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

Fix signal connection count

Browse source
This commit is contained in:
Fedor Indutny 2023-12-14 00:58:56 +01:00 committed by GitHub
parent 4dfbb25c71
commit f1665c65d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ts/util/getSignalConnections.ts
View file

@ -5,8 +5,10 @@ import type { ConversationAttributesType } from '../model-types.d';
import type { ConversationModel } from '../models/conversations';
import type { ConversationType } from '../state/ducks/conversations';
import { isInSystemContacts } from './isInSystemContacts';
import { isSignalConversation } from './isSignalConversation';
import { isDirectConversation } from './whatTypeOfConversation';
import { isConversationEverUnregistered } from './isConversationUnregistered';
import { isBlocked } from './isBlocked';
export function isSignalConnection(
conversation: ConversationType | ConversationAttributesType
@ -15,6 +17,10 @@ export function isSignalConnection(
isDirectConversation(conversation) &&
(conversation.profileSharing || isInSystemContacts(conversation)) &&
conversation.serviceId !== undefined &&
('isBlocked' in conversation
? !conversation.isBlocked
: !isBlocked(conversation)) &&
!isSignalConversation(conversation) &&
!isConversationEverUnregistered(conversation)
);
}

4
ts/util/isBlocked.ts
View file

@ -3,7 +3,9 @@
import type { ConversationAttributesType } from '../model-types';
export function isBlocked(attributes: ConversationAttributesType): boolean {
export function isBlocked(
attributes: Pick<ConversationAttributesType, 'e164' | 'groupId' | 'serviceId'>
): boolean {
const { e164, groupId, serviceId } = attributes;
if (serviceId) {
return window.storage.blocked.isServiceIdBlocked(serviceId);