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

A few small bugfixes

Browse source
This commit is contained in:
Scott Nonnenberg 2020-10-30 10:56:03 -07:00 • committed by GitHub
parent cd9aee84f5
commit 05f905fd10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/models/messages.ts
View file

@ -128,8 +128,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
OUR_UUID?: string;
deletedForEveryone?: boolean;
isSelected?: boolean;
hasExpired?: boolean;
@ -1076,6 +1074,12 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
};
}
if (this.get('deletedForEveryone')) {
return {
text: window.i18n('message--deletedForEveryone'),
};
}
if (this.isProfileChange()) {
const change = this.get('profileChange');
const changedId = this.get('changedId');
@ -1652,11 +1656,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
getSourceDevice(): string | number | undefined {
const sourceDevice = this.get('sourceDevice');
if (this.isIncoming()) {
return this.get('sourceDevice');
return sourceDevice;
}
return window.textsecure.storage.user.getDeviceId();
return sourceDevice || window.textsecure.storage.user.getDeviceId();
}
getSourceUuid(): string | undefined {