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

Process username changes in storage service

Browse source
This commit is contained in:
Fedor Indutny 2023-02-02 10:03:51 -08:00 • committed by GitHub
parent 71c97e9580
commit 1381e8df5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 252 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

53
ts/models/conversations.ts
View file

@ -97,6 +97,7 @@ import {
getProfileName,
getTitle,
getTitleNoDefault,
canHaveUsername,
} from '../util/getTitle';
import { markConversationRead } from '../util/markConversationRead';
import { handleMessageSend } from '../util/handleMessageSend';
@ -349,6 +350,10 @@ export class ConversationModel extends window.Backbone
this.on('newmessage', this.onNewMessage);
this.on('change:profileKey', this.onChangeProfileKey);
this.on(
'change:name change:profileName change:profileFamilyName change:e164',
() => this.maybeClearUsername()
);
const sealedSender = this.get('sealedSender');
if (sealedSender === undefined) {
@ -1826,7 +1831,9 @@ export class ConversationModel extends window.Backbone
// We had previously stored `null` instead of `undefined` in some cases. We should
// be able to remove this `dropNull` once usernames have gone to production.
username: dropNull(this.get('username')),
username: canHaveUsername(this.attributes, ourConversationId)
? dropNull(this.get('username'))
: undefined,
about: this.getAboutText(),
aboutText: this.get('about'),
@ -4218,6 +4225,50 @@ export class ConversationModel extends window.Backbone
);
}
async maybeClearUsername(): Promise<void> {
const ourConversationId =
window.ConversationController.getOurConversationId();
// Clear username once we have other information about the contact
if (
canHaveUsername(this.attributes, ourConversationId) ||
!this.get('username')
) {
return;
}
log.info(`maybeClearUsername(${this.idForLogging()}): clearing username`);
this.unset('username');
window.Signal.Data.updateConversation(this.attributes);
this.captureChange('clearUsername');
}
async updateUsername(
username: string | undefined,
{ shouldSave = true }: { shouldSave?: boolean } = {}
): Promise<void> {
const ourConversationId =
window.ConversationController.getOurConversationId();
if (!canHaveUsername(this.attributes, ourConversationId)) {
return;
}
if (this.get('username') === username) {
return;
}
log.info(`updateUsername(${this.idForLogging()}): updating username`);
this.set('username', username);
this.captureChange('updateUsername');
if (shouldSave) {
await window.Signal.Data.updateConversation(this.attributes);
}
}
async updateLastMessage(): Promise<void> {
if (!this.id) {
return;