remove fetching of description for link preview as we do not send it

ts/components/conversation/SessionStagedLinkPreview.tsx

@@ -25,7 +25,6 @@ export interface GetLinkPreviewResult {
   title: string;
   url: string;
   image?: GetLinkPreviewResultImage;
-  description: string | null;
   date: number | null;
 }
 
@@ -48,7 +47,7 @@ export const getPreview = async (
   if (!linkPreviewMetadata) {
     throw new Error('Could not fetch link preview metadata');
   }
-  const { title, imageHref, description, date } = linkPreviewMetadata;
+  const { title, imageHref, date } = linkPreviewMetadata;
 
   let image;
   if (imageHref && window.Signal.LinkPreviews.isLinkSafeToPreview(imageHref)) {
@@ -100,7 +99,6 @@ export const getPreview = async (
     title,
     url,
     image,
-    description,
     date,
   };
 };
@@ -118,7 +116,6 @@ export const SessionStagedLinkPreview = (props: StagedLinkPreviewProps) => {
       domain={props.domain}
       url={props.url}
       image={props.image as any}
-      description={props.description}
     />
   );
 };

ts/components/conversation/StagedLinkPreview.tsx

@@ -10,7 +10,6 @@ type Props = {
   isLoaded: boolean;
   title: null | string;
   url: null | string;
-  description: null | string;
   domain: null | string;
   image?: AttachmentType;
 
@@ -18,7 +17,7 @@ type Props = {
 };
 
 export const StagedLinkPreview = (props: Props) => {
-  const { isLoaded, onClose, title, image, domain, description, url } = props;
+  const { isLoaded, onClose, title, image, domain, url } = props;
 
   const isImage = image && isImageAttachment(image);
   if (isLoaded && !(title && domain)) {
@@ -50,9 +49,7 @@ export const StagedLinkPreview = (props: Props) => {
       {isLoaded ? (
         <div className="module-staged-link-preview__content">
           <div className="module-staged-link-preview__title">{title}</div>
-          {description && (
-            <div className="module-staged-link-preview__description">{description}</div>
-          )}
+
           <div className="module-staged-link-preview__footer">
             <div className="module-staged-link-preview__location">{domain}</div>
           </div>

ts/components/conversation/composition/CompositionBox.tsx

@@ -61,7 +61,6 @@ export interface StagedLinkPreviewData {
   title: string | null;
   url: string | null;
   domain: string | null;
-  description: string | null;
   image?: AttachmentType;
 }
 
@@ -556,13 +555,12 @@ class CompositionBoxInner extends React.Component<Props, State> {
       return null;
     }
 
-    const { isLoaded, title, description, domain, image } = this.state.stagedLinkPreview;
+    const { isLoaded, title, domain, image } = this.state.stagedLinkPreview;
 
     return (
       <SessionStagedLinkPreview
         isLoaded={isLoaded}
         title={title}
-        description={description}
         domain={domain}
         image={image}
         url={firstLink}
@@ -580,7 +578,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
         isLoaded: false,
         url: firstLink,
         domain: null,
-        description: null,
         image: undefined,
         title: null,
       },
@@ -620,7 +617,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
             stagedLinkPreview: {
               isLoaded: true,
               title: ret?.title || null,
-              description: ret?.description || '',
               url: ret?.url || null,
               domain: (ret?.url && window.Signal.LinkPreviews.getDomain(ret.url)) || '',
               image,
@@ -631,7 +627,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
             stagedLinkPreview: {
               isLoaded: false,
               title: null,
-              description: null,
               url: null,
               domain: null,
               image: undefined,
@@ -659,7 +654,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
             stagedLinkPreview: {
               isLoaded: true,
               title: null,
-              description: null,
               url: firstLink,
               domain: null,
               image: undefined,

ts/util/attachmentsUtil.ts

@@ -12,6 +12,25 @@ import { THUMBNAIL_SIDE } from '../types/attachments/VisualAttachment';
 import imageType from 'image-type';
 import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../session/constants';
 
+/**
+ * The logic for sending attachments is as follow:
+ *
+ * 1. The User selects whatever attachments he wants to send with the system file handler.
+ * 2. We generate a preview if possible just to use it in the Composition Box Staged attachments list (preview of attachments scheduled for sending with the next message)
+ * 3. During that preview generation, we also autoscale images if possible and make sure the orientation is right.
+ * 4. If autoscale is not possible, we make sure the size of each attachments is fine with the service nodes limit. Otherwise, a toast is shown and the attachment is not added.
+ * 5. When autoscale is possible, we make sure that the scaled size is OK for the services nodes already
+ * 6. We do not keep those autoscaled attachments in memory for now, just the previews are kept in memory and the original filepath.
+ *
+ * 7. Once the user is ready to send a message and hit ENTER or SEND, we grab the real files again from the staged attachments, autoscale them again if possible, generate thumbnails and screenshot (video) if needed and write them to the attachments folder (encrypting them) with processNewAttachments.
+ *
+ * 8. This operation will give us back the path of the attachment in the attachments folder and the size written for this attachment (make sure to use that one as size for the outgoing attachment)
+ *
+ * 9. Once all attachments are written to the attachments folder, we grab the data from those files directly before sending them. This is done in uploadData() with loadAttachmentsData().
+ *
+ * 10. We use the grabbed data for upload of the attachments, get an url for each of them and send the url with the attachments details to the user/opengroup/closed group
+ */
+
 export interface MaxScaleSize {
   maxSize?: number;
   maxHeight?: number;

ts/util/linkPreviewFetch.ts

@@ -45,7 +45,6 @@ type FetchFn = (href: string, init: RequestInit) => Promise<Response>;
 
 export interface LinkPreviewMetadata {
   title: string;
-  description: null | string;
   date: null | number;
   imageHref: null | string;
 }
@@ -317,14 +316,6 @@ const parseMetadata = (document: HTMLDocument, href: string): LinkPreviewMetadat
     return null;
   }
 
-  const description =
-    getOpenGraphContent(document, ['og:description']) ||
-    document
-      .querySelector('meta[name="description"]')
-      ?.getAttribute('content')
-      ?.trim() ||
-    null;
-
   const rawImageHref =
     getOpenGraphContent(document, ['og:image', 'og:image:url']) ||
     getLinkHrefAttribute(document, ['shortcut icon', 'icon', 'apple-touch-icon']);
@@ -347,7 +338,6 @@ const parseMetadata = (document: HTMLDocument, href: string): LinkPreviewMetadat
 
   return {
     title,
-    description,
     imageHref,
     date,
   };
@@ -368,7 +358,7 @@ const parseMetadata = (document: HTMLDocument, href: string): LinkPreviewMetadat
  * 3. Streams up to `MAX_HTML_BYTES_TO_LOAD`, stopping when (1) it has loaded all of the
  *    HTML (2) loaded the maximum number of bytes (3) finished loading the `<head>`.
  * 4. Parses the resulting HTML with `DOMParser`.
- * 5. Grabs the title, description, image URL, and date.
+ * 5. Grabs the title, image URL, and date.
  */
 export async function fetchLinkPreviewMetadata(
   fetchFn: FetchFn,