feat: support altering post using user defined metadata(dimensions/ig…

…nore websites) (#268)

apps/client-server/src/app/post/models/posting-file.ts

@@ -1,4 +1,9 @@
-import { FileType, IFileBuffer } from '@postybirb/types';
+import {
+  FileMetadataFields,
+  FileType,
+  IFileBuffer,
+  SubmissionFileId,
+} from '@postybirb/types';
 import { getFileType } from '@postybirb/utils/file-type';
 import { parse } from 'path';
 
@@ -8,6 +13,8 @@ export type ThumbnailOptions = {
 };
 
 export class PostingFile {
+  public readonly id: SubmissionFileId;
+
   public readonly buffer: Buffer;
 
   public readonly mimeType: string;
@@ -16,21 +23,30 @@ export class PostingFile {
 
   public readonly fileName: string;
 
-  public readonly id: string;
+  public metadata: FileMetadataFields;
 
   public readonly thumbnail?: ThumbnailOptions;
 
-  public constructor(file: IFileBuffer, thumbnail?: ThumbnailOptions) {
+  public constructor(
+    id: SubmissionFileId,
+    file: IFileBuffer,
+    thumbnail?: ThumbnailOptions
+  ) {
+    this.id = id;
     this.buffer = file.buffer;
     this.mimeType = file.mimeType;
     this.fileType = getFileType(file.fileName);
     this.fileName = this.normalizeFileName(file);
-    this.id = file.id;
     this.thumbnail = thumbnail;
   }
 
   private normalizeFileName(file: IFileBuffer): string {
     const { ext } = parse(file.fileName);
     return `${file.id}${ext}`;
   }
+
+  public withMetadata(metadata: FileMetadataFields): PostingFile {
+    this.metadata = metadata;
+    return this;
+  }
 }

apps/client-server/src/app/post/post-file-resizer.service.ts

@@ -45,6 +45,7 @@ export class PostFileResizerService {
     }
 
     return new PostingFile(
+      file.id,
       await this.processPrimaryFile(file, resize),
       await this.processThumbnailFile(file)
     );

apps/client-server/src/app/post/post-manager.service.ts

@@ -5,6 +5,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { Logger } from '@postybirb/logger';
 import {
   EntityId,
+  FileMetadataFields,
   FileSubmission,
   FileType,
   ISubmissionFile,
@@ -337,11 +338,18 @@ export class PostManagerService {
     // Order files based on submission order
     const fileBatchSize = Math.max(instance.metadata.fileBatchSize ?? 1, 1);
     const orderedFiles: Loaded<ISubmissionFile[]> = [];
-    const files = submission.files.getItems().filter(
-      // Only post files that haven't been posted
-      // Ensures CONTINUED posts don't post files that have already been posted.
-      (f) => websitePostRecord.metadata.postedFiles.indexOf(f.id) === -1
-    );
+    const metadata = submission.metadata.fileMetadata;
+    const files = submission.files
+      .getItems()
+      .filter(
+        // Filter out files that have been marked by the user as ignored for this website.
+        (f) => !metadata[f.id]?.ignoredWebsites?.includes(instance.accountId)
+      )
+      .filter(
+        // Only post files that haven't been posted
+        // Ensures CONTINUED posts don't post files that have already been posted.
+        (f) => websitePostRecord.metadata.postedFiles.indexOf(f.id) === -1
+      );
     submission.metadata.order.forEach((fileId) => {
       const file = files.find((f) => f.id === fileId);
       if (file) {
@@ -357,23 +365,57 @@ export class PostManagerService {
       this.cancelToken.throwIfCancelled();
 
       // Resize files if necessary
-      const processedFiles: PostingFile[] = await Promise.all(
-        batch.map((f) => {
-          let resizeParams: ImageResizeProps | undefined;
-          const fileType = getFileType(f.mimeType);
-          if (fileType === FileType.IMAGE) {
-            resizeParams = this.getResizeParameters(
-              submission,
-              filePostableInstance,
-              f
-            );
+      const processedFiles: PostingFile[] = (
+        await Promise.all(
+          batch.map((f) => {
+            const fileMetadata: FileMetadataFields = submission.metadata[f.id];
+            let resizeParams: ImageResizeProps | undefined;
+            const fileType = getFileType(f.mimeType);
+            if (fileType === FileType.IMAGE) {
+              resizeParams = this.getResizeParameters(
+                submission,
+                filePostableInstance,
+                f
+              );
+
+              // User defined dimensions
+              const userDefinedDimensions =
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                fileMetadata?.dimensions['default'] ??
+                fileMetadata?.dimensions[instance.accountId];
+              if (userDefinedDimensions) {
+                if (
+                  userDefinedDimensions.width &&
+                  userDefinedDimensions.height
+                ) {
+                  resizeParams = resizeParams ?? {};
+                  if (
+                    userDefinedDimensions.width > resizeParams.width &&
+                    userDefinedDimensions.height > resizeParams.height
+                  ) {
+                    resizeParams = {
+                      ...resizeParams,
+                      width: userDefinedDimensions.width,
+                      height: userDefinedDimensions.height,
+                    };
+                  }
+                }
+              }
+            }
+
+            return this.resizerService.resize({
+              file: f,
+              resize: resizeParams,
+            });
+          })
+        )
+      ).map((f) =>
+        f.withMetadata(
+          metadata[f.id] ?? {
+            ignoredWebsites: [],
+            dimensions: null,
           }
-
-          return this.resizerService.resize({
-            file: f,
-            resize: resizeParams,
-          });
-        })
+        )
       );
 
       // Post

apps/postybirb-ui/src/components/submissions/submission-edit-form/components/submission-file-section/file-details.tsx

@@ -11,7 +11,11 @@ import {
 } from '@elastic/eui';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
-import { FileSubmissionMetadata, ISubmissionFileDto } from '@postybirb/types';
+import {
+  AccountId,
+  FileSubmissionMetadata,
+  ISubmissionFileDto,
+} from '@postybirb/types';
 import { isImage } from '@postybirb/utils/file-type';
 import { filesize } from 'filesize';
 import { ReactNode, useCallback, useMemo, useState } from 'react';
@@ -69,7 +73,7 @@ function SharedDetails(props: FileDetailsProps) {
   const providedIgnoredWebsites = fileMetadata.ignoredWebsites ?? [];
 
   const [altText, setAltText] = useState<string>(providedAltText);
-  const [ignoredWebsites, setIgnoredWebsites] = useState<string[]>(
+  const [ignoredWebsites, setIgnoredWebsites] = useState<AccountId[]>(
     providedIgnoredWebsites
   );
 

apps/postybirb-ui/src/components/submissions/submission-edit-form/components/submission-form-website-select/simple-website-select.tsx

@@ -1,6 +1,7 @@
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 import { msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
+import { AccountId } from '@postybirb/types';
 import { useEffect, useState } from 'react';
 import { SubmissionDto } from '../../../../../models/dtos/submission.dto';
 import { AccountStore } from '../../../../../stores/account.store';
@@ -9,7 +10,7 @@ import { useStore } from '../../../../../stores/use-store';
 type SimpleWebsiteSelectProps = {
   onChange: (websitesIds: string[]) => void;
   submission: SubmissionDto;
-  selected: string[]; // AccountIds
+  selected: AccountId[];
 };
 
 export function SimpleWebsiteSelect(props: SimpleWebsiteSelectProps) {

libs/types/src/models/submission/file-submission/file-metadata-fields.type.ts

@@ -1,4 +1,4 @@
-import { WebsiteId } from '../../website/website.type';
+import { AccountId } from '../../account/account.interface';
 import { ModifiedFileDimension } from './modified-file-dimension.type';
 
 /**
@@ -13,15 +13,18 @@ export type FileMetadataFields = {
    * The alternative text for the file.
    * @type {string}
    */
-  altText: string;
+  altText?: string;
+
   /**
    * The dimensions of the file for different websites.
-   * @type {Record<WebsiteId, ModifiedFileDimension>}
+   * Currently only supports 'default'
+   * @type {Record<AccountId, ModifiedFileDimension>}
    */
-  dimensions: Record<WebsiteId, ModifiedFileDimension>;
+  dimensions: Record<AccountId, ModifiedFileDimension>;
+
   /**
    * The list of websites where the file is ignored.
-   * @type {WebsiteId[]}
+   * @type {AccountId[]}
    */
-  ignoredWebsites: WebsiteId[];
+  ignoredWebsites: AccountId[];
 };