Merge pull request #63 from mvdicarlo/develop

v3.0.42
mvdicarlo · Nov 19, 2021 · be85232 · be85232
2 parents 2044a00 + 45fd636
commit be85232
Show file tree

Hide file tree

Showing 9 changed files with 378 additions and 167 deletions.
diff --git a/electron-app/package.json b/electron-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.0.41",
+  "version": "3.0.42",
   "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/e621/e621.service.ts b/electron-app/src/server/websites/e621/e621.service.ts
@@ -44,7 +44,7 @@ export class e621 extends Website {
   async checkLoginStatus(data: UserAccountEntity): Promise<LoginResponse> {
     const status: LoginResponse = { loggedIn: false, username: null };
     const accountData: e621AccountData = data.data;
-    if (accountData && accountData.username && accountData.username) {
+    if (accountData?.username) {
       status.username = accountData.username;
       status.loggedIn = true;
     }
@@ -97,7 +97,7 @@ export class e621 extends Website {
       'upload[description]': data.description,
       'upload[parent_id]': data.options.parentId || '',
       'upload[source]': [...data.options.sources, ...data.sources]
-        .filter(s => s)
+        .filter((s) => s)
         .slice(0, 5)
         .join('%0A'),
     };
@@ -144,15 +144,12 @@ export class e621 extends Website {
   }
 
   formatTags(tags: string[]) {
-    return super
-      .formatTags(tags)
-      .join(' ')
-      .trim();
+    return super.formatTags(tags).join(' ').trim();
   }
 
   transformAccountData(data: e621AccountData) {
     return {
-      username: data.username,
+      username: data?.username,
     };
   }
 
@@ -170,9 +167,7 @@ export class e621 extends Website {
     }
 
     if (!WebsiteValidator.supportsFileType(submission.primary, this.acceptsFiles)) {
-      problems.push(
-        `Currently supported file formats: ${this.acceptsFiles.join(', ')}`,
-      );
+      problems.push(`Currently supported file formats: ${this.acceptsFiles.join(', ')}`);
     }
 
     const { type, size, name } = submission.primary;

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
@@ -211,7 +211,13 @@ export class FurAffinity extends Website {
   private processForError(body: string): string | undefined {
     if (body.includes('redirect-message')) {
       const $ = cheerio.load(body);
-      const msg = $('.redirect-message').first().text();
+      let msg = $('.redirect-message').first().text();
+
+      if (msg?.includes('CAPTCHA')) {
+        msg =
+          'You need at least 11+ posts on your account before you can use PostyBirb with Fur Affinity.';
+      }
+
       return msg;
     }
 
@@ -312,7 +318,9 @@ export class FurAffinity extends Website {
         return Promise.reject(this.createPostResponse({ message: err, additionalInfo: body }));
       }
 
-      return Promise.reject(this.createPostResponse({ message: 'Something went wrong', additionalInfo: body }));
+      return Promise.reject(
+        this.createPostResponse({ message: 'Something went wrong', additionalInfo: body }),
+      );
     }
 
     try {

diff --git a/electron-app/src/server/websites/website-provider.service.ts b/electron-app/src/server/websites/website-provider.service.ts
@@ -53,7 +53,7 @@ export class WebsiteProvider {
     readonly newgrounds: Newgrounds,
     readonly pixiv: Pixiv,
     readonly newTumbl: NewTumbl,
-    readonly furryLife: FurryLife,
+    // readonly furryLife: FurryLife,
     readonly furryNetwork: FurryNetwork,
     readonly patreon: Patreon,
     readonly tumblr: Tumblr,

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

diff --git a/ui/src/websites/fur-affinity/FurAffinityCategories.tsx b/ui/src/websites/fur-affinity/FurAffinityCategories.tsx
@@ -10,11 +10,11 @@ export const FurAffinityCategories = [
     <Option value="4">Cellshading</Option>
     <Option value="5">Crafting</Option>
     <Option value="6">Designs</Option>
-    <Option value="7">Flash</Option>
     <Option value="8">Fursuiting</Option>
     <Option value="9">Icons</Option>
     <Option value="10">Mosaics</Option>
     <Option value="11">Photography</Option>
+    <Option value="32">Food / Recipes</Option>
     <Option value="12">Sculpting</Option>
   </OptGroup>,
   <OptGroup label="Readable Art">
@@ -36,7 +36,6 @@ export const FurAffinityCategories = [
     <Option value="22">Auctions</Option>
     <Option value="23">Contests</Option>
     <Option value="24">Current Events</Option>
-    <Option value="25">Desktops</Option>
     <Option value="26">Stockart</Option>
     <Option value="27">Screenshots</Option>
     <Option value="28">Scraps</Option>