From 74cf88cf8124d9cb17ec92357752ffa914923b1a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 16 Mar 2022 10:49:19 +1100
Subject: [PATCH] create closed group mark as approved

also, do not filter closed group based on the isApproved field in redux
---
 ts/models/conversation.ts               | 5 ++---
 ts/receiver/closedGroups.ts             | 2 +-
 ts/receiver/contentMessage.ts           | 3 ++-
 ts/session/group/closed-group.ts        | 1 -
 ts/session/utils/calling/CallManager.ts | 1 -
 ts/state/selectors/conversations.ts     | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index b18165411..20be3cc2e 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -776,7 +776,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       messageRequestResponse: {
         isApproved: 1,
       },
-      unread: 1, // 1 means unread
       expireTimer: 0,
     });
 
@@ -945,7 +944,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (isOutgoing) {
       message = await this.addSingleOutgoingMessage({
         ...commonAttributes,
-        unread: 0,
         sent_at: timestamp,
       });
     } else {
@@ -1017,7 +1015,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   public async addSingleOutgoingMessage(
     messageAttributes: Omit<
       MessageAttributesOptionals,
-      'conversationId' | 'source' | 'type' | 'direction' | 'received_at'
+      'conversationId' | 'source' | 'type' | 'direction' | 'received_at' | 'unread'
     >
   ) {
     return this.addSingleMessage({
@@ -1026,6 +1024,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       source: UserUtils.getOurPubKeyStrFromCache(),
       type: 'outgoing',
       direction: 'outgoing',
+      unread: 0, // an outgoing message must be read right?
       received_at: messageAttributes.sent_at, // make sure to set an received_at timestamp for an outgoing message, so the order are right.
     });
   }
diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 7f88d44c0..54de697c0 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -954,7 +954,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
     UserUtils.getOurPubKeyStrFromCache(),
     Date.now()
   );
-
+  await convo.setIsApproved(true, false);
   // be sure to call this before sending the message.
   // the sending pipeline needs to know from GroupUtils when a message is for a medium group
   await ClosedGroup.updateOrCreateClosedGroup(groupDetails);
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 9237ce416..d23fc9fb1 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -616,7 +616,8 @@ export async function handleDataExtractionNotification(
     const envelopeTimestamp = Lodash.toNumber(timestamp);
     const referencedAttachmentTimestamp = Lodash.toNumber(referencedAttachment);
 
-    await convo.addSingleOutgoingMessage({
+    await convo.addSingleIncomingMessage({
+      source,
       sent_at: envelopeTimestamp,
       dataExtractionNotification: {
         type,
diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts
index e432d8ad8..1524b0f7a 100644
--- a/ts/session/group/closed-group.ts
+++ b/ts/session/group/closed-group.ts
@@ -174,7 +174,6 @@ export async function addUpdateMessage(
     const outgoingMessage = await convo.addSingleOutgoingMessage({
       sent_at: sentAt,
       group_update: groupUpdate,
-      unread: 1,
       expireTimer: 0,
     });
     return outgoingMessage;
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index 1e7f8faf0..5ce99e7d8 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -503,7 +503,6 @@ export async function USER_callRecipient(recipient: string) {
     sent_at: now,
     expireTimer: 0,
     callNotificationType: 'started-call',
-    unread: 0,
   });
 
   // initiating a call is analgous to sending a message request
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index b06b20e13..4fbed7e74 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -352,7 +352,7 @@ export const _getLeftPaneLists = (
       directConversations.push(conversation);
     }
 
-    if (!conversation.isApproved) {
+    if (!conversation.isApproved && conversation.isPrivate) {
       // dont increase unread counter, don't push to convo list.
       continue;
     }