magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unnecessary cloning on account deactivation profile updates

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-09-08 19:33:21 -04:00
parent b44f7f5476
commit 38cd88e1e8
4 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/admin/user/commands.rs
View file

@ -163,8 +163,8 @@ pub(super) async fn deactivate(&self, no_leave_rooms: bool, user_id: String) ->
.rooms_joined(&user_id) .rooms_joined(&user_id)
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
update_displayname(self.services, user_id.clone(), None, all_joined_rooms.clone()).await?; update_displayname(self.services, &user_id, None, all_joined_rooms.clone()).await?;
update_avatar_url(self.services, user_id.clone(), None, None, all_joined_rooms).await?; update_avatar_url(self.services, &user_id, None, None, all_joined_rooms).await?;
self.services.users.set_timezone(&user_id, None).await?; self.services.users.set_timezone(&user_id, None).await?;
leave_all_rooms(self.services, &user_id).await; leave_all_rooms(self.services, &user_id).await;
} }
@ -272,8 +272,9 @@ pub(super) async fn deactivate_all(&self, no_leave_rooms: bool, force: bool) ->
.rooms_joined(&user_id) .rooms_joined(&user_id)
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
update_displayname(self.services, user_id.clone(), None, all_joined_rooms.clone()).await?; update_displayname(self.services, &user_id, None, all_joined_rooms.clone()).await?;
update_avatar_url(self.services, user_id.clone(), None, None, all_joined_rooms).await?; update_avatar_url(self.services, &user_id, None, None, all_joined_rooms).await?;
self.services.users.set_timezone(&user_id, None).await?;
leave_all_rooms(self.services, &user_id).await; leave_all_rooms(self.services, &user_id).await;
} }
}, },

5
src/api/client/account.rs
View file

@ -568,8 +568,9 @@ pub(crate) async fn deactivate_route(
.rooms_joined(sender_user) .rooms_joined(sender_user)
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
super::update_displayname(&services, sender_user.clone(), None, all_joined_rooms.clone()).await?; super::update_displayname(&services, sender_user, None, all_joined_rooms.clone()).await?;
super::update_avatar_url(&services, sender_user.clone(), None, None, all_joined_rooms).await?; super::update_avatar_url(&services, sender_user, None, None, all_joined_rooms).await?;
services.users.set_timezone(sender_user, None).await?;
// Make the user leave all rooms before deactivation // Make the user leave all rooms before deactivation
super::leave_all_rooms(&services, sender_user).await; super::leave_all_rooms(&services, sender_user).await;

10
src/api/client/membership.rs
View file

@ -93,8 +93,9 @@ async fn banned_room_check(
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
update_displayname(services, user_id.into(), None, all_joined_rooms.clone()).await?; update_displayname(services, user_id, None, all_joined_rooms.clone()).await?;
update_avatar_url(services, user_id.into(), None, None, all_joined_rooms).await?; update_avatar_url(services, user_id, None, None, all_joined_rooms).await?;
services.users.set_timezone(user_id, None).await?;
leave_all_rooms(services, user_id).await; leave_all_rooms(services, user_id).await;
} }
@ -136,8 +137,9 @@ async fn banned_room_check(
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
update_displayname(services, user_id.into(), None, all_joined_rooms.clone()).await?; update_displayname(services, user_id, None, all_joined_rooms.clone()).await?;
update_avatar_url(services, user_id.into(), None, None, all_joined_rooms).await?; update_avatar_url(services, user_id, None, None, all_joined_rooms).await?;
services.users.set_timezone(user_id, None).await?;
leave_all_rooms(services, user_id).await; leave_all_rooms(services, user_id).await;
} }

26
src/api/client/profile.rs
View file

@ -10,7 +10,7 @@ use ruma::{
}, },
events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType}, events::{room::member::RoomMemberEventContent, StateEventType, TimelineEventType},
presence::PresenceState, presence::PresenceState,
OwnedMxcUri, OwnedRoomId, OwnedUserId, OwnedMxcUri, OwnedRoomId, UserId,
}; };
use serde_json::value::to_raw_value; use serde_json::value::to_raw_value;
use service::Services; use service::Services;
@ -38,7 +38,7 @@ pub(crate) async fn set_displayname_route(
.filter_map(Result::ok) .filter_map(Result::ok)
.collect(); .collect();
update_displayname(&services, body.user_id.clone(), body.displayname.clone(), all_joined_rooms).await?; update_displayname(&services, &body.user_id, body.displayname.clone(), all_joined_rooms).await?;
if services.globals.allow_local_presence() { if services.globals.allow_local_presence() {
// Presence update // Presence update
@ -129,7 +129,7 @@ pub(crate) async fn set_avatar_url_route(
update_avatar_url( update_avatar_url(
&services, &services,
body.user_id.clone(), &body.user_id,
body.avatar_url.clone(), body.avatar_url.clone(),
body.blurhash.clone(), body.blurhash.clone(),
all_joined_rooms, all_joined_rooms,
@ -271,9 +271,9 @@ pub(crate) async fn get_profile_route(
} }
pub async fn update_displayname( pub async fn update_displayname(
services: &Services, user_id: OwnedUserId, displayname: Option<String>, all_joined_rooms: Vec<OwnedRoomId>, services: &Services, user_id: &UserId, displayname: Option<String>, all_joined_rooms: Vec<OwnedRoomId>,
) -> Result<()> { ) -> Result<()> {
let current_display_name = services.users.displayname(&user_id).unwrap_or_default(); let current_display_name = services.users.displayname(user_id).unwrap_or_default();
if displayname == current_display_name { if displayname == current_display_name {
return Ok(()); return Ok(());
@ -281,7 +281,7 @@ pub async fn update_displayname(
services services
.users .users
.set_displayname(&user_id, displayname.clone()) .set_displayname(user_id, displayname.clone())
.await?; .await?;
// Send a new join membership event into all joined rooms // Send a new join membership event into all joined rooms
@ -325,11 +325,11 @@ pub async fn update_displayname(
} }
pub async fn update_avatar_url( pub async fn update_avatar_url(
services: &Services, user_id: OwnedUserId, avatar_url: Option<OwnedMxcUri>, blurhash: Option<String>, services: &Services, user_id: &UserId, avatar_url: Option<OwnedMxcUri>, blurhash: Option<String>,
all_joined_rooms: Vec<OwnedRoomId>, all_joined_rooms: Vec<OwnedRoomId>,
) -> Result<()> { ) -> Result<()> {
let current_avatar_url = services.users.avatar_url(&user_id).unwrap_or_default(); let current_avatar_url = services.users.avatar_url(user_id).unwrap_or_default();
let current_blurhash = services.users.blurhash(&user_id).unwrap_or_default(); let current_blurhash = services.users.blurhash(user_id).unwrap_or_default();
if current_avatar_url == avatar_url && current_blurhash == blurhash { if current_avatar_url == avatar_url && current_blurhash == blurhash {
return Ok(()); return Ok(());
@ -337,11 +337,11 @@ pub async fn update_avatar_url(
services services
.users .users
.set_avatar_url(&user_id, avatar_url.clone()) .set_avatar_url(user_id, avatar_url.clone())
.await?; .await?;
services services
.users .users
.set_blurhash(&user_id, blurhash.clone()) .set_blurhash(user_id, blurhash.clone())
.await?; .await?;
// Send a new join membership event into all joined rooms // Send a new join membership event into all joined rooms
@ -386,14 +386,14 @@ pub async fn update_avatar_url(
} }
pub async fn update_all_rooms( pub async fn update_all_rooms(
services: &Services, all_joined_rooms: Vec<(PduBuilder, &OwnedRoomId)>, user_id: OwnedUserId, services: &Services, all_joined_rooms: Vec<(PduBuilder, &OwnedRoomId)>, user_id: &UserId,
) { ) {
for (pdu_builder, room_id) in all_joined_rooms { for (pdu_builder, room_id) in all_joined_rooms {
let state_lock = services.rooms.state.mutex.lock(room_id).await; let state_lock = services.rooms.state.mutex.lock(room_id).await;
if let Err(e) = services if let Err(e) = services
.rooms .rooms
.timeline .timeline
.build_and_append_pdu(pdu_builder, &user_id, room_id, &state_lock) .build_and_append_pdu(pdu_builder, user_id, room_id, &state_lock)
.await .await
{ {
warn!(%user_id, %room_id, %e, "Failed to update/send new profile join membership update in room"); warn!(%user_id, %room_id, %e, "Failed to update/send new profile join membership update in room");