From f7c7d6a3d82e1a7da01b38608c79ea561a4c447b Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Tue, 3 Aug 2021 14:31:06 +1000
Subject: [PATCH] change source of MessageAttributesOptionals to not null

---
 ts/models/conversation.ts       | 1 +
 ts/models/message.ts            | 1 +
 ts/models/messageType.ts        | 2 +-
 ts/receiver/contentMessage.ts   | 1 +
 ts/session/group/index.ts       | 6 ++++++
 ts/state/ducks/conversations.ts | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 88d329981..92f1d29a6 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -852,6 +852,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       //   indicator above it. We set it to 'unread' to trigger that placement.
       unread: 1,
       conversationId: this.id,
+      source,
       // No type; 'incoming' messages are specially treated by conversation.markRead()
       sent_at: timestamp,
       received_at: timestamp,
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 405fc0180..ffba9cb89 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -506,6 +506,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       // isSelected: this.isSelected,
       id: this.id as string,
       conversationId: this.get('conversationId'),
+      source: this.get('source'),
       receivedAt: this.get('received_at'),
       snippet: this.get('snippet'),
     };
diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index 353215118..e62eb3385 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -117,7 +117,7 @@ export type PropsForDataExtractionNotification = DataExtractionNotificationMsg &
 
 export interface MessageAttributesOptionals {
   id?: string;
-  source?: string;
+  source: string;
   quote?: any;
   expireTimer?: number;
   received_at?: number;
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index 8ca06b0b4..5924660b6 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -515,6 +515,7 @@ export async function handleDataExtractionNotification(
 
     await convo.addSingleMessage({
       conversationId: convo.get('id'),
+      source,
       type: 'outgoing', // mark it as outgoing just so it appears below our sent attachment
       sent_at: envelopeTimestamp,
       received_at: now,
diff --git a/ts/session/group/index.ts b/ts/session/group/index.ts
index 23ba35529..4e59db40b 100644
--- a/ts/session/group/index.ts
+++ b/ts/session/group/index.ts
@@ -164,8 +164,11 @@ export async function addUpdateMessage(
 
   const unread = type === 'incoming';
 
+  const source = UserUtils.getOurPubKeyStrFromCache();
+
   const message = await convo.addSingleMessage({
     conversationId: convo.get('id'),
+    source,
     type,
     sent_at: sentAt,
     received_at: now,
@@ -313,9 +316,12 @@ export async function leaveClosedGroup(groupId: string) {
   convo.set({ groupAdmins: admins });
   await convo.commit();
 
+  const source = UserUtils.getOurPubKeyStrFromCache();
+
   const dbMessage = await convo.addSingleMessage({
     group_update: { left: 'You' },
     conversationId: groupId,
+    source,
     type: 'outgoing',
     sent_at: now,
     received_at: now,
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 0940c65b2..59fe736ab 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -122,6 +122,7 @@ export type PropsForSearchResults = {
   to: FindAndFormatContactType;
   id: string;
   conversationId: string;
+  source: string;
   receivedAt: number | undefined;
   snippet?: string; //not sure about the type of snippet
 };