Added ability to set a pin for settings menu

2026-03-07 20:10:03 +03:00 · 2023-04-27 21:37:32 -04:00
179 changed files with 858 additions and 1675 deletions
--- a/v1.yaml
+++ b/v1.yaml
@@ -678,22 +678,6 @@ paths:
                $ref: '#/components/schemas/SuccessObject'
      security:
        - Auth query parameter: []
-  /api/isPinSet:
-    post:
-      tags:
-        - security
-      summary: Check if pin is set
-      description: Checks if the pin is set for settings
-      operationId: post-api-isPinSet
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/inline_response_200_15'
-      security:
-        - Auth query parameter: []
  /api/generateNewAPIKey:
    post:
      tags:
@@ -1311,6 +1295,48 @@ paths:
        - Auth query parameter: []
      tags:
        - multi-user mode
+  /api/setPin:
+    post:
+      summary: Set settings pin
+      operationId: post-api-setPin
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SuccessObject'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SetPinRequest'
+      description: 'Sets a pin for the settings'
+      security:
+        - Auth query parameter: []
+      tags:
+        - security
+  /api/auth/pinLogin:
+    post:
+      summary: Pin login
+      operationId: post-api-pin-login
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PinLoginResponse'
+      description: Use this endpoint to generate a JWT token for pin authentication. Put anything in the username field.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoginRequest'
+      security:
+        - Auth query parameter: []
+      tags:
+        - security
  /api/getUsers:
    post:
      summary: Get all users
@@ -3025,6 +3051,13 @@ components:
              type: string
          required:
            - role
+    SetPinRequest:
+      required:
+        - new_pin
+      type: object
+      properties:
+        new_pin:
+          type: string
    file:
      title: file
      type: object
@@ -3074,6 +3107,13 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/UserPermission'
+    PinLoginResponse:
+      required:
+        - pin_token
+      type: object
+      properties:
+        pin_token:
+          type: string
    UpdateUserRequest:
      required:
        - change_object
--- a/backend/app.js
+++ b/backend/app.js
@@ -742,6 +742,18 @@ const optionalJwt = async function (req, res, next) {
    return next();
 };

+const optionalPin = async function (req, res, next) {
+    const use_pin = config_api.getConfigItem('ytdl_use_pin');
+    if (use_pin && req.path.includes('/api/setConfig')) {
+        if (!req.query.pin_token) {
+            res.sendStatus(418); // I'm a teapot (RFC 2324)
+            return;
+        }
+        return next();
+    }
+    return next();
+};
+
 app.get('/api/config', function(req, res) {
    let config_file = config_api.getConfigFile();
    res.send({
@@ -750,7 +762,7 @@ app.get('/api/config', function(req, res) {
    });
 });

-app.post('/api/setConfig', optionalJwt, function(req, res) {
+app.post('/api/setConfig', optionalJwt, optionalPin, function(req, res) {
    let new_config_file = req.body.new_config_file;
    if (new_config_file && new_config_file['YoutubeDLMaterial']) {
        let success = config_api.setConfigFile(new_config_file);
@@ -1639,7 +1651,7 @@ app.get('/api/stream', optionalJwt, async (req, res) => {
        else file_path = null;
    }
    if (!fs.existsSync(file_path)) {
-        logger.error(`File ${file_path} could not be found! UID: ${uid}, ID: ${file_obj && file_obj.id}`);
+        logger.error(`File ${file_path} could not be found! UID: ${uid}, ID: ${file_obj.id}`);
    }
    const stat = fs.statSync(file_path);
    const fileSize = stat.size;
@@ -1934,12 +1946,23 @@ app.post('/api/auth/login'
        , auth_api.generateJWT
        , auth_api.returnAuthResponse
 );
+app.post('/api/auth/pinLogin'
+        , auth_api.passport.authenticate(['local_pin'], {})
+        , auth_api.generatePinJWT
+        , auth_api.returnPinAuthResponse
+);
 app.post('/api/auth/jwtAuth'
        , auth_api.passport.authenticate('jwt', { session: false })
        , auth_api.passport.authorize('jwt')
        , auth_api.generateJWT
        , auth_api.returnAuthResponse
 );
+app.post('/api/auth/pinAuth'
+        , auth_api.passport.authenticate('pin', { session: false })
+        , auth_api.passport.authorize('pin')
+        , auth_api.generatePinJWT
+        , auth_api.returnPinAuthResponse
+);
 app.post('/api/auth/changePassword', optionalJwt, async (req, res) => {
    let user_uid = req.body.user_uid;
    let password = req.body.new_password;
@@ -2029,6 +2052,13 @@ app.post('/api/changeRolePermissions', optionalJwt, async (req, res) => {
    res.send({success: success});
 });

+app.post('/api/setPin', function(req, res) {
+    const success = auth_api.setPin(req.body.new_pin);
+    res.send({
+        success: success
+    });
+});
+
 // notifications

 app.post('/api/getNotifications', optionalJwt, async (req, res) => {
--- a/backend/appdata/default.json
+++ b/backend/appdata/default.json
@@ -23,12 +23,7 @@
      "download_only_mode": false,
      "allow_autoplay": true,
      "enable_downloads_manager": true,
-      "allow_playlist_categorization": true,
-      "force_autoplay": false,
-      "enable_notifications": true,
-      "enable_all_notifications": true,
-      "allowed_notification_types": [],
-      "enable_rss_feed": false
+      "allow_playlist_categorization": true
    },
    "API": {
      "use_API_key": false,
@@ -40,17 +35,7 @@
      "twitch_client_secret": "",
      "twitch_auto_download_chat": false,
      "use_sponsorblock_API": false,
-      "generate_NFO_files": false,
-      "use_ntfy_API": false,
-      "ntfy_topic_URL": "",
-      "use_gotify_API": false,
-      "gotify_server_URL": "",
-      "gotify_app_token": "",
-      "use_telegram_API": false,
-      "telegram_bot_token": "",
-      "telegram_chat_id": "",
-      "webhook_URL": "",
-      "discord_webhook_URL": ""
+      "generate_NFO_files": false
    },
    "Themes": {
      "default_theme": "default",
--- a/backend/authentication/auth.js
+++ b/backend/authentication/auth.js
@@ -15,7 +15,6 @@ var JwtStrategy = require('passport-jwt').Strategy,
 // other required vars
 let SERVER_SECRET = null;
 let JWT_EXPIRATION = null;
-let opts = null;
 let saltRounds = null;

 exports.initialize = function () {
@@ -50,11 +49,11 @@ exports.initialize = function () {
    db_api.users_db.set('jwt_secret', SERVER_SECRET).write();
  }

-  opts = {}
+  const opts = {}
  opts.jwtFromRequest = ExtractJwt.fromUrlQueryParameter('jwt');
  opts.secretOrKey = SERVER_SECRET;

-  exports.passport.use(new JwtStrategy(opts, async function(jwt_payload, done) {
+  exports.passport.use('jwt', new JwtStrategy(opts, async function(jwt_payload, done) {
    const user = await db_api.getRecord('users', {uid: jwt_payload.user});
    if (user) {
        return done(null, user);
@@ -63,6 +62,21 @@ exports.initialize = function () {
        // or you could create a new account
    }
  }));
+
+  const pin_opts = {}
+  pin_opts.jwtFromRequest = ExtractJwt.fromUrlQueryParameter('pin_token');
+  pin_opts.secretOrKey = SERVER_SECRET;
+
+  exports.passport.use('pin', new JwtStrategy(pin_opts, {
+    passwordField: 'pin'},
+    async function(username, password, done) {
+      if (await bcrypt.compare(password, config_api.getConfigItem('ytdl_pin_hash'))) {
+        return done(null, { success: true });
+      } else {
+        return done(null, false, { message: 'Incorrect pin' });
+      }
+    }
+  ));
 }

 const setupRoles = async () => {
@@ -188,6 +202,10 @@ exports.login = async (username, password) => {
  return await bcrypt.compare(password, user.passhash) ? user : false;
 }

+exports.pinLogin = async (pin) => {
+  return await bcrypt.compare(pin, config_api.getConfigItem('ytdl_pin_hash'));
+}
+
 exports.passport.use(new LocalStrategy({
    usernameField: 'username',
    passwordField: 'password'},
@@ -196,6 +214,14 @@ exports.passport.use(new LocalStrategy({
    }
 ));

+exports.passport.use('local_pin', new LocalStrategy({
+  usernameField: 'username',
+  passwordField: 'password'},
+  async function(username, password, done) {
+    return done(null, await exports.pinLogin(password));
+  }
+));
+
 var getLDAPConfiguration = function(req, callback) {
  const ldap_config = config_api.getConfigItem('ytdl_ldap_config');
  const opts = {server: ldap_config};
@@ -237,6 +263,14 @@ exports.generateJWT = function(req, res, next) {
  next();
 }

+exports.generatePinJWT = function(req, res, next) {
+  var payload = {
+      exp: Math.floor(Date.now() / 1000) + JWT_EXPIRATION
+  };
+  req.token = jwt.sign(payload, SERVER_SECRET);
+  next();
+}
+
 exports.returnAuthResponse = async function(req, res) {
  res.status(200).json({
    user: req.user,
@@ -246,6 +280,12 @@ exports.returnAuthResponse = async function(req, res) {
  });
 }

+exports.returnPinAuthResponse = async function(req, res) {
+  res.status(200).json({
+    pin_token: req.token
+  });
+}
+
 /***************************************
 * Authorization: middleware that checks the
 * JWT token for validity before allowing
@@ -439,6 +479,13 @@ exports.userPermissions = async function(user_uid) {
  return user_permissions;
 }

+// pin
+
+exports.setPin = async (new_pin) => {
+  const pin_hash = await bcrypt.hash(new_pin, saltRounds);
+  return config_api.setConfigItem('ytdl_pin_hash', pin_hash);
+}
+
 function getToken(queryParams) {
  if (queryParams && queryParams.jwt) {
    var parted = queryParams.jwt.split(' ');
@@ -450,7 +497,7 @@ function getToken(queryParams) {
  } else {
    return null;
  }
-};
+}

 function generateUserObject(userid, username, hash, auth_method = 'internal') {
  let new_user = {
--- a/backend/config.js
+++ b/backend/config.js
@@ -202,6 +202,8 @@ const DEFAULT_CONFIG = {
        "enable_all_notifications": true,
        "allowed_notification_types": [],
        "enable_rss_feed": false,
+        "use_pin": false,
+        "pin_hash": "",
      },
      "API": {
        "use_API_key": false,
@@ -219,8 +221,7 @@ const DEFAULT_CONFIG = {
        "use_telegram_API": false,
        "telegram_bot_token": "",
        "telegram_chat_id": "",
-        "webhook_URL": "",
-        "discord_webhook_URL": ""
+        "webhook_URL": ""
      },
      "Themes": {
        "default_theme": "default",
--- a/backend/consts.js
+++ b/backend/consts.js
@@ -92,6 +92,14 @@ exports.CONFIG_ITEMS = {
        'key': 'ytdl_enable_rss_feed',
        'path': 'YoutubeDLMaterial.Extra.enable_rss_feed'
    },
+    'ytdl_use_pin': {
+        'key': 'ytdl_use_pin',
+        'path': 'YoutubeDLMaterial.Extra.use_pin'
+    },
+    'ytdl_pin_hash': {
+        'key': 'ytdl_pin_hash',
+        'path': 'YoutubeDLMaterial.Extra.pin_hash'
+    },

    // API
    'ytdl_use_api_key': {
@@ -158,10 +166,6 @@ exports.CONFIG_ITEMS = {
        'key': 'ytdl_webhook_url',
        'path': 'YoutubeDLMaterial.API.webhook_URL'
    },
-    'ytdl_discord_webhook_url': {
-        'key': 'ytdl_discord_webhook_url',
-        'path': 'YoutubeDLMaterial.API.discord_webhook_URL'
-    },


    // Themes
@@ -346,6 +350,4 @@ const YTDL_ARGS_WITH_VALUES = [
 // we're using a Set here for performance
 exports.YTDL_ARGS_WITH_VALUES = new Set(YTDL_ARGS_WITH_VALUES);

-exports.ICON_URL = 'https://i.imgur.com/IKOlr0N.png';
-
 exports.CURRENT_VERSION = 'v4.3.1';
--- a/backend/db.js
+++ b/backend/db.js
@@ -720,14 +720,7 @@ exports.updateRecord = async (table, filter_obj, update_obj, nested_mode = false
 exports.updateRecords = async (table, filter_obj, update_obj) => {
    // local db override
    if (using_local_db) {
-        exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').each((record) => {
-            const props_to_update = Object.keys(update_obj);
-            for (let i = 0; i < props_to_update.length; i++) {
-                const prop_to_update = props_to_update[i];
-                const prop_value = update_obj[prop_to_update];
-                record[prop_to_update] = prop_value;
-            }
-        }).write();
+        exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').assign(update_obj).write();
        return true;
    }

--- a/backend/downloader.js
+++ b/backend/downloader.js
@@ -128,7 +128,7 @@ exports.clearDownload = async (download_uid) => {

 async function handleDownloadError(download, error_message, error_type = null) {
    if (!download || !download['uid']) return;
-    notifications_api.sendDownloadErrorNotification(download, download['user_uid'], error_message, error_type);
+    notifications_api.sendDownloadErrorNotification(download, download['user_uid'], error_type);
    await db_api.updateRecord('download_queue', {uid: download['uid']}, {error: error_message, finished: true, running: false, error_type: error_type});
 }

@@ -314,7 +314,7 @@ async function downloadQueuedFile(download_uid) {
            clearInterval(download_checker);
            if (err) {
                logger.error(err.stderr);
-                await handleDownloadError(download, err.stderr, 'unknown_error');
+                await handleDownloadError(download, err.stderr);
                resolve(false);
                return;
            } else if (output) {
@@ -596,7 +596,7 @@ exports.getVideoInfoByURL = async (url, args = [], download_uid = null) => {
                logger.error(error_message);
                if (download_uid) {
                    const download = await db_api.getRecord('download_queue', {uid: download_uid});
-                    await handleDownloadError(download, error_message, 'info_retrieve_failed');
+                    await handleDownloadError(download, error_message);
                }
                resolve(null);
            }
--- a/backend/notifications.js
+++ b/backend/notifications.js
@@ -2,16 +2,12 @@ const db_api = require('./db');
 const config_api = require('./config');
 const logger = require('./logger');
 const utils = require('./utils');
-const consts = require('./consts');

 const { uuid } = require('uuidv4');

 const fetch = require('node-fetch');
 const { gotify } = require("gotify");
 const TelegramBot = require('node-telegram-bot-api');
-const REST = require('@discordjs/rest').REST;
-const API = require('@discordjs/core').API;
-const EmbedBuilder = require('@discordjs/builders').EmbedBuilder;

 const NOTIFICATION_TYPE_TO_TITLE = {
    task_finished: 'Task finished',
@@ -22,7 +18,7 @@ const NOTIFICATION_TYPE_TO_TITLE = {
 const NOTIFICATION_TYPE_TO_BODY = {
    task_finished: (notification) => notification['data']['task_title'],
    download_complete: (notification) => {return `${notification['data']['file_title']}\nOriginal URL: ${notification['data']['original_url']}`},
-    download_error: (notification) => {return `Error: ${notification['data']['download_error_message']}\nError code: ${notification['data']['download_error_type']}\n\nOriginal URL: ${notification['data']['download_url']}`}
+    download_error: (notification) => {return `Error: ${notification['data']['download_error_type']}\nURL: ${notification['data']['download_url']}`}
 }

 const NOTIFICATION_TYPE_TO_URL = {
@@ -61,9 +57,6 @@ exports.sendNotification = async (notification) => {
    if (config_api.getConfigItem('ytdl_webhook_url')) {
        sendGenericNotification(data);
    }
-    if (config_api.getConfigItem('ytdl_discord_webhook_url')) {
-        sendDiscordNotification(data);
-    }

    await db_api.insertRecordIntoTable('notifications', notification);
    return notification;
@@ -86,9 +79,9 @@ exports.sendDownloadNotification = async (file, user_uid) => {
    return await exports.sendNotification(notification);
 }

-exports.sendDownloadErrorNotification = async (download, user_uid, error_message, error_type = null) => {
+exports.sendDownloadErrorNotification = async (download, user_uid, error_type = null) => {
    if (!notificationEnabled('download_error')) return;
-    const data = {download_uid: download.uid, download_url: download.url, download_error_message: error_message, download_error_type: error_type};
+    const data = {download_uid: download.uid, download_url: download.url, download_error_type: error_type};
    const notification = exports.createNotification('download_error', ['view_download_error', 'retry_download'], data, user_uid);
    return await exports.sendNotification(notification);
 }
@@ -151,29 +144,6 @@ async function sendTelegramNotification({body, title, type, url, thumbnail}) {
    bot.sendMessage(chat_id, `<b>${title}</b>\n\n${body}\n<a href="${url}">${url}</a>`, {parse_mode: 'HTML'});
 }

-async function sendDiscordNotification({body, title, type, url, thumbnail}) {
-    const discord_webhook_url = config_api.getConfigItem('ytdl_discord_webhook_url');
-    const url_split = discord_webhook_url.split('webhooks/');
-    const [webhook_id, webhook_token] = url_split[1].split('/');
-    const rest = new REST({ version: '10' });
-    const api = new API(rest);
-    const embed = new EmbedBuilder()
-        .setTitle(title)
-        .setColor(0x00FFFF)
-        .setURL(url)
-        .setDescription(`ID: ${type}`);
-    if (thumbnail) embed.setThumbnail(thumbnail);
-    if (type === 'download_error') embed.setColor(0xFC2003);
-
-    const result = await api.webhooks.execute(webhook_id, webhook_token, {
-        content: body,
-        username: 'YoutubeDL-Material',
-        avatar_url: consts.ICON_URL,
-        embeds: [embed],
-    });
-    return result;
-}
-
 function sendGenericNotification(data) {
    const webhook_url = config_api.getConfigItem('ytdl_webhook_url');
    logger.verbose(`Sending generic notification to ${webhook_url}`);
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -19,101 +19,6 @@
        "kuler": "^2.0.0"
      }
    },
-    "@discordjs/builders": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.6.1.tgz",
-      "integrity": "sha512-CCcLwn/8ANhlAbhlE18fcaN0hfXTen53/JiwZs1t9oE/Cqa9maA8ZRarkCIsXF4J7J/MYnd0J6IsxeKsq+f6mw==",
-      "requires": {
-        "@discordjs/formatters": "^0.3.0",
-        "@discordjs/util": "^0.2.0",
-        "@sapphire/shapeshift": "^3.8.1",
-        "discord-api-types": "^0.37.37",
-        "fast-deep-equal": "^3.1.3",
-        "ts-mixer": "^6.0.3",
-        "tslib": "^2.5.0"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        }
-      }
-    },
-    "@discordjs/collection": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.0.tgz",
-      "integrity": "sha512-suyVndkEAAWrGxyw/CPGdtXoRRU6AUNkibtnbJevQzpelkJh3Q1gQqWDpqf5i39CnAn5+LrN0YS+cULeEjq2Yw=="
-    },
-    "@discordjs/core": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/@discordjs/core/-/core-0.5.2.tgz",
-      "integrity": "sha512-OEgK8GYNB1IJK3nPQ3QBvNUmuvlPTitc0j9oXe801Z7xWOFwL/lePAGhd6cAFH7yYaslwhCoSh85KI9glrmjNQ==",
-      "requires": {
-        "@discordjs/rest": "^1.7.0",
-        "@discordjs/util": "^0.2.0",
-        "@discordjs/ws": "^0.8.1",
-        "@sapphire/snowflake": "^3.4.2",
-        "@vladfrangu/async_event_emitter": "^2.2.1",
-        "discord-api-types": "^0.37.38"
-      }
-    },
-    "@discordjs/formatters": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.3.0.tgz",
-      "integrity": "sha512-Fc4MomalbP8HMKEMor3qUiboAKDtR7PSBoPjwm7WYghVRwgJlj5WYvUsriLsxeKk8+Qq2oy+HJlGTUkGvX0YnA==",
-      "requires": {
-        "discord-api-types": "^0.37.37"
-      }
-    },
-    "@discordjs/rest": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-1.7.0.tgz",
-      "integrity": "sha512-r2HzmznRIo8IDGYBWqQfkEaGN1LrFfWQd3dSyC4tOpMU8nuVvFUEw6V/lwnG44jyOq+vgyDny2fxeUDMt9I4aQ==",
-      "requires": {
-        "@discordjs/collection": "^1.5.0",
-        "@discordjs/util": "^0.2.0",
-        "@sapphire/async-queue": "^1.5.0",
-        "@sapphire/snowflake": "^3.4.0",
-        "discord-api-types": "^0.37.37",
-        "file-type": "^18.2.1",
-        "tslib": "^2.5.0",
-        "undici": "^5.21.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "18.3.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.3.0.tgz",
-          "integrity": "sha512-pkPZ5OGIq0TYb37b8bHDLNeQSe1H2KlaQ2ySGpJkkr2KZdaWsO4QhPzHA0mQcsUW2cSqJk+4gM/UyLz/UFbXdQ==",
-          "requires": {
-            "readable-web-to-node-stream": "^3.0.2",
-            "strtok3": "^7.0.0",
-            "token-types": "^5.0.1"
-          }
-        }
-      }
-    },
-    "@discordjs/util": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.2.0.tgz",
-      "integrity": "sha512-/8qNbebFzLWKOOg+UV+RB8itp4SmU5jw0tBUD3ifElW6rYNOj1Ku5JaSW7lLl/WgjjxF01l/1uQPCzkwr110vg=="
-    },
-    "@discordjs/ws": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-0.8.1.tgz",
-      "integrity": "sha512-RZwlluBGmrgAgvTHP8w9IW7Kp/idWEQgSHBs5h0ecqiWGVCueoIr6jMmvbxqZ7vVirric3zRhNdmG/TNRxhWLg==",
-      "requires": {
-        "@discordjs/collection": "^1.5.0",
-        "@discordjs/rest": "^1.7.0",
-        "@discordjs/util": "^0.2.0",
-        "@sapphire/async-queue": "^1.5.0",
-        "@types/ws": "^8.5.4",
-        "@vladfrangu/async_event_emitter": "^2.2.1",
-        "discord-api-types": "^0.37.38",
-        "tslib": "^2.5.0",
-        "ws": "^8.13.0"
-      }
-    },
    "@oozcitak/dom": {
      "version": "1.15.10",
      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-1.15.10.tgz",
@@ -146,32 +51,6 @@
      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-8.3.8.tgz",
      "integrity": "sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ=="
    },
-    "@sapphire/async-queue": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz",
-      "integrity": "sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA=="
-    },
-    "@sapphire/shapeshift": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.8.2.tgz",
-      "integrity": "sha512-NXpnJAsxN3/h9TqQPntOeVWZrpIuucqXI3IWF6tj2fWCoRLCuVK5wx7Dtg7pRrtkYfsMUbDqgKoX26vrC5iYfA==",
-      "requires": {
-        "fast-deep-equal": "^3.1.3",
-        "lodash": "^4.17.21"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        }
-      }
-    },
-    "@sapphire/snowflake": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.4.2.tgz",
-      "integrity": "sha512-KJwlv5gkGjs1uFV7/xx81n3tqgBwBJvH94n1xDyH3q+JSmtsMeSleJffarEBfG2yAFeJiFA4BnGOK6FFPHc19g=="
-    },
    "@sindresorhus/is": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz",
@@ -185,11 +64,6 @@
        "defer-to-connect": "^2.0.0"
      }
    },
-    "@tokenizer/token": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
-    },
    "@types/cacheable-request": {
      "version": "6.0.3",
      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
@@ -235,29 +109,11 @@
        "@types/node": "*"
      }
    },
-    "@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="
-    },
-    "@types/ws": {
-      "version": "8.5.4",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
-      "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
    "@ungap/promise-all-settled": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="
    },
-    "@vladfrangu/async_event_emitter": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.2.1.tgz",
-      "integrity": "sha512-XtUEAS0m6uVddXW+EImGunLiJZzWNWAZQBoQCUneowrYXPQ6y7c0iWEm/wVYyGpTixTIhUfLRSoYCwojL64htA=="
-    },
    "abstract-logging": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
@@ -431,11 +287,11 @@
      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
    },
    "async-mutex": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz",
-      "integrity": "sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.1.tgz",
+      "integrity": "sha512-vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw==",
      "requires": {
-        "tslib": "^2.4.0"
+        "tslib": "^2.1.0"
      }
    },
    "asynckit": {
@@ -537,22 +393,20 @@
      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM="
    },
    "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
      "requires": {
        "bytes": "3.1.2",
        "content-type": "~1.0.4",
        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
+        "depd": "~1.1.2",
+        "http-errors": "1.8.1",
        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "on-finished": "~2.3.0",
+        "qs": "6.9.7",
+        "raw-body": "2.4.3",
+        "type-is": "~1.6.18"
      },
      "dependencies": {
        "bytes": {
@@ -863,9 +717,9 @@
      }
    },
    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
    },
    "cookie": {
      "version": "0.4.2",
@@ -974,25 +828,20 @@
      "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="
    },
    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
    },
    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
    },
    "diff": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="
    },
-    "discord-api-types": {
-      "version": "0.37.40",
-      "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.40.tgz",
-      "integrity": "sha512-LMALvtO+p6ERK8rwWoaI490NfIE/egbqjR4/rfLL1z9gQE1gqLiTpIUUDIunfAtKYzeH6ucyXhaXXWpfZh/Q6g=="
-    },
    "duplexer2": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
@@ -1203,38 +1052,37 @@
      }
    },
    "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
+      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
      "requires": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.19.2",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.4.2",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
-        "depd": "2.0.0",
+        "depd": "~1.1.2",
        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "~1.1.2",
        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
        "merge-descriptors": "1.0.1",
        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
        "parseurl": "~1.3.3",
        "path-to-regexp": "0.1.7",
        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.9.7",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.17.2",
+        "serve-static": "1.14.2",
        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
+        "statuses": "~1.5.0",
        "type-is": "~1.6.18",
        "utils-merge": "1.0.1",
        "vary": "~1.1.2"
@@ -1249,11 +1097,6 @@
            "negotiator": "0.6.3"
          }
        },
-        "cookie": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
-        },
        "mime-db": {
          "version": "1.52.0",
          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1353,16 +1196,16 @@
      }
    },
    "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
      "requires": {
        "debug": "2.6.9",
        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
+        "statuses": "~1.5.0",
        "unpipe": "~1.0.0"
      }
    },
@@ -1710,14 +1553,14 @@
      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
      "requires": {
-        "depd": "2.0.0",
+        "depd": "~1.1.2",
        "inherits": "2.0.4",
        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
+        "statuses": ">= 1.5.0 < 2",
        "toidentifier": "1.0.1"
      }
    },
@@ -2323,9 +2166,9 @@
      }
    },
    "luxon": {
-      "version": "1.28.1",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz",
-      "integrity": "sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw=="
+      "version": "1.28.0",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.28.0.tgz",
+      "integrity": "sha512-TfTiyvZhwBYM/7QdAVDh+7dBTBA29v4ik0Ce9zda3Mnf8on1S5KJI8P2jKFZ8+5C0jhmr0KwJEO/Wdpm0VeWJQ=="
    },
    "md5": {
      "version": "2.2.1",
@@ -2763,9 +2606,9 @@
      }
    },
    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
      "requires": {
        "ee-first": "1.1.1"
      }
@@ -2960,11 +2803,6 @@
      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
    },
-    "peek-readable": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz",
-      "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A=="
-    },
    "performance-now": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -3032,12 +2870,9 @@
      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
    },
    "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
    },
    "random-bytes": {
      "version": "1.0.0",
@@ -3058,12 +2893,12 @@
      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
    },
    "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
+      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
      "requires": {
        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
+        "http-errors": "1.8.1",
        "iconv-lite": "0.4.24",
        "unpipe": "1.0.0"
      },
@@ -3093,14 +2928,6 @@
        "util-deprecate": "^1.0.1"
      }
    },
-    "readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
-      "requires": {
-        "readable-stream": "^3.6.0"
-      }
-    },
    "readdir-glob": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz",
@@ -3293,23 +3120,23 @@
      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
    },
    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
+      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
      "requires": {
        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
+        "http-errors": "1.8.1",
        "mime": "1.6.0",
        "ms": "2.1.3",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.3.0",
        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "statuses": "~1.5.0"
      },
      "dependencies": {
        "ms": {
@@ -3328,14 +3155,14 @@
      }
    },
    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
+      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
      "requires": {
        "encodeurl": "~1.0.2",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.17.2"
      }
    },
    "setimmediate": {
@@ -3433,9 +3260,9 @@
      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
    },
    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
    },
    "stealthy-require": {
      "version": "1.1.1",
@@ -3541,15 +3368,6 @@
      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
    },
-    "strtok3": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.0.0.tgz",
-      "integrity": "sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==",
-      "requires": {
-        "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^5.0.0"
-      }
-    },
    "table-parser": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz",
@@ -3609,15 +3427,6 @@
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
    },
-    "token-types": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz",
-      "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==",
-      "requires": {
-        "@tokenizer/token": "^0.3.0",
-        "ieee754": "^1.2.1"
-      }
-    },
    "tough-cookie": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -3642,15 +3451,10 @@
      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
    },
-    "ts-mixer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz",
-      "integrity": "sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ=="
-    },
    "tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
    },
    "tunnel-agent": {
      "version": "0.6.0",
@@ -3713,14 +3517,6 @@
        "which-boxed-primitive": "^1.0.2"
      }
    },
-    "undici": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.0.tgz",
-      "integrity": "sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==",
-      "requires": {
-        "busboy": "^1.6.0"
-      }
-    },
    "universalify": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
@@ -3783,17 +3579,16 @@
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
    },
    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz",
+      "integrity": "sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="
    },
    "uuidv4": {
-      "version": "6.2.13",
-      "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz",
-      "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.0.6.tgz",
+      "integrity": "sha512-10YcruyGJtsG5SJnPG+8atr8toJa7xAOrcO7B7plYYiwpH1mQ8UZHjNSa2MrwGi6KWuyVrXGHr+Rce22F9UAiw==",
      "requires": {
-        "@types/uuid": "8.3.4",
-        "uuid": "8.3.2"
+        "uuid": "7.0.2"
      }
    },
    "vary": {
@@ -3923,11 +3718,6 @@
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
-    "ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
-    },
    "xml-js": {
      "version": "1.6.11",
      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
--- a/backend/package.json
+++ b/backend/package.json
@@ -19,16 +19,14 @@
  },
  "homepage": "",
  "dependencies": {
-    "@discordjs/builders": "^1.6.1",
-    "@discordjs/core": "^0.5.2",
    "archiver": "^5.3.1",
    "async": "^3.2.3",
-    "async-mutex": "^0.4.0",
+    "async-mutex": "^0.3.1",
    "axios": "^0.21.2",
    "bcryptjs": "^2.4.0",
    "compression": "^1.7.4",
    "config": "^3.2.3",
-    "express": "^4.18.2",
+    "express": "^4.17.3",
    "express-session": "^1.17.3",
    "feed": "^4.2.2",
    "fluent-ffmpeg": "^2.1.2",
@@ -57,7 +55,7 @@
    "rxjs": "^7.3.0",
    "shortid": "^2.2.15",
    "unzipper": "^0.10.10",
-    "uuidv4": "^6.2.13",
+    "uuidv4": "^6.0.6",
    "winston": "^3.7.2",
    "xmlbuilder2": "^3.0.2",
    "youtube-dl": "^3.0.2"
--- a/backend/subscriptions.js
+++ b/backend/subscriptions.js
@@ -92,10 +92,7 @@ async function getSubscriptionInfo(sub) {
                        }
                        // if it's now valid, update
                        if (sub.name) {
-                            let sub_name = sub.name;
-                            const sub_name_exists = await db_api.getRecord('subscriptions', {name: sub.name, isPlaylist: sub.isPlaylist, user_uid: sub.user_uid});
-                            if (sub_name_exists) sub_name += ` - ${sub.id}`;
-                            await db_api.updateRecord('subscriptions', {id: sub.id}, {name: sub_name});
+                            await db_api.updateRecord('subscriptions', {id: sub.id}, {name: sub.name});
                        }
                    }

@@ -232,20 +229,13 @@ async function getVideosForSub(sub, user_uid = null) {
    const downloadConfig = await generateArgsForSubscription(sub, user_uid);

    // get videos
-    logger.verbose(`Subscription: getting list of videos to download for ${sub.name} with args: ${downloadConfig.join(',')}`);
+    logger.verbose(`Subscription: getting videos for subscription ${sub.name} with args: ${downloadConfig.join(',')}`);

    return new Promise(async resolve => {
        youtubedl.exec(sub.url, downloadConfig, {maxBuffer: Infinity}, async function(err, output) {
            // cleanup
            updateSubscriptionProperty(sub, {downloading: false}, user_uid);

-            // remove temporary archive file if it exists
-            const archive_path = path.join(appendedBasePath, 'archive.txt');
-            const archive_exists = await fs.pathExists(archive_path);
-            if (archive_exists) {
-                await fs.unlink(archive_path);
-            }
-
            logger.verbose('Subscription: finished check for ' + sub.name);
            if (err && !output) {
                logger.error(err.stderr ? err.stderr : err.message);
@@ -364,16 +354,6 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de

    downloadConfig.push(...qualityPath)

-    // if archive is being used, we want to quickly skip videos that are in the archive. otherwise sub download can be permanently slow (vs. just the first time)
-    const useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
-    if (useYoutubeDLArchive) {
-        const archive_text = await archive_api.generateArchive(sub.type, sub.user_uid, sub.id);
-        logger.verbose(`Generating temporary archive file for subscription ${sub.name} with ${archive_text.split('\n').length - 1} entries.`)
-        const archive_path = path.join(appendedBasePath, 'archive.txt');
-        await fs.writeFile(archive_path, archive_text);
-        downloadConfig.push('--download-archive', archive_path);
-    }
-
    if (sub.custom_args) {
        const customArgsArray = sub.custom_args.split(',,');
        if (customArgsArray.indexOf('-f') !== -1) {
--- a/backend/test/tests.js
+++ b/backend/test/tests.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 const assert = require('assert');
 const low = require('lowdb')
 const winston = require('winston');
@@ -39,7 +38,6 @@ var db_api = require('../db');
 const utils = require('../utils');
 const subscriptions_api = require('../subscriptions');
 const archive_api = require('../archive');
-const categories_api = require('../categories');
 const fs = require('fs-extra');
 const { uuid } = require('uuidv4');
 const NodeID3 = require('node-id3');
@@ -177,15 +175,6 @@ describe('Database', async function() {
                    await db_api.removeRecord('test', {test_update: 'test'});
                });

-                it('Update records', async function() {
-                    await db_api.insertRecordIntoTable('test', {test_update: 'test', key: 'test1'});
-                    await db_api.insertRecordIntoTable('test', {test_update: 'test', key: 'test2'});
-                    await db_api.updateRecords('test', {test_update: 'test'}, {added_field: true});
-                    const updated_records = await db_api.getRecords('test', {added_field: true});
-                    assert(updated_records.length === 2);
-                    await db_api.removeRecord('test', {test_update: 'test'});
-                });
-
                it('Remove property from record', async function() {
                    await db_api.insertRecordIntoTable('test', {test_keep: 'test', test_remove: 'test'});
                    await db_api.removePropertyFromRecord('test', {test_keep: 'test'}, {test_remove: true});
@@ -350,10 +339,8 @@ describe('Multi User', async function() {
        });
    });
    describe('Video player - normal', async function() {
-        beforeEach(async function() {
-            await db_api.removeRecord('files', {uid: sample_video_json['uid']});
-            await db_api.insertRecordIntoTable('files', sample_video_json);
-        });
+        await db_api.removeRecord('files', {uid: sample_video_json['uid']});
+        await db_api.insertRecordIntoTable('files', sample_video_json);
        const video_to_test = sample_video_json['uid'];
        it('Get video', async function() {
            const video_obj = await db_api.getVideo(video_to_test);
@@ -510,19 +497,14 @@ describe('Downloader', function() {
        const new_args1 = ['--age-limit', '25', '--yes-playlist', '--abort-on-error', '-o', '%(id)s'];
        const updated_args1 = utils.injectArgs(original_args1, new_args1);
        const expected_args1 = ['--no-resize-buffer', '--no-mtime', '--age-limit', '25', '--yes-playlist', '--abort-on-error', '-o', '%(id)s'];
-        assert(JSON.stringify(updated_args1) === JSON.stringify(expected_args1));
+        assert(JSON.stringify(updated_args1), JSON.stringify(expected_args1));

        const original_args2 = ['-o', '%(title)s.%(ext)s', '--write-info-json', '--print-json', '--audio-quality', '0', '-x', '--audio-format', 'mp3'];
        const new_args2 =  ['--add-metadata', '--embed-thumbnail', '--convert-thumbnails', 'jpg'];
        const updated_args2 = utils.injectArgs(original_args2, new_args2);
-        const expected_args2 =  ['-o', '%(title)s.%(ext)s', '--write-info-json', '--print-json', '--audio-quality', '0', '-x', '--audio-format', 'mp3', '--add-metadata', '--embed-thumbnail', '--convert-thumbnails', 'jpg'];
-        assert(JSON.stringify(updated_args2) === JSON.stringify(expected_args2));
-
-        const original_args3 = ['-o', '%(title)s.%(ext)s'];
-        const new_args3 =  ['--min-filesize','1'];
-        const updated_args3 = utils.injectArgs(original_args3, new_args3);
-        const expected_args3 =  ['-o', '%(title)s.%(ext)s', '--min-filesize', '1'];
-        assert(JSON.stringify(updated_args3) === JSON.stringify(expected_args3));
+        const expected_args2 =  ['-o', '%(title)s.%(ext)s', '--write-info-json', '--print-json', '--audio-quality', '0', '-x', '--audio-format', 'mp3', '--add-metadata', '--embed-thumbnail', '--convert_thumbnails', 'jpg'];
+        console.log(updated_args2);
+        assert(JSON.stringify(updated_args2), JSON.stringify(expected_args2));
    });
    describe('Twitch', async function () {
        const twitch_api = require('../twitch');
@@ -608,7 +590,7 @@ describe('Tasks', function() {
        fs.copyFileSync('test/sample.mp4', 'video/sample.mp4');
        await tasks_api.executeTask('missing_db_records');
        const imported_file = await db_api.getRecord('files', {title: 'Sample File'});
-        assert(!!imported_file === true);
+        assert(!!imported_file, true);
        
        // post-test cleanup
        if (fs.existsSync('video/sample.info.json')) fs.unlinkSync('video/sample.info.json');
@@ -746,109 +728,4 @@ describe('Utils', async function() {
        assert(nested_obj2['test1'] && nested_obj2['test1']['test_sub']);
        assert(nested_obj2['test1'] && nested_obj2['test1']['test2'] && nested_obj2['test1']['test2']['test_sub']);
    });
-});
-
-describe('Categories', async function() {
-    beforeEach(async function() {
-        await db_api.connectToDB();
-        const new_category = {
-            name: 'test_category',
-            uid: uuid(),
-            rules: [],
-            custom_output: ''
-        };
-    
-        await db_api.insertRecordIntoTable('categories', new_category);
-    });
-
-    afterEach(async function() {
-        await db_api.removeAllRecords('categories', {name: 'test_category'});
-    });
-
-    it('Categorize - includes', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'includes',
-            property: 'title',
-            value: 'Sample'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        assert(category && category.name === 'test_category');
-    });
-
-    it('Categorize - not includes', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'not_includes',
-            property: 'title',
-            value: 'Sample'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        assert(!category);
-    });
-
-    it('Categorize - equals', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'equals',
-            property: 'uploader',
-            value: 'Sample Uploader'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        console.log(category);
-        assert(category && category.name === 'test_category');
-    });
-
-    it('Categorize - not equals', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'not_equals',
-            property: 'uploader',
-            value: 'Sample Uploader'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        assert(!category);
-    });
-
-    it('Categorize - AND', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'equals',
-            property: 'uploader',
-            value: 'Sample Uploader'
-        });
-
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: 'and',
-            comparator: 'not_includes',
-            property: 'title',
-            value: 'Sample'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        assert(!category);
-    });
-
-    it('Categorize - OR', async function() {
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: null,
-            comparator: 'equals',
-            property: 'uploader',
-            value: 'Sample Uploader'
-        });
-
-        await db_api.pushToRecordsArray('categories', {name: 'test_category'}, 'rules', {
-            preceding_operator: 'or',
-            comparator: 'not_includes',
-            property: 'title',
-            value: 'Sample'
-        });
-
-        const category = await categories_api.categorize([sample_video_json]);
-        assert(category);
-    });
 });
--- a/backend/utils.js
+++ b/backend/utils.js
@@ -92,7 +92,7 @@ exports.createZipFile = async (zip_file_path, file_paths) => {
    await archive.finalize();

    // wait a tiny bit for the zip to reload in fs
-    await exports.wait(100);
+    await wait(100);
    return zip_file_path;
 }

@@ -414,11 +414,10 @@ exports.injectArgs = (original_args, new_args) => {
            if (CONSTS.YTDL_ARGS_WITH_VALUES.has(new_arg)) {
                if (original_args.includes(new_arg)) {
                    const original_index = original_args.indexOf(new_arg);
-                    updated_args.splice(original_index, 2);
+                    original_args.splice(original_index, 2);
                }

                updated_args.push(new_arg, new_args[i + 1]);
-                i++; // we need to skip the arg value on the next loop
            } else {
                if (!original_args.includes(new_arg)) {
                    updated_args.push(new_arg);
--- a/chart/LICENSE
+++ b/chart/LICENSE
@@ -1,7 +0,0 @@
-Copyright 2018 Isaac Grynsztein
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/chart/README.md
+++ b/chart/README.md
@@ -1,3 +0,0 @@
-The official YoutubeDL-Material chart
-
-Repo: https://github.com/Tzahi12345/YoutubeDL-Material
--- a/chart/artifacthub-repo.yml
+++ b/chart/artifacthub-repo.yml
@@ -1,4 +0,0 @@
-# Artifact Hub repository metadata file
-repositoryID: ff79ae03-57c1-4f18-8368-5e085d06e2f1
-owners:
-  - name: tzahi12345
--- a/chart/index.yaml
+++ b/chart/index.yaml
@@ -1,22 +0,0 @@
-apiVersion: v1
-entries:
-  youtubedl-material:
-  - apiVersion: v1
-    created: "2021-01-01T05:51:36.304331-05:00"
-    description: A Material Design frontend for youtube-dl
-    digest: f7340d24fb051ade30b890db3b5c483a884b8459316dcf2ffc6fb9413d41252e
-    home: https://github.com/Tzahi12345/YoutubeDL-Material/
-    icon: https://i.imgur.com/IKOlr0N.png
-    keywords:
-    - youtubedl-material
-    - youtube-dl
-    maintainers:
-    - email: IsaacMGrynsztein@gmail.com
-      name: tzahi12345
-    name: youtubedl-material
-    sources:
-    - https://github.com/Tzahi12345/YoutubeDL-Material/
-    urls:
-    - youtubedl-material-0.0.1.tgz
-    version: 0.0.1
-generated: "2021-01-01T05:51:36.3003569-05:00"
--- a/chart/templates/claim-appdata-persistentvolumeclaim.yaml
+++ b/chart/templates/claim-appdata-persistentvolumeclaim.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ytdl-material-claim-appdata
-  name: ytdl-material-claim-appdata
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ default "1Gi" .Values.appdataClaimSize }}
-status: {}
--- a/chart/templates/claim-audio-persistentvolumeclaim.yaml
+++ b/chart/templates/claim-audio-persistentvolumeclaim.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ytdl-material-claim-audio
-  name: ytdl-material-claim-audio
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ default "50Gi" .Values.audioClaimSize }}
-status: {}
--- a/chart/templates/claim-subscriptions-persistentvolumeclaim.yaml
+++ b/chart/templates/claim-subscriptions-persistentvolumeclaim.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ytdl-material-claim-subscriptions
-  name: ytdl-material-claim-subscriptions
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ default "50Gi" .Values.subscriptionsClaimSize }}
-status: {}
--- a/chart/templates/claim-users-persistentvolumeclaim.yaml
+++ b/chart/templates/claim-users-persistentvolumeclaim.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ytdl-material-claim-users
-  name: ytdl-material-claim-users
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ default "50Gi" .Values.usersClaimSize }}
-status: {}
--- a/chart/templates/claim-video-persistentvolumeclaim.yaml
+++ b/chart/templates/claim-video-persistentvolumeclaim.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ytdl-material-claim-video
-  name: ytdl-material-claim-video
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ default "50Gi" .Values.videoClaimSize }}
-status: {}
--- a/chart/youtubedl-material-0.0.1.tgz
+++ b/chart/youtubedl-material-0.0.1.tgz
--- a/package-lock.json
+++ b/package-lock.json
@@ -2142,12 +2142,6 @@
        }
      }
    },
-    "@colors/colors": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-      "dev": true
-    },
    "@discoveryjs/json-ext": {
      "version": "0.5.7",
      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
@@ -3709,6 +3703,12 @@
      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
      "dev": true
    },
+    "@socket.io/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+      "dev": true
+    },
    "@socket.io/component-emitter": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
@@ -3781,13 +3781,10 @@
      "dev": true
    },
    "@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
    },
    "@types/eslint": {
      "version": "8.4.10",
@@ -3854,9 +3851,9 @@
      }
    },
    "@types/jasmine": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.1.tgz",
-      "integrity": "sha512-Vu8l+UGcshYmV1VWwULgnV/2RDbBaO6i2Ptx7nd//oJPIZGhoI1YLST4VKagD2Pq/Bc2/7zvtvhM7F3p4SN7kQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.2.tgz",
+      "integrity": "sha512-AzfesNFLvOs6Q1mHzIsVJXSeUnqVh4ZHG8ngygKJfbkcSLwzrBVm/LKa+mR8KrOfnWtUL47112gde1MC0IXqpQ==",
      "dev": true
    },
    "@types/json-schema": {
@@ -4786,13 +4783,13 @@
      }
    },
    "body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
      "dev": true,
      "requires": {
        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
+        "content-type": "~1.0.4",
        "debug": "2.6.9",
        "depd": "2.0.0",
        "destroy": "1.2.0",
@@ -4800,7 +4797,7 @@
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
        "qs": "6.11.0",
-        "raw-body": "2.5.2",
+        "raw-body": "2.5.1",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
      },
@@ -4811,12 +4808,6 @@
          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
          "dev": true
        },
-        "content-type": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-          "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-          "dev": true
-        },
        "debug": {
          "version": "2.6.9",
          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -4832,11 +4823,72 @@
          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
          "dev": true
        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "dev": true,
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
        "ms": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "qs": {
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        },
+        "toidentifier": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+          "dev": true
        }
      }
    },
@@ -5397,7 +5449,7 @@
        "ms": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
          "dev": true
        }
      }
@@ -5754,7 +5806,7 @@
    "custom-event": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
      "dev": true
    },
    "damerau-levenshtein": {
@@ -5773,9 +5825,9 @@
      }
    },
    "date-format": {
-      "version": "4.0.14",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz",
-      "integrity": "sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
+      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
      "dev": true
    },
    "debug": {
@@ -5887,7 +5939,7 @@
    "di": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
      "dev": true
    },
    "diff": {
@@ -5932,7 +5984,7 @@
    "dom-serialize": {
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
      "dev": true,
      "requires": {
        "custom-event": "~1.0.0",
@@ -6072,47 +6124,15 @@
        "once": "^1.4.0"
      }
    },
-    "engine.io": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.1.tgz",
-      "integrity": "sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==",
+    "engine.io-parser": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
+      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
      "dev": true,
      "requires": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
+        "@socket.io/base64-arraybuffer": "~1.0.2"
      }
    },
-    "engine.io-parser": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz",
-      "integrity": "sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==",
-      "dev": true
-    },
    "enhanced-resolve": {
      "version": "5.12.0",
      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
@@ -6143,7 +6163,7 @@
    "ent": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
      "dev": true
    },
    "entities": {
@@ -7138,9 +7158,9 @@
      "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
    },
    "filesize": {
-      "version": "10.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.0.7.tgz",
-      "integrity": "sha512-iMRG7Qo9nayLoU3PNCiLizYtsy4W1ClrapeCwEgtiQelOAOuRJiw4QaLI+sSr8xr901dgHv+EYP2bCusGZgoiA=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
+      "integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="
    },
    "fill-range": {
      "version": "7.0.1",
@@ -7178,17 +7198,8 @@
        "ms": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
          "dev": true
-        },
-        "on-finished": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-          "dev": true,
-          "requires": {
-            "ee-first": "1.1.1"
-          }
        }
      }
    },
@@ -7254,9 +7265,9 @@
      }
    },
    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
      "dev": true
    },
    "follow-redirects": {
@@ -7798,33 +7809,6 @@
      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
      "dev": true
    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-          "dev": true
-        }
-      }
-    },
    "http-parser-js": {
      "version": "0.5.8",
      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
@@ -8279,9 +8263,9 @@
      "dev": true
    },
    "isbinaryfile": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz",
-      "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
+      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
      "dev": true
    },
    "isexe": {
@@ -8630,15 +8614,15 @@
      }
    },
    "karma": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz",
-      "integrity": "sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==",
+      "version": "6.3.16",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz",
+      "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==",
      "dev": true,
      "requires": {
-        "@colors/colors": "1.5.0",
        "body-parser": "^1.19.0",
        "braces": "^3.0.2",
        "chokidar": "^3.5.1",
+        "colors": "1.4.0",
        "connect": "^3.7.0",
        "di": "^0.0.1",
        "dom-serialize": "^2.2.1",
@@ -8654,31 +8638,73 @@
        "qjobs": "^1.2.0",
        "range-parser": "^1.2.1",
        "rimraf": "^3.0.2",
-        "socket.io": "^4.4.1",
+        "socket.io": "^4.2.0",
        "source-map": "^0.6.1",
        "tmp": "^0.2.1",
        "ua-parser-js": "^0.7.30",
        "yargs": "^16.1.1"
      },
      "dependencies": {
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "chokidar": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
        "glob": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-          "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
          "dev": true,
          "requires": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
            "inherits": "2",
-            "minimatch": "^3.1.1",
+            "minimatch": "^3.0.4",
            "once": "^1.3.0",
            "path-is-absolute": "^1.0.0"
          }
        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
        "graceful-fs": {
-          "version": "4.2.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-          "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+          "version": "4.2.9",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+          "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
          "dev": true
        },
        "mime": {
@@ -8688,12 +8714,21 @@
          "dev": true
        },
        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
          "dev": true,
          "requires": {
-            "minimist": "^1.2.6"
+            "minimist": "^1.2.5"
+          }
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
          }
        },
        "source-map": {
@@ -8745,18 +8780,18 @@
      }
    },
    "karma-jasmine": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-5.1.0.tgz",
-      "integrity": "sha512-i/zQLFrfEpRyQoJF9fsCdTMOF5c2dK7C7OmsuKg2D0YSsuZSfQDiLuaiktbuio6F2wiCsZSnSnieIQ0ant/uzQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz",
+      "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==",
      "dev": true,
      "requires": {
-        "jasmine-core": "^4.1.0"
+        "jasmine-core": "^3.6.0"
      },
      "dependencies": {
        "jasmine-core": {
-          "version": "4.6.0",
-          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz",
-          "integrity": "sha512-O236+gd0ZXS8YAjFx8xKaJ94/erqUliEkJTDedyE7iHvv4ZVqi+q+8acJxu05/WJDKm512EUNn809In37nWlAQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
+          "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==",
          "dev": true
        }
      }
@@ -8986,22 +9021,22 @@
      }
    },
    "log4js": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
-      "integrity": "sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
+      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
      "dev": true,
      "requires": {
-        "date-format": "^4.0.14",
-        "debug": "^4.3.4",
-        "flatted": "^3.2.7",
+        "date-format": "^4.0.3",
+        "debug": "^4.3.3",
+        "flatted": "^3.2.4",
        "rfdc": "^1.3.0",
-        "streamroller": "^3.1.5"
+        "streamroller": "^3.0.2"
      },
      "dependencies": {
        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
          "dev": true,
          "requires": {
            "ms": "2.1.2"
@@ -10100,9 +10135,9 @@
      "dev": true
    },
    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
      "dev": true,
      "requires": {
        "ee-first": "1.1.1"
@@ -11196,15 +11231,6 @@
      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
      "dev": true
    },
-    "qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
    "randombytes": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -11220,26 +11246,6 @@
      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
      "dev": true
    },
-    "raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        }
-      }
-    },
    "read-package-json": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.0.tgz",
@@ -11637,9 +11643,9 @@
      }
    },
    "rxjs-compat": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.6.7.tgz",
-      "integrity": "sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw=="
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.4.tgz",
+      "integrity": "sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA=="
    },
    "safe-buffer": {
      "version": "5.1.2",
@@ -12008,12 +12014,6 @@
      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
      "dev": true
    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
    "shallow-clone": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -12105,19 +12105,25 @@
      "dev": true
    },
    "socket.io": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.1.tgz",
-      "integrity": "sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz",
+      "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==",
      "dev": true,
      "requires": {
        "accepts": "~1.3.4",
        "base64id": "~2.0.0",
        "debug": "~4.3.2",
-        "engine.io": "~6.4.1",
-        "socket.io-adapter": "~2.5.2",
+        "engine.io": "~6.2.1",
+        "socket.io-adapter": "~2.4.0",
        "socket.io-parser": "~4.2.1"
      },
      "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+          "dev": true
+        },
        "debug": {
          "version": "4.3.4",
          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -12126,36 +12132,46 @@
          "requires": {
            "ms": "2.1.2"
          }
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "requires": {
-        "ws": "~8.11.0"
-      }
-    },
-    "socket.io-parser": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
-      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+        },
+        "engine.io": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz",
+          "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==",
          "dev": true,
          "requires": {
-            "ms": "2.1.2"
+            "@types/cookie": "^0.4.1",
+            "@types/cors": "^2.8.12",
+            "@types/node": ">=10.0.0",
+            "accepts": "~1.3.4",
+            "base64id": "2.0.0",
+            "cookie": "~0.4.1",
+            "cors": "~2.8.5",
+            "debug": "~4.3.1",
+            "engine.io-parser": "~5.0.3",
+            "ws": "~8.2.3"
          }
+        },
+        "socket.io-adapter": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz",
+          "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==",
+          "dev": true
+        },
+        "socket.io-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz",
+          "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==",
+          "dev": true,
+          "requires": {
+            "@socket.io/component-emitter": "~3.1.0",
+            "debug": "~4.3.1"
+          }
+        },
+        "ws": {
+          "version": "8.2.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+          "dev": true
        }
      }
    },
@@ -12387,36 +12403,14 @@
      "dev": true
    },
    "streamroller": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
-      "integrity": "sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
+      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
      "dev": true,
      "requires": {
-        "date-format": "^4.0.14",
-        "debug": "^4.3.4",
-        "fs-extra": "^8.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
+        "date-format": "^4.0.3",
+        "debug": "^4.1.1",
+        "fs-extra": "^10.0.0"
      }
    },
    "string-width": {
@@ -12698,12 +12692,6 @@
        "is-number": "^7.0.0"
      }
    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
    "tough-cookie": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -12940,9 +12928,9 @@
      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
    },
    "ua-parser-js": {
-      "version": "0.7.35",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz",
-      "integrity": "sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==",
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
+      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
      "dev": true
    },
    "uglify-js": {
@@ -13114,7 +13102,7 @@
    "void-elements": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
      "dev": true
    },
    "watchpack": {
@@ -13508,9 +13496,9 @@
      }
    },
    "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
      "dev": true
    },
    "yauzl": {
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
    "core-js": "^2.4.1",
    "crypto-js": "^4.1.1",
    "file-saver": "^2.0.2",
-    "filesize": "^10.0.7",
+    "filesize": "^6.1.0",
    "fingerprintjs2": "^2.1.0",
    "fs-extra": "^10.0.0",
    "material-icons": "^1.10.8",
@@ -47,7 +47,7 @@
    "ngx-avatars": "^1.4.1",
    "ngx-file-drop": "^13.0.0",
    "rxjs": "^6.6.3",
-    "rxjs-compat": "^6.6.7",
+    "rxjs-compat": "^6.0.0-rc.0",
    "tslib": "^2.0.0",
    "typescript": "~4.8.4",
    "xliff-to-json": "^1.0.4",
@@ -60,7 +60,7 @@
    "@angular/language-service": "^15.0.1",
    "@types/core-js": "^2.5.2",
    "@types/file-saver": "^2.0.1",
-    "@types/jasmine": "^4.3.1",
+    "@types/jasmine": "~3.6.0",
    "@types/node": "^12.11.1",
    "@typescript-eslint/eslint-plugin": "^4.29.0",
    "@typescript-eslint/parser": "^4.29.0",
@@ -70,11 +70,11 @@
    "eslint": "^7.32.0",
    "jasmine-core": "~3.6.0",
    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~6.4.2",
+    "karma": "~6.3.16",
    "karma-chrome-launcher": "~3.1.0",
    "karma-cli": "~1.0.1",
    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~5.1.0",
+    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
    "openapi-typescript-codegen": "^0.23.0",
    "protractor": "~7.0.0",
--- a/src/api-types/index.ts
+++ b/src/api-types/index.ts
@@ -87,6 +87,7 @@ export type { LoginResponse } from './models/LoginResponse';
 export type { Notification } from './models/Notification';
 export { NotificationAction } from './models/NotificationAction';
 export { NotificationType } from './models/NotificationType';
+export type { PinLoginResponse } from './models/PinLoginResponse';
 export type { Playlist } from './models/Playlist';
 export type { RegisterRequest } from './models/RegisterRequest';
 export type { RegisterResponse } from './models/RegisterResponse';
@@ -95,6 +96,7 @@ export type { RestoreDBBackupRequest } from './models/RestoreDBBackupRequest';
 export { Schedule } from './models/Schedule';
 export type { SetConfigRequest } from './models/SetConfigRequest';
 export type { SetNotificationsToReadRequest } from './models/SetNotificationsToReadRequest';
+export type { SetPinRequest } from './models/SetPinRequest';
 export type { SharingToggle } from './models/SharingToggle';
 export type { Sort } from './models/Sort';
 export type { SubscribeRequest } from './models/SubscribeRequest';
--- a/src/api-types/models/AddFileToPlaylistRequest.ts
+++ b/src/api-types/models/AddFileToPlaylistRequest.ts
@@ -5,4 +5,4 @@
 export type AddFileToPlaylistRequest = {
    file_uid: string;
    playlist_id: string;
-};
+};
--- a/src/api-types/models/Archive.ts
+++ b/src/api-types/models/Archive.ts
@@ -13,4 +13,4 @@ export type Archive = {
    sub_id?: string;
    timestamp: number;
    uid: string;
-};
+};
--- a/src/api-types/models/BaseChangePermissionsRequest.ts
+++ b/src/api-types/models/BaseChangePermissionsRequest.ts
@@ -8,4 +8,4 @@ import type { YesNo } from './YesNo';
 export type BaseChangePermissionsRequest = {
    permission: UserPermission;
    new_value: YesNo;
-};
+};
--- a/src/api-types/models/Category.ts
+++ b/src/api-types/models/Category.ts
@@ -12,4 +12,4 @@ export type Category = {
     * Overrides file output for downloaded files in category
     */
    custom_output?: string;
-};
+};
--- a/src/api-types/models/CategoryRule.ts
+++ b/src/api-types/models/CategoryRule.ts
@@ -22,4 +22,4 @@ export namespace CategoryRule {
    }


-}
+}
--- a/src/api-types/models/ChangeRolePermissionsRequest.ts
+++ b/src/api-types/models/ChangeRolePermissionsRequest.ts
@@ -6,4 +6,4 @@ import type { BaseChangePermissionsRequest } from './BaseChangePermissionsReques

 export type ChangeRolePermissionsRequest = (BaseChangePermissionsRequest & {
 role: string;
-});
+});
--- a/src/api-types/models/ChangeUserPermissionsRequest.ts
+++ b/src/api-types/models/ChangeUserPermissionsRequest.ts
@@ -6,4 +6,4 @@ import type { BaseChangePermissionsRequest } from './BaseChangePermissionsReques

 export type ChangeUserPermissionsRequest = (BaseChangePermissionsRequest & {
 user_uid: string;
-});
+});
--- a/src/api-types/models/CheckConcurrentStreamRequest.ts
+++ b/src/api-types/models/CheckConcurrentStreamRequest.ts
@@ -7,4 +7,4 @@ export type CheckConcurrentStreamRequest = {
     * UID of the concurrent stream
     */
    uid: string;
-};
+};
--- a/src/api-types/models/CheckConcurrentStreamResponse.ts
+++ b/src/api-types/models/CheckConcurrentStreamResponse.ts
@@ -6,4 +6,4 @@ import type { ConcurrentStream } from './ConcurrentStream';

 export type CheckConcurrentStreamResponse = {
    stream: ConcurrentStream;
-};
+};
--- a/src/api-types/models/ClearDownloadsRequest.ts
+++ b/src/api-types/models/ClearDownloadsRequest.ts
@@ -6,4 +6,4 @@ export type ClearDownloadsRequest = {
    clear_finished?: boolean;
    clear_paused?: boolean;
    clear_errors?: boolean;
-};
+};
--- a/src/api-types/models/ConcurrentStream.ts
+++ b/src/api-types/models/ConcurrentStream.ts
@@ -6,4 +6,4 @@ export type ConcurrentStream = {
    playback_timestamp?: number;
    unix_timestamp?: number;
    playing?: boolean;
-};
+};
--- a/src/api-types/models/Config.ts
+++ b/src/api-types/models/Config.ts
@@ -4,4 +4,4 @@

 export type Config = {
    YoutubeDLMaterial: any;
-};
+};
--- a/src/api-types/models/ConfigResponse.ts
+++ b/src/api-types/models/ConfigResponse.ts
@@ -7,4 +7,4 @@ import type { Config } from './Config';
 export type ConfigResponse = {
    config_file: Config;
    success: boolean;
-};
+};
--- a/src/api-types/models/CreateCategoryRequest.ts
+++ b/src/api-types/models/CreateCategoryRequest.ts
@@ -4,4 +4,4 @@

 export type CreateCategoryRequest = {
    name: string;
-};
+};
--- a/src/api-types/models/CreateCategoryResponse.ts
+++ b/src/api-types/models/CreateCategoryResponse.ts
@@ -7,4 +7,4 @@ import type { Category } from './Category';
 export type CreateCategoryResponse = {
    new_category?: Category;
    success?: boolean;
-};
+};
--- a/src/api-types/models/CreatePlaylistRequest.ts
+++ b/src/api-types/models/CreatePlaylistRequest.ts
@@ -6,4 +6,4 @@ export type CreatePlaylistRequest = {
    playlistName: string;
    uids: Array<string>;
    thumbnailURL: string;
-};
+};
--- a/src/api-types/models/CreatePlaylistResponse.ts
+++ b/src/api-types/models/CreatePlaylistResponse.ts
@@ -7,4 +7,4 @@ import type { Playlist } from './Playlist';
 export type CreatePlaylistResponse = {
    new_playlist: Playlist;
    success: boolean;
-};
+};
--- a/src/api-types/models/CropFileSettings.ts
+++ b/src/api-types/models/CropFileSettings.ts
@@ -5,4 +5,4 @@
 export type CropFileSettings = {
    cropFileStart: number;
    cropFileEnd: number;
-};
+};
--- a/src/api-types/models/DBBackup.ts
+++ b/src/api-types/models/DBBackup.ts
@@ -17,4 +17,4 @@ export namespace DBBackup {
    }


-}
+}
--- a/src/api-types/models/DBInfoResponse.ts
+++ b/src/api-types/models/DBInfoResponse.ts
@@ -16,4 +16,4 @@ roles?: TableInfo;
 download_queue?: TableInfo;
 archives?: TableInfo;
 };
-};
+};
--- a/src/api-types/models/DatabaseFile.ts
+++ b/src/api-types/models/DatabaseFile.ts
@@ -42,4 +42,4 @@ export type DatabaseFile = {
     */
    abr?: number;
    favorite: boolean;
-};
+};
--- a/src/api-types/models/DeleteAllFilesResponse.ts
+++ b/src/api-types/models/DeleteAllFilesResponse.ts
@@ -11,4 +11,4 @@ export type DeleteAllFilesResponse = {
     * Number of files removed
     */
    delete_count?: number;
-};
+};
--- a/src/api-types/models/DeleteArchiveItemsRequest.ts
+++ b/src/api-types/models/DeleteArchiveItemsRequest.ts
@@ -6,4 +6,4 @@ import type { Archive } from './Archive';

 export type DeleteArchiveItemsRequest = {
    archives: Array<Archive>;
-};
+};
--- a/src/api-types/models/DeleteCategoryRequest.ts
+++ b/src/api-types/models/DeleteCategoryRequest.ts
@@ -4,4 +4,4 @@

 export type DeleteCategoryRequest = {
    category_uid: string;
-};
+};
--- a/src/api-types/models/DeleteMp3Mp4Request.ts
+++ b/src/api-types/models/DeleteMp3Mp4Request.ts
@@ -5,4 +5,4 @@
 export type DeleteMp3Mp4Request = {
    uid: string;
    blacklistMode?: boolean;
-};
+};
--- a/src/api-types/models/DeleteNotificationRequest.ts
+++ b/src/api-types/models/DeleteNotificationRequest.ts
@@ -4,4 +4,4 @@

 export type DeleteNotificationRequest = {
    uid: string;
-};
+};
--- a/src/api-types/models/DeletePlaylistRequest.ts
+++ b/src/api-types/models/DeletePlaylistRequest.ts
@@ -4,4 +4,4 @@

 export type DeletePlaylistRequest = {
    playlist_id: string;
-};
+};
--- a/src/api-types/models/DeleteSubscriptionFileRequest.ts
+++ b/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;
-};
+};
--- a/src/api-types/models/DeleteUserRequest.ts
+++ b/src/api-types/models/DeleteUserRequest.ts
@@ -4,4 +4,4 @@

 export type DeleteUserRequest = {
    uid: string;
-};
+};
--- a/src/api-types/models/Download.ts
+++ b/src/api-types/models/Download.ts
@@ -27,4 +27,4 @@ export type Download = {
    sub_id?: string;
    sub_name?: string;
    prefetched_info?: any;
-};
+};
--- a/src/api-types/models/DownloadArchiveRequest.ts
+++ b/src/api-types/models/DownloadArchiveRequest.ts
@@ -7,4 +7,4 @@ import type { FileType } from './FileType';
 export type DownloadArchiveRequest = {
    type?: FileType;
    sub_id?: string;
-};
+};
--- a/src/api-types/models/DownloadFileRequest.ts
+++ b/src/api-types/models/DownloadFileRequest.ts
@@ -11,4 +11,4 @@ export type DownloadFileRequest = {
    playlist_id?: string;
    url?: string;
    type?: FileType;
-};
+};
--- a/src/api-types/models/DownloadRequest.ts
+++ b/src/api-types/models/DownloadRequest.ts
@@ -49,4 +49,4 @@ export type DownloadRequest = {
     * If using youtube-dl archive, download will ignore it
     */
    ignoreArchive?: boolean;
-};
+};
--- a/src/api-types/models/DownloadResponse.ts
+++ b/src/api-types/models/DownloadResponse.ts
@@ -6,4 +6,4 @@ import type { Download } from './Download';

 export type DownloadResponse = {
    download?: Download;
-};
+};
--- a/src/api-types/models/DownloadTwitchChatByVODIDRequest.ts
+++ b/src/api-types/models/DownloadTwitchChatByVODIDRequest.ts
@@ -20,4 +20,4 @@ export type DownloadTwitchChatByVODIDRequest = {
     */
    uuid?: string;
    sub?: Subscription;
-};
+};
--- a/src/api-types/models/DownloadTwitchChatByVODIDResponse.ts
+++ b/src/api-types/models/DownloadTwitchChatByVODIDResponse.ts
@@ -6,4 +6,4 @@ import type { TwitchChatMessage } from './TwitchChatMessage';

 export type DownloadTwitchChatByVODIDResponse = {
    chat: Array<TwitchChatMessage>;
-};
+};
--- a/src/api-types/models/DownloadVideosForSubscriptionRequest.ts
+++ b/src/api-types/models/DownloadVideosForSubscriptionRequest.ts
@@ -4,4 +4,4 @@

 export type DownloadVideosForSubscriptionRequest = {
    subID: string;
-};
+};
--- a/src/api-types/models/FileType.ts
+++ b/src/api-types/models/FileType.ts
@@ -5,4 +5,4 @@
 export enum FileType {
    AUDIO = 'audio',
    VIDEO = 'video',
-}
+}
--- a/src/api-types/models/FileTypeFilter.ts
+++ b/src/api-types/models/FileTypeFilter.ts
@@ -6,4 +6,4 @@ export enum FileTypeFilter {
    AUDIO_ONLY = 'audio_only',
    VIDEO_ONLY = 'video_only',
    BOTH = 'both',
-}
+}
--- a/src/api-types/models/GenerateArgsResponse.ts
+++ b/src/api-types/models/GenerateArgsResponse.ts
@@ -4,4 +4,4 @@

 export type GenerateArgsResponse = {
    args?: Array<string>;
-};
+};
--- a/src/api-types/models/GenerateNewApiKeyResponse.ts
+++ b/src/api-types/models/GenerateNewApiKeyResponse.ts
@@ -4,4 +4,4 @@

 export type GenerateNewApiKeyResponse = {
    new_api_key: string;
-};
+};
--- a/src/api-types/models/GetAllCategoriesResponse.ts
+++ b/src/api-types/models/GetAllCategoriesResponse.ts
@@ -6,4 +6,4 @@ import type { Category } from './Category';

 export type GetAllCategoriesResponse = {
    categories: Array<Category>;
-};
+};
--- a/src/api-types/models/GetAllDownloadsRequest.ts
+++ b/src/api-types/models/GetAllDownloadsRequest.ts
@@ -7,4 +7,4 @@ export type GetAllDownloadsRequest = {
     * Filters downloads with the array
     */
    uids?: Array<string> | null;
-};
+};
--- a/src/api-types/models/GetAllDownloadsResponse.ts
+++ b/src/api-types/models/GetAllDownloadsResponse.ts
@@ -6,4 +6,4 @@ import type { Download } from './Download';

 export type GetAllDownloadsResponse = {
    downloads?: Array<Download>;
-};
+};
--- a/src/api-types/models/GetAllFilesRequest.ts
+++ b/src/api-types/models/GetAllFilesRequest.ts
@@ -21,4 +21,4 @@ export type GetAllFilesRequest = {
     * Include if you want to filter by subscription
     */
    sub_id?: string;
-};
+};
--- a/src/api-types/models/GetAllFilesResponse.ts
+++ b/src/api-types/models/GetAllFilesResponse.ts
@@ -11,4 +11,4 @@ export type GetAllFilesResponse = {
     * All video playlists
     */
    playlists: Array<Playlist>;
-};
+};
--- a/src/api-types/models/GetAllSubscriptionsResponse.ts
+++ b/src/api-types/models/GetAllSubscriptionsResponse.ts
@@ -6,4 +6,4 @@ import type { Subscription } from './Subscription';

 export type GetAllSubscriptionsResponse = {
    subscriptions: Array<Subscription>;
-};
+};
--- a/src/api-types/models/GetAllTasksResponse.ts
+++ b/src/api-types/models/GetAllTasksResponse.ts
@@ -6,4 +6,4 @@ import type { Task } from './Task';

 export type GetAllTasksResponse = {
    tasks?: Array<Task>;
-};
+};
--- a/src/api-types/models/GetArchivesRequest.ts
+++ b/src/api-types/models/GetArchivesRequest.ts
@@ -7,4 +7,4 @@ import type { FileType } from './FileType';
 export type GetArchivesRequest = {
    type?: FileType;
    sub_id?: string;
-};
+};
--- a/src/api-types/models/GetArchivesResponse.ts
+++ b/src/api-types/models/GetArchivesResponse.ts
@@ -6,4 +6,4 @@ import type { Archive } from './Archive';

 export type GetArchivesResponse = {
    archives: Array<Archive>;
-};
+};
--- a/src/api-types/models/GetDBBackupsResponse.ts
+++ b/src/api-types/models/GetDBBackupsResponse.ts
@@ -6,4 +6,4 @@ import type { DBBackup } from './DBBackup';

 export type GetDBBackupsResponse = {
    tasks?: Array<DBBackup>;
-};
+};
--- a/src/api-types/models/GetDownloadRequest.ts
+++ b/src/api-types/models/GetDownloadRequest.ts
@@ -4,4 +4,4 @@

 export type GetDownloadRequest = {
    download_uid: string;
-};
+};
--- a/src/api-types/models/GetDownloadResponse.ts
+++ b/src/api-types/models/GetDownloadResponse.ts
@@ -6,4 +6,4 @@ import type { Download } from './Download';

 export type GetDownloadResponse = {
    download?: Download;
-};
+};
--- a/src/api-types/models/GetFileFormatsRequest.ts
+++ b/src/api-types/models/GetFileFormatsRequest.ts
@@ -4,4 +4,4 @@

 export type GetFileFormatsRequest = {
    url?: string;
-};
+};
--- a/src/api-types/models/GetFileFormatsResponse.ts
+++ b/src/api-types/models/GetFileFormatsResponse.ts
@@ -7,4 +7,4 @@ export type GetFileFormatsResponse = {
    result: {
 formats?: Array<any>;
 };
-};
+};
--- a/src/api-types/models/GetFileRequest.ts
+++ b/src/api-types/models/GetFileRequest.ts
@@ -14,4 +14,4 @@ export type GetFileRequest = {
     * User UID
     */
    uuid?: string;
-};
+};
--- a/src/api-types/models/GetFileResponse.ts
+++ b/src/api-types/models/GetFileResponse.ts
@@ -7,4 +7,4 @@ import type { DatabaseFile } from './DatabaseFile';
 export type GetFileResponse = {
    success: boolean;
    file?: DatabaseFile;
-};
+};
--- a/src/api-types/models/GetFullTwitchChatRequest.ts
+++ b/src/api-types/models/GetFullTwitchChatRequest.ts
@@ -16,4 +16,4 @@ export type GetFullTwitchChatRequest = {
     */
    uuid?: string;
    sub?: Subscription;
-};
+};
--- a/src/api-types/models/GetFullTwitchChatResponse.ts
+++ b/src/api-types/models/GetFullTwitchChatResponse.ts
@@ -5,4 +5,4 @@
 export type GetFullTwitchChatResponse = {
    success: boolean;
    error?: string;
-};
+};
--- a/src/api-types/models/GetLogsRequest.ts
+++ b/src/api-types/models/GetLogsRequest.ts
@@ -4,4 +4,4 @@

 export type GetLogsRequest = {
    lines?: number;
-};
+};
--- a/src/api-types/models/GetLogsResponse.ts
+++ b/src/api-types/models/GetLogsResponse.ts
@@ -8,4 +8,4 @@ export type GetLogsResponse = {
     */
    logs?: string;
    success?: boolean;
-};
+};
--- a/src/api-types/models/GetMp3sResponse.ts
+++ b/src/api-types/models/GetMp3sResponse.ts
@@ -11,4 +11,4 @@ export type GetMp3sResponse = {
     * All audio playlists
     */
    playlists: Array<Playlist>;
-};
+};
--- a/src/api-types/models/GetMp4sResponse.ts
+++ b/src/api-types/models/GetMp4sResponse.ts
@@ -11,4 +11,4 @@ export type GetMp4sResponse = {
     * All video playlists
     */
    playlists: Array<Playlist>;
-};
+};
--- a/src/api-types/models/GetNotificationsResponse.ts
+++ b/src/api-types/models/GetNotificationsResponse.ts
@@ -6,4 +6,4 @@ import type { Notification } from './Notification';

 export type GetNotificationsResponse = {
    notifications?: Array<Notification>;
-};
+};
--- a/src/api-types/models/GetPlaylistRequest.ts
+++ b/src/api-types/models/GetPlaylistRequest.ts
@@ -9,4 +9,4 @@ export type GetPlaylistRequest = {
    type?: FileType;
    uuid?: string;
    include_file_metadata?: boolean;
-};
+};
--- a/src/api-types/models/GetPlaylistResponse.ts
+++ b/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>;
-};
+};
--- a/src/api-types/models/GetPlaylistsRequest.ts
+++ b/src/api-types/models/GetPlaylistsRequest.ts
@@ -4,4 +4,4 @@

 export type GetPlaylistsRequest = {
    include_categories?: boolean;
-};
+};
--- a/src/api-types/models/GetPlaylistsResponse.ts
+++ b/src/api-types/models/GetPlaylistsResponse.ts
@@ -6,4 +6,4 @@ import type { Playlist } from './Playlist';

 export type GetPlaylistsResponse = {
    playlists: Array<Playlist>;
-};
+};
--- a/src/api-types/models/GetRolesResponse.ts
+++ b/src/api-types/models/GetRolesResponse.ts
@@ -13,4 +13,4 @@ user?: {
 permissions?: Array<UserPermission>;
 };
 };
-};
+};
--- a/src/api-types/models/GetSubscriptionRequest.ts
+++ b/src/api-types/models/GetSubscriptionRequest.ts
@@ -11,4 +11,4 @@ export type GetSubscriptionRequest = {
     * Subscription name
     */
    name?: string;
-};
+};
--- a/src/api-types/models/GetSubscriptionResponse.ts
+++ b/src/api-types/models/GetSubscriptionResponse.ts
@@ -7,4 +7,4 @@ import type { Subscription } from './Subscription';
 export type GetSubscriptionResponse = {
    subscription: Subscription;
    files: Array<any>;
-};
+};
--- a/src/api-types/models/GetTaskRequest.ts
+++ b/src/api-types/models/GetTaskRequest.ts
@@ -4,4 +4,4 @@

 export type GetTaskRequest = {
    task_key: string;
-};
+};
--- a/src/api-types/models/GetTaskResponse.ts
+++ b/src/api-types/models/GetTaskResponse.ts
@@ -6,4 +6,4 @@ import type { Task } from './Task';

 export type GetTaskResponse = {
    task?: Task;
-};
+};
--- a/Show More
+++ b/Show More