Merge pull request #86 from mvdicarlo/develop

v2.3.32

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postybirb",
-  "version": "2.3.31",
+  "version": "2.3.32",
   "description": "PostyBirb is an application that helps artists post art and other multimedia to multiple websites more quickly.",
   "main": "main.js",
   "scripts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postybirb",
-  "version": "2.3.31",
+  "version": "2.3.32",
   "scripts": {
     "ng": "ng",
     "compile": "ng build --vendor-chunk=false",
@@ -25,7 +25,7 @@
     "@fortawesome/fontawesome-free": "^5.6.3",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
-    "@tinymce/tinymce-angular": "^3.3.1",
+    "@tinymce/tinymce-angular": "~3.3.1",
     "angular2-hotkeys": "~2.1.4",
     "bootstrap-css-only": "^4.2.1",
     "core-js": "^2.5.4",

src/app/app.error.logger.ts

@@ -72,8 +72,9 @@ export class ErrorLoggerHandler extends ErrorHandler {
       if (this.seenList.includes(error.message)) return;
       this.seenList.push(error.message);
       if (error.message) {
-        this.http.post('https://postybirb-error-server.now.sh/log/error', { errorLog: error })
-          .subscribe(res => console.debug('Error logging success', res), err => console.debug('Error logging failure', err));
+        // Haven't logged errors to any server in a long time
+        // this.http.post('https://postybirb-error-server.now.sh/log/error', { errorLog: error })
+        //   .subscribe(res => console.debug('Error logging success', res), err => console.debug('Error logging failure', err));
       }
     }
   }

src/app/websites/website-services/deviant-art/deviant-art.service.ts

@@ -53,6 +53,15 @@ function descriptionParse(html: string): string {
     .replace(/\n/g, '');
 }
 
+interface DeviantArtFolder {
+  description: string;
+  folderid: string;
+  has_subfolders: boolean;
+  name: string;
+  parent?: string;
+  subfolders: DeviantArtFolder[];
+}
+
 @Injectable({
   providedIn: 'root'
 })
@@ -150,13 +159,31 @@ export class DeviantArt extends BaseWebsiteService implements WebsiteService {
     });
   }
 
+  private flattenFolders(folder: DeviantArtFolder): DeviantArtFolder[] {
+    const folders = [folder];
+
+    if (!folder) {
+      return [];
+    }
+
+    if (!folder.has_subfolders) {
+      return folders;
+    }
+
+    folder.subfolders.forEach(sf => folders.push(...this.flattenFolders(sf)))
+    return folders;
+  }
+
   private async _getFolders(profileId: string, accessToken: string): Promise<void> {
     const folderResponse = await got.get(`${this.BASE_URL}/api/v1/oauth2/gallery/folders?calculate_size=false&limit=50&access_token=${accessToken}`, this.BASE_URL, [], profileId);
     const results = (JSON.parse(folderResponse.body).results || []);
     const folders: Folder[] = [];
 
-    results.forEach(folder => {
-      const parent = folder.parent ? results.find(f => f.folderid === folder.parent && f.name !== 'Featured') : undefined;
+    const flattenedFolders: DeviantArtFolder[] = [];
+    results.forEach((r: DeviantArtFolder) => flattenedFolders.push(...this.flattenFolders(r)));
+
+    flattenedFolders.forEach(folder => {
+      const parent = folder.parent ? flattenedFolders.find(f => f.folderid === folder.parent && f.name !== 'Featured') : undefined;
       folders.push({
         id: folder.folderid,
         title: parent ? `${parent.name} / ${folder.name}` : folder.name,

src/app/websites/website-services/furry-network/furry-network.service.ts

@@ -358,7 +358,7 @@ export class FurryNetwork extends BaseWebsiteService implements WebsiteService {
 
   formatTags(defaultTags: string[] = [], other: string[] = []): any {
     return super.formatTags(defaultTags, other, '-').filter(tag => tag.length <= 30 && tag.length >= 3)
-      .map(tag => { return tag.replace(/(\(|\)|:|#|;|\]|\[|')/g, '').replace(/(\\|\/)/g, '-').replace(/\?/g, 'unknown') })
+      .map(tag => { return tag.replace(/(\(|\)|:|#|;|\]|\[|'|\.)/g, '').replace(/(\\|\/)/g, '-').replace(/\?/g, 'unknown') })
       .filter(tag => tag.length >= 3)
       .slice(0, 30);
   }