Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/home/rooms_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ impl RoomsList {
RoomsListUpdate::UpdateRoomAvatar { room_id, room_avatar } => {
if let Some(room) = self.all_joined_rooms.get_mut(&room_id) {
room.room_avatar = room_avatar;
} else if let Some(room) = self.invited_rooms.borrow_mut().get_mut(&room_id) {
room.room_avatar = room_avatar;
} else {
error!("Error: couldn't find room {room_id} to update avatar");
}
Expand Down
4 changes: 3 additions & 1 deletion src/sliding_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2973,7 +2973,8 @@ async fn add_new_room(
RoomState::Invited => {
let invite_details = new_room.room.invite_details().await.ok();
let room_name_id = RoomNameId::from((new_room.display_name.clone(), new_room.room_id.clone()));
let room_avatar = room_avatar(&new_room.room, &room_name_id).await;
// Start with a basic text avatar; the avatar image will be fetched asynchronously below.
let room_avatar = avatar_from_room_name(room_name_id.name_for_avatar().as_deref());
let inviter_info = if let Some(inviter) = invite_details.and_then(|d| d.inviter) {
Some(InviterInfo {
user_id: inviter.user_id().to_owned(),
Expand Down Expand Up @@ -3004,6 +3005,7 @@ async fn add_new_room(
room_name_id,
is_invite: true,
});
spawn_fetch_room_avatar(new_room);
return Ok(());
}
RoomState::Joined => { } // Fall through to adding the joined room below.
Expand Down