[FIX] Avatar on sidebar when showing real names (#17286)

pull/15488/head^2
Guilherme Gazzo 5 years ago committed by GitHub
parent 39c74d4b8c
commit fd69a79d74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      app/lib/lib/roomTypes/direct.js

@ -186,16 +186,23 @@ export class DirectMessageRoomType extends RoomTypeConfig {
}
getAvatarPath(roomData, subData) {
if (!roomData && !subData) {
return '';
}
if (this.isGroupChat(roomData)) {
return getAvatarURL({ username: roomData.uids.length + roomData.usernames.join() });
}
if (roomData) {
return getUserAvatarURL(roomData.name || this.roomName(roomData));
const sub = subData || Subscriptions.findOne({ rid: roomData._id }, { fields: { name: 1 } });
if (sub && sub.name) {
return getUserAvatarURL(sub.name);
}
const sub = subData || Subscriptions.findOne({ rid: roomData._id }, { fields: { name: 1 } });
return getUserAvatarURL(sub.name || this.roomName(roomData));
if (roomData) {
return getUserAvatarURL(roomData.name || this.roomName(roomData)); // rooms should have no name for direct messages...
}
}
includeInDashboard() {

Loading…
Cancel
Save