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

Fixes isAccepted logic when calling it for the first time

Browse source
This commit is contained in:
Josh Perez 2022-04-07 22:12:35 -04:00 • committed by GitHub
parent c3fa6b87fe
commit d8e6516fb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ts/models/messages.ts
View file

@ -1927,11 +1927,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
); );
if ( if (
type === 'story' && isStory(message.attributes) &&
!isConversationAccepted(conversation.attributes) !isConversationAccepted(conversation.attributes, {
ignoreEmptyConvo: true,
})
) { ) {
log.info( log.info(
'handleDataMessage: dropping story from !whitelisted', 'handleDataMessage: dropping story from !accepted',
this.getSenderIdentifier() this.getSenderIdentifier()
); );
confirm(); confirm();
@ -2572,9 +2574,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
if ( if (
this.hasAttachmentDownloads() && this.hasAttachmentDownloads() &&
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion (conversation.getAccepted() || isOutgoing(message.attributes)) &&
(this.getConversation()!.getAccepted() ||
isOutgoing(message.attributes)) &&
!shouldHoldOffDownload !shouldHoldOffDownload
) { ) {
if (window.attachmentDownloadQueue) { if (window.attachmentDownloadQueue) {

7
ts/util/isConversationAccepted.ts
View file

@ -11,7 +11,8 @@ import { isInSystemContacts } from './isInSystemContacts';
* of message requests * of message requests
*/ */
export function isConversationAccepted( export function isConversationAccepted(
conversationAttrs: ConversationAttributesType conversationAttrs: ConversationAttributesType,
{ ignoreEmptyConvo = false } = {}
): boolean { ): boolean {
const messageRequestsEnabled = window.Signal.RemoteConfig.isEnabled( const messageRequestsEnabled = window.Signal.RemoteConfig.isEnabled(
'desktop.messageRequests' 'desktop.messageRequests'
@ -40,7 +41,9 @@ export function isConversationAccepted(
const hasNoMessages = (conversationAttrs.messageCount || 0) === 0; const hasNoMessages = (conversationAttrs.messageCount || 0) === 0;
const isEmptyPrivateConvo = const isEmptyPrivateConvo =
hasNoMessages && isDirectConversation(conversationAttrs); hasNoMessages &&
isDirectConversation(conversationAttrs) &&
!ignoreEmptyConvo;
const isEmptyWhitelistedGroup = const isEmptyWhitelistedGroup =
hasNoMessages && hasNoMessages &&
!isDirectConversation(conversationAttrs) && !isDirectConversation(conversationAttrs) &&