diff --git a/ts/background.preload.ts b/ts/background.preload.ts index b7701134d0..b3da33f69a 100644 --- a/ts/background.preload.ts +++ b/ts/background.preload.ts @@ -2186,7 +2186,7 @@ export async function startApp(): Promise { if (isGroup(conversation.attributes)) { // We drop typing notifications in groups we're not a part of - if (!conversation.areWeAMember()) { + if (!conversation.areWeAGroupMember()) { log.warn( `Received typing indicator for group ${conversation.idForLogging()}, which we're not a part of. Dropping.` ); diff --git a/ts/groups.preload.ts b/ts/groups.preload.ts index 4b68e7002d..f1ea36b080 100644 --- a/ts/groups.preload.ts +++ b/ts/groups.preload.ts @@ -1992,7 +1992,7 @@ export async function isGroupEligibleToMigrate( return false; } - const areWeMember = conversation.areWeAMember(); + const areWeMember = conversation.areWeAGroupMember(); if (!areWeMember) { return false; } diff --git a/ts/messages/handleDataMessage.preload.ts b/ts/messages/handleDataMessage.preload.ts index 30d6599ba8..b177c5d619 100644 --- a/ts/messages/handleDataMessage.preload.ts +++ b/ts/messages/handleDataMessage.preload.ts @@ -327,7 +327,7 @@ export async function handleDataMessage( return; } - const areWeMember = conversation.areWeAMember(); + const areWeMember = conversation.areWeAGroupMember(); // Drop an incoming GroupV2 message if we or the sender are not part of the group // after applying the message's associated group changes. diff --git a/ts/models/conversations.preload.ts b/ts/models/conversations.preload.ts index 25c89662c9..ca68f824eb 100644 --- a/ts/models/conversations.preload.ts +++ b/ts/models/conversations.preload.ts @@ -1411,7 +1411,7 @@ export class ConversationModel { return; } - if (!this.areWeAMember()) { + if (!isDirectConversation(this.attributes) && !this.areWeAGroupMember()) { log.warn( `sendTypingMessage(${this.idForLogging()}): not sending, we are not a member` ); @@ -5379,7 +5379,7 @@ export class ConversationModel { return areWeAdmin(this.attributes); } - areWeAMember(): boolean { + areWeAGroupMember(): boolean { return ( !this.get('left') && this.hasMember(itemStorage.user.getCheckedAci()) );