chore: remove attachment ids as int, instead use the url

Author: Bilb

ts/models/message.ts

@@ -9,6 +9,7 @@ import { ClosedGroupV2VisibleMessage } from '../session/messages/outgoing/visibl
 import { PubKey } from '../session/types';
 import {
   UserUtils,
+  attachmentIdAsStrFromUrl,
   uploadAttachmentsToFileServer,
   uploadLinkPreviewToFileServer,
   uploadQuoteThumbnailsToFileServer,
@@ -788,7 +789,7 @@ export class MessageModel extends Model<MessageAttributes> {
     let attachmentPromise;
     let linkPreviewPromise;
     let quotePromise;
-    const fileIdsToLink: Array<number> = [];
+    const fileIdsToLink: Array<string> = [];
 
     // we can only send a single preview
     const firstPreviewWithData = previewWithData?.[0] || null;
@@ -811,9 +812,9 @@ export class MessageModel extends Model<MessageAttributes> {
       linkPreviewPromise,
       quotePromise,
     ]);
-    fileIdsToLink.push(...attachments.map(m => m.id));
-    if (preview) {
-      fileIdsToLink.push(preview.id);
+    fileIdsToLink.push(...attachments.map(m => attachmentIdAsStrFromUrl(m.url)));
+    if (preview && preview.image?.url) {
+      fileIdsToLink.push(attachmentIdAsStrFromUrl(preview.image.url));
     }
 
     if (quote && quote.attachments?.length) {

ts/session/apis/file_server_api/FileServerApi.ts

@@ -23,11 +23,11 @@ const POST_GET_FILE_ENDPOINT = '/file';
 /**
  * Upload a file to the file server v2 using the onion v4 encoding
  * @param fileContent the data to send
- * @returns null or the fileID and complete URL to share this file
+ * @returns null or the complete URL to share this file
  */
 export const uploadFileToFsWithOnionV4 = async (
   fileContent: ArrayBuffer
-): Promise<{ fileId: number; fileUrl: string } | null> => {
+): Promise<{ fileUrl: string } | null> => {
   if (!fileContent || !fileContent.byteLength) {
     return null;
   }
@@ -51,14 +51,13 @@ export const uploadFileToFsWithOnionV4 = async (
   }
   const fileUrl = `${fileServerURL}${POST_GET_FILE_ENDPOINT}/${fileId}`;
   return {
-    fileId,
     fileUrl,
   };
 };
 
 /**
  * Download a file given the fileId from the fileserver
- * @param fileIdOrCompleteUrl the fileId to download or the completeUrl to the fileitself
+ * @param fileIdOrCompleteUrl the fileId to download or the completeUrl to the file itself
  * @returns the data as an Uint8Array or null
  */
 export const downloadFileFromFileServer = async (

ts/session/apis/open_group_api/opengroupV2/OpenGroupMessageV2.ts

@@ -12,15 +12,15 @@ export class OpenGroupMessageV2 {
   public sentTimestamp: number;
   public base64EncodedData: string;
   public base64EncodedSignature?: string;
-  public filesToLink?: Array<number>;
+  public filesToLink?: Array<string>;
 
   constructor(messageData: {
     serverId?: number;
     sender?: string;
     sentTimestamp: number;
     base64EncodedData: string;
     base64EncodedSignature?: string;
-    filesToLink?: Array<number>;
+    filesToLink?: Array<string>;
   }) {
     const {
       base64EncodedData,

ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts

@@ -1,10 +1,12 @@
 import ByteBuffer from 'bytebuffer';
 import { isEmpty } from 'lodash';
+import Long from 'long';
 import { SignalService } from '../../../../protobuf';
 import { Reaction } from '../../../../types/Reaction';
 import { DataMessage } from '../DataMessage';
 import { LokiProfile } from '../../../../types/message';
 import { ExpirableMessageParams } from '../ExpirableMessage';
+import { attachmentIdAsLongFromUrl } from '../../../utils';
 
 interface AttachmentPointerCommon {
   contentType?: string;
@@ -21,12 +23,10 @@ interface AttachmentPointerCommon {
 
 export interface AttachmentPointer extends AttachmentPointerCommon {
   url?: string;
-  id?: number;
 }
 
 export interface AttachmentPointerWithUrl extends AttachmentPointerCommon {
   url: string;
-  id: number;
 }
 
 export interface Preview {
@@ -37,7 +37,6 @@ export interface Preview {
 
 export interface PreviewWithAttachmentUrl {
   url: string;
-  id: number;
   title?: string;
   image?: AttachmentPointerWithUrl;
 }
@@ -75,12 +74,12 @@ export interface VisibleMessageParams extends ExpirableMessageParams {
 export class VisibleMessage extends DataMessage {
   public readonly reaction?: Reaction;
 
-  private readonly attachments?: Array<AttachmentPointerWithUrl>;
+  private readonly attachments?: Array<AttachmentPointerWithUrl & { id: Long }>;
   private readonly body?: string;
   private readonly quote?: Quote;
   private readonly profileKey?: Uint8Array;
   private readonly profile?: SignalService.DataMessage.ILokiProfile;
-  private readonly preview?: Array<PreviewWithAttachmentUrl>;
+  private readonly preview?: Array<PreviewWithAttachmentUrl & { id?: Long }>;
 
   /// In the case of a sync message, the public key of the person the message was targeted at.
   /// - Note: `null or undefined` if this isn't a sync message.
@@ -93,7 +92,10 @@ export class VisibleMessage extends DataMessage {
       expirationType: params.expirationType,
       expireTimer: params.expireTimer,
     });
-    this.attachments = params.attachments;
+    this.attachments = params.attachments?.map(attachment => ({
+      ...attachment,
+      id: attachmentIdAsLongFromUrl(attachment.url),
+    }));
     this.body = params.body;
     this.quote = params.quote;
 
@@ -102,7 +104,10 @@ export class VisibleMessage extends DataMessage {
     this.profile = profile.lokiProfile;
     this.profileKey = profile.profileKey;
 
-    this.preview = params.preview;
+    this.preview = params.preview?.map(attachment => ({
+      ...attachment,
+      id: attachment.image?.url ? attachmentIdAsLongFromUrl(attachment.image.url) : undefined,
+    }));
     this.reaction = params.reaction;
     this.syncTarget = params.syncTarget;
   }
@@ -122,9 +127,6 @@ export class VisibleMessage extends DataMessage {
 
     dataMessage.attachments = this.attachments || [];
 
-    if (this.preview) {
-      dataMessage.preview = this.preview;
-    }
     if (this.reaction) {
       dataMessage.reaction = this.reaction;
     }
@@ -173,7 +175,9 @@ export class VisibleMessage extends DataMessage {
         if (preview.url) {
           item.url = preview.url;
         }
-        item.image = preview.image || null;
+        item.image = preview.image
+          ? { ...preview.image, id: attachmentIdAsLongFromUrl(preview.image.url) }
+          : null;
 
         return item;
       });

ts/session/sending/MessageQueue.ts

@@ -65,7 +65,7 @@ export class MessageQueueCl {
     message: OpenGroupVisibleMessage;
     roomInfos: OpenGroupRequestCommonType;
     blinded: boolean;
-    filesToLink: Array<number>;
+    filesToLink: Array<string>;
   }) {
     // Skipping the MessageQueue for Open Groups v2; the message is sent directly
 

ts/session/sending/MessageSender.ts

@@ -584,7 +584,7 @@ async function sendToOpenGroupV2(
   rawMessage: OpenGroupVisibleMessage,
   roomInfos: OpenGroupRequestCommonType,
   blinded: boolean,
-  filesToLink: Array<number>
+  filesToLink: Array<string>
 ): Promise<OpenGroupMessageV2 | boolean> {
   // we agreed to pad messages for opengroup v2
   const paddedBody = addMessagePadding(rawMessage.plainTextBuffer());

ts/session/utils/Attachments.ts

@@ -1,5 +1,6 @@
 import * as crypto from 'crypto';
 import _ from 'lodash';
+import Long from 'long';
 
 import { Attachment } from '../../types/Attachment';
 
@@ -80,7 +81,6 @@ async function uploadToFileServer(params: UploadParams): Promise<AttachmentPoint
   if (uploadToV2Result) {
     const pointerWithUrl: AttachmentPointerWithUrl = {
       ...pointer,
-      id: uploadToV2Result.fileId,
       url: uploadToV2Result.fileUrl,
     };
     return pointerWithUrl;
@@ -118,7 +118,6 @@ export async function uploadLinkPreviewToFileServer(
   return {
     ...preview,
     image,
-    id: image.id,
   };
 }
 
@@ -143,7 +142,6 @@ export async function uploadQuoteThumbnailsToFileServer(
       ...attachment,
       thumbnail,
       url: thumbnail.url,
-      id: thumbnail.id,
     } as QuotedAttachmentWithUrl;
   });
 
@@ -154,3 +152,18 @@ export async function uploadQuoteThumbnailsToFileServer(
     attachments,
   };
 }
+
+export function attachmentIdAsStrFromUrl(url: string) {
+  return attachmentIdAsLongFromUrl(url).toString();
+}
+
+export function attachmentIdAsLongFromUrl(url: string) {
+  const urlObj = new URL(url);
+
+  const lastSegment = urlObj.pathname.split('/').pop();
+  if (!lastSegment) {
+    throw new Error('attachmentIdAsLongFromUrl last is not valid');
+  }
+  // this throws if not a valid long
+  return Long.fromString(lastSegment);
+}

ts/session/utils/AttachmentsV2.ts

@@ -52,7 +52,6 @@ async function uploadV3(params: UploadParamsV2): Promise<AttachmentPointerWithUr
 
   return {
     ...pointer,
-    id: fileDetails.fileId,
     url: fileDetails.fileUrl,
   };
 }
@@ -89,7 +88,6 @@ export async function uploadLinkPreviewsV3(
     ...preview,
     image,
     url: preview.url || image.url,
-    id: image.id,
   };
 }
 

ts/test/session/unit/messages/ChatMessage_test.ts

@@ -121,7 +121,7 @@ describe('VisibleMessage', () => {
   });
 
   it('can create message with a preview', () => {
-    const preview: PreviewWithAttachmentUrl = { url: 'url', title: 'title', id: 1 };
+    const preview: PreviewWithAttachmentUrl = { url: 'url', title: 'title' };
     const previews = new Array<PreviewWithAttachmentUrl>();
     previews.push(preview);
 
@@ -143,7 +143,6 @@ describe('VisibleMessage', () => {
     const attachment: AttachmentPointerWithUrl = {
       url: 'url',
       contentType: 'contentType',
-      id: 1234,
     };
     const attachments = new Array<AttachmentPointerWithUrl>();
     attachments.push(attachment);