From eb280ec1e4ef9a42abc70a2d9237ec5c275e14e9 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <msgmaxim@gmail.com>
Date: Mon, 15 Jun 2020 10:56:38 +1000
Subject: [PATCH] Move model definition files

---
 {ts/receiver => js/models}/conversation.d.ts |  0
 {ts/receiver => js/models}/message.d.ts      |  0
 ts/receiver/attachments.ts                   |  2 +-
 ts/receiver/conversation.ts                  | 41 --------------
 ts/receiver/message.ts                       | 56 --------------------
 ts/receiver/polling.rs                       |  0
 ts/receiver/queuedJob.ts                     |  4 +-
 ts/receiver/receiver.ts                      |  4 +-
 8 files changed, 5 insertions(+), 102 deletions(-)
 rename {ts/receiver => js/models}/conversation.d.ts (100%)
 rename {ts/receiver => js/models}/message.d.ts (100%)
 delete mode 100644 ts/receiver/conversation.ts
 delete mode 100644 ts/receiver/message.ts
 delete mode 100644 ts/receiver/polling.rs

diff --git a/ts/receiver/conversation.d.ts b/js/models/conversation.d.ts
similarity index 100%
rename from ts/receiver/conversation.d.ts
rename to js/models/conversation.d.ts
diff --git a/ts/receiver/message.d.ts b/js/models/message.d.ts
similarity index 100%
rename from ts/receiver/message.d.ts
rename to js/models/message.d.ts
diff --git a/ts/receiver/attachments.ts b/ts/receiver/attachments.ts
index 4702bfc08..db6a112d2 100644
--- a/ts/receiver/attachments.ts
+++ b/ts/receiver/attachments.ts
@@ -1,4 +1,4 @@
-import { MessageModel } from './message';
+import { MessageModel } from '../../js/models/message';
 
 // TODO: Might convert it to a class later
 let webAPI: any;
diff --git a/ts/receiver/conversation.ts b/ts/receiver/conversation.ts
deleted file mode 100644
index dbfa05c65..000000000
--- a/ts/receiver/conversation.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { MessageModel } from './message';
-
-interface ConversationAttributes {
-  members: Array<string>;
-  left: boolean;
-  expireTimer: number;
-  profileSharing: boolean;
-  mentionedUs: boolean;
-  unreadCount: number;
-  isArchived: boolean;
-  active_at: number;
-  timestamp: number; // timestamp of what?
-}
-
-export interface ConversationModel
-  extends Backbone.Model<ConversationAttributes> {
-  setFriendRequestStatus: (status: any) => Promise<void>;
-  idForLogging: () => string;
-  saveChangesToDB: () => Promise<void>;
-  notifyFriendRequest: (source: string, type: string) => Promise<void>;
-  notify: (message: MessageModel) => void;
-  isSessionResetReceived: () => boolean;
-  updateExpirationTimer: (
-    expireTimer: number | null,
-    source: string,
-    receivedAt: number,
-    options: object
-  ) => void;
-  isPrivate: () => boolean;
-  setProfileKey: (key: string) => void;
-  isMe: () => boolean;
-  getRecipients: () => Array<string>;
-  onReadMessage: (message: MessageModel) => void;
-  updateTextInputState: () => void;
-  isFriend: () => boolean;
-  hasSentFriendRequest: () => boolean;
-  onFriendRequestAccepted: () => Promise<void>;
-  onFriendRequestReceived: () => Promise<void>;
-
-  lastMessage: string;
-}
diff --git a/ts/receiver/message.ts b/ts/receiver/message.ts
deleted file mode 100644
index a800fb701..000000000
--- a/ts/receiver/message.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-enum MessageModelType {
-  INCOMING = 'incoming',
-  OUTGOING = 'outgoing',
-  FRIEND_REQUEST = 'friend-request',
-}
-
-export enum EndSessionType {
-  DONE = 'done',
-  ONGOING = 'ongoing',
-}
-
-interface MessageAttributes {
-  id: number;
-  source: string;
-  endSessionType: EndSessionType;
-  quote: any;
-  expireTimer: number;
-  received_at: number;
-  sent_at: number;
-  preview: any;
-  body: string;
-  expirationStartTimestamp: any;
-  read_by: Array<string>;
-  delivered_to: Array<string>;
-  decrypted_at: number;
-  recipients: Array<string>;
-  delivered: number;
-  friendStatus: any;
-  type: MessageModelType;
-  group_update: any;
-  groupInvitation: any;
-  attachments: any;
-  contact: any;
-  conversationId: any;
-  errors: any;
-  flags: number;
-  hasAttachments: boolean;
-  hasFileAttachments: boolean;
-  hasVisualMediaAttachments: boolean;
-  schemaVersion: number;
-  expirationTimerUpdate: any;
-  unread: boolean;
-  group: any;
-  bodyPending: boolean;
-}
-
-export interface MessageModel extends Backbone.Model<MessageAttributes> {
-  idForLogging: () => string;
-  isGroupUpdate: () => boolean;
-  isExpirationTimerUpdate: () => boolean;
-  isFriendRequest: () => boolean;
-  getNotificationText: () => string;
-  isEndSession: () => boolean;
-  markRead: () => void;
-  merge: (other: MessageModel) => void;
-}
diff --git a/ts/receiver/polling.rs b/ts/receiver/polling.rs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 5c5adc4ee..e74f73ad8 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 './conversation';
-import { EndSessionType, MessageModel } from './message';
+import { ConversationModel } from '../../js/models/conversation';
+import { EndSessionType, MessageModel } from '../../js/models/message';
 
 async function handleGroups(
   conversation: ConversationModel,
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 7d4f567c8..4e62ed335 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -5,8 +5,8 @@ import { handleMessageJob } from './queuedJob';
 import { handleEndSession } from './sessionHandling';
 import { handleUnpairRequest } from './multidevice';
 import { EnvelopePlus } from './types';
-import { ConversationModel } from './conversation';
-import { EndSessionType, MessageModel } from './message';
+import { ConversationModel } from '../../js/models/conversation';
+import { EndSessionType, MessageModel } from '../../js/models/message';
 import { downloadAttachment } from './attachments';
 import { handleMediumGroupUpdate } from './mediumGroups';