Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Use fallback avatar only for DMs with 2 people #6144

Closed
wants to merge 4 commits into from
Closed

Use fallback avatar only for DMs with 2 people #6144

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3eb517
Use fallback avatar only for DMs with 2 people
SimonBrandner Jun 5, 2021
4b2a9a6
Remove mistaken param
SimonBrandner Jun 5, 2021
87622fb
Add a comment
SimonBrandner Jun 5, 2021
2571de2
Merge remote-tracking branch 'upstream/develop' into fix/auto-avatars
SimonBrandner Oct 1, 2021
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
14 changes: 5 additions & 9 deletions src/Avatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,11 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
// space rooms cannot be DMs so skip the rest
if (SpaceStore.spacesEnabled && room.isSpaceRoom()) return null;

let otherMember = null;
const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
if (otherUserId) {
otherMember = room.getMember(otherUserId);
} else {
// if the room is not marked as a 1:1, but only has max 2 members
// then still try to show any avatar (pref. other member)
otherMember = room.getAvatarFallbackMember();
}
// If the room is not a DM don't fallback to a member avatar
if (!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) return null;

// If there are only two members in the DM use the avatar of the other member
const otherMember = room.getAvatarFallbackMember();
if (otherMember?.getMxcAvatarUrl()) {
return mediaFromMxc(otherMember.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
}
Expand Down