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

New contact popup when clicking on group member or avatar

Browse source
This commit is contained in:
Chris Svenningsen 2020-11-11 09:36:05 -08:00 • committed by GitHub
parent cd599f92c8
commit d593f74241
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 717 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ts/models/conversations.ts
View file

@ -1139,6 +1139,7 @@ export class ConversationModel extends window.Backbone.Model<
areWePending: Boolean(
ourConversationId && this.isMemberPending(ourConversationId)
),
areWeAdmin: this.areWeAdmin(),
canChangeTimer: this.canChangeTimer(),
avatarPath: this.getAvatarPath()!,
color,
@ -1437,6 +1438,24 @@ export class ConversationModel extends window.Backbone.Model<
}
}
async removeFromGroupV2(conversationId: string): Promise<void> {
if (this.isGroupV2() && this.isMemberPending(conversationId)) {
await this.modifyGroupV2({
name: 'removePendingMember',
createGroupChange: () => this.removePendingMember(conversationId),
});
} else if (this.isGroupV2() && this.isMember(conversationId)) {
await this.modifyGroupV2({
name: 'removeFromGroup',
createGroupChange: () => this.removeMember(conversationId),
});
} else {
window.log.error(
`removeFromGroupV2: Member ${conversationId} is neither a member nor a pending member of the group`
);
}
}
async syncMessageRequestResponse(response: number): Promise<void> {
// In GroupsV2, this may modify the server. We only want to continue if those
// server updates were successful.
@ -4013,6 +4032,14 @@ export class ConversationModel extends window.Backbone.Model<
return true;
}
return this.areWeAdmin();
}
areWeAdmin(): boolean {
if (!this.isGroupV2()) {
return false;
}
const memberEnum = window.textsecure.protobuf.Member.Role;
const members = this.get('membersV2') || [];
const myId = window.ConversationController.getOurConversationId();
@ -4021,12 +4048,7 @@ export class ConversationModel extends window.Backbone.Model<
return false;
}
const isAdministrator = me.role === memberEnum.ADMINISTRATOR;
if (isAdministrator) {
return true;
}
return false;
return me.role === memberEnum.ADMINISTRATOR;
}
// Set of items to captureChanges on: