From 225d7f84e463da5a608537d6e14bf3278ea6d87d Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Tue, 30 Jun 2020 09:44:39 +1000
Subject: [PATCH] Fix declaration file names

---
 js/models/{conversation.d.ts => conversations.d.ts} | 0
 js/models/conversations.js                          | 4 ++--
 js/models/{message.d.ts => messages.d.ts}           | 0
 js/models/messages.js                               | 2 +-
 ts/receiver/attachments.ts                          | 2 +-
 ts/receiver/queuedJob.ts                            | 4 ++--
 ts/receiver/receiver.ts                             | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename js/models/{conversation.d.ts => conversations.d.ts} (100%)
 rename js/models/{message.d.ts => messages.d.ts} (100%)

diff --git a/js/models/conversation.d.ts b/js/models/conversations.d.ts
similarity index 100%
rename from js/models/conversation.d.ts
rename to js/models/conversations.d.ts
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 25aaaac3f..92f2ac674 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1191,7 +1191,7 @@
       };
     },
 
-    getOpenGroup() {
+    toOpenGroup() {
       if (!this.isPublic()) {
         return undefined;
       }
@@ -1325,7 +1325,7 @@
           options.messageType = message.get('type');
           options.isPublic = this.isPublic();
           if (this.isPublic()) {
-            const openGroup = this.getOpenGroup();
+            const openGroup = this.toOpenGroup();
 
             const openGroupParams = {
               body,
diff --git a/js/models/message.d.ts b/js/models/messages.d.ts
similarity index 100%
rename from js/models/message.d.ts
rename to js/models/messages.d.ts
diff --git a/js/models/messages.js b/js/models/messages.js
index deb8771ca..0b800ba4d 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1017,7 +1017,7 @@
       const previewWithData = await loadPreviewData(this.get('preview'));
 
       const conversation = this.getConversation();
-      const openGroup = conversation && conversation.getOpenGroup();
+      const openGroup = conversation && conversation.toOpenGroup();
 
       const { AttachmentUtils } = libsession.Utils;
       const [attachments, preview, quote] = await Promise.all([
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index db6a112d2..8f35e91d6 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -1,4 +1,4 @@
-import { MessageModel } from '../../js/models/message';
+import { MessageModel } from '../../js/models/messages';
 
 // TODO: Might convert it to a class later
 let webAPI: any;
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index c1520c09c..7e7a9dc61 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -1,8 +1,8 @@
 import { queueAttachmentDownloads } from './attachments';
 
 import { Quote } from './types';
-import { ConversationModel } from '../../js/models/conversation';
-import { EndSessionType, MessageModel } from '../../js/models/message';
+import { ConversationModel } from '../../js/models/conversations';
+import { MessageModel } from '../../js/models/messages';
 
 async function handleGroups(
   conversation: ConversationModel,
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index ad8a9a9b2..4c34efaf9 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -5,8 +5,7 @@ import { handleMessageJob } from './queuedJob';
 import { handleEndSession } from './sessionHandling';
 import { handleUnpairRequest } from './multidevice';
 import { EnvelopePlus } from './types';
-import { ConversationModel } from '../../js/models/conversation';
-import { EndSessionType, MessageModel } from '../../js/models/message';
+import { MessageModel } from '../../js/models/messages';
 import { downloadAttachment } from './attachments';
 import { handleMediumGroupUpdate } from './mediumGroups';