Participants: fix count

This commit is contained in:
Liam Fitzgerald 2021-03-17 10:35:31 +10:00
parent ede3b53c60
commit db811cf1bd
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB

View File

@ -66,9 +66,8 @@ function getParticipants(cs: Contacts, group: Group) {
})) }))
)(cs); )(cs);
const members: Participant[] = _.map( const members: Participant[] = _.map(
Array.from(group.members) Array.from(group.members),
.filter(e => group?.policy?.invite?.pending ? !group.policy.invite.pending.has(e) : true), m => s => contacts[s] ?? emptyContact(s, false)
emptyContact(m, false)
); );
const allMembers = _.unionBy(contacts, members, 'patp'); const allMembers = _.unionBy(contacts, members, 'patp');
const pending: Participant[] = const pending: Participant[] =
@ -78,10 +77,11 @@ function getParticipants(cs: Contacts, group: Group) {
) )
: []; : [];
const incPending = _.unionBy(allMembers, pending, 'patp');
return [ return [
_.unionBy(allMembers, pending, 'patp'), incPending,
pending.length, incPending.length - group.members.size,
allMembers.length group.members.size
] as const; ] as const;
} }