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

Group name spoofing warning

Browse source
This commit is contained in:
Evan Hahn 2021-06-01 18:30:25 -05:00 • committed by GitHub
parent 51b45ab275
commit 36c15fead4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 1312 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/models/conversations.ts
View file

@ -56,6 +56,7 @@ import { sendReadReceiptsFor } from '../util/sendReadReceiptsFor';
import { updateConversationsWithUuidLookup } from '../updateConversationsWithUuidLookup';
import { filter, map, take } from '../util/iterables';
import * as universalExpireTimer from '../util/universalExpireTimer';
import { GroupNameCollisionsWithIdsByTitle } from '../util/groupMemberNameCollisions';
/* eslint-disable more/no-then */
window.Whisper = window.Whisper || {};
@ -1531,6 +1532,8 @@ export class ConversationModel extends window.Backbone
}
: {
type: 'group' as const,
acknowledgedGroupNameCollisions:
this.get('acknowledgedGroupNameCollisions') || {},
sharedGroupNames: [],
}),
};
@ -5231,6 +5234,13 @@ export class ConversationModel extends window.Backbone
me.captureChange('pin');
}
}
acknowledgeGroupMemberNameCollisions(
groupNameCollisions: Readonly<GroupNameCollisionsWithIdsByTitle>
): void {
this.set('acknowledgedGroupNameCollisions', groupNameCollisions);
window.Signal.Data.updateConversation(this.attributes);
}
}
window.Whisper.Conversation = ConversationModel;