permissions code simplified

Update entrypoint.sh

.github/workflows/docker-pr.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           #platforms: linux/amd64
           push: false
           tags: tzahi12345/youtubedl-material:nightly-pr

.github/workflows/docker-release.yml

@@ -80,9 +80,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker.yml

@@ -80,10 +80,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
+          platforms: linux/amd64,linux/arm64/v8
           push: true
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

Dockerfile

@@ -53,7 +53,7 @@ FROM base as python
 WORKDIR /app
 COPY docker-utils/GetTwitchDownloader.py .
 RUN apt update && \
-    apt install -y --no-install-recommends python3-minimal python-is-python3 python3-pip python3.8-dev build-essential && \
+    apt install -y --no-install-recommends python3-minimal python-is-python3 python3-pip && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 RUN pip install PyGithub requests

Public API v1.yaml

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

backend/authentication/auth.js

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

backend/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-CMD="npm start"
+CMD="npm start && pm2 start"
 
 # if the first arg starts with "-" pass it to program
 if [ "${1#-}" != "$1" ]; then

docker-utils/GetTwitchDownloader.py

@@ -26,8 +26,7 @@ def getZipName():
 
 def getLatestFileInRepo(repo, search_string):
     # Create an unauthenticated instance of the Github object
-    gh_token = os.environ.get('GH_TOKEN')
+    g = Github(os.environ.get('GH_TOKEN'))
-    g = Github(gh_token if gh_token else None) # ensure it's none if it's falsy
 
     # Replace with the repository owner and name
     repo = g.get_repo(repo)

docker-utils/ffmpeg-fetch.sh

@@ -30,7 +30,7 @@ curl -o ffmpeg.txz \
     --retry 5 \
     --retry-delay 0 \
     --retry-max-time 40 \
-    "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-${ARCH}-static.tar.xz"
+    "https://johnvansickle.com/ffmpeg/old-releases/ffmpeg-5.1.1-${ARCH}-static.tar.xz"
 mkdir /tmp/ffmpeg
 tar xf ffmpeg.txz -C /tmp/ffmpeg
 echo "(3/5) CLEANUP - Remove temp dependencies from ffmpeg obtain layer"

src/api-types/models/AddFileToPlaylistRequest.ts

@@ -5,4 +5,4 @@
 export type AddFileToPlaylistRequest = {
     file_uid: string;
     playlist_id: string;
-};
+};

src/api-types/models/Archive.ts

@@ -13,4 +13,4 @@ export type Archive = {
     sub_id?: string;
     timestamp: number;
     uid: string;
-};
+};

src/api-types/models/BaseChangePermissionsRequest.ts

@@ -8,4 +8,4 @@ import type { YesNo } from './YesNo';
 export type BaseChangePermissionsRequest = {
     permission: UserPermission;
     new_value: YesNo;
-};
+};

src/api-types/models/Category.ts

@@ -12,4 +12,4 @@ export type Category = {
      * Overrides file output for downloaded files in category
      */
     custom_output?: string;
-};
+};

src/api-types/models/CategoryRule.ts

@@ -22,4 +22,4 @@ export namespace CategoryRule {
     }
 
 
-}
+}

src/api-types/models/ChangeRolePermissionsRequest.ts

@@ -6,4 +6,4 @@ import type { BaseChangePermissionsRequest } from './BaseChangePermissionsReques
 
 export type ChangeRolePermissionsRequest = (BaseChangePermissionsRequest & {
 role: string;
-});
+});

src/api-types/models/ChangeUserPermissionsRequest.ts

@@ -6,4 +6,4 @@ import type { BaseChangePermissionsRequest } from './BaseChangePermissionsReques
 
 export type ChangeUserPermissionsRequest = (BaseChangePermissionsRequest & {
 user_uid: string;
-});
+});

src/api-types/models/CheckConcurrentStreamRequest.ts

@@ -7,4 +7,4 @@ export type CheckConcurrentStreamRequest = {
      * UID of the concurrent stream
      */
     uid: string;
-};
+};

src/api-types/models/CheckConcurrentStreamResponse.ts

@@ -6,4 +6,4 @@ import type { ConcurrentStream } from './ConcurrentStream';
 
 export type CheckConcurrentStreamResponse = {
     stream: ConcurrentStream;
-};
+};

src/api-types/models/ClearDownloadsRequest.ts

@@ -6,4 +6,4 @@ export type ClearDownloadsRequest = {
     clear_finished?: boolean;
     clear_paused?: boolean;
     clear_errors?: boolean;
-};
+};

src/api-types/models/ConcurrentStream.ts

@@ -6,4 +6,4 @@ export type ConcurrentStream = {
     playback_timestamp?: number;
     unix_timestamp?: number;
     playing?: boolean;
-};
+};

src/api-types/models/Config.ts

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

src/api-types/models/ConfigResponse.ts

@@ -7,4 +7,4 @@ import type { Config } from './Config';
 export type ConfigResponse = {
     config_file: Config;
     success: boolean;
-};
+};

src/api-types/models/CreateCategoryRequest.ts

@@ -4,4 +4,4 @@
 
 export type CreateCategoryRequest = {
     name: string;
-};
+};

src/api-types/models/CreateCategoryResponse.ts

@@ -7,4 +7,4 @@ import type { Category } from './Category';
 export type CreateCategoryResponse = {
     new_category?: Category;
     success?: boolean;
-};
+};

src/api-types/models/CreatePlaylistRequest.ts

@@ -6,4 +6,4 @@ export type CreatePlaylistRequest = {
     playlistName: string;
     uids: Array<string>;
     thumbnailURL: string;
-};
+};

src/api-types/models/CreatePlaylistResponse.ts

@@ -7,4 +7,4 @@ import type { Playlist } from './Playlist';
 export type CreatePlaylistResponse = {
     new_playlist: Playlist;
     success: boolean;
-};
+};

src/api-types/models/CropFileSettings.ts

@@ -5,4 +5,4 @@
 export type CropFileSettings = {
     cropFileStart: number;
     cropFileEnd: number;
-};
+};

src/api-types/models/DBBackup.ts

@@ -17,4 +17,4 @@ export namespace DBBackup {
     }
 
 
-}
+}

src/api-types/models/DBInfoResponse.ts

@@ -16,4 +16,4 @@ roles?: TableInfo;
 download_queue?: TableInfo;
 archives?: TableInfo;
 };
-};
+};

src/api-types/models/DatabaseFile.ts

@@ -42,4 +42,4 @@ export type DatabaseFile = {
      */
     abr?: number;
     favorite: boolean;
-};
+};

src/api-types/models/DeleteAllFilesResponse.ts

@@ -11,4 +11,4 @@ export type DeleteAllFilesResponse = {
      * Number of files removed
      */
     delete_count?: number;
-};
+};

src/api-types/models/DeleteArchiveItemsRequest.ts

@@ -6,4 +6,4 @@ import type { Archive } from './Archive';
 
 export type DeleteArchiveItemsRequest = {
     archives: Array<Archive>;
-};
+};

src/api-types/models/DeleteCategoryRequest.ts

@@ -4,4 +4,4 @@
 
 export type DeleteCategoryRequest = {
     category_uid: string;
-};
+};

src/api-types/models/DeleteMp3Mp4Request.ts

@@ -5,4 +5,4 @@
 export type DeleteMp3Mp4Request = {
     uid: string;
     blacklistMode?: boolean;
-};
+};

src/api-types/models/DeleteNotificationRequest.ts

@@ -4,4 +4,4 @@
 
 export type DeleteNotificationRequest = {
     uid: string;
-};
+};

src/api-types/models/DeletePlaylistRequest.ts

@@ -4,4 +4,4 @@
 
 export type DeletePlaylistRequest = {
     playlist_id: string;
-};
+};

src/api-types/models/DeleteSubscriptionFileRequest.ts

@@ -8,4 +8,4 @@ export type DeleteSubscriptionFileRequest = {
      * If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.
      */
     deleteForever?: boolean;
-};
+};

src/api-types/models/DeleteUserRequest.ts

@@ -4,4 +4,4 @@
 
 export type DeleteUserRequest = {
     uid: string;
-};
+};

src/api-types/models/Download.ts

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

src/api-types/models/DownloadArchiveRequest.ts

@@ -7,4 +7,4 @@ import type { FileType } from './FileType';
 export type DownloadArchiveRequest = {
     type?: FileType;
     sub_id?: string;
-};
+};

src/api-types/models/DownloadFileRequest.ts

@@ -11,4 +11,4 @@ export type DownloadFileRequest = {
     playlist_id?: string;
     url?: string;
     type?: FileType;
-};
+};

src/api-types/models/DownloadRequest.ts

@@ -49,4 +49,4 @@ export type DownloadRequest = {
      * If using youtube-dl archive, download will ignore it
      */
     ignoreArchive?: boolean;
-};
+};

src/api-types/models/DownloadResponse.ts

@@ -6,4 +6,4 @@ import type { Download } from './Download';
 
 export type DownloadResponse = {
     download?: Download;
-};
+};

src/api-types/models/DownloadTwitchChatByVODIDRequest.ts

@@ -20,4 +20,4 @@ export type DownloadTwitchChatByVODIDRequest = {
      */
     uuid?: string;
     sub?: Subscription;
-};
+};

src/api-types/models/DownloadTwitchChatByVODIDResponse.ts

@@ -6,4 +6,4 @@ import type { TwitchChatMessage } from './TwitchChatMessage';
 
 export type DownloadTwitchChatByVODIDResponse = {
     chat: Array<TwitchChatMessage>;
-};
+};

src/api-types/models/DownloadVideosForSubscriptionRequest.ts

@@ -4,4 +4,4 @@
 
 export type DownloadVideosForSubscriptionRequest = {
     subID: string;
-};
+};

src/api-types/models/FileType.ts

@@ -5,4 +5,4 @@
 export enum FileType {
     AUDIO = 'audio',
     VIDEO = 'video',
-}
+}

src/api-types/models/FileTypeFilter.ts

@@ -6,4 +6,4 @@ export enum FileTypeFilter {
     AUDIO_ONLY = 'audio_only',
     VIDEO_ONLY = 'video_only',
     BOTH = 'both',
-}
+}

src/api-types/models/GenerateArgsResponse.ts

@@ -4,4 +4,4 @@
 
 export type GenerateArgsResponse = {
     args?: Array<string>;
-};
+};

src/api-types/models/GenerateNewApiKeyResponse.ts

@@ -4,4 +4,4 @@
 
 export type GenerateNewApiKeyResponse = {
     new_api_key: string;
-};
+};

src/api-types/models/GetAllCategoriesResponse.ts

@@ -6,4 +6,4 @@ import type { Category } from './Category';
 
 export type GetAllCategoriesResponse = {
     categories: Array<Category>;
-};
+};

src/api-types/models/GetAllDownloadsRequest.ts

@@ -7,4 +7,4 @@ export type GetAllDownloadsRequest = {
      * Filters downloads with the array
      */
     uids?: Array<string> | null;
-};
+};

src/api-types/models/GetAllDownloadsResponse.ts

@@ -6,4 +6,4 @@ import type { Download } from './Download';
 
 export type GetAllDownloadsResponse = {
     downloads?: Array<Download>;
-};
+};

src/api-types/models/GetAllFilesRequest.ts

@@ -21,4 +21,4 @@ export type GetAllFilesRequest = {
      * Include if you want to filter by subscription
      */
     sub_id?: string;
-};
+};

src/api-types/models/GetAllFilesResponse.ts

@@ -11,4 +11,4 @@ export type GetAllFilesResponse = {
      * All video playlists
      */
     playlists: Array<Playlist>;
-};
+};

src/api-types/models/GetAllSubscriptionsResponse.ts

@@ -6,4 +6,4 @@ import type { Subscription } from './Subscription';
 
 export type GetAllSubscriptionsResponse = {
     subscriptions: Array<Subscription>;
-};
+};

src/api-types/models/GetAllTasksResponse.ts

@@ -6,4 +6,4 @@ import type { Task } from './Task';
 
 export type GetAllTasksResponse = {
     tasks?: Array<Task>;
-};
+};

src/api-types/models/GetArchivesRequest.ts

@@ -7,4 +7,4 @@ import type { FileType } from './FileType';
 export type GetArchivesRequest = {
     type?: FileType;
     sub_id?: string;
-};
+};

src/api-types/models/GetArchivesResponse.ts

@@ -6,4 +6,4 @@ import type { Archive } from './Archive';
 
 export type GetArchivesResponse = {
     archives: Array<Archive>;
-};
+};

src/api-types/models/GetDBBackupsResponse.ts

@@ -6,4 +6,4 @@ import type { DBBackup } from './DBBackup';
 
 export type GetDBBackupsResponse = {
     tasks?: Array<DBBackup>;
-};
+};

src/api-types/models/GetDownloadRequest.ts

@@ -4,4 +4,4 @@
 
 export type GetDownloadRequest = {
     download_uid: string;
-};
+};

src/api-types/models/GetDownloadResponse.ts

@@ -6,4 +6,4 @@ import type { Download } from './Download';
 
 export type GetDownloadResponse = {
     download?: Download;
-};
+};

src/api-types/models/GetFileFormatsRequest.ts

@@ -4,4 +4,4 @@
 
 export type GetFileFormatsRequest = {
     url?: string;
-};
+};

src/api-types/models/GetFileFormatsResponse.ts

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

src/api-types/models/GetFileRequest.ts

@@ -14,4 +14,4 @@ export type GetFileRequest = {
      * User UID
      */
     uuid?: string;
-};
+};

src/api-types/models/GetFileResponse.ts

@@ -7,4 +7,4 @@ import type { DatabaseFile } from './DatabaseFile';
 export type GetFileResponse = {
     success: boolean;
     file?: DatabaseFile;
-};
+};

src/api-types/models/GetFullTwitchChatRequest.ts

@@ -16,4 +16,4 @@ export type GetFullTwitchChatRequest = {
      */
     uuid?: string;
     sub?: Subscription;
-};
+};

src/api-types/models/GetFullTwitchChatResponse.ts

@@ -5,4 +5,4 @@
 export type GetFullTwitchChatResponse = {
     success: boolean;
     error?: string;
-};
+};

src/api-types/models/GetLogsRequest.ts

@@ -4,4 +4,4 @@
 
 export type GetLogsRequest = {
     lines?: number;
-};
+};

src/api-types/models/GetLogsResponse.ts

@@ -8,4 +8,4 @@ export type GetLogsResponse = {
      */
     logs?: string;
     success?: boolean;
-};
+};

src/api-types/models/GetMp3sResponse.ts

@@ -11,4 +11,4 @@ export type GetMp3sResponse = {
      * All audio playlists
      */
     playlists: Array<Playlist>;
-};
+};

src/api-types/models/GetMp4sResponse.ts

@@ -11,4 +11,4 @@ export type GetMp4sResponse = {
      * All video playlists
      */
     playlists: Array<Playlist>;
-};
+};

src/api-types/models/GetNotificationsResponse.ts

@@ -6,4 +6,4 @@ import type { Notification } from './Notification';
 
 export type GetNotificationsResponse = {
     notifications?: Array<Notification>;
-};
+};

src/api-types/models/GetPlaylistRequest.ts

@@ -9,4 +9,4 @@ export type GetPlaylistRequest = {
     type?: FileType;
     uuid?: string;
     include_file_metadata?: boolean;
-};
+};

src/api-types/models/GetPlaylistResponse.ts

@@ -12,4 +12,4 @@ export type GetPlaylistResponse = {
      * File objects for every uid in the playlist's uids property, in the same order
      */
     file_objs?: Array<DatabaseFile>;
-};
+};

src/api-types/models/GetPlaylistsRequest.ts

@@ -4,4 +4,4 @@
 
 export type GetPlaylistsRequest = {
     include_categories?: boolean;
-};
+};

src/api-types/models/GetPlaylistsResponse.ts

@@ -6,4 +6,4 @@ import type { Playlist } from './Playlist';
 
 export type GetPlaylistsResponse = {
     playlists: Array<Playlist>;
-};
+};

src/api-types/models/GetRolesResponse.ts

@@ -13,4 +13,4 @@ user?: {
 permissions?: Array<UserPermission>;
 };
 };
-};
+};

src/api-types/models/GetSubscriptionRequest.ts

@@ -11,4 +11,4 @@ export type GetSubscriptionRequest = {
      * Subscription name
      */
     name?: string;
-};
+};

src/api-types/models/GetSubscriptionResponse.ts

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

src/api-types/models/GetTaskRequest.ts

@@ -4,4 +4,4 @@
 
 export type GetTaskRequest = {
     task_key: string;
-};
+};

src/api-types/models/GetTaskResponse.ts

@@ -6,4 +6,4 @@ import type { Task } from './Task';
 
 export type GetTaskResponse = {
     task?: Task;
-};
+};

src/api-types/models/GetUsersResponse.ts

@@ -6,4 +6,4 @@ import type { User } from './User';
 
 export type GetUsersResponse = {
     users: Array<User>;
-};
+};

src/api-types/models/ImportArchiveRequest.ts

@@ -8,4 +8,4 @@ export type ImportArchiveRequest = {
     archive: string;
     type: FileType;
     sub_id?: string;
-};
+};

src/api-types/models/IncrementViewCountRequest.ts

@@ -9,4 +9,4 @@ export type IncrementViewCountRequest = {
      * User UID
      */
     uuid?: string;
-};
+};

src/api-types/models/LoginRequest.ts

@@ -5,4 +5,4 @@
 export type LoginRequest = {
     username: string;
     password: string;
-};
+};

src/api-types/models/LoginResponse.ts

@@ -10,4 +10,4 @@ export type LoginResponse = {
     token?: string;
     permissions?: Array<UserPermission>;
     available_permissions?: Array<UserPermission>;
-};
+};

src/api-types/models/Notification.ts

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

src/api-types/models/NotificationAction.ts

@@ -7,4 +7,4 @@ export enum NotificationAction {
     RETRY_DOWNLOAD = 'retry_download',
     VIEW_DOWNLOAD_ERROR = 'view_download_error',
     VIEW_TASKS = 'view_tasks',
-}
+}

src/api-types/models/NotificationType.ts

@@ -6,4 +6,4 @@ export enum NotificationType {
     DOWNLOAD_COMPLETE = 'download_complete',
     DOWNLOAD_ERROR = 'download_error',
     TASK_FINISHED = 'task_finished',
-}
+}

src/api-types/models/Playlist.ts

@@ -15,4 +15,4 @@ export type Playlist = {
     user_uid?: string;
     auto?: boolean;
     sharingEnabled?: boolean;
-};
+};

src/api-types/models/RegisterRequest.ts

@@ -6,4 +6,4 @@ export type RegisterRequest = {
     userid: string;
     username: string;
     password: string;
-};
+};

src/api-types/models/RegisterResponse.ts

@@ -6,4 +6,4 @@ import type { User } from './User';
 
 export type RegisterResponse = {
     user?: User;
-};
+};

src/api-types/models/RestartDownloadResponse.ts

@@ -6,4 +6,4 @@ import type { SuccessObject } from './SuccessObject';
 
 export type RestartDownloadResponse = (SuccessObject & {
 new_download_uid?: string;
-});
+});

src/api-types/models/RestoreDBBackupRequest.ts

@@ -4,4 +4,4 @@
 
 export type RestoreDBBackupRequest = {
     file_name: string;
-};
+};

src/api-types/models/Schedule.ts

@@ -21,4 +21,4 @@ export namespace Schedule {
     }
 
 
-}
+}

src/api-types/models/SetConfigRequest.ts

@@ -6,4 +6,4 @@ import type { Config } from './Config';
 
 export type SetConfigRequest = {
     new_config_file: Config;
-};
+};

src/api-types/models/SetNotificationsToReadRequest.ts

@@ -4,4 +4,4 @@
 
 export type SetNotificationsToReadRequest = {
     uids: Array<string>;
-};
+};

src/api-types/models/SharingToggle.ts

@@ -5,4 +5,4 @@
 export type SharingToggle = {
     uid: string;
     is_playlist?: boolean;
-};
+};

src/api-types/models/Sort.ts

@@ -11,4 +11,4 @@ export type Sort = {
      * 1 for ascending, -1 for descending
      */
     order?: number;
-};
+};