Update to v1.2.7 (Official Legacy Version)

README.md

@@ -1,6 +1,5 @@
-# BEING REMADE
-Currently PostyBirb is being remade.
-All of it is available on branch PB-Next
+# Legacy Version
+PostyBirb was remade and this branch is kept to track legacy code.
 
 # PostyBirb
 

electron/main.js

@@ -29,7 +29,6 @@ const profileWindows = {};
 const dbStore = {}; // store of all dbs for lookup
 
 let tray = null;
-let updateInterval = null;
 let scheduledInterval = null;
 let adapter = null;
 
@@ -137,7 +136,6 @@ app.on('ready', () => {
             label: 'Quit',
             click() {
                 clearInterval(scheduledInterval);
-                clearInterval(updateInterval);
                 rimraf(path.join(app.getPath('temp'), 'PostyBirb'), () => {
                     app.quit();
                 });
@@ -174,11 +172,11 @@ app.on('ready', () => {
     scheduledInterval = setInterval(checkForScheduledPost, 2 * 60000);
 
     if (!process.env.DEVELOP) {
-        updateInterval = setInterval(() => {
-            autoUpdater.checkForUpdates();
-        }, 3 * 60 * 60000);
-
-        autoUpdater.checkForUpdates();
+      const enabled = createDB('postybirb').get('autoUpdate').value();
+      const isEnabled = enabled === undefined ? true : enabled;
+      if (!isEnabled) {
+          autoUpdater.checkForUpdates();
+      }
     }
 });
 

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "PostyBirb",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Multimedia crossposter for multimedia websites",
   "main": "main.js",
   "scripts": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "postybirb",
   "description": "Multimedia crossposter for multimedia websites",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "author": "Michael DiCarlo (Lemonynade)",
   "license": "BSD-3-Clause",
   "homepage": "https://bitbucket.org/Michael_DiCarlo/postybirb-angular#readme",

src/app/app.component.ts

@@ -55,7 +55,9 @@ export class AppComponent implements AfterViewInit {
         }
       });
     } else {
-      this.dialog.open(RemakeAlertDialogComponent);
+      if (!store.get('disablev2Notification')) {
+        this.dialog.open(RemakeAlertDialogComponent);
+      }
     }
 
     this._hotKeysService.add(new Hotkey('ctrl+l', (event: KeyboardEvent): boolean => {

src/app/commons/models/website/aryion.ts

@@ -103,7 +103,7 @@ export class Aryion extends BaseWebsite implements Website {
         }
       } : '',
       desc: submission.description,
-      tags: this.formatTags(submission.defaultTags, submission.customTags).filter(f => !f.match(/(v|V)ore/)).filter(f => !f.match(/(n|N)on-vore/)).join('\n'),
+      tags: this.formatTags(submission.defaultTags, submission.customTags).filter(f => !f.match(/^vore$/i)).filter(f => !f.match(/^non-vore$/i)).join('\n'),
       'reqtag[]': submission.options.reqtag === 1 ? 'Non-Vore' : '',
       view_perm: submission.options.viewPerm,
       comment_perm: submission.options.commentPerm,

src/app/commons/models/website/furrynetwork.ts

@@ -45,7 +45,7 @@ export class FurryNetwork extends BaseWebsite implements Website {
       }
     };
 
-    this.coordinator.insertService(this.websiteName, this, 30 * 60000);
+    this.coordinator.insertService(this.websiteName, this, 5 * 60000);
   }
 
   getStatus(): Promise<WebsiteStatus> {

src/app/commons/models/website/patreon.ts

@@ -40,7 +40,7 @@ export class Patreon extends BaseWebsite implements Website {
     return new Promise(resolve => {
       this.http.get(this.baseURL, { responseType: 'text' })
         .subscribe(page => {
-          if (page.includes('Log In')) this.loginStatus = WebsiteStatus.Logged_Out;
+          if (page.includes('Sign up')) this.loginStatus = WebsiteStatus.Logged_Out;
           else this.loginStatus = WebsiteStatus.Logged_In;
           resolve(this.loginStatus);
         }, err => {

src/app/miscellaneous/components/remake-alert-dialog/remake-alert-dialog.component.html

@@ -1,15 +1,29 @@
 <h2 mat-dialog-title>PostyBirb 2.0!</h2>
 <mat-dialog-content class="window">
-  <p>
-    Over the past few months PostyBirb has been in the process of being remade. This is why there have not been many updates.
+  <div>
+    <strong>The 1.X version of PostyBirb is no longer actively supported.</strong>
     <br>
+    <p>
+      v1.2.7 adds a setting that allows you to opt out of update prompts.
+    </p>
     <br>
-    This is an announcement to let you know that it will be openly available for download within the next couple weeks.
     <br>
-    <br>
-    You can find more about it here <a href="#" (click)="openInfo()">PostyBirb 2.0</a>
-  </p>
+    <p>
+      You can find more about v2 here <a href="#" (click)="openInfo()">PostyBirb 2.0</a>
+      <br>
+      If you want to download and try 2.0 you can download it <a href="http://www.postybirb.com/download.html">Here</a>
+      <br>
+      You will need to manually install v2.
+      <br>
+      <br>
+      <span class="text-danger">
+        Be aware that templates and unposted submissions will not transfer to v2.
+        Although if you decide to downgrade to v1 you should still be able to use whatever templates you already had.
+      </span>
+    </p>
+  </div>
 </mat-dialog-content>
 <mat-dialog-actions class="float-right">
+  <button mat-raised-button color="warn" (click)="stopNotify()">Don't Tell Me Again</button>
   <button mat-raised-button color="primary" mat-dialog-close>OK</button>
 </mat-dialog-actions>

src/app/miscellaneous/components/remake-alert-dialog/remake-alert-dialog.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { MatDialogRef } from '@angular/material';
 
 @Component({
   selector: 'remake-alert-dialog',
@@ -7,7 +8,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class RemakeAlertDialogComponent implements OnInit {
 
-  constructor() { }
+  constructor(public dialogRef: MatDialogRef<RemakeAlertDialogComponent>) { }
 
   ngOnInit() {
   }
@@ -16,4 +17,9 @@ export class RemakeAlertDialogComponent implements OnInit {
     openUrlInBrowser('http://www.postybirb.com/postybirb-next.html');
   }
 
+  public stopNotify() {
+    store.set('disablev2Notification', true);
+    this.dialogRef.close();
+  }
+
 }

src/app/postybirb/components/dialog/submission-settings-dialog/submission-settings-dialog.component.html

@@ -20,15 +20,24 @@ <h2 mat-dialog-title>{{'Settings' | translate}}</h2>
         <div class="col-md-12 col-xl-12 col-lg-12">
           <mat-slide-toggle [checked]="isStopAllSubmissionsEnabled()" (change)="toggleStopOnFailure($event)">{{ 'Stop posting on submission failure' | translate }}</mat-slide-toggle>
         </div>
-        <!-- <div class="col-md-12 col-xl-12 col-lg-12">
-          <mat-slide-toggle [checked]="isGenerateErrorLogEnabled()" (change)="toggleGenerateErrorLog($event)">{{ 'Allow error logs' | translate }}</mat-slide-toggle>
-        </div> -->
         <div class="col-md-12 col-xl-12 col-lg-12 mt-3">
           <button mat-button mat-raised-button color="warn" (click)="resetScheduled()">{{'Clear Scheduled' | translate}}</button>
           <button mat-button mat-raised-button color="warn" (click)="resetUnscheduled()">{{'Clear Unscheduled' | translate}}</button>
         </div>
       </div>
     </mat-expansion-panel>
+
+    <mat-expansion-panel [expanded]="true">
+      <mat-expansion-panel-header>
+        <mat-panel-title>Updates</mat-panel-title>
+      </mat-expansion-panel-header>
+      <div class="row no-gutters">
+        <div class="col-md-12 col-xl-12 col-lg-12">
+          <mat-slide-toggle [checked]="isAutoUpdateOn()" (change)="toggleAutoUpdate($event)">Check For Updates</mat-slide-toggle>
+        </div>
+      </div>
+    </mat-expansion-panel>
+
     <mat-expansion-panel>
       <mat-expansion-panel-header>
         <mat-panel-title>{{'Performance' | translate}}</mat-panel-title>

src/app/postybirb/components/dialog/submission-settings-dialog/submission-settings-dialog.component.ts

@@ -29,6 +29,15 @@ export class SubmissionSettingsDialogComponent implements OnDestroy {
     return enabled === undefined ? false : enabled;
   }
 
+  public isAutoUpdateOn(): boolean {
+    const enabled = db.get('autoUpdate').value();
+    return enabled === undefined ? true : enabled;
+  }
+
+  public toggleAutoUpdate(event: any): void {
+    db.set('autoUpdate', event.checked).write();
+  }
+
   public toggleHardwareAccceleration(event: any): void {
     if (event.checked == this.isHardwareAccelerationOn()) return;
 

src/app/postybirb/components/website-options/inkbunny-form/inkbunny-form.component.html

@@ -11,6 +11,7 @@
       <div class="col-md-8 col-lg-7 col-xl-8 col-sm">
         <mat-form-field color="accent" class="w-100">
           <mat-select formControlName="rating" [placeholder]="'Rating' | translate">
+            <mat-option [value]="null">None</mat-option>
             <mat-option [value]="2">Nudity - Nonsexual</mat-option>
             <mat-option [value]="3">Violence - Mild</mat-option>
             <mat-option [value]="4">Sexual Themes - Erotic</mat-option>