added authorId to MessageAttributesType

Lightbox:
  moved conversationId references to new authorId reference
  save authorId and conversationId separately

Author: findus

ts/components/Lightbox.tsx

@@ -190,7 +190,7 @@ export function Lightbox({
 
   const handleJumpToConversation = useCallback(
     (
-      event: KeyboardEvent | React.MouseEvent<HTMLButtonElement, MouseEvent>
+      _event: KeyboardEvent | React.MouseEvent<HTMLButtonElement, MouseEvent>
     ) => {
       if (isViewOnce) {
         return;
@@ -828,7 +828,7 @@ function LightboxHeader({
   i18n: LocalizerType;
   message: ReadonlyDeep<MediaItemMessageType>;
 }): JSX.Element {
-  const conversation = getConversation(message.conversationId);
+  const conversation = getConversation(message.authorId);
 
   const now = Date.now();
 

ts/model-types.d.ts

@@ -217,6 +217,7 @@ export type MessageAttributesType = {
   verified?: boolean;
   verifiedChanged?: string;
 
+  authorId: string;
   id: string;
   type: MessageType;
   body?: string;

ts/state/ducks/lightbox.ts

@@ -40,6 +40,7 @@ import {
 import { showStickerPackPreview } from './globalModals';
 import { useBoundActions } from '../../hooks/useBoundActions';
 import { DataReader } from '../../sql/Client';
+import { MessageModel } from '../../models/messages';
 
 // eslint-disable-next-line local-rules/type-alias-readonlydeep
 export type LightboxStateType =
@@ -196,6 +197,8 @@ function showLightboxForViewOnceMedia(
 
     const { contentType } = tempAttachment;
 
+    const authorId = getAuthorId(message);
+
     const media = [
       {
         attachment: tempAttachment,
@@ -208,6 +211,7 @@ function showLightboxForViewOnceMedia(
           attachments: message.get('attachments') || [],
           id: message.get('id'),
           conversationId: message.get('conversationId'),
+          authorId,
           receivedAt: message.get('received_at'),
           receivedAtMs: Number(message.get('received_at_ms')),
           sentAt: message.get('sent_at'),
@@ -228,6 +232,16 @@ function showLightboxForViewOnceMedia(
   };
 }
 
+function getAuthorId(message: MessageModel) {
+  return (
+    window.ConversationController.lookupOrCreate({
+      serviceId: message.get('sourceServiceId'),
+      e164: message.get('source'),
+      reason: 'conversation_view.showLightBox',
+    })?.id || message.get('conversationId')
+  );
+}
+
 function filterValidAttachments(
   attributes: ReadonlyMessageAttributesType
 ): Array<AttachmentType> {
@@ -278,12 +292,8 @@ function showLightbox(opts: {
     const attachments = filterValidAttachments(message.attributes);
     const loop = isGIF(attachments);
 
-    const authorId =
-      window.ConversationController.lookupOrCreate({
-        serviceId: message.get('sourceServiceId'),
-        e164: message.get('source'),
-        reason: 'conversation_view.showLightBox',
-      })?.id || message.get('conversationId');
+    const authorId = getAuthorId(message);
+    const conversationId = message.get('conversationId');
     const receivedAt = message.get('received_at');
     const sentAt = message.get('sent_at');
 
@@ -296,7 +306,8 @@ function showLightbox(opts: {
       message: {
         attachments: message.get('attachments') || [],
         id: messageId,
-        conversationId: authorId,
+        conversationId,
+        authorId,
         receivedAt,
         receivedAtMs: Number(message.get('received_at_ms')),
         sentAt,

ts/types/MediaItem.ts

@@ -7,7 +7,7 @@ import type { MIMEType } from './MIME';
 
 export type MediaItemMessageType = Pick<
   ReadonlyMessageAttributesType,
-  'attachments' | 'conversationId' | 'id'
+  'attachments' | 'conversationId' | 'authorId' | 'id'
 > & {
   receivedAt: number;
   receivedAtMs?: number;