Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-25 02:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update profile sharing when added to group

Browse Source
This commit is contained in:
trevor-signal
2025-08-25 10:26:49 -04:00
committed by GitHub
parent 5e44de3bd7
commit 435dc2acf7
3 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ts/util/isConversationAccepted.ts
View File

@@ -5,11 +5,14 @@ import type { ConversationAttributesType } from '../model-types.d';
import { SignalService as Proto } from '../protobuf';
import { isDirectConversation, isMe } from './whatTypeOfConversation';
import { isInSystemContacts } from './isInSystemContacts';
import { createLogger } from '../logging/log';
export type IsConversationAcceptedOptionsType = {
ignoreEmptyConvo: boolean;
};
const log = createLogger('isConversationAccepted');
/**
* Determine if this conversation should be considered "accepted" in terms
* of message requests
@@ -77,17 +80,28 @@ export function isConversationAccepted(
);
}
// Is this someone who is a contact, or are we sharing our profile with them?
// Or is the person who added us to this group a contact or are we sharing profile
// with them?
// Is this someone me, a system contact, or are we sharing our profile with them?
export function isTrustedContact(
conversationAttrs: ConversationAttributesType
): boolean {
if (!isDirectConversation(conversationAttrs)) {
log.error('isTrustedContact should only be called for direct convos');
return false;
}
return (
isMe(conversationAttrs) ||
isInSystemContacts(conversationAttrs) ||
Boolean(conversationAttrs.profileSharing)
);
}
// Is this person (or the person who added us to this group) a trusted contact?
function isFromOrAddedByTrustedContact(
conversationAttrs: ConversationAttributesType
): boolean {
if (isDirectConversation(conversationAttrs)) {
return (
isInSystemContacts(conversationAttrs) ||
Boolean(conversationAttrs.profileSharing)
);
return isTrustedContact(conversationAttrs);
}
const { addedBy } = conversationAttrs;
@@ -95,14 +109,10 @@ function isFromOrAddedByTrustedContact(
return false;
}
const conversation = window.ConversationController.get(addedBy);
if (!conversation) {
const addedByContact = window.ConversationController.get(addedBy);
if (!addedByContact) {
return false;
}
return Boolean(
isMe(conversation.attributes) ||
conversation.get('name') ||
conversation.get('profileSharing')
);
return isTrustedContact(addedByContact.attributes);
}