mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Rename ConversationModel#getAvatarPath for clarity

Browse source
This commit is contained in:
Evan Hahn 2021-04-26 09:31:36 -05:00 • committed by Scott Nonnenberg
parent 3ce39a6316
commit 664865c9f1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/models/conversations.ts
View file

@ -1345,7 +1345,7 @@ export class ConversationModel extends window.Backbone.Model<
areWeAdmin: this.areWeAdmin(), areWeAdmin: this.areWeAdmin(),
canChangeTimer: this.canChangeTimer(), canChangeTimer: this.canChangeTimer(),
canEditGroupInfo: this.canEditGroupInfo(), canEditGroupInfo: this.canEditGroupInfo(),
avatarPath: this.getAvatarPath()!, avatarPath: this.getAbsoluteAvatarPath(),
color, color,
discoveredUnregisteredAt: this.get('discoveredUnregisteredAt'), discoveredUnregisteredAt: this.get('discoveredUnregisteredAt'),
draftBodyRanges, draftBodyRanges,
@ -4929,7 +4929,7 @@ export class ConversationModel extends window.Backbone.Model<
return migrateColor(this.get('color')); return migrateColor(this.get('color'));
} }
getAvatarPath(): string | undefined { getAbsoluteAvatarPath(): string | undefined {
const avatar = this.isMe() const avatar = this.isMe()
? this.get('profileAvatar') || this.get('avatar') ? this.get('profileAvatar') || this.get('avatar')
: this.get('avatar') || this.get('profileAvatar'); : this.get('avatar') || this.get('profileAvatar');

2
ts/models/messages.ts
View file

@ -888,7 +888,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const authorColor = contactModel ? contactModel.getColor() : undefined; const authorColor = contactModel ? contactModel.getColor() : undefined;
const authorAvatarPath = contactModel const authorAvatarPath = contactModel
? contactModel.getAvatarPath() ? contactModel.getAbsoluteAvatarPath()
: undefined; : undefined;
const expirationLength = this.get('expireTimer') * 1000; const expirationLength = this.get('expireTimer') * 1000;