fix lint

app/sql.js

@@ -7,7 +7,6 @@ const { redactAll } = require('../js/modules/privacy');
 const { remove: removeUserConfig } = require('./user_config');
 
 const pify = require('pify');
-const uuidv4 = require('uuid/v4');
 const {
   map,
   isString,

ts/models/messageType.ts

@@ -1,6 +1,6 @@
 import { DefaultTheme } from 'styled-components';
 import _ from 'underscore';
-import uuidv4 from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 import { QuotedAttachmentType } from '../components/conversation/Quote';
 import { AttachmentType } from '../types/Attachment';
 import { Contact } from '../types/Contact';

ts/receiver/receiver.ts

@@ -2,7 +2,7 @@
 
 import { EnvelopePlus } from './types';
 export { downloadAttachment } from './attachments';
-import uuidv4 from 'uuid';
+import { v4 as uuidv4 } from 'uuid';
 
 import {
   addToCache,

ts/session/sending/MessageSentHandler.ts

@@ -3,38 +3,8 @@ import { MessageController } from '../messages';
 import { OpenGroupMessage } from '../messages/outgoing';
 import { RawMessage } from '../types';
 
+// tslint:disable-next-line no-unnecessary-class
 export class MessageSentHandler {
-  /**
-   * This function tries to find a message by messageId by first looking on the MessageController.
-   * The MessageController holds all messages being in memory.
-   * Those are the messages sent recently, recieved recently, or the one shown to the user.
-   *
-   * If the app restarted, it's very likely those messages won't be on the memory anymore.
-   * In this case, this function will look for it in the database and return it.
-   * If the message is found on the db, it will also register it to the MessageController so our subsequent calls are quicker.
-   */
-  private static async fetchHandleMessageSentData(
-    m: RawMessage | OpenGroupMessage
-  ) {
-    // if a message was sent and this message was created after the last app restart,
-    // this message is still in memory in the MessageController
-    const msg = MessageController.getInstance().get(m.identifier);
-
-    if (!msg || !msg.message) {
-      // otherwise, look for it in the database
-      // nobody is listening to this freshly fetched message .trigger calls
-      const dbMessage = await getMessageById(m.identifier);
-
-      if (!dbMessage) {
-        return null;
-      }
-      MessageController.getInstance().register(m.identifier, dbMessage);
-      return dbMessage;
-    }
-
-    return msg.message;
-  }
-
   public static async handlePublicMessageSentSuccess(
     sentMessage: OpenGroupMessage,
     result: { serverId: number; serverTimestamp: number }
@@ -90,4 +60,35 @@ export class MessageSentHandler {
 
     await fetchedMessage.handleMessageSentFailure(sentMessage, error);
   }
+
+  /**
+   * This function tries to find a message by messageId by first looking on the MessageController.
+   * The MessageController holds all messages being in memory.
+   * Those are the messages sent recently, recieved recently, or the one shown to the user.
+   *
+   * If the app restarted, it's very likely those messages won't be on the memory anymore.
+   * In this case, this function will look for it in the database and return it.
+   * If the message is found on the db, it will also register it to the MessageController so our subsequent calls are quicker.
+   */
+  private static async fetchHandleMessageSentData(
+    m: RawMessage | OpenGroupMessage
+  ) {
+    // if a message was sent and this message was created after the last app restart,
+    // this message is still in memory in the MessageController
+    const msg = MessageController.getInstance().get(m.identifier);
+
+    if (!msg || !msg.message) {
+      // otherwise, look for it in the database
+      // nobody is listening to this freshly fetched message .trigger calls
+      const dbMessage = await getMessageById(m.identifier);
+
+      if (!dbMessage) {
+        return null;
+      }
+      MessageController.getInstance().register(m.identifier, dbMessage);
+      return dbMessage;
+    }
+
+    return msg.message;
+  }
 }

ts/test/session/unit/sending/MessageQueue_test.ts

@@ -80,14 +80,18 @@ describe('MessageQueue', () => {
         done();
       });
 
-      pendingMessageCache.add(
-        device,
-        TestUtils.generateChatMessage(),
-        waitForMessageSentEvent as any
-      );
-
-      messageQueueStub.processPending(device);
-      expect(waitForMessageSentEvent).to.be.fulfilled;
+      void pendingMessageCache
+        .add(
+          device,
+          TestUtils.generateChatMessage(),
+          waitForMessageSentEvent as any
+        )
+        .then(async () => {
+          return messageQueueStub.processPending(device);
+        })
+        .then(() => {
+          expect(waitForMessageSentEvent).to.be.fulfilled;
+        });
     });
 
     it('should remove message from cache', async () => {
@@ -123,7 +127,7 @@ describe('MessageQueue', () => {
           done();
         });
 
-        pendingMessageCache
+        void pendingMessageCache
           .add(device, message, waitForMessageSentEvent as any)
           .then(() => messageQueueStub.processPending(device))
           .then(() => {
@@ -144,7 +148,7 @@ describe('MessageQueue', () => {
           done();
         });
 
-        pendingMessageCache
+        void pendingMessageCache
           .add(device, message, waitForMessageSentEvent as any)
           .then(() => messageQueueStub.processPending(device))
           .then(() => {