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

Make it more difficult to blur avatars

Browse source
This commit is contained in:
Evan Hahn 2021-05-07 17:21:10 -05:00 • committed by GitHub
parent 1276368f94
commit d28678dbf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 1118 additions and 889 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/models/conversations.ts
View file

@ -18,10 +18,7 @@ import {
GroupV2InfoType,
SendOptionsType,
} from '../textsecure/SendMessage';
import {
ConversationType,
ConversationTypeType,
} from '../state/ducks/conversations';
import { ConversationType } from '../state/ducks/conversations';
import { ColorType } from '../types/Colors';
import { MessageModel } from './messages';
import { isMuted } from '../util/isMuted';
@ -1386,7 +1383,6 @@ export class ConversationModel extends window.Backbone
profileSharing: this.get('profileSharing'),
publicParams: this.get('publicParams'),
secretParams: this.get('secretParams'),
sharedGroupNames: this.get('sharedGroupNames'),
shouldShowDraft,
sortedGroupMembers,
timestamp,
@ -1394,8 +1390,16 @@ export class ConversationModel extends window.Backbone
searchableTitle: this.isMe()
? window.i18n('noteToSelf')
: this.getTitle(),
type: (this.isPrivate() ? 'direct' : 'group') as ConversationTypeType,
unreadCount: this.get('unreadCount')! || 0,
...(this.isPrivate()
? {
type: 'direct' as const,
sharedGroupNames: this.get('sharedGroupNames') || [],
}
: {
type: 'group' as const,
sharedGroupNames: [],
}),
};
if (typingContact) {