Merge pull request #278 from mvdicarlo/develop

v3.1.34
mvdicarlo · Nov 8, 2023 · 21bdab7 · 21bdab7
2 parents 6555640 + df8ce86
commit 21bdab7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.1.33",
+  "version": "3.1.34",
   "description": "(ClientServer) PostyBirb is an application that helps artists post art and other multimedia to multiple websites more quickly.",
   "main": "dist/main.js",
   "author": "Michael DiCarlo",

diff --git a/electron-app/src/server/submission/parser/section-parsers/description.parser.ts b/electron-app/src/server/submission/parser/section-parsers/description.parser.ts
@@ -28,6 +28,15 @@ export class DescriptionParser {
     private settings: SettingsService,
   ) {
     this.websiteDescriptionShortcuts = websitesService.getUsernameShortcuts();
+    this.websiteDescriptionShortcuts = {
+      ...this.websiteDescriptionShortcuts,
+      twitter: [ // injects legacy twitter shortcut back in
+        {
+          key: 'tw',
+          url: 'https://twitter.com/$1',
+        },
+      ],
+    };
   }
 
   public async parse(

diff --git a/electron-app/src/server/websites/newgrounds/newgrounds.service.ts b/electron-app/src/server/websites/newgrounds/newgrounds.service.ts
@@ -120,17 +120,20 @@ export class Newgrounds extends Website {
     return Promise.reject(this.createPostResponse({ additionalInfo: post.body }));
   }
 
-  private async getThumbnail(thumbnail: PostFile, primary: PostFile): Promise<PostFile> {
-    let thumbfile = thumbnail;
+  private async getThumbnail(
+    thumbnail: PostFile | undefined,
+    primary: PostFile,
+  ): Promise<PostFile> {
+    let thumbfile: PostFile = {
+      value: thumbnail?.value ?? primary.value,
+      options: {
+        filename: 'thumbnail.png',
+        contentType: 'image/png',
+      },
+    };
     if (!thumbnail && primary.options.contentType === 'image/gif') {
       const frame0 = await GifManipulator.getFrame(primary.value);
-      thumbfile = {
-        value: frame0,
-        options: {
-          filename: 'thumbnail.png',
-          contentType: 'image/png',
-        },
-      };
+      thumbfile.value = frame0;
     }
 
     const scalePx = 600;
@@ -158,8 +161,6 @@ export class Newgrounds extends Website {
     }
 
     thumbfile.value = thumb.toPNG();
-    thumbfile.options.filename = 'thumbnail.png';
-    thumbfile.options.contentType = 'image/png';
     return thumbfile;
   }
 
@@ -215,12 +216,7 @@ export class Newgrounds extends Website {
     }
 
     const { edit_url, project_id } = initRes.body;
-
-    let thumbfile = await this.getThumbnail(
-      data.thumbnail ? data.thumbnail : data.primary.file,
-      data.primary.file,
-    );
-
+    const thumbfile = await this.getThumbnail(data.thumbnail, data.primary.file);
     const primaryBuf = nativeImage.createFromBuffer(data.primary.file.value);
     const size = primaryBuf.getSize();
     const fileUploadRes = await Http.post<

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.1.33",
+  "version": "3.1.34",
   "description": "PostyBirb is an application that helps artists post art and other multimedia to multiple websites more quickly..",
   "main": "index.js",
   "scripts": {

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus-ui",
-  "version": "3.1.33",
+  "version": "3.1.34",
   "license": "BSD-3-Clause",
   "private": true,
   "Author": "Michael DiCarlo",