Fixed issue where twitch chat downloader could not be found in docker

Public API v1.yaml

@@ -2742,7 +2742,7 @@ components:
         error:
           type: string
         schedule:
-          $ref: '#/components/schemas/Schedule'
+          type: object
         options:
           type: object
     Schedule:
@@ -2877,7 +2877,6 @@ components:
         - sharing
         - advanced_download
         - downloads_manager
-        - tasks_manager
     YesNo:
       type: string
       enum:

backend/authentication/auth.js

@@ -68,7 +68,15 @@ exports.initialize = function () {
 const setupRoles = async () => {
   const required_roles = {
     admin: {
-        permissions: consts.AVAILABLE_PERMISSIONS
+        permissions: [
+            'filemanager',
+            'settings',
+            'subscriptions',
+            'sharing',
+            'advanced_download',
+            'downloads_manager',
+            'tasks_manager'
+        ]
     },
     user: {
         permissions: [

backend/package-lock.json

@@ -769,6 +769,11 @@
         "delayed-stream": "~1.0.0"
       }
     },
+    "command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+    },
     "compress-commons": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz",

backend/package.json

@@ -30,6 +30,7 @@
     "async-mutex": "^0.4.0",
     "axios": "^0.21.2",
     "bcryptjs": "^2.4.0",
+    "command-exists": "^1.2.9",
     "compression": "^1.7.4",
     "config": "^3.2.3",
     "express": "^4.18.2",

backend/twitch.js

@@ -6,6 +6,7 @@ const fs = require('fs-extra')
 const path = require('path');
 const { promisify } = require('util');
 const child_process = require('child_process');
+const commandExistsSync = require('command-exists').sync;
 
 async function getCommentsForVOD(vodId) {
     const exec = promisify(child_process.exec);
@@ -20,7 +21,7 @@ async function getCommentsForVOD(vodId) {
     const cliExt = is_windows ? '.exe' : ''
     const cliPath = `TwitchDownloaderCLI${cliExt}`
 
-    if (!fs.existsSync(cliPath)) {
+    if (!commandExistsSync(cliPath)) {
         logger.error(`${cliPath} does not exist. Twitch chat download failed! Get it here: https://github.com/lay295/TwitchDownloader`);
         return null;
     }

src/api-types/models/Config.ts

@@ -3,5 +3,5 @@
 /* eslint-disable */
 
 export type Config = {
-    YoutubeDLMaterial: Record<string, any>;
+    YoutubeDLMaterial: any;
 };

src/api-types/models/Download.ts

@@ -26,5 +26,5 @@ export type Download = {
     user_uid?: string;
     sub_id?: string;
     sub_name?: string;
-    prefetched_info?: Record<string, any>;
+    prefetched_info?: any;
 };

src/api-types/models/GetFileFormatsResponse.ts

@@ -5,6 +5,6 @@
 export type GetFileFormatsResponse = {
     success: boolean;
     result: {
-formats?: Array<Record<string, any>>;
+formats?: Array<any>;
 };
 };

src/api-types/models/GetSubscriptionResponse.ts

@@ -6,5 +6,5 @@ import type { Subscription } from './Subscription';
 
 export type GetSubscriptionResponse = {
     subscription: Subscription;
-    files: Array<Record<string, any>>;
+    files: Array<any>;
 };

src/api-types/models/Notification.ts

@@ -11,6 +11,6 @@ export type Notification = {
     user_uid?: string;
     action?: Array<NotificationAction>;
     read: boolean;
-    data?: Record<string, any>;
+    data?: any;
     timestamp: number;
 };

src/api-types/models/Subscription.ts

@@ -15,5 +15,5 @@ export type Subscription = {
     timerange?: string;
     custom_args?: string;
     custom_output?: string;
-    videos: Array<Record<string, any>>;
+    videos: Array<any>;
 };

src/api-types/models/Task.ts

@@ -2,8 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { Schedule } from './Schedule';
-
 export type Task = {
     key: string;
     title?: string;
@@ -11,8 +9,8 @@ export type Task = {
     last_confirmed: number;
     running: boolean;
     confirming: boolean;
-    data: Record<string, any>;
+    data: any;
     error: string;
-    schedule: Schedule;
+    schedule: any;
-    options?: Record<string, any>;
+    options?: any;
 };

src/api-types/models/UpdateFileRequest.ts

@@ -10,5 +10,5 @@ export type UpdateFileRequest = {
     /**
      * Object with fields to update as keys and their new values
      */
-    change_obj: Record<string, any>;
+    change_obj: any;
 };

src/api-types/models/UpdateTaskDataRequest.ts

@@ -4,5 +4,5 @@
 
 export type UpdateTaskDataRequest = {
     task_key: string;
-    new_data: Record<string, any>;
+    new_data: any;
 };

src/api-types/models/UpdateTaskOptionsRequest.ts

@@ -4,5 +4,5 @@
 
 export type UpdateTaskOptionsRequest = {
     task_key: string;
-    new_options: Record<string, any>;
+    new_options: any;
 };

src/api-types/models/UserPermission.ts

@@ -9,5 +9,4 @@ export enum UserPermission {
     SHARING = 'sharing',
     ADVANCED_DOWNLOAD = 'advanced_download',
     DOWNLOADS_MANAGER = 'downloads_manager',
-    TASKS_MANAGER = 'tasks_manager',
 }

src/app/app.component.ts

@@ -84,8 +84,8 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.postsService.open_create_default_admin_dialog.subscribe(open => {
       if (open) {
         const dialogRef = this.dialog.open(SetDefaultAdminDialogComponent);
-        dialogRef.afterClosed().subscribe(res => {
+        dialogRef.afterClosed().subscribe(success => {
-          if (!res || !res['user']) {
+          if (success) {
             if (this.router.url !== '/login') { this.router.navigate(['/login']); }
           } else {
             console.error('Failed to create default admin account. See logs for details.');

src/app/posts.services.ts

@@ -734,7 +734,7 @@ export class PostsService implements CanActivate {
                 this.afterLogin(res['user'], res['token'], res['permissions'], res['available_permissions']);
             }
         }, err => {
-            if (err === 'Unauthorized') {
+            if (err.status === 401) {
                 this.sendToLogin();
                 this.token = null;
                 this.resetHttpParams();