Skip to content

feat(core): Enable leaving federated conversations #12078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atomrc merged 1 commit into from
Oct 25, 2021
Merged

feat(core): Enable leaving federated conversations #12078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/script/conversation/ConversationRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,9 @@ export class ConversationRepository {
* @returns Resolves when member was removed from the conversation
*/
public async removeMember(conversationEntity: Conversation, user: QualifiedId) {
const response = await this.conversation_service.deleteMembers(conversationEntity.id, user.id);
const response = conversationEntity.isFederated()
? await this.conversation_service.deleteQualifiedMembers(conversationEntity.qualifiedId, user)
: await this.conversation_service.deleteMembers(conversationEntity.id, user.id);
const roles = conversationEntity.roles();
delete roles[user.id];
conversationEntity.roles(roles);
Expand Down
13 changes: 13 additions & 0 deletions src/script/conversation/ConversationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,19 @@ export class ConversationService {
return this.apiClient.conversation.api.deleteMember(conversationId, userId);
}

/**
* Remove member from federated conversation.
*
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/removeMember
*
* @param conversationId Qualified ID of conversation to remove member from
* @param userId Qualified ID of member to be removed from the the conversation
* @returns Resolves with the server response
*/
deleteQualifiedMembers(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent> {
return this.apiClient.conversation.api.deleteQualifiedMember(conversationId, userId);
}

putMembers(conversationId: string, userId: string, data: ConversationOtherMemberUpdateData): Promise<void> {
return this.apiClient.conversation.api.putOtherMember(userId, conversationId, data);
}
Expand Down