Merge pull request #1544 from Bilb/fix-filename-no-contenttype

fix bug with extension not being send if we don't have contenttype set

AUDRICTOCLEAN.txt

@@ -1,39 +0,0 @@
-indexeddb
-
-
-remove from db
-    * 'sentSessionsTimestamp'
-    * 'processedSessionsTimestamp'
-    * 'sessions'
-    * 'preKeys'
-    * 'signedPreKeys'
-    * senderkeys
-
-getContact()
-remove what is is Storage / user.js
-remove on the UI ts files the calls to conversationModel. everything should be on the props
-conversationModel
-    .get()
-
-getOurNumber
-primaryDevicePubKey
-getRecipients() does not make asny sense right
-
-ReadSyncs
-SyncMessage
-sendSyncMessage needs to be rewritten
-sendSyncMessageOnly to fix
-
-
-indexedDB
-initializeAttachmentMetadata=>
-run_migration
-
-
-
-### Bug fixes on update of models
-* quote of attachment does not share preview
-* setting disappearing timer for isMe does not trigger the message
-* expiration timer set from user1 second device is not synced to his other devices for a private chat
-* add a way for users to know when the messageQueue is reconnected (loading bar or something)
-* handled better reconnection

js/modules/types/attachment.js

@@ -214,7 +214,6 @@ exports.deleteData = deleteOnDisk => {
 exports.isVoiceMessage = AttachmentTS.isVoiceMessage;
 exports.save = AttachmentTS.save;
 exports.getFileExtension = AttachmentTS.getFileExtension;
-exports.getSuggestedFilenameSending = AttachmentTS.getSuggestedFilenameSending;
 exports.arrayBufferFromFile = AttachmentTS.arrayBufferFromFile;
 
 const THUMBNAIL_SIZE = 150;

ts/components/session/ActionsPanel.tsx

@@ -102,11 +102,14 @@ const Section = (props: { type: SectionType; avatarPath?: string }) => {
       iconType = SessionIconType.Moon;
   }
 
+  const unreadToShow =
+    type === SectionType.Message ? unreadMessageCount : undefined;
+
   return (
     <SessionIconButton
       iconSize={SessionIconSize.Medium}
       iconType={iconType}
-      notificationCount={unreadMessageCount}
+      notificationCount={unreadToShow}
       onClick={handleClick}
       isSelected={isSelected}
       theme={theme}

ts/models/message.ts

@@ -26,6 +26,7 @@ import { ConversationModel } from './conversation';
 import { actions as conversationActions } from '../state/ducks/conversations';
 import { VisibleMessage } from '../session/messages/outgoing/visibleMessage/VisibleMessage';
 import { buildSyncMessage } from '../session/utils/syncUtils';
+import { getSuggestedFilenameSending } from '../types/Attachment';
 
 export class MessageModel extends Backbone.Model<MessageAttributes> {
   public propsForTimerNotification: any;
@@ -800,7 +801,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const filenameOverridenAttachments = finalAttachments.map(
       (attachment: any) => ({
         ...attachment,
-        fileName: window.Signal.Types.Attachment.getSuggestedFilenameSending({
+        fileName: getSuggestedFilenameSending({
           attachment,
           timestamp: Date.now(),
         }),

ts/test/types/Attachment_test.ts

@@ -54,6 +54,46 @@ describe('Attachment', () => {
         const expected = 'session-attachment_003.mov';
         assert.strictEqual(actual, expected);
       });
+      it('should generate a filename with an extension if contentType is not setup', () => {
+        const attachment: Attachment.AttachmentType = {
+          fileName: 'funny-cat.ini',
+          url: 'funny-cat.ini',
+          contentType: '',
+        };
+        const actual = Attachment.getSuggestedFilename({
+          attachment,
+          index: 3,
+        });
+        const expected = 'session-attachment_003.ini';
+        assert.strictEqual(actual, expected);
+      });
+
+      it('should generate a filename with an extension if contentType is text/plain', () => {
+        const attachment: Attachment.AttachmentType = {
+          fileName: 'funny-cat.txt',
+          url: 'funny-cat.txt',
+          contentType: 'text/plain',
+        };
+        const actual = Attachment.getSuggestedFilename({
+          attachment,
+          index: 3,
+        });
+        const expected = 'session-attachment_003.txt';
+        assert.strictEqual(actual, expected);
+      });
+      it('should generate a filename with an extension if contentType is json', () => {
+        const attachment: Attachment.AttachmentType = {
+          fileName: 'funny-cat.json',
+          url: 'funny-cat.json',
+          contentType: '',
+        };
+        const actual = Attachment.getSuggestedFilename({
+          attachment,
+          index: 3,
+        });
+        const expected = 'session-attachment_003.json';
+        assert.strictEqual(actual, expected);
+      });
     });
     context('for attachment without filename', () => {
       it('should generate a filename based on timestamp', () => {

ts/types/Attachment.ts

@@ -396,8 +396,17 @@ export const getSuggestedFilenameSending = ({
 export const getFileExtension = (
   attachment: AttachmentType
 ): string | undefined => {
-  if (!attachment.contentType) {
-    return;
+  // we override textplain to the extension of the file
+  if (!attachment.contentType || attachment.contentType === 'text/plain') {
+    if (attachment.fileName?.length) {
+      const dotLastIndex = attachment.fileName.lastIndexOf('.');
+      if (dotLastIndex !== -1) {
+        return attachment.fileName.substring(dotLastIndex + 1);
+      } else {
+        return undefined;
+      }
+    }
+    return undefined;
   }
 
   switch (attachment.contentType) {