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

Use UUIDs in group database schema

Browse source
This commit is contained in:
Fedor Indutny 2021-10-26 15:59:08 -07:00 • committed by GitHub
parent 74fde10ff5
commit 63fcdbe787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 4530 additions and 3664 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/util/getGroupMemberships.ts
View file

@ -7,6 +7,7 @@ import type {
GroupV2RequestingMembership,
} from '../components/conversation/conversation-details/PendingInvites';
import type { ConversationType } from '../state/ducks/conversations';
import type { UUIDStringType } from '../types/UUID';
import { isConversationUnregistered } from './isConversationUnregistered';
export const getGroupMemberships = (
@ -20,7 +21,7 @@ export const getGroupMemberships = (
'memberships' | 'pendingApprovalMemberships' | 'pendingMemberships'
>
>,
getConversationById: (conversationId: string) => undefined | ConversationType
getConversationByUuid: (uuid: UUIDStringType) => undefined | ConversationType
): {
memberships: Array<GroupV2Membership>;
pendingApprovalMemberships: Array<GroupV2RequestingMembership>;
@ -28,7 +29,7 @@ export const getGroupMemberships = (
} => ({
memberships: memberships.reduce(
(result: Array<GroupV2Membership>, membership) => {
const member = getConversationById(membership.conversationId);
const member = getConversationByUuid(membership.uuid);
if (!member) {
return result;
}
@ -38,7 +39,7 @@ export const getGroupMemberships = (
),
pendingApprovalMemberships: pendingApprovalMemberships.reduce(
(result: Array<GroupV2RequestingMembership>, membership) => {
const member = getConversationById(membership.conversationId);
const member = getConversationByUuid(membership.uuid);
if (!member || isConversationUnregistered(member)) {
return result;
}
@ -48,7 +49,7 @@ export const getGroupMemberships = (
),
pendingMemberships: pendingMemberships.reduce(
(result: Array<GroupV2PendingMembership>, membership) => {
const member = getConversationById(membership.conversationId);
const member = getConversationByUuid(membership.uuid);
if (!member || isConversationUnregistered(member)) {
return result;
}