Merge pull request #321 from mvdicarlo/develop

v3.1.41

commons/src/index.ts

@@ -94,6 +94,8 @@ export * from './interfaces/websites/pixelfed/pixelfed.file.options.interface';
 export * from './interfaces/websites/bluesky/bluesky.account.interface';
 export * from './interfaces/websites/bluesky/bluesky.file.options.interface';
 export * from './interfaces/websites/bluesky/bluesky.notification.options.interface';
+export * from './interfaces/websites/twitter/twitter.file.options.interface';
+export * from './interfaces/websites/twitter/twitter.account.interface';
 
 // Models/Entities
 export * from './models/default-options.entity';
@@ -104,4 +106,4 @@ import * as WebsiteOptions from './websites/websites';
 export { WebsiteOptions };
 
 // Doesn't really fit :P
-export * from './websites/megalodon/megalodon.instancesettings';
+export * from './websites/megalodon/megalodon.instancesettings';

commons/src/interfaces/websites/twitter/twitter.account.interface.ts

@@ -0,0 +1,8 @@
+export interface TwitterAccountData {
+  key: string;
+  secret: string;
+  user_id: number;
+  screen_name: string;
+  oauth_token: string;
+  oauth_token_secret: string;
+}

commons/src/websites/twitter/twitter.file.options.ts

@@ -0,0 +1,18 @@
+import { Expose } from 'class-transformer';
+import { IsString } from 'class-validator';
+import { DefaultFileOptions } from '../../interfaces/submission/default-options.interface';
+import { TwitterFileOptions } from '../../interfaces/websites/twitter/twitter.file.options.interface';
+import { DefaultFileOptionsEntity } from '../../models/default-file-options.entity';
+
+export class TwitterFileOptionsEntity
+  extends DefaultFileOptionsEntity
+  implements TwitterFileOptions
+{
+  @Expose()
+  @IsString()
+  contentBlur?: 'other' | 'graphic_violence' | 'adult_content';
+
+  constructor(entity?: Partial<TwitterFileOptions>) {
+    super(entity as DefaultFileOptions);
+  }
+}

commons/src/websites/twitter/twitter.options.ts

@@ -0,0 +1,7 @@
+import { DefaultOptionsEntity } from '../../models/default-options.entity';
+import { TwitterFileOptionsEntity } from './twitter.file.options';
+
+export class Twitter {
+  static readonly FileOptions = TwitterFileOptionsEntity;
+  static readonly NotificationOptions = DefaultOptionsEntity;
+}

commons/src/websites/websites.ts

@@ -29,3 +29,4 @@ export * from './weasyl/weasyl.options';
 export * from './itaku/itaku.options';
 export * from './pixelfed/pixelfed.options';
 export * from './bluesky/bluesky.options';
+export * from './twitter/twitter.options';

electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postybirb-plus",
-  "version": "3.1.40",
+  "version": "3.1.41",
   "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",
@@ -78,6 +78,7 @@
     "set-cookie-parser": "^2.4.5",
     "shortid": "^2.2.16",
     "turndown": "^5.0.3",
+    "twitter-lite": "^1.1.0",
     "uuid": "^3.3.3",
     "winston": "^3.2.1",
     "winston-daily-rotate-file": "^4.5.5"

electron-app/src/app/settings.ts

@@ -1,5 +1,5 @@
 /* tslint:disable: no-console no-var-requires */
-import { app } from 'electron';
+import { app, dialog } from 'electron';
 import { Settings } from 'postybirb-commons';
 const fs = require('fs-extra');
 const path = require('path');
@@ -9,8 +9,7 @@ const util = require('./utils');
 
 const settingsPath = path.join(global.BASE_DIRECTORY, 'data', 'settings.json');
 fs.ensureFileSync(settingsPath);
-const adapter = new FileSync(settingsPath);
-const settings = low(adapter);
+const settings = init();
 const settingDefaults: Settings = {
   advertise: true,
   emptyQueueOnFailedPost: true,
@@ -34,3 +33,19 @@ if (!settings.getState().useHardwareAcceleration || util.isLinux()) {
 }
 
 global.settingsDB = settings;
+
+function init() {
+  try {
+    const adapter = new FileSync(settingsPath);
+    return low(adapter);
+  } catch (e) {
+    console.error('Error initializing settings database', e);
+    fs.removeSync(settingsPath);
+    dialog.showErrorBox(
+      'Settings were corrupted',
+      'Settings could not be loaded and had to be reset.',
+    );
+    const adapter = new FileSync(settingsPath);
+    return low(adapter);
+  }
+}