Merge pull request #40 from mvdicarlo/develop

v3.0.28

commons/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index",
   "types": "lib/index",
   "scripts": {
-    "build": "npm run prebuild && tsc",
+    "build": "tsc",
     "prebuild": "rimraf lib",
     "lint": "tslint -p tsconfig.json -c tslint.json",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\""

commons/src/interfaces/websites/subscribe-star/subscribe-star.file.options.interface.ts

@@ -1,6 +1,6 @@
 import { DefaultFileOptions } from '../../submission/default-options.interface';
 
 export interface SubscribeStarFileOptions extends DefaultFileOptions {
-  tier?: string;
+  tiers: string[];
   useTitle: boolean;
 }

commons/src/interfaces/websites/subscribe-star/subscribe-star.notification.options.interface.ts

@@ -1,6 +1,6 @@
 import { DefaultOptions } from '../../submission/default-options.interface';
 
 export interface SubscribeStarNotificationOptions extends DefaultOptions {
-  tier?: string;
+  tiers: string[];
   useTitle: boolean;
 }

commons/src/websites/subscribe-star/subscribe-star.file.options.ts

@@ -10,7 +10,8 @@ export class SubscribeStarFileOptionsEntity extends DefaultFileOptionsEntity
   @Expose()
   @IsOptional()
   @IsString()
-  tier?: string;
+  @DefaultValue([])
+  tiers!: string[];
 
   @Expose()
   @IsBoolean()

commons/src/websites/subscribe-star/subscribe-star.notification.options.ts

@@ -10,7 +10,8 @@ export class SubscribeStarNotificationOptionsEntity extends DefaultOptionsEntity
   @Expose()
   @IsOptional()
   @IsString()
-  tier?: string;
+  @DefaultValue([])
+  tiers!: string[];
 
   @Expose()
   @IsBoolean()

electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.0.27",
+  "version": "3.0.28",
   "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",
@@ -52,7 +52,6 @@
     "electron-updater": "^4.3.5",
     "electron-window-state": "^5.0.3",
     "fs-extra": "^8.1.0",
-    "gif-frames": "^1.0.1",
     "iconv-lite": "^0.5.1",
     "image-decode": "^1.2.2",
     "jimp": "^0.9.3",

electron-app/src/main.ts

@@ -16,8 +16,8 @@ app.commandLine.appendSwitch('disable-background-timer-throttling');
 
 process.env.PORT = process.env.PORT || '9247';
 global.AUTH_SERVER_URL = 'https://postybirb-api.cleverapps.io';
-global.DEBUG_MODE = !!process.argv.find(arg => arg === '-d' || arg === '--develop');
-global.SERVER_ONLY_MODE = !!process.argv.find(arg => arg === '-s' || arg === '--server');
+global.DEBUG_MODE = !!process.argv.find((arg) => arg === '-d' || arg === '--develop');
+global.SERVER_ONLY_MODE = !!process.argv.find((arg) => arg === '-s' || arg === '--server');
 global.BASE_DIRECTORY = path.join(app.getPath('documents'), 'PostyBirb');
 global.CHILD_PROCESS_IDS = [];
 
@@ -40,6 +40,7 @@ let initializedOnce: boolean = false;
 let mainWindowState: WindowStateKeeper.State = null;
 let mainWindow: BrowserWindow = null;
 let backgroundAlertTimeout = null;
+let hasNotifiedAboutBackground = false;
 const icon: string = path.join(__dirname, '../build/assets/icons/minnowicon.png');
 
 // Enable windows 10 notifications
@@ -82,9 +83,9 @@ app.on(
   },
 );
 app.on('quit', () => {
-  enableSleep()
+  enableSleep();
   clearTimeout(backgroundAlertTimeout);
-  global.CHILD_PROCESS_IDS.forEach(id => process.kill(id));
+  global.CHILD_PROCESS_IDS.forEach((id) => process.kill(id));
 });
 
 async function initialize() {
@@ -153,20 +154,23 @@ function createWindow() {
     mainWindowState.manage(mainWindow);
   }
 
-  mainWindow.webContents.on('new-window', event => event.preventDefault());
+  mainWindow.webContents.on('new-window', (event) => event.preventDefault());
   mainWindow.on('closed', () => {
     mainWindow = null;
     if (global.tray && util.isWindows()) {
       clearTimeout(backgroundAlertTimeout);
-      backgroundAlertTimeout = setTimeout(() => {
-        const notification = new Notification({
-          title: 'PostyBirb',
-          icon,
-          body: 'PostyBirb will continue in the background.',
-          silent: true,
-        });
-        notification.show();
-      }, 750);
+      if (!hasNotifiedAboutBackground) {
+        backgroundAlertTimeout = setTimeout(() => {
+          hasNotifiedAboutBackground = true;
+          const notification = new Notification({
+            title: 'PostyBirb',
+            icon,
+            body: 'PostyBirb will continue in the background.',
+            silent: true,
+          });
+          notification.show();
+        }, 750);
+      }
     }
   });
 

electron-app/src/server/file-manager/file-manager.service.ts

@@ -1,18 +1,16 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { detect } from 'chardet';
+import { app, nativeImage } from 'electron';
 import * as fs from 'fs-extra';
-import * as shortid from 'shortid';
+import { decode } from 'iconv-lite';
 import * as _ from 'lodash';
 import * as path from 'path';
 import { FileRecord, FileSubmission, UploadedFile } from 'postybirb-commons';
-
-import { Injectable, Logger } from '@nestjs/common';
+import * as shortid from 'shortid';
 import { SUBMISSION_FILE_DIRECTORY, THUMBNAIL_FILE_DIRECTORY } from 'src/server/directories';
-
-import { app, nativeImage } from 'electron';
-import * as gifFrames from 'gif-frames';
 import ImageManipulator from 'src/server/file-manipulation/manipulators/image.manipulator';
-import { decode } from 'iconv-lite';
-import { detect } from 'chardet';
 import { ImageManipulationPoolService } from 'src/server/file-manipulation/pools/image-manipulation-pool.service';
+import { GifManipulator } from '../file-manipulation/manipulators/gif.manipulator';
 
 @Injectable()
 export class FileManagerService {
@@ -44,17 +42,13 @@ export class FileManagerService {
     if (file.mimetype.includes('image')) {
       if (file.mimetype === 'image/gif') {
         await fs.outputFile(submissionFilePath, file.buffer);
-        const [frame0] = await gifFrames({ url: file.buffer, frames: 0 });
+
+        const frame0 = await GifManipulator.getFrame(file.buffer);
         const im: ImageManipulator = await this.imageManipulationPool.getImageManipulator(
-          frame0.getImage().read(),
+          frame0,
           'image/jpeg',
         );
-        thumbnail = (
-          await im
-            .resize(300)
-            .setQuality(99)
-            .getData()
-        ).buffer;
+        thumbnail = (await im.resize(300).setQuality(99).getData()).buffer;
       } else if (ImageManipulator.isMimeType(file.mimetype)) {
         const im: ImageManipulator = await this.imageManipulationPool.getImageManipulator(
           file.buffer,
@@ -75,10 +69,7 @@ export class FileManagerService {
             ext: `.${ImageManipulator.getExtension(data.type)}`,
           });
 
-          const thumbnailData = await im
-            .resize(300)
-            .setQuality(99)
-            .getData();
+          const thumbnailData = await im.resize(300).setQuality(99).getData();
           thumbnail = thumbnailData.buffer;
           thumbnailFilePath = `${THUMBNAIL_FILE_DIRECTORY}/${fileId}.${ImageManipulator.getExtension(
             thumbnailData.type,
@@ -129,7 +120,7 @@ export class FileManagerService {
       submission.fallback,
       ...(submission.additional || []),
     ];
-    await Promise.all(files.filter(f => !!f).map(f => this.removeSubmissionFile(f)));
+    await Promise.all(files.filter((f) => !!f).map((f) => this.removeSubmissionFile(f)));
   }
 
   scaleImage(file: UploadedFile, scalePx: number): UploadedFile {

electron-app/src/server/file-manipulation/manipulators/gif.manipulator.ts

@@ -0,0 +1,8 @@
+const Jimp = require('jimp');
+
+export class GifManipulator {
+  static async getFrame(fileBuffer: Buffer): Promise<Buffer> {
+    const gif = await Jimp.read(fileBuffer);
+    return await gif.getBufferAsync(Jimp.MIME_PNG);
+  }
+}

electron-app/src/server/remote/remote.controller.ts

@@ -19,4 +19,9 @@ export class RemoteController {
     }
     res.sendFile(query.uri);
   }
+
+  @Get('ping')
+  ping() {
+    return 'pong';
+  }
 }

electron-app/src/server/submission/parser/parser.service.ts

@@ -100,12 +100,12 @@ export class ParserService {
     if (tags.length) {
       const conversionMap = {};
       (await this.tagConverter.getTagConvertersForWebsite(website.constructor.name)).forEach(
-        converter => {
+        (converter) => {
           conversionMap[converter.tag] = converter.getTagForWebsite(website.constructor.name);
         },
       );
 
-      tags = tags.map(tag => conversionMap[tag] || tag);
+      tags = tags.map((tag) => conversionMap[tag] || tag).filter((tag) => !!tag.trim().length);
     }
 
     return tags;
@@ -157,11 +157,11 @@ export class ParserService {
 
     if (website.acceptsAdditionalFiles) {
       const additionalFiles = (submission.additional || []).filter(
-        record => !record.ignoredAccounts!.includes(websitePart.accountId),
+        (record) => !record.ignoredAccounts!.includes(websitePart.accountId),
       );
 
       data.additional = await Promise.all(
-        additionalFiles.map(file => this.attemptFileScale(website, file, canScale)),
+        additionalFiles.map((file) => this.attemptFileScale(website, file, canScale)),
       );
     } else {
       data.additional = [];

electron-app/src/server/websites/newgrounds/newgrounds.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import * as cheerio from 'cheerio';
 import { nativeImage } from 'electron';
-import * as gifFrames from 'gif-frames';
 import {
   DefaultOptions,
   FileRecord,
@@ -13,6 +12,7 @@ import {
   SubmissionPart,
 } from 'postybirb-commons';
 import UserAccountEntity from 'src/server//account/models/user-account.entity';
+import { GifManipulator } from 'src/server/file-manipulation/manipulators/gif.manipulator';
 import ImageManipulator from 'src/server/file-manipulation/manipulators/image.manipulator';
 import Http from 'src/server/http/http.util';
 import { CancellationToken } from 'src/server/submission/post/cancellation/cancellation-token';
@@ -158,12 +158,12 @@ export class Newgrounds extends Website {
 
     let thumbfile = data.thumbnail ? data.thumbnail : data.primary.file;
     if (!data.thumbnail && data.primary.file.options.contentType === 'image/gif') {
-      const [frame0] = await gifFrames({ url: data.primary.file.value, frames: 0 });
+      const frame0 = await GifManipulator.getFrame(data.primary.file.value);
       thumbfile = {
-        value: frame0.getImage().read(),
+        value: frame0,
         options: {
-          filename: 'thumbnail.jpg',
-          contentType: 'image/jpg',
+          filename: 'thumbnail.png',
+          contentType: 'image/png',
         },
       };
     }

electron-app/src/server/websites/patreon/patreon.service.ts

@@ -305,7 +305,7 @@ export class Patreon extends Website {
       post_type: createData.data.type,
       is_paid: options.charge ? 'true' : 'false',
       title: data.title,
-      teaser_text: options.teaser || '',
+      teaser_text: (options.teaser || '').slice(0, 140),
       post_metadata: {},
       tags: { publish: true },
     };
@@ -456,7 +456,7 @@ export class Patreon extends Website {
       post_type: createData.data.type,
       is_paid: options.charge ? 'true' : 'false',
       title: data.title,
-      teaser_text: options.teaser || '',
+      teaser_text: (options.teaser || '').slice(0, 140),
       post_metadata: {},
       tags: { publish: true },
     };

electron-app/src/server/websites/subscribe-star/subscribe-star.service.ts

@@ -114,7 +114,7 @@ export class SubscribeStar extends Website {
       }</div>`,
       pinned_uploads: '[]',
       new_editor: 'true',
-      'tier_ids[]': data.options.tier === 'free' ? undefined : data.options.tier,
+      'tier_ids[]': data.options.tiers.includes('free') ? undefined : data.options.tiers,
       'tags[]': data.tags,
     };
 
@@ -158,7 +158,7 @@ export class SubscribeStar extends Website {
     page.body = page.body.replace(/\&quot;/g, '"');
     const csrf = page.body.match(/<meta name="csrf-token" content="(.*?)"/)[1];
 
-    const files = [data.primary, ...data.additional].map(f => f.file);
+    const files = [data.primary, ...data.additional].map((f) => f.file);
     const postKey = page.body.match(/data-s3-upload-path=\\"(.*?)\\"/)[1];
     const uploadURL = page.body.match(/data-s3-url="(.*?)"/)[1];
     this.checkCancelled(cancellationToken);
@@ -217,7 +217,7 @@ export class SubscribeStar extends Website {
     if (files.length > 1) {
       const order = processData.imgs_and_videos
         .sort((a, b) => a.id - b.id)
-        .map(record => record.id);
+        .map((record) => record.id);
 
       const reorder = await Http.post<{ error: any; html: string }>(
         `${this.BASE_URL}/post_uploads/reorder`,
@@ -245,7 +245,7 @@ export class SubscribeStar extends Website {
       }</div>`,
       pinned_uploads: '[]',
       new_editor: 'true',
-      'tier_ids[]': data.options.tier === 'free' ? undefined : data.options.tier,
+      'tier_ids[]': data.options.tiers.includes('free') ? undefined : data.options.tiers,
       'tags[]': data.tags,
     };
 
@@ -287,29 +287,31 @@ export class SubscribeStar extends Website {
     const warnings: string[] = [];
     const isAutoscaling: boolean = submissionPart.data.autoScale;
 
-    if (!submissionPart.data.tier) {
-      problems.push('No access tier selected.');
+    if (!submissionPart.data.tiers) {
+      problems.push('No access tiers selected.');
     }
 
-    if (submissionPart.data.tier) {
+    if (submissionPart.data.tiers && submissionPart.data.tiers.length) {
       const folders: Folder[] = _.get(
         this.accountInformation.get(submissionPart.accountId),
         GenericAccountProp.FOLDERS,
         [],
       );
-      if (!folders.find(f => f.value === submissionPart.data.tier)) {
-        warnings.push(`Access Tier (${submissionPart.data.tier}) not found.`);
-      }
+      submissionPart.data.tiers.forEach((tier) => {
+        if (!folders.find((f) => f.value === tier)) {
+          warnings.push(`Access Tier (${tier}) not found.`);
+        }
+      });
     }
 
     const files = [
       submission.primary,
       ...(submission.additional || []).filter(
-        f => !f.ignoredAccounts!.includes(submissionPart.accountId),
+        (f) => !f.ignoredAccounts!.includes(submissionPart.accountId),
       ),
     ];
 
-    files.forEach(file => {
+    files.forEach((file) => {
       const { type, size, name, mimetype } = file;
       let maxMB = 5;
       if (type === FileSubmissionType.AUDIO) {
@@ -344,20 +346,23 @@ export class SubscribeStar extends Website {
     const problems: string[] = [];
     const warnings: string[] = [];
 
-    if (!submissionPart.data.tier) {
-      problems.push('No access tier selected.');
+    if (!submissionPart.data.tiers) {
+      problems.push('No access tiers selected.');
     }
 
-    if (submissionPart.data.tier) {
+    if (submissionPart.data.tiers && submissionPart.data.tiers.length) {
       const folders: Folder[] = _.get(
         this.accountInformation.get(submissionPart.accountId),
         GenericAccountProp.FOLDERS,
         [],
       );
-      if (!folders.find(f => f.value === submissionPart.data.tier)) {
-        warnings.push(`Access Tier (${submissionPart.data.tier}) not found.`);
-      }
+      submissionPart.data.tiers.forEach((tier) => {
+        if (!folders.find((f) => f.value === tier)) {
+          warnings.push(`Access Tier (${tier}) not found.`);
+        }
+      });
     }
+
     return { problems, warnings };
   }
 }