Merge pull request #294 from mvdicarlo/develop

v3.1.37
mvdicarlo · Dec 27, 2023 · 1ebf799 · 1ebf799
2 parents f13cc5d + 74f007d
commit 1ebf799
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 63 deletions.
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.1.36",
+  "version": "3.1.37",
   "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/websites/derpibooru/derpibooru.service.ts b/electron-app/src/server/websites/derpibooru/derpibooru.service.ts
@@ -121,7 +121,7 @@ export class Derpibooru extends Website {
         custom: 'document.body.querySelectorAll("form")[3]',
       })),
       _method: 'post',
-      'image[tag_input]': this.formatTags(tags),
+      'image[tag_input]': this.formatTags(tags).join(', ').trim(),
       'image[image]': data.primary.file,
       'image[description]': data.description,
       'image[source_url]': data.options.source || data.sources[0] || '',
@@ -138,7 +138,7 @@ export class Derpibooru extends Website {
   }
 
   formatTags(tags: string[]) {
-    return tags.join(', ').trim();
+    return tags;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/e621/e621.service.ts b/electron-app/src/server/websites/e621/e621.service.ts
@@ -92,7 +92,7 @@ export class e621 extends Website {
     const form: any = {
       login: accountData.username,
       api_key: accountData.key,
-      'upload[tag_string]': this.formatTags(data.tags),
+      'upload[tag_string]': this.formatTags(data.tags).join(' ').trim(),
       'upload[file]': data.primary.file,
       'upload[rating]': this.getRating(data.rating),
       'upload[description]': data.description,
@@ -144,10 +144,6 @@ export class e621 extends Website {
     }
   }
 
-  formatTags(tags: string[]) {
-    return super.formatTags(tags).join(' ').trim();
-  }
-
   transformAccountData(data: e621AccountData) {
     return {
       username: data?.username,

diff --git a/electron-app/src/server/websites/fur-affinity/fur-affinity.service.ts b/electron-app/src/server/websites/fur-affinity/fur-affinity.service.ts
@@ -277,7 +277,7 @@ export class FurAffinity extends Website {
     const form: any = {
       key: HtmlParserUtil.getInputValue(part2.body.split('"submit-finalize"').pop(), 'key'),
       title: data.title,
-      keywords: this.formatTags(data.tags),
+      keywords: this.getFormTags(data.tags),
       message: data.description,
       rating: this.getRating(data.rating),
       create_folder_name: '',
@@ -346,7 +346,7 @@ export class FurAffinity extends Website {
     return this.createPostResponse({ source: post.returnUrl.replace('?upload-successful', '') });
   }
 
-  formatTags(tags: string[]): string {
+  getFormTags(tags: string[]): string {
     const maxLength = 250;
     tags = super.parseTags(tags).map(tag => tag.replace(/(\/|\\)/gm, '_'));
     const filteredTags = tags.filter(tag => tag.length >= 3);

diff --git a/electron-app/src/server/websites/furbooru/furbooru.service.ts b/electron-app/src/server/websites/furbooru/furbooru.service.ts
@@ -121,7 +121,7 @@ export class Furbooru extends Website {
         custom: 'document.body.querySelectorAll("form")[3]',
       })),
       _method: 'post',
-      'image[tag_input]': this.formatTags(tags),
+      'image[tag_input]': this.formatTags(tags).join(', ').trim(),
       'image[image]': data.primary.file,
       'image[description]': data.description,
       'image[source_url]': data.options.source || data.sources[0] || '',
@@ -138,7 +138,7 @@ export class Furbooru extends Website {
   }
 
   formatTags(tags: string[]) {
-    return tags.join(', ').trim();
+    return tags;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/furtastic/furtastic.service.ts b/electron-app/src/server/websites/furtastic/furtastic.service.ts
@@ -61,7 +61,7 @@ export class Furtastic extends Website {
     accountData: FurtasticAccountData,
   ): Promise<PostResponse> {
     const form: any = {
-      tags: this.formatTags(data.tags),
+      tags: this.formatTags(data.tags).join(' ').trim(),
       'file[0]': data.primary.file,
       rating: this.getRating(data.rating),
       description: data.description,
@@ -115,10 +115,6 @@ export class Furtastic extends Website {
     }
   }
 
-  formatTags(tags: string[]) {
-    return super.formatTags(tags).join(' ').trim();
-  }
-
   transformAccountData(data: FurtasticAccountData) {
     return {
       username: data?.username,

diff --git a/electron-app/src/server/websites/hentai-foundry/hentai-foundry.service.ts b/electron-app/src/server/websites/hentai-foundry/hentai-foundry.service.ts
@@ -96,7 +96,7 @@ export class HentaiFoundry extends Website {
       'Pictures[fileupload]': data.primary.file,
       'Pictures[submissionPolicyAgree]': '1',
       yt0: 'Create',
-      'Pictures[edit_tags]': this.formatTags(data.tags),
+      'Pictures[edit_tags]': this.formatTags(data.tags).join(', '),
       'Pictures[is_scrap]': options.scraps ? '1' : '0',
       'Pictures[comments_type]': options.disableComments ? '-1' : '0',
       'Pictures[categoryHier]': options.category || '',
@@ -149,8 +149,7 @@ export class HentaiFoundry extends Website {
           .substring(0, maxLength)
           .split(', ')
           .filter(tag => tag.length >= 3)
-          .join(', ')
-      : tagString;
+      : t;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/inkbunny/inkbunny.service.ts b/electron-app/src/server/websites/inkbunny/inkbunny.service.ts
@@ -156,7 +156,7 @@ export class Inkbunny extends Website {
       submission_id: upload.body.submission_id,
       title: data.title,
       desc: data.description,
-      keywords: this.formatTags(data.tags),
+      keywords: this.formatTags(data.tags).join(',').trim(),
     };
 
     const ratings = this.getRating(data.rating);
@@ -219,10 +219,6 @@ export class Inkbunny extends Website {
     });
   }
 
-  formatTags(tags: string[]) {
-    return super.formatTags(tags).join(',').trim();
-  }
-
   transformAccountData(data: InkbunnyAccountData) {
     return { username: data.username };
   }

diff --git a/electron-app/src/server/websites/ko-fi/ko-fi.service.ts b/electron-app/src/server/websites/ko-fi/ko-fi.service.ts
@@ -160,10 +160,6 @@ export class KoFi extends Website {
     return this.createPostResponse({});
   }
 
-  formatTags(tags: string[]) {
-    return super.formatTags(tags).join(',');
-  }
-
   validateFileSubmission(
     submission: FileSubmission,
     submissionPart: SubmissionPart<KoFiFileOptions>,

diff --git a/electron-app/src/server/websites/manebooru/manebooru.service.ts b/electron-app/src/server/websites/manebooru/manebooru.service.ts
@@ -121,7 +121,7 @@ export class Manebooru extends Website {
         custom: 'document.body.querySelectorAll("form")[3]',
       })),
       _method: 'post',
-      'image[tag_input]': this.formatTags(tags),
+      'image[tag_input]': this.formatTags(tags).join(', ').trim(),
       'image[image]': data.primary.file,
       'image[description]': data.description,
       'image[source_url]': data.options.source || data.sources[0] || '',
@@ -138,7 +138,7 @@ export class Manebooru extends Website {
   }
 
   formatTags(tags: string[]) {
-    return tags.join(', ').trim();
+    return tags;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/newgrounds/newgrounds.service.ts b/electron-app/src/server/websites/newgrounds/newgrounds.service.ts
@@ -351,7 +351,7 @@ export class Newgrounds extends Website {
     }
   }
 
-  formatTags(tags: string[]): any {
+  formatTags(tags: string[]): string[] {
     return super
       .formatTags(tags, { spaceReplacer: '-' })
       .map(tag => {

diff --git a/electron-app/src/server/websites/patreon/patreon.service.ts b/electron-app/src/server/websites/patreon/patreon.service.ts
@@ -138,6 +138,12 @@ export class Patreon extends Website {
         if (rule.attributes.access_rule_type === 'public') {
           tiers.find(t => t.value === '-1').value = rule.id;
         }
+        if (rule.attributes.access_rule_type === 'patrons') {
+          tiers.push({
+            value: rule.id,
+            label: 'Patrons Only',
+          });
+        }
       });
 
     this.storeAccountInformation(profileId, GenericAccountProp.FOLDERS, tiers);
@@ -277,7 +283,18 @@ export class Patreon extends Website {
     const link = create.data.id;
 
     // Tags
-    const formattedTags = this.formatTags(data.tags);
+    const formattedTags = this.formatTags(data.tags)
+      .map(tag => {
+        return {
+          type: 'post_tag',
+          id: `user_defined;${tag}`,
+          attributes: {
+            value: tag,
+            cardinality: 1,
+          },
+        };
+      })
+      .slice(0, 50);
     const relationshipTags = formattedTags.map(tag => {
       return {
         id: tag.id,
@@ -428,7 +445,18 @@ export class Patreon extends Website {
     }
 
     // Tags
-    const formattedTags = this.formatTags(data.tags);
+    const formattedTags = this.formatTags(data.tags)
+      .map(tag => {
+        return {
+          type: 'post_tag',
+          id: `user_defined;${tag}`,
+          attributes: {
+            value: tag,
+            cardinality: 1,
+          },
+        };
+      })
+      .slice(0, 50);
     const relationshipTags = formattedTags.map(tag => {
       return {
         id: tag.id,
@@ -607,20 +635,8 @@ export class Patreon extends Website {
     }
   }
 
-  formatTags(tags: string[]): any {
-    tags = tags.filter(tag => tag.length <= 25);
-    return tags
-      .map(tag => {
-        return {
-          type: 'post_tag',
-          id: `user_defined;${tag}`,
-          attributes: {
-            value: tag,
-            cardinality: 1,
-          },
-        };
-      })
-      .slice(0, 50);
+  formatTags(tags: string[]): string[] {
+    return tags.filter(tag => tag.length <= 25);
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/pillowfort/pillowfort.service.ts b/electron-app/src/server/websites/pillowfort/pillowfort.service.ts
@@ -98,7 +98,7 @@ export class Pillowfort extends Website {
       title: data.title,
       content: `<p>${data.description}</p>`,
       privacy: data.options.privacy,
-      tags: this.formatTags(data.tags),
+      tags: this.formatTags(data.tags).join(', '),
       commit: 'Submit',
     };
 
@@ -160,7 +160,7 @@ export class Pillowfort extends Website {
       title: data.title,
       content: `<p>${data.description}</p>`,
       privacy: data.options.privacy,
-      tags: this.formatTags(data.tags),
+      tags: this.formatTags(data.tags).join(', '),
       commit: 'Submit',
     };
 
@@ -189,7 +189,7 @@ export class Pillowfort extends Website {
   }
 
   formatTags(tags: string[]) {
-    return tags.join(', ');
+    return tags;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/so-furry/so-furry.service.ts b/electron-app/src/server/websites/so-furry/so-furry.service.ts
@@ -123,7 +123,7 @@ export class SoFurry extends Website {
       'UploadForm[binarycontent_5]': data.thumbnail || '',
       'UploadForm[P_title]': data.title,
       'UploadForm[description]': data.description.replace(/<\/div>(\n|\r)/g, '</div>'),
-      'UploadForm[formtags]': this.formatTags(data.tags),
+      'UploadForm[formtags]': this.formatTags(data.tags).join(', '),
       'UploadForm[contentLevel]': this.getRating(data.rating),
       'UploadForm[P_hidePublic]': '0',
       'UploadForm[folderId]': data.options.folder || '0',
@@ -178,7 +178,7 @@ export class SoFurry extends Website {
       'UploadForm[P_title]': data.title,
       'UploadForm[textcontent]': data.description,
       'UploadForm[description]': PlaintextParser.parse(data.description.split('\n')[0]),
-      'UploadForm[formtags]': this.formatTags(data.tags),
+      'UploadForm[formtags]': this.formatTags(data.tags).join(', '),
       'UploadForm[contentLevel]': this.getRating(data.rating),
       'UploadForm[P_hidePublic]': '0',
       'UploadForm[folderId]': data.options.folder || '0',
@@ -205,7 +205,7 @@ export class SoFurry extends Website {
   }
 
   formatTags(tags: string[]) {
-    return tags.join(', ');
+    return tags;
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/weasyl/weasyl.service.ts b/electron-app/src/server/websites/weasyl/weasyl.service.ts
@@ -119,7 +119,7 @@ export class Weasyl extends Website {
       title: data.title,
       rating: this.convertRating(data.rating),
       content: data.description,
-      tags: this.formatTags(data.tags),
+      tags: this.formatTags(data.tags).join(' '),
     };
 
     this.checkCancelled(cancellationToken);
@@ -162,7 +162,7 @@ export class Weasyl extends Website {
       title: data.title,
       rating: this.convertRating(data.rating),
       content: data.description,
-      tags: this.formatTags(data.tags),
+      tags: this.formatTags(data.tags).join(' '),
       submitfile: postFile,
       redirect: url,
     };
@@ -313,7 +313,7 @@ export class Weasyl extends Website {
   }
 
   formatTags(tags: string[]) {
-    return super.formatTags(tags).join(' ');
+    return super.formatTags(tags);
   }
 
   validateFileSubmission(

diff --git a/electron-app/src/server/websites/website.base.ts b/electron-app/src/server/websites/website.base.ts
@@ -128,7 +128,7 @@ export abstract class Website {
       .map(tag => tag.replace(/\s/g, options.spaceReplacer).trim());
   }
 
-  formatTags(tags: string[], options?: TagParseOptions): any {
+  formatTags(tags: string[], options?: TagParseOptions): string[] {
     return this.parseTags(tags, options);
   }
 
@@ -139,7 +139,12 @@ export abstract class Website {
     limit: number,
     getLength: (text: string) => number = text => text.length,
   ): void {
-    const { includedTags, skippedTags } = this.calculateFittingTags(tags, description, limit, getLength);
+    const { includedTags, skippedTags } = this.calculateFittingTags(
+      tags,
+      description,
+      limit,
+      getLength,
+    );
     const skippedCount = skippedTags.length;
     if (skippedCount !== 0) {
       const includedCount = includedTags.length;
@@ -161,9 +166,18 @@ export abstract class Website {
     tags: string[],
     description: string,
     websitePart: SubmissionPartEntity<DefaultOptions>,
-  ) : string {
+  ): string {
     const { includedTags } = this.calculateFittingTags(tags, description, this.MAX_CHARS);
-    return this.formatTags(includedTags).join(' ') ?? ''
+    const formattedTags = this.formatTags(includedTags);
+    if (Array.isArray(formattedTags)) {
+      return formattedTags.join(' ');
+    }
+
+    if (typeof formattedTags === 'string') {
+      return formattedTags;
+    }
+
+    return '';
   }
 
   protected calculateFittingTags(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.1.36",
+  "version": "3.1.37",
   "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.36",
+  "version": "3.1.37",
   "license": "BSD-3-Clause",
   "private": true,
   "Author": "Michael DiCarlo",