For 'me,' prefer signal profile avatar over address book info

This commit is contained in:
Scott Nonnenberg 2019-06-07 10:51:41 -07:00 committed by Ken Powers
parent 3505ab9198
commit dd98477479

View file

@ -2019,7 +2019,9 @@
return migrateColor(this.get('color'));
},
getAvatarPath() {
const avatar = this.get('avatar') || this.get('profileAvatar');
const avatar = this.isMe()
? this.get('profileAvatar') || this.get('avatar')
: this.get('avatar') || this.get('profileAvatar');
if (avatar && avatar.path) {
return getAbsoluteAttachmentPath(avatar.path);