From a0abc6819bb72e3b9dd6f9d8ecf4b99bff1aa2b5 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 17 May 2023 19:05:59 -0400
Subject: [PATCH 001/210] Initial webhook integration

---
 app/classes/shared/server.py       | 13 +++++++++++++
 app/classes/web/webhook_handler.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 app/classes/web/webhook_handler.py

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index fa68eb62..9cecc6ce 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -31,6 +31,7 @@ from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
+from app.classes.web.webhook_handler import WebhookHandler
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -512,6 +513,9 @@ class ServerInstance:
         if self.process.poll() is None:
             logger.info(f"Server {self.name} running with PID {self.process.pid}")
             Console.info(f"Server {self.name} running with PID {self.process.pid}")
+            WebhookHandler.send_discord_webhook(
+                "Crafty Controller", f"{self.name} started!", 65354
+            )
             self.is_crashed = False
             self.stats_helper.server_crash_reset()
             self.record_server_stats()
@@ -807,6 +811,9 @@ class ServerInstance:
 
         logger.info(f"Stopped Server {server_name} with PID {server_pid}")
         Console.info(f"Stopped Server {server_name} with PID {server_pid}")
+        WebhookHandler.send_discord_webhook(
+            "Crafty Controller", f"{self.name} was stopped!", 16748076
+        )
 
         # massive resetting of variables
         self.cleanup_server_object()
@@ -890,6 +897,12 @@ class ServerInstance:
                 f"The server {name} has crashed and will be restarted. "
                 f"Restarting server"
             )
+
+            WebhookHandler.send_discord_webhook(
+                "Crafty Controller",
+                f"{self.name} crashed! Crafty Controller is attempting to start it back up!",
+                16711680,
+            )
             self.run_threaded_server(None)
             return True
         logger.critical(
diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
new file mode 100644
index 00000000..c972cff1
--- /dev/null
+++ b/app/classes/web/webhook_handler.py
@@ -0,0 +1,30 @@
+import json
+import logging
+import requests
+
+logger = logging.getLogger(__name__)
+
+
+class WebhookHandler:
+    @staticmethod
+    def send_discord_webhook(title, message, color):
+        dataset = {
+            "username": "Crafty Webhooks",
+            "avatar_url": "https://docs.craftycontrol.com/img/favicon.ico",
+            "embeds": [
+                {
+                    "title": title,
+                    "description": message,
+                    "color": color,
+                }
+            ],
+        }
+
+        logger.debug(
+            "Webhook response: "
+            + requests.post(
+                "https://discord.com/api/webhooks/1107017140004995081/leFCJ4g_Uw6ZwxaZXTLmi-L7njIFwVvFbf3JEHnAvUJAd90PoMknlivel0rosfnFed77",
+                data=json.dumps(dataset),
+                headers={"Content-type": "application/json"},
+            ),
+        )

From e6723d9ebceacc24cec06021f3e8d1b02f2ef388 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 20 May 2023 17:49:13 -0400
Subject: [PATCH 002/210] Add new backup routes

---
 app/classes/web/routes/api/api_handlers.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 29ee02c5..8e4b7ac3 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -26,6 +26,12 @@ from app.classes.web.routes.api.servers.server.stdin import ApiServersServerStdi
 from app.classes.web.routes.api.servers.server.tasks.index import (
     ApiServersServerTasksIndexHandler,
 )
+from app.classes.web.routes.api.servers.server.backups.index import (
+    ApiServersServerBackupsIndexHandler,
+)
+from app.classes.web.routes.api.servers.server.backups.backup.index import (
+    ApiServersServerBackupsBackupIndexHandler,
+)
 from app.classes.web.routes.api.servers.server.tasks.task.children import (
     ApiServersServerTasksTaskChildrenHandler,
 )
@@ -112,6 +118,16 @@ def api_handlers(handler_args):
             ApiServersServerIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/([0-9]+)/backups/?",
+            ApiServersServerBackupsIndexHandler,
+            handler_args,
+        ),
+        (
+            r"/api/v2/servers/([0-9]+)/backups/backup/?",
+            ApiServersServerBackupsBackupIndexHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/tasks/?",
             ApiServersServerTasksIndexHandler,

From fb16be6a6444bb8cd549803a585c5079dd458216 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 20 May 2023 17:49:51 -0400
Subject: [PATCH 003/210] Add index handlers (aware of the lint issue)

---
 .../servers/server/backups/backup/index.py    |  53 +++++++++
 .../api/servers/server/backups/index.py       | 104 ++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 app/classes/web/routes/api/servers/server/backups/backup/index.py
 create mode 100644 app/classes/web/routes/api/servers/server/backups/index.py

diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
new file mode 100644
index 00000000..5c7a6f86
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -0,0 +1,53 @@
+import logging
+import json
+import os
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.shared.file_helpers import FileHelpers
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+
+class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
+    def get(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        self.finish_json(200, self.controller.management.get_backup_config(server_id))
+
+    def delete(self, server_id: str, backup_name: str):
+        auth_data = self.authenticate_user()
+        backup_conf = self.controller.management.get_backup_config(server_id)
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            FileHelpers.del_file(os.path.join(backup_conf["backup_path"], backup_name))
+        except Exception:
+            return self.finish_json(
+                400, {"status": "error", "error": "NO BACKUP FOUND"}
+            )
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Edited server {server_id}: removed backup {backup_name}",
+            server_id,
+            self.get_remote_ip(),
+        )
+
+        return self.finish_json(200, {"status": "ok"})
diff --git a/app/classes/web/routes/api/servers/server/backups/index.py b/app/classes/web/routes/api/servers/server/backups/index.py
new file mode 100644
index 00000000..ac2111db
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/backups/index.py
@@ -0,0 +1,104 @@
+import logging
+import json
+import os
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.shared.file_helpers import FileHelpers
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+backup_patch_schema = {
+    "type": "object",
+    "properties": {
+        "path": {"type": "string", "minLength": 1},
+        "max": {"type": "int"},
+        "compress": {"type": "boolean"},
+        "shutdown": {"type": "boolean"},
+        "before_command": {"type": "string"},
+        "after_command": {"type": "string"},
+        "exclusions": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+basic_backup_patch_schema = {
+    "type": "object",
+    "properties": {
+        "max": {"type": "int"},
+        "compress": {"type": "boolean"},
+        "shutdown": {"type": "boolean"},
+        "before_command": {"type": "string"},
+        "after_command": {"type": "string"},
+        "exclusions": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiServersServerBackupsIndexHandler(BaseApiHandler):
+    def get(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        self.finish_json(200, self.controller.management.get_backup_config(server_id))
+
+    def patch(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, backup_patch_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        self.controller.management.set_backup_config(
+            data["server_id"],
+            data["backup_path"],
+            data["max_backups"],
+            data["excluded_dirs"],
+            data["compress"],
+            data["shutdown"],
+            data["before"],
+            data["after"],
+        )
+        return self.finish(200, {"status": "ok"})

From 03cfdc0aa11159392f09ff7189f42ac6044d6748 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 12:00:03 -0400
Subject: [PATCH 004/210] Add perms for webhooks

---
 app/classes/web/panel_handler.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index b7219ac6..cb6fd9cc 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -576,6 +576,7 @@ class PanelHandler(BaseHandler):
                 "Files": EnumPermissionsServer.FILES,
                 "Config": EnumPermissionsServer.CONFIG,
                 "Players": EnumPermissionsServer.PLAYERS,
+                "Webhooks": EnumPermissionsServer.WEBHOOKS,
             }
             page_data[
                 "user_permissions"
@@ -749,6 +750,17 @@ class PanelHandler(BaseHandler):
                 page_data["history_stats"] = self.controller.servers.get_history_stats(
                     server_id, days
                 )
+            if subpage == "webhooks":
+                if (
+                    not page_data["permissions"]["Webhooks"]
+                    in page_data["user_permissions"]
+                ):
+                    if not superuser:
+                        self.redirect(
+                            "/panel/error?error=Unauthorized access to Webhooks Config"
+                        )
+                        return
+                page_data[""]
 
             def get_banned_players_html():
                 banned_players = self.controller.servers.get_banned_players(server_id)

From e228f04345d6846151cfe0e8fd4c78aa8fb47b37 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 12:18:07 -0400
Subject: [PATCH 005/210] Remove permissions work

---
 app/classes/web/panel_handler.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 4297d698..692bcff4 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -576,7 +576,6 @@ class PanelHandler(BaseHandler):
                 "Files": EnumPermissionsServer.FILES,
                 "Config": EnumPermissionsServer.CONFIG,
                 "Players": EnumPermissionsServer.PLAYERS,
-                "Webhooks": EnumPermissionsServer.WEBHOOKS,
             }
             page_data[
                 "user_permissions"
@@ -752,7 +751,7 @@ class PanelHandler(BaseHandler):
                 )
             if subpage == "webhooks":
                 if (
-                    not page_data["permissions"]["Webhooks"]
+                    not page_data["permissions"]["Config"]
                     in page_data["user_permissions"]
                 ):
                     if not superuser:
@@ -760,7 +759,6 @@ class PanelHandler(BaseHandler):
                             "/panel/error?error=Unauthorized access to Webhooks Config"
                         )
                         return
-                page_data[""]
 
             def get_banned_players_html():
                 banned_players = self.controller.servers.get_banned_players(server_id)

From b15477ca4ca894171885f4f26b476515d3d705ae Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 12:19:05 -0400
Subject: [PATCH 006/210] Add providers

---
 app/classes/web/webhook_handler.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index c972cff1..15b48b34 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -6,6 +6,22 @@ logger = logging.getLogger(__name__)
 
 
 class WebhookHandler:
+    @staticmethod
+    def get_providers():
+        return [
+            "Discord",
+            "Home Assistant",
+            "Mattermost",
+            "Opsgenie",
+            "Signal",
+            "Slack",
+            "SMTP",
+            "Splunk",
+            "Teams",
+            "Telegram",
+            "Custom",
+        ]
+
     @staticmethod
     def send_discord_webhook(title, message, color):
         dataset = {
@@ -23,7 +39,7 @@ class WebhookHandler:
         logger.debug(
             "Webhook response: "
             + requests.post(
-                "https://discord.com/api/webhooks/1107017140004995081/leFCJ4g_Uw6ZwxaZXTLmi-L7njIFwVvFbf3JEHnAvUJAd90PoMknlivel0rosfnFed77",
+                "",
                 data=json.dumps(dataset),
                 headers={"Content-type": "application/json"},
             ),

From 7c72dfc241aba6724c8501a7a15f74550e8e6812 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 12:21:23 -0400
Subject: [PATCH 007/210] Add webhook front end

---
 .../panel/parts/m_server_controls_list.html   |   3 +
 .../panel/parts/server_controls_list.html     |   6 +
 .../templates/panel/server_webhooks.html      | 280 ++++++++++++++++++
 3 files changed, 289 insertions(+)
 create mode 100644 app/frontend/templates/panel/server_webhooks.html

diff --git a/app/frontend/templates/panel/parts/m_server_controls_list.html b/app/frontend/templates/panel/parts/m_server_controls_list.html
index 63c6b98a..6c645881 100644
--- a/app/frontend/templates/panel/parts/m_server_controls_list.html
+++ b/app/frontend/templates/panel/parts/m_server_controls_list.html
@@ -31,6 +31,9 @@
             <a class="dropdown-item {% if data['active_link'] == 'admin_controls' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=admin_controls" role="tab" aria-selected="true"><i class="fas fa-users"></i> {{ translate('serverDetails', 'playerControls', data['lang']) }}</a>
             {% end %}
             <a class="dropdown-item {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true"><i class="fa-solid fa-chart-line"></i> {{ translate('serverDetails', 'metrics', data['lang']) }}</a>
+            {% if data['permissions']['Config'] in data['user_permissions'] %}
+            <a class="dropdown-item {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true"><i class="fas fa-users"></i>Webhooks</a>
+            {% end %}
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/app/frontend/templates/panel/parts/server_controls_list.html b/app/frontend/templates/panel/parts/server_controls_list.html
index 4f5bb6b5..09c9b213 100644
--- a/app/frontend/templates/panel/parts/server_controls_list.html
+++ b/app/frontend/templates/panel/parts/server_controls_list.html
@@ -53,4 +53,10 @@
         <a class="nav-link {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true">
             <i class="fa-solid fa-chart-line"></i>{{ translate('serverDetails', 'metrics', data['lang']) }}</a>
     </li>
+    {% if data['permissions']['Webhooks'] in data['user_permissions'] %}
+    <li class="nav-item term-nav-item">
+        <a class="nav-link {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true">
+        <i class="fas fa-users"></i>Webhooks</a>
+    </li>
+    {% end %}
 </ul>
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
new file mode 100644
index 00000000..b8552401
--- /dev/null
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -0,0 +1,280 @@
+{% extends ../base.html %}
+
+{% block meta %}
+{% end %}
+
+{% block title %}Crafty Controller - {{ translate('serverDetails', 'serverDetails', data['lang']) }}{% end %}
+
+{% block content %}
+
+<div class="content-wrapper">
+
+  <!-- Page Title Header Starts-->
+  <div class="row page-title-header">
+    <div class="col-12">
+      <div class="page-header">
+        <h4 class="page-title">
+          {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{
+          data['server_stats']['server_id']['server_name'] }}
+          <br />
+          <small>UUID: {{ data['server_stats']['server_id']['server_uuid'] }}</small>
+        </h4>
+      </div>
+    </div>
+
+  </div>
+  <!-- Page Title Header Ends-->
+
+  {% include "parts/details_stats.html" %}
+
+  <div class="row">
+
+    <div class="col-sm-12 grid-margin">
+      <div class="card">
+        <div class="card-body  pt-0">
+
+          <span class="d-none d-sm-block">
+            {% include "parts/server_controls_list.html" %}
+          </span>
+          <span class="d-block d-sm-none">
+            {% include "parts/m_server_controls_list.html" %}
+          </span>
+
+          <div class="row">
+            <div class="col-md-12 col-sm-12" style="overflow-x:auto;">
+              <div class="card">
+                <div class="card-header header-sm d-flex justify-content-between align-items-center">
+                  <h4 class="card-title"><i class="fas fa-calendar"></i> {{ translate('serverSchedules',
+                    'scheduledTasks', data['lang']) }} </h4>
+                  {% if data['user_data']['hints'] %}
+                  <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" ,
+                    data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" ,
+                    data-placement="bottom"></span>
+                  {% end %}
+                  <div><button
+                      onclick="location.href=`/panel/add_schedule?id={{ data['server_stats']['server_id']['server_id'] }}`"
+                      class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}<i
+                        class="fas fa-pencil-alt"></i></button></div>
+                </div>
+                <div class="card-body">
+                </div>
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+  <style>
+    .popover-body {
+      color: white !important;
+      ;
+    }
+
+    .toggle-handle {
+      background-color: white !important;
+    }
+
+    .toggle-on {
+      color: black !important;
+    }
+
+    .toggle {
+      height: 0px !important;
+    }
+  </style>
+
+
+
+</div>
+<style>
+  /* Hide scrollbar for Chrome, Safari and Opera */
+  td::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* Hide scrollbar for IE, Edge and Firefox */
+  td {
+    -ms-overflow-style: none;
+    /* IE and Edge */
+    scrollbar-width: none;
+    /* Firefox */
+  }
+</style>
+<!-- content-wrapper ends -->
+
+{% end %}
+
+{% block js %}
+<script>
+
+  function debounce(func, timeout = 300) {
+    let timer;
+    return (...args) => {
+      clearTimeout(timer);
+      timer = setTimeout(() => { func.apply(this, args); }, timeout);
+    };
+  }
+
+  $(() => {
+    $('.schedule-enabled-toggle').bootstrapToggle({
+      on: 'Yes',
+      off: 'No',
+      onstyle: 'success',
+      offstyle: 'danger',
+    })
+    $('.schedule-enabled-toggle').each(function () {
+      const enabled = JSON.parse(this.getAttribute('data-schedule-enabled'));
+      $(this).bootstrapToggle(enabled ? 'on' : 'off')
+    })
+    $('.schedule-enabled-toggle').change(function () {
+      const id = this.getAttribute('data-schedule-id');
+      const enabled = this.checked;
+
+      fetch(`/api/v2/servers/{{data['server_id']}}/tasks/${id}`, {
+        method: 'PATCH',
+        body: JSON.stringify({ enabled }),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      })
+    });
+  })
+
+  const serverId = new URLSearchParams(document.location.search).get('id')
+
+  $(document).ready(function () {
+    console.log('ready for JS!')
+    $('#schedule_table').DataTable({
+      'order': [4, 'asc'],
+    }
+    );
+
+  });
+  $(document).ready(function () {
+    console.log('ready for JS!')
+    $('#mini_schedule_table').DataTable({
+      'order': [2, 'asc']
+    }
+    );
+    document.getElementById('mini_schedule_table_wrapper').hidden = true;
+  });
+  $(document).ready(function () {
+    $('[data-toggle="popover"]').popover();
+    if ($(window).width() < 1000) {
+      $('.too_small').popover("show");
+      document.getElementById('schedule_table_wrapper').hidden = true;
+      document.getElementById('mini_schedule_table_wrapper').hidden = false;
+    }
+
+  });
+  $(window).ready(function () {
+    $('body').click(function () {
+      $('.too_small').popover("hide");
+    });
+  });
+  $(window).resize(function () {
+    // This will execute whenever the window is resized
+    if ($(window).width() < 1000) {
+      $('.too_small').popover("show");
+      document.getElementById('schedule_table_wrapper').hidden = true;
+      document.getElementById('mini_schedule_table_wrapper').hidden = false;
+    }
+    else {
+      $('.too_small').popover("hide");
+      document.getElementById('schedule_table_wrapper').hidden = false;
+      document.getElementById('mini_schedule_table_wrapper').hidden = true;
+    } // New width
+  });
+</script>
+<script>
+
+
+  //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
+  function getCookie(name) {
+    var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+    return r ? r[1] : undefined;
+  }
+
+  $(document).ready(function () {
+    console.log("ready!");
+
+  });
+
+  function yesnoCheck(that) {
+    if (that.value == "command") {
+      document.getElementById("ifYes").style.display = "block";
+      document.getElementById("command").required = true;
+    } else {
+      document.getElementById("ifYes").style.display = "none";
+      document.getElementById("command").required = false;
+    }
+  }
+  function basicAdvanced(that) {
+    if (that.value == "advanced") {
+      document.getElementById("ifAdvanced").style.display = "block";
+      document.getElementById("ifBasic").style.display = "none";
+      document.getElementById("interval").required = false;
+      document.getElementById("time").required = false;
+    } else {
+      document.getElementById("ifAdvanced").style.display = "none";
+      document.getElementById("ifBasic").style.display = "block";
+      document.getElementById("interval").required = true;
+      document.getElementById("time").required = true;
+    }
+  }
+  function ifDays(that) {
+    if (that.value == "days") {
+      document.getElementById("ifDays").style.display = "block";
+      document.getElementById("time").required = true;
+    } else {
+      document.getElementById("ifDays").style.display = "none";
+      document.getElementById("time").required = false;
+    }
+  }
+
+  $(".del_button").click(function () {
+    var sch_id = $(this).data('sch');
+
+    console.log(sch_id)
+
+    bootbox.confirm({
+      title: "{{ translate('serverSchedules', 'areYouSure', data['lang']) }}",
+      message: "{{ translate('serverSchedules', 'confirmDelete', data['lang']) }}",
+      buttons: {
+        cancel: {
+          label: '<i class="fas fa-times"></i> {{ translate("serverSchedules", "cancel", data['lang']) }}'
+          },
+        confirm: {
+          className: 'btn-outline-danger',
+          label: '<i class="fas fa-check"></i> {{ translate("serverSchedules", "confirm", data['lang']) }}'
+          }
+      },
+      callback: function (result) {
+        console.log(result);
+        if (result == true) {
+          del_task(sch_id, serverId);
+        }
+      }
+    });
+  });
+
+  async function del_task(sch_id, id) {
+    var token = getCookie("_xsrf")
+
+    let res = await fetch(`/api/v2/servers/${id}/tasks/${sch_id}`, {
+      method: 'DELETE',
+      headers: {
+        'token': token,
+      },
+    });
+    let responseData = await res;
+    if (responseData.statusText === "OK") {
+      window.location.reload();
+    }
+  }
+
+</script>
+
+{% end %}
\ No newline at end of file

From fb2bcd7e4eebf02d0a1dc702c5eeda34e20faf53 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 12:22:10 -0400
Subject: [PATCH 008/210] Fix permissions on webhooks nav

---
 app/frontend/templates/panel/parts/server_controls_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/parts/server_controls_list.html b/app/frontend/templates/panel/parts/server_controls_list.html
index 09c9b213..39360f72 100644
--- a/app/frontend/templates/panel/parts/server_controls_list.html
+++ b/app/frontend/templates/panel/parts/server_controls_list.html
@@ -53,7 +53,7 @@
         <a class="nav-link {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true">
             <i class="fa-solid fa-chart-line"></i>{{ translate('serverDetails', 'metrics', data['lang']) }}</a>
     </li>
-    {% if data['permissions']['Webhooks'] in data['user_permissions'] %}
+    {% if data['permissions']['Config'] in data['user_permissions'] %}
     <li class="nav-item term-nav-item">
         <a class="nav-link {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true">
         <i class="fas fa-users"></i>Webhooks</a>

From cc157f86bbd3408d1305d7615b26da72f78ec196 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 13:35:29 -0400
Subject: [PATCH 009/210] Setup webhooks database

---
 app/classes/models/management.py    | 61 +++++++++++++++++++++++++++--
 app/migrations/20230603_webhooks.py | 26 ++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 app/migrations/20230603_webhooks.py

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 73a0d9f4..d7d93235 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -77,11 +77,14 @@ class HostStats(BaseModel):
 # **********************************************************************************
 class Webhooks(BaseModel):
     id = AutoField()
-    name = CharField(max_length=64, unique=True, index=True)
-    method = CharField(default="POST")
+    server_id = IntegerField(null=True)
+    name = CharField(default="Custom Webhook", max_length=64)
     url = CharField(unique=True)
-    event = CharField(default="")
-    send_data = BooleanField(default=True)
+    webhook_type = CharField(default="Custom")
+    bot_name = CharField(default="Crafty Controller")
+    triggers = CharField(default="server_start,server_stop")
+    body = CharField(default="")
+    enabled = BooleanField(default=True)
 
     class Meta:
         table_name = "webhooks"
@@ -501,3 +504,53 @@ class HelpersManagement:
                 f"Not removing {dir_to_del} from excluded directories - "
                 f"not in the excluded directory list for server ID {server_id}"
             )
+
+
+# **********************************************************************************
+#                                   Webhooks Class
+# **********************************************************************************
+class HelpersWebhooks:
+    def __init__(self, database):
+        self.database = database
+
+    @staticmethod
+    def create_webhook(
+        server_id: int,
+        webhook_type: str,
+        name: str,
+        url: str,
+        bot_name: str,
+        body: str,
+        triggers: str,
+        enabled: bool,
+    ) -> int:
+        """Create a webhook in the database
+
+        Args:
+            server_id: ID of a server this webhook will be married to
+            name: The name of the webhook
+            url: URL to the webhook
+            webhook_type: The provider this webhook will be sent to
+            bot name: The name that will appear when the webhook is sent
+            triggers: Server actions that will trigger this webhook
+            body: The message body of the webhook
+            enabled: Should Crafty trigger the webhook
+
+        Returns:
+            int: The new webhooks's id
+
+        Raises:
+            PeeweeException: If the webhook already exists
+        """
+        return Webhooks.insert(
+            {
+                Webhooks.server_id: server_id,
+                Webhooks.name: name,
+                Webhooks.webhook_type: webhook_type,
+                Webhooks.url: url,
+                Webhooks.bot_name: bot_name,
+                Webhooks.body: body,
+                Webhooks.triggers: triggers,
+                Webhooks.enabled: enabled,
+            }
+        ).execute()
diff --git a/app/migrations/20230603_webhooks.py b/app/migrations/20230603_webhooks.py
new file mode 100644
index 00000000..6470d5fc
--- /dev/null
+++ b/app/migrations/20230603_webhooks.py
@@ -0,0 +1,26 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.drop_columns("webhooks", ["name", "method", "url", "event", "send_data"])
+    migrator.add_columns(
+        "webhooks",
+        server_id=peewee.IntegerField(null=True),
+        webhook_type=peewee.CharField(default="Custom"),
+        name=peewee.CharField(default="Custom Webhook", max_length=64),
+        url=peewee.CharField(default=""),
+        bot_name=peewee.CharField(default="Crafty Controller"),
+        trigger=peewee.CharField(default="server_start,server_stop"),
+        body=peewee.CharField(default=""),
+        enabled=peewee.BooleanField(default=True),
+    )
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    """
+    Write your rollback migrations here.
+    """

From 67a5e65b46492cdfd083f6178173fa319d8005bd Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 13:36:20 -0400
Subject: [PATCH 010/210] Remove webhooks

---
 app/classes/shared/server.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 9cecc6ce..ebaec284 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -31,7 +31,6 @@ from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
-from app.classes.web.webhook_handler import WebhookHandler
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -513,9 +512,6 @@ class ServerInstance:
         if self.process.poll() is None:
             logger.info(f"Server {self.name} running with PID {self.process.pid}")
             Console.info(f"Server {self.name} running with PID {self.process.pid}")
-            WebhookHandler.send_discord_webhook(
-                "Crafty Controller", f"{self.name} started!", 65354
-            )
             self.is_crashed = False
             self.stats_helper.server_crash_reset()
             self.record_server_stats()
@@ -811,9 +807,6 @@ class ServerInstance:
 
         logger.info(f"Stopped Server {server_name} with PID {server_pid}")
         Console.info(f"Stopped Server {server_name} with PID {server_pid}")
-        WebhookHandler.send_discord_webhook(
-            "Crafty Controller", f"{self.name} was stopped!", 16748076
-        )
 
         # massive resetting of variables
         self.cleanup_server_object()
@@ -898,11 +891,6 @@ class ServerInstance:
                 f"Restarting server"
             )
 
-            WebhookHandler.send_discord_webhook(
-                "Crafty Controller",
-                f"{self.name} crashed! Crafty Controller is attempting to start it back up!",
-                16711680,
-            )
             self.run_threaded_server(None)
             return True
         logger.critical(

From 0adc129462ca680a644ab3676f9f3ddaba67d370 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 13:36:38 -0400
Subject: [PATCH 011/210] Inital commit for webhooks on frontend

---
 app/classes/web/panel_handler.py              |  43 +++
 .../templates/panel/server_webhook_edit.html  | 261 ++++++++++++++++++
 .../templates/panel/server_webhooks.html      |   2 +-
 3 files changed, 305 insertions(+), 1 deletion(-)
 create mode 100644 app/frontend/templates/panel/server_webhook_edit.html

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 692bcff4..454cbd4d 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -25,6 +25,7 @@ from app.classes.controllers.roles_controller import RolesController
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
+from app.classes.web.webhook_handler import WebhookHandler
 
 logger = logging.getLogger(__name__)
 
@@ -1039,6 +1040,48 @@ class PanelHandler(BaseHandler):
 
             template = "panel/panel_edit_user.html"
 
+        elif page == "add_webhook":
+            server_id = self.get_argument("id", None)
+            if server_id is None:
+                return self.redirect("/panel/error?error=Invalid Server ID")
+            server_obj = self.controller.servers.get_server_instance_by_id(server_id)
+            page_data["backup_failed"] = server_obj.last_backup_status()
+            server_obj = None
+            page_data["active_link"] = "webhooks"
+            page_data["server_data"] = self.controller.servers.get_server_data_by_id(
+                server_id
+            )
+            page_data[
+                "user_permissions"
+            ] = self.controller.server_perms.get_user_id_permissions_list(
+                exec_user["user_id"], server_id
+            )
+            page_data["permissions"] = {
+                "Commands": EnumPermissionsServer.COMMANDS,
+                "Terminal": EnumPermissionsServer.TERMINAL,
+                "Logs": EnumPermissionsServer.LOGS,
+                "Schedule": EnumPermissionsServer.SCHEDULE,
+                "Backup": EnumPermissionsServer.BACKUP,
+                "Files": EnumPermissionsServer.FILES,
+                "Config": EnumPermissionsServer.CONFIG,
+                "Players": EnumPermissionsServer.PLAYERS,
+            }
+            page_data["server_stats"] = self.controller.servers.get_server_stats_by_id(
+                server_id
+            )
+            page_data["server_stats"][
+                "server_type"
+            ] = self.controller.servers.get_server_type_by_id(server_id)
+            page_data["new_webhook"] = True
+            page_data["providers"] = WebhookHandler.get_providers()
+
+            if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
+                if not superuser:
+                    self.redirect("/panel/error?error=Unauthorized access To Webhooks")
+                    return
+
+            template = "panel/server_webhook_edit.html"
+
         elif page == "add_schedule":
             server_id = self.get_argument("id", None)
             if server_id is None:
diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
new file mode 100644
index 00000000..8baed81f
--- /dev/null
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -0,0 +1,261 @@
+{% extends ../base.html %}
+
+{% block meta %}
+{% end %}
+
+{% block title %}Crafty Controller - {{ translate('serverDetails', 'serverDetails', data['lang']) }}{% end %}
+
+{% block content %}
+
+<div class="content-wrapper">
+
+  <!-- Page Title Header Starts-->
+  <div class="row page-title-header">
+    <div class="col-12">
+      <div class="page-header">
+        <h4 class="page-title">
+          {{ translate('serverDetails', 'serverDetails', data['lang']) }} - {{
+          data['server_stats']['server_id']['server_name'] }}
+          <br />
+          <small>UUID: {{ data['server_stats']['server_id']['server_uuid'] }}</small>
+        </h4>
+      </div>
+    </div>
+
+  </div>
+  <!-- Page Title Header Ends-->
+
+  {% include "parts/details_stats.html" %}
+
+  <div class="row">
+
+    <div class="col-sm-12 grid-margin">
+      <div class="card">
+        <div class="card-body  pt-0">
+          {% include "parts/server_controls_list.html" %}
+
+          <div class="row">
+            <div class="col-md-8 col-sm-8">
+              {% if data['new_webhook'] == True %}
+              <form class="forms-sample" method="post" id="new_webhook_form"
+                action="/panel/new_webhook?id={{ data['server_stats']['server_id']['server_id'] }}">
+                {% else %}
+                <form class="forms-sample" method="post" id="schedule_form"
+                  action="/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['schedule']['schedule_id'] }}">
+                  {% end %}
+                  <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type"
+                  form="role_form">
+                  {% for type in data['providers'] %}
+                  <option value="{{type}}">{{type}}</option>
+                  {% end %}
+                </select>
+                <br>
+                <br>
+                  <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{
+                    translate('serverConfig', 'save', data['lang']) }}</button>
+                  <button type="reset"
+                    onclick="location.href=`/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=schedules`"
+                    class="btn btn-light"><i class="fas fa-times"></i> {{ translate('serverConfig', 'cancel',
+                    data['lang']) }}</button>
+                </form>
+            </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+
+  </div>
+  <!-- content-wrapper ends -->
+
+  {% end %}
+
+  {% block js %}
+  <script>
+
+
+    //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
+    function getCookie(name) {
+      var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+      return r ? r[1] : undefined;
+    }
+
+    function replacer(key, value) {
+    if (key != "start_time" && key != "cron_string" && key != "interval_type") {
+      if (typeof value == "boolean") {
+        return value
+      } 
+      console.log(key)
+      if (key === "interval" && value === ""){
+        return 0;
+      }
+      if (key === "command" && typeof(value === "integer")){
+        return value.toString();
+      }else {
+        return (isNaN(value) ? value : +value);
+      }
+    } else {
+      if (value === "" && key == "start_time"){
+        return "00:00";
+      }else{
+        return value;
+      }
+    }
+  }
+
+    const serverId = new URLSearchParams(document.location.search).get('id');
+    const schId = new URLSearchParams(document.location.search).get('sch_id');
+    $(document).ready(function () {
+      console.log("ready!");
+      $("#new_schedule_form").on("submit", async function (e) {
+      e.preventDefault();
+      var token = getCookie("_xsrf")
+      let schForm = document.getElementById("new_schedule_form");
+
+      let formData = new FormData(schForm);
+      formData.delete("difficulty");
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      //We need to make sure these are sent regardless of whether or not they're checked
+      formDataObject.enabled = $("#enabled").prop('checked');
+      formDataObject.one_time = $("#one_time").prop('checked');
+      if ($("#difficulty").val() == "reaction"){
+        formDataObject.interval_type = "reaction";
+      }
+      if ($("#action").val() != "command"){
+        formDataObject.command = formDataObject.action + "_server";
+      }
+      if (formDataObject.cron_string != ""){
+        formDataObject.interval_type = '';
+      }
+      console.log(formDataObject);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(formDataObject, replacer);
+
+      let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token,
+          "Content-Type": "application/json",
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+          });
+      } 
+    });
+
+    $("#schedule_form").on("submit", async function (e) {
+      e.preventDefault();
+      var token = getCookie("_xsrf")
+      let schForm = document.getElementById("schedule_form");
+
+      let formData = new FormData(schForm);
+      formData.delete("difficulty");
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      //We need to make sure these are sent regardless of whether or not they're checked
+      formDataObject.enabled = $("#enabled").prop('checked');
+      formDataObject.one_time = $("#one_time").prop('checked');
+      if ($("#difficulty").val() == "reaction"){
+        formDataObject.interval_type = "reaction";
+      }
+      if ($("#action").val() != "command"){
+        formDataObject.command = formDataObject.action + "_server";
+      }
+      if (formDataObject.cron_string != ""){
+        formDataObject.interval_type = '';
+      }
+      console.log(formDataObject);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(formDataObject, replacer);
+
+      console.log(formDataJsonString);
+
+      let res = await fetch(`/api/v2/servers/${serverId}/tasks/${schId}`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token,
+          "Content-Type": "application/json", 
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+          });
+      } 
+    });
+
+    });
+
+    function yesnoCheck() {
+      if (document.getElementById('action').value == "command") {
+        document.getElementById("ifYes").style.display = "block";
+        document.getElementById("command_input").required = true;
+      } else {
+        document.getElementById("ifYes").style.display = "none";
+        document.getElementById("command_input").required = false;
+      }
+    }
+    function basicAdvanced() {
+      if (document.getElementById('difficulty').value == "advanced") {
+        document.getElementById("ifAdvanced").style.display = "block";
+        document.getElementById("ifReaction").style.display = "none";
+        document.getElementById("ifBasic").style.display = "none";
+        document.getElementById("delay").required = false;
+        document.getElementById("parent").required = false;
+        document.getElementById("interval").required = false;
+        document.getElementById("time").required = false;
+      } else if (document.getElementById('difficulty').value == "reaction") {
+        document.getElementById("ifReaction").style.display = "block";
+        document.getElementById("ifBasic").style.display = "none";
+        document.getElementById("ifAdvanced").style.display = "none";
+        document.getElementById("delay").required = true;
+        document.getElementById("parent").required = true;
+        document.getElementById("interval").required = false;
+        document.getElementById("time").required = false;
+        $("#cron").val("");
+      }
+      else {
+        document.getElementById("ifAdvanced").style.display = "none";
+        document.getElementById("ifReaction").style.display = "none";
+        document.getElementById("ifBasic").style.display = "block";
+        document.getElementById("delay").required = false;
+        document.getElementById("parent").required = false;
+        document.getElementById("interval").required = true;
+        document.getElementById("time").required = true;
+        $("#cron").val("");
+      }
+    }
+    function ifDays() {
+      if (document.getElementById('interval_type').value == "days") {
+        document.getElementById("ifDays").style.display = "block";
+        document.getElementById("time").required = true;
+      } else {
+        document.getElementById("ifDays").style.display = "none";
+        document.getElementById("time").required = false;
+      }
+    }
+
+    function startup() {
+    }
+
+    window.onload(startup())
+  </script>
+
+  {% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
index b8552401..e0342c4b 100644
--- a/app/frontend/templates/panel/server_webhooks.html
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -52,7 +52,7 @@
                     data-placement="bottom"></span>
                   {% end %}
                   <div><button
-                      onclick="location.href=`/panel/add_schedule?id={{ data['server_stats']['server_id']['server_id'] }}`"
+                      onclick="location.href=`/panel/add_webhook?id={{ data['server_stats']['server_id']['server_id'] }}`"
                       class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}<i
                         class="fas fa-pencil-alt"></i></button></div>
                 </div>

From 50c515b2aa3f552b60a9a7f29d1e4630aba2e784 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 15:05:08 -0400
Subject: [PATCH 012/210] Add database methods

---
 .../controllers/management_controller.py      | 29 ++++++++-
 app/classes/models/management.py              | 64 +++++++++++++------
 2 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index 7c423da9..71327c1c 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -1,7 +1,7 @@
 import logging
 import queue
 
-from app.classes.models.management import HelpersManagement
+from app.classes.models.management import HelpersManagement, HelpersWebhooks
 from app.classes.models.servers import HelperServers
 
 logger = logging.getLogger(__name__)
@@ -206,3 +206,30 @@ class ManagementController:
     @staticmethod
     def set_master_server_dir(server_dir):
         HelpersManagement.set_master_server_dir(server_dir)
+
+    # **********************************************************************************
+    #                                   Webhooks Methods
+    # **********************************************************************************
+    @staticmethod
+    def create_webhook(data):
+        return HelpersWebhooks.create_webhook(data)
+
+    @staticmethod
+    def modify_webhook(webhook_id, data):
+        HelpersWebhooks.modify_webhook(webhook_id, data)
+
+    @staticmethod
+    def get_webhook_by_id(webhook_id):
+        return HelpersWebhooks.get_webhook_by_id(webhook_id)
+
+    @staticmethod
+    def get_webhooks_by_server(server_id):
+        return HelpersWebhooks.get_webhooks_by_server(server_id)
+
+    @staticmethod
+    def delete_webhook(webhook_id):
+        HelpersWebhooks.delete_webhook(webhook_id)
+
+    @staticmethod
+    def delete_webhook_by_server(server_id):
+        HelpersWebhooks.delete_webhooks_by_server(server_id)
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index d7d93235..6166dcd0 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -79,10 +79,10 @@ class Webhooks(BaseModel):
     id = AutoField()
     server_id = IntegerField(null=True)
     name = CharField(default="Custom Webhook", max_length=64)
-    url = CharField(unique=True)
+    url = CharField(default="")
     webhook_type = CharField(default="Custom")
     bot_name = CharField(default="Crafty Controller")
-    triggers = CharField(default="server_start,server_stop")
+    trigger = CharField(default="server_start,server_stop")
     body = CharField(default="")
     enabled = BooleanField(default=True)
 
@@ -514,16 +514,7 @@ class HelpersWebhooks:
         self.database = database
 
     @staticmethod
-    def create_webhook(
-        server_id: int,
-        webhook_type: str,
-        name: str,
-        url: str,
-        bot_name: str,
-        body: str,
-        triggers: str,
-        enabled: bool,
-    ) -> int:
+    def create_webhook(create_data) -> int:
         """Create a webhook in the database
 
         Args:
@@ -544,13 +535,46 @@ class HelpersWebhooks:
         """
         return Webhooks.insert(
             {
-                Webhooks.server_id: server_id,
-                Webhooks.name: name,
-                Webhooks.webhook_type: webhook_type,
-                Webhooks.url: url,
-                Webhooks.bot_name: bot_name,
-                Webhooks.body: body,
-                Webhooks.triggers: triggers,
-                Webhooks.enabled: enabled,
+                Webhooks.server_id: create_data["server_id"],
+                Webhooks.name: create_data["name"],
+                Webhooks.webhook_type: create_data["webhook_type"],
+                Webhooks.url: create_data["url"],
+                Webhooks.bot_name: create_data["bot_name"],
+                Webhooks.body: create_data["body"],
+                Webhooks.trigger: create_data["trigger"],
+                Webhooks.enabled: create_data["enabled"],
             }
         ).execute()
+
+    @staticmethod
+    def modify_webhook(webhook_id, updata):
+        Webhooks.update(updata).where(Webhooks.id == webhook_id).execute()
+
+    @staticmethod
+    def get_webhook_by_id(webhook_id):
+        return model_to_dict(Webhooks.get(Webhooks.id == webhook_id))
+
+    @staticmethod
+    def get_webhooks_by_server(server_id):
+        data = {}
+        for webhook in (
+            Webhooks.select().where(Webhooks.server_id == server_id).execute()
+        ):
+            data[str(webhook.id)] = {
+                "webhook_type": webhook.webhook_type,
+                "name": webhook.name,
+                "url": webhook.url,
+                "bot_name": webhook.bot_name,
+                "trigger": webhook.trigger,
+                "body": webhook.body,
+                "enabled": webhook.enabled,
+            }
+        return data
+
+    @staticmethod
+    def delete_webhook(webhook_id):
+        Webhooks.delete().where(Webhooks.id == webhook_id).execute()
+
+    @staticmethod
+    def delete_webhooks_by_server(server_id):
+        Webhooks.delete().where(Webhooks.server_id == server_id).execute()

From f1ed96595d491e22e048b34b1abbbb1bfcfa5a21 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 15:05:21 -0400
Subject: [PATCH 013/210] Add first monitored actions

---
 app/classes/web/webhook_handler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index 15b48b34..7c1bc1c7 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -22,6 +22,10 @@ class WebhookHandler:
             "Custom",
         ]
 
+    @staticmethod
+    def get_monitored_actions():
+        return ["server_start", "server_stop", "server_crash", "server_backup"]
+
     @staticmethod
     def send_discord_webhook(title, message, color):
         dataset = {

From cbd988ee5bd4e9071fbeae974c2eb71646f709a2 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 15:05:33 -0400
Subject: [PATCH 014/210] Add api routes

---
 app/classes/web/routes/api/api_handlers.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 29ee02c5..82a13168 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -32,6 +32,12 @@ from app.classes.web.routes.api.servers.server.tasks.task.children import (
 from app.classes.web.routes.api.servers.server.tasks.task.index import (
     ApiServersServerTasksTaskIndexHandler,
 )
+from app.classes.web.routes.api.servers.server.webhooks.index import (
+    ApiServersServerWebhooksIndexHandler,
+)
+from app.classes.web.routes.api.servers.server.webhooks.webhook.index import (
+    ApiServersServerWebhooksWebhookIndexHandler,
+)
 from app.classes.web.routes.api.servers.server.users import ApiServersServerUsersHandler
 from app.classes.web.routes.api.users.index import ApiUsersIndexHandler
 from app.classes.web.routes.api.users.user.index import ApiUsersUserIndexHandler
@@ -132,6 +138,16 @@ def api_handlers(handler_args):
             ApiServersServerStatsHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/([0-9]+)/webhook/([0-9]+)/?",
+            ApiServersServerWebhooksWebhookIndexHandler,
+            handler_args,
+        ),
+        (
+            r"/api/v2/servers/([0-9]+)/webhook/?",
+            ApiServersServerWebhooksIndexHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/action/([a-z_]+)/?",
             ApiServersServerActionHandler,

From 0877f650f44a5d7b88b6d2136eb8712a8253f48c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 15:05:44 -0400
Subject: [PATCH 015/210] Add api methods

---
 .../api/servers/server/webhooks/index.py      | 100 ++++++++++++
 .../servers/server/webhooks/webhook/index.py  | 152 ++++++++++++++++++
 2 files changed, 252 insertions(+)
 create mode 100644 app/classes/web/routes/api/servers/server/webhooks/index.py
 create mode 100644 app/classes/web/routes/api/servers/server/webhooks/webhook/index.py

diff --git a/app/classes/web/routes/api/servers/server/webhooks/index.py b/app/classes/web/routes/api/servers/server/webhooks/index.py
new file mode 100644
index 00000000..599a4f4c
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/webhooks/index.py
@@ -0,0 +1,100 @@
+# TODO: create and read
+
+import json
+import logging
+
+from jsonschema import ValidationError, validate
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.web.base_api_handler import BaseApiHandler
+from app.classes.web.webhook_handler import WebhookHandler
+
+
+logger = logging.getLogger(__name__)
+new_webhook_schema = {
+    "type": "object",
+    "properties": {
+        "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
+        "name": {"type": "string"},
+        "url": {"type": "string"},
+        "bot_name": {"type": "string"},
+        "trigger": {"type": "array"},
+        "body": {"type": "string"},
+        "enabled": {
+            "type": "boolean",
+            "default": True,
+        },
+    },
+    "additionalProperties": False,
+    "minProperties": 7,
+}
+
+
+class ApiServersServerWebhooksIndexHandler(BaseApiHandler):
+    def get(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.CONFIG
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        self.finish_json(
+            200, self.controller.management.get_webhooks_by_server(server_id)
+        )
+
+    def post(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, new_webhook_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.CONFIG
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        data["server_id"] = server_id
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Edited server {server_id}: added webhook",
+            server_id,
+            self.get_remote_ip(),
+        )
+        triggers = ""
+        for item in data["trigger"]:
+            string = item + ","
+            triggers += string
+        data["trigger"] = triggers
+        webhook_id = self.controller.management.create_webhook(data)
+
+        self.finish_json(200, {"status": "ok", "data": {"webhook_id": webhook_id}})
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
new file mode 100644
index 00000000..370f7360
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -0,0 +1,152 @@
+# TODO: read and delete
+
+import json
+import logging
+
+from croniter import croniter
+from jsonschema import ValidationError, validate
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.web.webhook_handler import WebhookHandler
+
+from app.classes.web.base_api_handler import BaseApiHandler
+
+
+logger = logging.getLogger(__name__)
+
+task_patch_schema = {
+    "type": "object",
+    "properties": {
+        "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
+        "name": {"type": "string"},
+        "url": {"type": "string"},
+        "bot_name": {"type": "string"},
+        "trigger": {"type": "array"},
+        "body": {"type": "string"},
+        "enabled": {
+            "type": "boolean",
+            "default": True,
+        },
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
+    def get(self, server_id: str, webhook_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.CONFIG
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        if (
+            not str(webhook_id)
+            in self.controller.management.get_webhooks_by_server(server_id).keys()
+        ):
+            return self.finish_json(
+                400, {"status": "error", "error": "NO WEBHOOK FOUND"}
+            )
+        self.finish_json(200, self.controller.management.get_webhook_by_id(webhook_id))
+
+    def delete(self, server_id: str, webhook_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.CONFIG
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            self.controller.management.delete_webhook(webhook_id)
+        except Exception:
+            return self.finish_json(
+                400, {"status": "error", "error": "NO WEBHOOK FOUND"}
+            )
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Edited server {server_id}: removed webhook",
+            server_id,
+            self.get_remote_ip(),
+        )
+
+        return self.finish_json(200, {"status": "ok"})
+
+    def patch(self, server_id: str, task_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, task_patch_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.SCHEDULE
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        # Checks to make sure some doofus didn't actually make the newly
+        # created task a child of itself.
+        if str(data.get("parent")) == str(task_id) and data.get("parent") is not None:
+            data["parent"] = None
+
+        data["server_id"] = server_id
+        if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
+            return self.finish_json(
+                405,
+                {
+                    "status": "error",
+                    "error": self.helper.translation.translate(
+                        "error",
+                        "cronFormat",
+                        self.controller.users.get_user_lang_by_id(
+                            auth_data[4]["user_id"]
+                        ),
+                    ),
+                },
+            )
+        self.tasks_manager.update_job(task_id, data)
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Edited server {server_id}: updated schedule",
+            server_id,
+            self.get_remote_ip(),
+        )
+        self.tasks_manager.reload_schedule_from_db()
+
+        self.finish_json(200, {"status": "ok"})

From 0a2b8694acbef4d32ff87b51d64c2c581c0a2ca1 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 15:24:28 -0400
Subject: [PATCH 016/210] Add webhook patch

---
 .../servers/server/webhooks/webhook/index.py  | 32 ++++---------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 370f7360..1cf588ff 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -13,7 +13,7 @@ from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
 
-task_patch_schema = {
+webhook_patch_schema = {
     "type": "object",
     "properties": {
         "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
@@ -82,7 +82,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
 
         return self.finish_json(200, {"status": "ok"})
 
-    def patch(self, server_id: str, task_id: str):
+    def patch(self, server_id: str, webhook_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -95,7 +95,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
             )
 
         try:
-            validate(data, task_patch_schema)
+            validate(data, webhook_patch_schema)
         except ValidationError as e:
             return self.finish_json(
                 400,
@@ -111,7 +111,7 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         if (
-            EnumPermissionsServer.SCHEDULE
+            EnumPermissionsServer.CONFIG
             not in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )
@@ -119,34 +119,14 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
             # if the user doesn't have Schedule permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
-        # Checks to make sure some doofus didn't actually make the newly
-        # created task a child of itself.
-        if str(data.get("parent")) == str(task_id) and data.get("parent") is not None:
-            data["parent"] = None
-
         data["server_id"] = server_id
-        if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
-            return self.finish_json(
-                405,
-                {
-                    "status": "error",
-                    "error": self.helper.translation.translate(
-                        "error",
-                        "cronFormat",
-                        self.controller.users.get_user_lang_by_id(
-                            auth_data[4]["user_id"]
-                        ),
-                    ),
-                },
-            )
-        self.tasks_manager.update_job(task_id, data)
+        self.controller.management.modify_webhook(webhook_id, data)
 
         self.controller.management.add_to_audit_log(
             auth_data[4]["user_id"],
-            f"Edited server {server_id}: updated schedule",
+            f"Edited server {server_id}: updated webhook",
             server_id,
             self.get_remote_ip(),
         )
-        self.tasks_manager.reload_schedule_from_db()
 
         self.finish_json(200, {"status": "ok"})

From 697c1392dc93640d4f7004dfa41e5ff8aac1d12b Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:10:39 -0400
Subject: [PATCH 017/210] Add webhooks to frontend

---
 .../templates/panel/server_webhook_edit.html  | 179 ++++++++--------
 .../templates/panel/server_webhooks.html      | 193 ++++++++++--------
 2 files changed, 185 insertions(+), 187 deletions(-)

diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index 8baed81f..a9252bc5 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -6,7 +6,7 @@
 {% block title %}Crafty Controller - {{ translate('serverDetails', 'serverDetails', data['lang']) }}{% end %}
 
 {% block content %}
-
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/css/bootstrap-select.min.css">
 <div class="content-wrapper">
 
   <!-- Page Title Header Starts-->
@@ -39,22 +39,61 @@
               {% if data['new_webhook'] == True %}
               <form class="forms-sample" method="post" id="new_webhook_form"
                 action="/panel/new_webhook?id={{ data['server_stats']['server_id']['server_id'] }}">
-                {% else %}
-                <form class="forms-sample" method="post" id="schedule_form"
-                  action="/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['schedule']['schedule_id'] }}">
-                  {% end %}
-                  <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type"
-                  form="role_form">
-                  {% for type in data['providers'] %}
-                  <option value="{{type}}">{{type}}</option>
-                  {% end %}
+              {% else %}
+              <form class="forms-sample" method="post" id="schedule_form"
+                action="/panel/edit_webhook?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['webhook']['id'] }}">
+              {% end %}
+                <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type">
+                {% for type in data['providers'] %}
+                <option value="{{type}}">{{type}}</option>
+                {% end %}
                 </select>
                 <br>
                 <br>
+                <div class="form-group">
+                  <label for="name">{{ translate('serverSchedules', 'name' , data['lang']) }}</label>
+                  <input type="input" class="form-control" name="name" id="name_input"
+                    value="{{ data['webhook']['name']}}" maxlength="30" placeholder="Name" required>
+                </div>
+                <div class="form-group">
+                  <label for="url">Webhook URL</label>
+                  <input type="input" class="form-control" name="url" id="url"
+                    value="{{ data['webhook']['url']}}" placeholder="https://webhooks.craftycontrol.com/fakeurl" required>
+                </div>
+                <div class="form-group">
+                  <label for="bot_name">Bot {{ translate('serverSchedules', 'name' , data['lang']) }}</label>
+                  <input type="input" class="form-control" name="bot_name" id="bot_name_input"
+                    value="{{ data['webhook']['bot_name']}}" maxlength="30" placeholder="Crafty Controller" required>
+                </div>
+                <div class="form-group">
+                  <label for="trigger">Trigger</label>
+                  <select class="form-control selectpicker show-tick" name="trigger" id="trigger-select" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
+                  {% for trigger in data['triggers'] %}
+                  {% if trigger in data["webhook"]["trigger"] %}
+                  <option selected>{{trigger}}</option>
+                  {% else %}
+                  <option>{{trigger}}</option>
+                  {% end %}
+                  {% end %}
+                  </select>
+                </div>
+                <div class="form-group">
+                  <label for="body">Body</label>
+                    <textarea id="body-input" name="body" rows="4" cols="50">
+                      {{ data["webhook"]["body"] }}
+                    </textarea>
+                </div>
+                <div class="form-check-flat">
+                  <label for="enabled" class="form-check-label ml-4 mb-4">
+                    <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked=""
+                      value="1">{{ translate('serverScheduleConfig', 'enabled' , data['lang']) }}
+                  </label>
+
+                </div>
                   <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{
                     translate('serverConfig', 'save', data['lang']) }}</button>
                   <button type="reset"
-                    onclick="location.href=`/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=schedules`"
+                    onclick="location.href=`/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks`"
                     class="btn btn-light"><i class="fas fa-times"></i> {{ translate('serverConfig', 'cancel',
                     data['lang']) }}</button>
                 </form>
@@ -68,6 +107,14 @@
 
 
   </div>
+  <style>
+    #body-input {
+      background-color: var(--card-banner-bg);
+      outline-color: var(--outline);
+      color: var(--base-text);
+      width: 100%;
+    }
+  </style>
   <!-- content-wrapper ends -->
 
   {% end %}
@@ -106,35 +153,30 @@
   }
 
     const serverId = new URLSearchParams(document.location.search).get('id');
-    const schId = new URLSearchParams(document.location.search).get('sch_id');
+    const webhookId = new URLSearchParams(document.location.search).get('webhook_id');
     $(document).ready(function () {
       console.log("ready!");
-      $("#new_schedule_form").on("submit", async function (e) {
+      console.log('ready for JS!');
+    $('.selectpicker').selectpicker("refresh");
+      $("#new_webhook_form").on("submit", async function (e) {
       e.preventDefault();
       var token = getCookie("_xsrf")
-      let schForm = document.getElementById("new_schedule_form");
+      let webhookForm = document.getElementById("new_webhook_form");
+      let select_val = JSON.stringify($('#trigger-select').val());
+      select_val = JSON.parse(select_val);
 
-      let formData = new FormData(schForm);
-      formData.delete("difficulty");
+      let formData = new FormData(webhookForm);
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       //We need to make sure these are sent regardless of whether or not they're checked
       formDataObject.enabled = $("#enabled").prop('checked');
-      formDataObject.one_time = $("#one_time").prop('checked');
-      if ($("#difficulty").val() == "reaction"){
-        formDataObject.interval_type = "reaction";
-      }
-      if ($("#action").val() != "command"){
-        formDataObject.command = formDataObject.action + "_server";
-      }
-      if (formDataObject.cron_string != ""){
-        formDataObject.interval_type = '';
-      }
+      formDataObject.trigger = select_val;
+
       console.log(formDataObject);
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
-      let res = await fetch(`/api/v2/servers/${serverId}/tasks/`, {
+      let res = await fetch(`/api/v2/servers/${serverId}/webhook/`, {
         method: 'POST',
         headers: {
           'X-XSRFToken': token,
@@ -144,7 +186,7 @@
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
-        window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+        window.location.href = `/panel/server_detail?id=${serverId}&subpage=webhooks`;
       } else {
 
         bootbox.alert({
@@ -156,32 +198,23 @@
 
     $("#schedule_form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
-      let schForm = document.getElementById("schedule_form");
+      var token = getCookie("_xsrf");
+      let webhookForm = document.getElementById("new_webhook_form");
+      let select_val = JSON.stringify($('#trigger-select').val());
+      select_val = JSON.parse(select_val);
 
-      let formData = new FormData(schForm);
-      formData.delete("difficulty");
+      let formData = new FormData(webhookForm);
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       //We need to make sure these are sent regardless of whether or not they're checked
       formDataObject.enabled = $("#enabled").prop('checked');
-      formDataObject.one_time = $("#one_time").prop('checked');
-      if ($("#difficulty").val() == "reaction"){
-        formDataObject.interval_type = "reaction";
-      }
-      if ($("#action").val() != "command"){
-        formDataObject.command = formDataObject.action + "_server";
-      }
-      if (formDataObject.cron_string != ""){
-        formDataObject.interval_type = '';
-      }
+      formDataObject.trigger = select_val;
+
       console.log(formDataObject);
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
-      console.log(formDataJsonString);
-
-      let res = await fetch(`/api/v2/servers/${serverId}/tasks/${schId}`, {
+      let res = await fetch(`/api/v2/servers/${serverId}/webhooks/${webhookId}`, {
         method: 'PATCH',
         headers: {
           'X-XSRFToken': token,
@@ -191,7 +224,7 @@
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
-        window.location.href = `/panel/server_detail?id=${serverId}&subpage=schedules`;
+        window.location.href = `/panel/server_detail?id=${serverId}&subpage=webhooks`;
       } else {
 
         bootbox.alert({
@@ -202,60 +235,8 @@
     });
 
     });
-
-    function yesnoCheck() {
-      if (document.getElementById('action').value == "command") {
-        document.getElementById("ifYes").style.display = "block";
-        document.getElementById("command_input").required = true;
-      } else {
-        document.getElementById("ifYes").style.display = "none";
-        document.getElementById("command_input").required = false;
-      }
-    }
-    function basicAdvanced() {
-      if (document.getElementById('difficulty').value == "advanced") {
-        document.getElementById("ifAdvanced").style.display = "block";
-        document.getElementById("ifReaction").style.display = "none";
-        document.getElementById("ifBasic").style.display = "none";
-        document.getElementById("delay").required = false;
-        document.getElementById("parent").required = false;
-        document.getElementById("interval").required = false;
-        document.getElementById("time").required = false;
-      } else if (document.getElementById('difficulty').value == "reaction") {
-        document.getElementById("ifReaction").style.display = "block";
-        document.getElementById("ifBasic").style.display = "none";
-        document.getElementById("ifAdvanced").style.display = "none";
-        document.getElementById("delay").required = true;
-        document.getElementById("parent").required = true;
-        document.getElementById("interval").required = false;
-        document.getElementById("time").required = false;
-        $("#cron").val("");
-      }
-      else {
-        document.getElementById("ifAdvanced").style.display = "none";
-        document.getElementById("ifReaction").style.display = "none";
-        document.getElementById("ifBasic").style.display = "block";
-        document.getElementById("delay").required = false;
-        document.getElementById("parent").required = false;
-        document.getElementById("interval").required = true;
-        document.getElementById("time").required = true;
-        $("#cron").val("");
-      }
-    }
-    function ifDays() {
-      if (document.getElementById('interval_type').value == "days") {
-        document.getElementById("ifDays").style.display = "block";
-        document.getElementById("time").required = true;
-      } else {
-        document.getElementById("ifDays").style.display = "none";
-        document.getElementById("time").required = false;
-      }
-    }
-
-    function startup() {
-    }
-
     window.onload(startup())
   </script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/js/bootstrap-select.min.js"></script>
 
   {% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
index e0342c4b..0357bf80 100644
--- a/app/frontend/templates/panel/server_webhooks.html
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -57,6 +57,51 @@
                         class="fas fa-pencil-alt"></i></button></div>
                 </div>
                 <div class="card-body">
+                                    <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%" style="table-layout:fixed;">
+                    <thead>
+                      <tr class="rounded">
+                        <th style="width: 10%; min-width: 10px;">Name
+                        </th>
+                        <th style="width: 20%; min-width: 50px;">Webhook Type</th>
+                        <th style="width: 50%; min-width: 50px;">Trigger</th>
+                        <th style="width: 10%; min-width: 50px;">{{ translate('serverSchedules', 'enabled',
+                          data['lang']) }}</th>
+                        <th style="width: 10%; min-width: 50px;">{{ translate('serverSchedules', 'edit', data['lang'])
+                          }}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {% for webhook in data['webhooks'] %}
+                      <tr>
+                        <td id="{{webhook.name}}" class="id">
+                          <p>{{webhook.name}}</p>
+                        </td>
+                        <td id="{{webhook.webhook_type}}" class="type">
+                          <p>{{webhook.webhook_type}}</p>
+                        </td>
+                        <td id="{{webhook.trigger}}" class="trigger" style="overflow: scroll; max-width: 30px;">
+                          <p style="overflow: scroll;" class="no-scroll">{{webhook.trigger}}</p>
+                        </td>
+                        <td id="{{webhook.enabled}}" class="enabled">
+                          <input style="width: 10px !important;" type="checkbox" class="webhook-enabled-toggle" data-webhook-id="{{webhook.id}}" data-webhook-enabled="{{ 'true' if webhook.enabled else 'false' }}">
+                        </td>
+                        <td id="webhook_edit" class="action">
+                          <button onclick="window.location.href='/panel/webhook_edit?id={{ data['server_stats']['server_id']['server_id'] }}&webhook_id={{webhook.id}}'" class="btn btn-info">
+                            <i class="fas fa-pencil-alt"></i>
+                          </button>
+                          <br>
+                          <br>
+                          <button data-webhook={{ webhook.id }} class="btn btn-danger del_button">
+                            <i class="fas fa-trash" aria-hidden="true"></i>
+                          </button>
+                          <button data-webhook={{ webhook.id }} data-toggle="tooltip" title="Test Websocket" class="btn btn-outline-warning test-socket">
+                            <i class="fa-solid fa-vial"></i>
+                          </button>
+                        </td>
+                      </tr>
+                      {% end %}
+                    </tbody>
+                  </table>
                 </div>
               </div>
             </div>
@@ -118,21 +163,21 @@
   }
 
   $(() => {
-    $('.schedule-enabled-toggle').bootstrapToggle({
+    $('.webhook-enabled-toggle').bootstrapToggle({
       on: 'Yes',
       off: 'No',
       onstyle: 'success',
       offstyle: 'danger',
     })
-    $('.schedule-enabled-toggle').each(function () {
-      const enabled = JSON.parse(this.getAttribute('data-schedule-enabled'));
+    $('.webhook-enabled-toggle').each(function () {
+      const enabled = JSON.parse(this.getAttribute('data-webhook-enabled'));
       $(this).bootstrapToggle(enabled ? 'on' : 'off')
     })
-    $('.schedule-enabled-toggle').change(function () {
-      const id = this.getAttribute('data-schedule-id');
+    $('.webhook-enabled-toggle').change(function () {
+      const id = this.getAttribute('data-webhook-id');
       const enabled = this.checked;
 
-      fetch(`/api/v2/servers/{{data['server_id']}}/tasks/${id}`, {
+      fetch(`/api/v2/servers/{{data['server_id']}}/webhook/${id}`, {
         method: 'PATCH',
         body: JSON.stringify({ enabled }),
         headers: {
@@ -143,50 +188,6 @@
   })
 
   const serverId = new URLSearchParams(document.location.search).get('id')
-
-  $(document).ready(function () {
-    console.log('ready for JS!')
-    $('#schedule_table').DataTable({
-      'order': [4, 'asc'],
-    }
-    );
-
-  });
-  $(document).ready(function () {
-    console.log('ready for JS!')
-    $('#mini_schedule_table').DataTable({
-      'order': [2, 'asc']
-    }
-    );
-    document.getElementById('mini_schedule_table_wrapper').hidden = true;
-  });
-  $(document).ready(function () {
-    $('[data-toggle="popover"]').popover();
-    if ($(window).width() < 1000) {
-      $('.too_small').popover("show");
-      document.getElementById('schedule_table_wrapper').hidden = true;
-      document.getElementById('mini_schedule_table_wrapper').hidden = false;
-    }
-
-  });
-  $(window).ready(function () {
-    $('body').click(function () {
-      $('.too_small').popover("hide");
-    });
-  });
-  $(window).resize(function () {
-    // This will execute whenever the window is resized
-    if ($(window).width() < 1000) {
-      $('.too_small').popover("show");
-      document.getElementById('schedule_table_wrapper').hidden = true;
-      document.getElementById('mini_schedule_table_wrapper').hidden = false;
-    }
-    else {
-      $('.too_small').popover("hide");
-      document.getElementById('schedule_table_wrapper').hidden = false;
-      document.getElementById('mini_schedule_table_wrapper').hidden = true;
-    } // New width
-  });
 </script>
 <script>
 
@@ -202,42 +203,9 @@
 
   });
 
-  function yesnoCheck(that) {
-    if (that.value == "command") {
-      document.getElementById("ifYes").style.display = "block";
-      document.getElementById("command").required = true;
-    } else {
-      document.getElementById("ifYes").style.display = "none";
-      document.getElementById("command").required = false;
-    }
-  }
-  function basicAdvanced(that) {
-    if (that.value == "advanced") {
-      document.getElementById("ifAdvanced").style.display = "block";
-      document.getElementById("ifBasic").style.display = "none";
-      document.getElementById("interval").required = false;
-      document.getElementById("time").required = false;
-    } else {
-      document.getElementById("ifAdvanced").style.display = "none";
-      document.getElementById("ifBasic").style.display = "block";
-      document.getElementById("interval").required = true;
-      document.getElementById("time").required = true;
-    }
-  }
-  function ifDays(that) {
-    if (that.value == "days") {
-      document.getElementById("ifDays").style.display = "block";
-      document.getElementById("time").required = true;
-    } else {
-      document.getElementById("ifDays").style.display = "none";
-      document.getElementById("time").required = false;
-    }
-  }
 
   $(".del_button").click(function () {
-    var sch_id = $(this).data('sch');
-
-    console.log(sch_id)
+    var webhook_id = $(this).data('webhook');
 
     bootbox.confirm({
       title: "{{ translate('serverSchedules', 'areYouSure', data['lang']) }}",
@@ -254,24 +222,73 @@
       callback: function (result) {
         console.log(result);
         if (result == true) {
-          del_task(sch_id, serverId);
+          del_hook(webhook_id, serverId);
         }
       }
     });
   });
 
-  async function del_task(sch_id, id) {
+  $(".test-socket").click(function () {
+    var webhook_id = $(this).data('webhook');
+
+    bootbox.confirm({
+      title: "{{ translate('serverSchedules', 'areYouSure', data['lang']) }}",
+      message: "{{ translate('serverSchedules', 'confirmDelete', data['lang']) }}",
+      buttons: {
+        cancel: {
+          label: '<i class="fas fa-times"></i> {{ translate("serverSchedules", "cancel", data['lang']) }}'
+          },
+        confirm: {
+          className: 'btn-outline-danger',
+          label: '<i class="fas fa-check"></i> {{ translate("serverSchedules", "confirm", data['lang']) }}'
+          }
+      },
+      callback: function (result) {
+        console.log(result);
+        if (result == true) {
+          test_hook(webhook_id, serverId);
+        }
+      }
+    });
+  });
+  async function test_hook(webhook_id, id) {
     var token = getCookie("_xsrf")
 
-    let res = await fetch(`/api/v2/servers/${id}/tasks/${sch_id}`, {
+    let res = await fetch(`/api/v2/servers/${id}/webhook/${webhook_id}/`, {
+      method: 'POST',
+      headers: {
+        'token': token,
+      },
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      bootbox.alert("Webhook Sent!")
+    }else{
+      console.log(responseData);
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+          });
+    }
+  }
+
+  async function del_hook(webhook_id, id) {
+    var token = getCookie("_xsrf")
+
+    let res = await fetch(`/api/v2/servers/${id}/webhook/${webhook_id}`, {
       method: 'DELETE',
       headers: {
         'token': token,
       },
     });
-    let responseData = await res;
+    let responseData = await res.json();
     if (responseData.statusText === "OK") {
       window.location.reload();
+    }else{
+      bootbox.alert({
+          title: responseData.stats,
+          message: responseData.error
+          });
     }
   }
 

From accbb89880b7671e7011d0650d93cca4ba1fee7e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:11:00 -0400
Subject: [PATCH 018/210] Add test webhook function

---
 .../servers/server/webhooks/webhook/index.py  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 1cf588ff..b12603b4 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -130,3 +130,36 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
         )
 
         self.finish_json(200, {"status": "ok"})
+
+    def post(self, server_id: str, webhook_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            "Tested webhook",
+            server_id,
+            self.get_remote_ip(),
+        )
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.CONFIG
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        webhook = self.controller.management.get_webhook_by_id(webhook_id)
+        try:
+            WebhookHandler.send_discord_webhook(
+                webhook["bot_name"], webhook["url"], webhook["body"], 880808
+            )
+        except Exception as e:
+            self.finish_json(500, {"status": "error", "error": str(e)})
+
+        self.finish_json(200, {"status": "ok"})

From 210fc306c419a8c3649f7df21879740b6631c9db Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:11:20 -0400
Subject: [PATCH 019/210] Add model option

---
 app/classes/models/management.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 6166dcd0..1d30a3e4 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -555,20 +555,23 @@ class HelpersWebhooks:
         return model_to_dict(Webhooks.get(Webhooks.id == webhook_id))
 
     @staticmethod
-    def get_webhooks_by_server(server_id):
-        data = {}
-        for webhook in (
-            Webhooks.select().where(Webhooks.server_id == server_id).execute()
-        ):
-            data[str(webhook.id)] = {
-                "webhook_type": webhook.webhook_type,
-                "name": webhook.name,
-                "url": webhook.url,
-                "bot_name": webhook.bot_name,
-                "trigger": webhook.trigger,
-                "body": webhook.body,
-                "enabled": webhook.enabled,
-            }
+    def get_webhooks_by_server(server_id, model):
+        if not model:
+            data = {}
+            for webhook in (
+                Webhooks.select().where(Webhooks.server_id == server_id).execute()
+            ):
+                data[str(webhook.id)] = {
+                    "webhook_type": webhook.webhook_type,
+                    "name": webhook.name,
+                    "url": webhook.url,
+                    "bot_name": webhook.bot_name,
+                    "trigger": webhook.trigger,
+                    "body": webhook.body,
+                    "enabled": webhook.enabled,
+                }
+        else:
+            data = Webhooks.select().where(Webhooks.server_id == server_id).execute()
         return data
 
     @staticmethod

From 5ebe135fae4edbdea2117aab8f220aac696e73d2 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:11:29 -0400
Subject: [PATCH 020/210] Alter webhook send

---
 app/classes/web/webhook_handler.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index 7c1bc1c7..9564c437 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -27,7 +27,7 @@ class WebhookHandler:
         return ["server_start", "server_stop", "server_crash", "server_backup"]
 
     @staticmethod
-    def send_discord_webhook(title, message, color):
+    def send_discord_webhook(title, url, message, color):
         dataset = {
             "username": "Crafty Webhooks",
             "avatar_url": "https://docs.craftycontrol.com/img/favicon.ico",
@@ -39,12 +39,8 @@ class WebhookHandler:
                 }
             ],
         }
-
-        logger.debug(
-            "Webhook response: "
-            + requests.post(
-                "",
-                data=json.dumps(dataset),
-                headers={"Content-type": "application/json"},
-            ),
+        requests.post(
+            url,
+            data=json.dumps(dataset),
+            headers={"Content-type": "application/json"},
         )

From c9c953418baf6dfce7c6b84362bdfc9f4af9c86f Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:11:50 -0400
Subject: [PATCH 021/210] Add webhooks to panel handler

---
 app/classes/web/panel_handler.py | 66 ++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 454cbd4d..50dd1837 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -760,6 +760,11 @@ class PanelHandler(BaseHandler):
                             "/panel/error?error=Unauthorized access to Webhooks Config"
                         )
                         return
+                page_data[
+                    "webhooks"
+                ] = self.controller.management.get_webhooks_by_server(
+                    server_id, model=True
+                )
 
             def get_banned_players_html():
                 banned_players = self.controller.servers.get_banned_players(server_id)
@@ -1073,7 +1078,68 @@ class PanelHandler(BaseHandler):
                 "server_type"
             ] = self.controller.servers.get_server_type_by_id(server_id)
             page_data["new_webhook"] = True
+            page_data["webhook"] = {}
+            page_data["webhook"]["webhook_type"] = "Custom"
+            page_data["webhook"]["name"] = ""
+            page_data["webhook"]["url"] = ""
+            page_data["webhook"]["bot_name"] = "Crafty Controller"
+            page_data["webhook"]["trigger"] = []
+            page_data["webhook"]["body"] = ""
+            page_data["webhook"]["enabled"] = True
+
             page_data["providers"] = WebhookHandler.get_providers()
+            page_data["triggers"] = WebhookHandler.get_monitored_actions()
+
+            if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
+                if not superuser:
+                    self.redirect("/panel/error?error=Unauthorized access To Webhooks")
+                    return
+
+            template = "panel/server_webhook_edit.html"
+
+        elif page == "webhook_edit":
+            server_id = self.get_argument("id", None)
+            webhook_id = self.get_argument("webhook_id", None)
+            if server_id is None:
+                return self.redirect("/panel/error?error=Invalid Server ID")
+            server_obj = self.controller.servers.get_server_instance_by_id(server_id)
+            page_data["backup_failed"] = server_obj.last_backup_status()
+            server_obj = None
+            page_data["active_link"] = "webhooks"
+            page_data["server_data"] = self.controller.servers.get_server_data_by_id(
+                server_id
+            )
+            page_data[
+                "user_permissions"
+            ] = self.controller.server_perms.get_user_id_permissions_list(
+                exec_user["user_id"], server_id
+            )
+            page_data["permissions"] = {
+                "Commands": EnumPermissionsServer.COMMANDS,
+                "Terminal": EnumPermissionsServer.TERMINAL,
+                "Logs": EnumPermissionsServer.LOGS,
+                "Schedule": EnumPermissionsServer.SCHEDULE,
+                "Backup": EnumPermissionsServer.BACKUP,
+                "Files": EnumPermissionsServer.FILES,
+                "Config": EnumPermissionsServer.CONFIG,
+                "Players": EnumPermissionsServer.PLAYERS,
+            }
+            page_data["server_stats"] = self.controller.servers.get_server_stats_by_id(
+                server_id
+            )
+            page_data["server_stats"][
+                "server_type"
+            ] = self.controller.servers.get_server_type_by_id(server_id)
+            page_data["new_webhook"] = True
+            page_data["webhook"] = self.controller.management.get_webhook_by_id(
+                webhook_id
+            )
+            page_data["webhook"]["trigger"] = str(
+                page_data["webhook"]["trigger"]
+            ).split(",")
+
+            page_data["providers"] = WebhookHandler.get_providers()
+            page_data["triggers"] = WebhookHandler.get_monitored_actions()
 
             if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
                 if not superuser:

From eadb01d7c08bca7ebf42d2e9625b2fdc3cc63e4c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:11:59 -0400
Subject: [PATCH 022/210] Add model option

---
 app/classes/controllers/management_controller.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index 71327c1c..cf3f5161 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -223,8 +223,8 @@ class ManagementController:
         return HelpersWebhooks.get_webhook_by_id(webhook_id)
 
     @staticmethod
-    def get_webhooks_by_server(server_id):
-        return HelpersWebhooks.get_webhooks_by_server(server_id)
+    def get_webhooks_by_server(server_id, model=False):
+        return HelpersWebhooks.get_webhooks_by_server(server_id, model)
 
     @staticmethod
     def delete_webhook(webhook_id):

From dbc1067a0e9a55f058295db10765f7d67b339712 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:38:44 -0400
Subject: [PATCH 023/210] Add translations

---
 .../panel/parts/m_server_controls_list.html   |   2 +-
 .../panel/parts/server_controls_list.html     |   2 +-
 .../templates/panel/server_webhook_edit.html  |  12 +-
 .../templates/panel/server_webhooks.html      | 105 +++++++++++++++---
 app/translations/en_EN.json                   |  15 +++
 5 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/app/frontend/templates/panel/parts/m_server_controls_list.html b/app/frontend/templates/panel/parts/m_server_controls_list.html
index 6c645881..e8cd34e2 100644
--- a/app/frontend/templates/panel/parts/m_server_controls_list.html
+++ b/app/frontend/templates/panel/parts/m_server_controls_list.html
@@ -32,7 +32,7 @@
             {% end %}
             <a class="dropdown-item {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true"><i class="fa-solid fa-chart-line"></i> {{ translate('serverDetails', 'metrics', data['lang']) }}</a>
             {% if data['permissions']['Config'] in data['user_permissions'] %}
-            <a class="dropdown-item {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true"><i class="fas fa-users"></i>Webhooks</a>
+            <a class="dropdown-item {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true"><i class="fa-solid fa-webhook"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
             {% end %}
         </div>
     </div>
diff --git a/app/frontend/templates/panel/parts/server_controls_list.html b/app/frontend/templates/panel/parts/server_controls_list.html
index 39360f72..660c6700 100644
--- a/app/frontend/templates/panel/parts/server_controls_list.html
+++ b/app/frontend/templates/panel/parts/server_controls_list.html
@@ -56,7 +56,7 @@
     {% if data['permissions']['Config'] in data['user_permissions'] %}
     <li class="nav-item term-nav-item">
         <a class="nav-link {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true">
-        <i class="fas fa-users"></i>Webhooks</a>
+            <i class="fa-solid fa-webhook"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
     </li>
     {% end %}
 </ul>
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index a9252bc5..c050ebfd 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -51,22 +51,22 @@
                 <br>
                 <br>
                 <div class="form-group">
-                  <label for="name">{{ translate('serverSchedules', 'name' , data['lang']) }}</label>
+                  <label for="name">{{ translate('webhooks', 'name' , data['lang']) }}</label>
                   <input type="input" class="form-control" name="name" id="name_input"
                     value="{{ data['webhook']['name']}}" maxlength="30" placeholder="Name" required>
                 </div>
                 <div class="form-group">
-                  <label for="url">Webhook URL</label>
+                  <label for="url">{{ translate('webhooks', 'url', data['lang']) }}</label>
                   <input type="input" class="form-control" name="url" id="url"
                     value="{{ data['webhook']['url']}}" placeholder="https://webhooks.craftycontrol.com/fakeurl" required>
                 </div>
                 <div class="form-group">
-                  <label for="bot_name">Bot {{ translate('serverSchedules', 'name' , data['lang']) }}</label>
+                  <label for="bot_name">{{ translate('webhooks', 'bot_name' , data['lang']) }}</label>
                   <input type="input" class="form-control" name="bot_name" id="bot_name_input"
                     value="{{ data['webhook']['bot_name']}}" maxlength="30" placeholder="Crafty Controller" required>
                 </div>
                 <div class="form-group">
-                  <label for="trigger">Trigger</label>
+                  <label for="trigger">{{ translate('webhooks', 'trigger', data['lang']) }}</label>
                   <select class="form-control selectpicker show-tick" name="trigger" id="trigger-select" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
                   {% for trigger in data['triggers'] %}
                   {% if trigger in data["webhook"]["trigger"] %}
@@ -78,7 +78,7 @@
                   </select>
                 </div>
                 <div class="form-group">
-                  <label for="body">Body</label>
+                  <label for="body">{{ translate('webhooks', 'webhook_body', data['lang']) }}</label>
                     <textarea id="body-input" name="body" rows="4" cols="50">
                       {{ data["webhook"]["body"] }}
                     </textarea>
@@ -86,7 +86,7 @@
                 <div class="form-check-flat">
                   <label for="enabled" class="form-check-label ml-4 mb-4">
                     <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked=""
-                      value="1">{{ translate('serverScheduleConfig', 'enabled' , data['lang']) }}
+                      value="1">{{ translate('webhooks', 'enabled', data['lang']) }}
                   </label>
 
                 </div>
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
index 0357bf80..140e2999 100644
--- a/app/frontend/templates/panel/server_webhooks.html
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -44,8 +44,7 @@
             <div class="col-md-12 col-sm-12" style="overflow-x:auto;">
               <div class="card">
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                  <h4 class="card-title"><i class="fas fa-calendar"></i> {{ translate('serverSchedules',
-                    'scheduledTasks', data['lang']) }} </h4>
+                  <h4 class="card-title"><i class="fas fa-calendar"></i> {{ translate('webhooks', 'webhooks', data['lang']) }} </h4>
                   {% if data['user_data']['hints'] %}
                   <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" ,
                     data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" ,
@@ -53,20 +52,20 @@
                   {% end %}
                   <div><button
                       onclick="location.href=`/panel/add_webhook?id={{ data['server_stats']['server_id']['server_id'] }}`"
-                      class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}<i
+                      class="btn btn-info">{{ translate('webhooks', 'new', data['lang']) }}<i
                         class="fas fa-pencil-alt"></i></button></div>
                 </div>
                 <div class="card-body">
-                                    <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%" style="table-layout:fixed;">
+                  <table class="table table-hover d-none d-lg-block responsive-table" id="webhook_table" width="100%" style="table-layout:fixed;">
                     <thead>
                       <tr class="rounded">
-                        <th style="width: 10%; min-width: 10px;">Name
+                        <th style="width: 10%; min-width: 10px;">{{ translate('webhooks', 'name', data['lang']) }}
                         </th>
-                        <th style="width: 20%; min-width: 50px;">Webhook Type</th>
-                        <th style="width: 50%; min-width: 50px;">Trigger</th>
-                        <th style="width: 10%; min-width: 50px;">{{ translate('serverSchedules', 'enabled',
+                        <th style="width: 20%; min-width: 50px;">{{ translate('webhooks', 'type', data['lang']) }}</th>
+                        <th style="width: 50%; min-width: 50px;">{{ translate('webhooks', 'trigger', data['lang']) }}</th>
+                        <th style="width: 10%; min-width: 50px;">{{ translate('webhooks', 'enabled',
                           data['lang']) }}</th>
-                        <th style="width: 10%; min-width: 50px;">{{ translate('serverSchedules', 'edit', data['lang'])
+                        <th style="width: 10%; min-width: 50px;">{{ translate('webhooks', 'edit', data['lang'])
                           }}</th>
                       </tr>
                     </thead>
@@ -94,7 +93,44 @@
                           <button data-webhook={{ webhook.id }} class="btn btn-danger del_button">
                             <i class="fas fa-trash" aria-hidden="true"></i>
                           </button>
-                          <button data-webhook={{ webhook.id }} data-toggle="tooltip" title="Test Websocket" class="btn btn-outline-warning test-socket">
+                          <button data-webhook={{ webhook.id }} data-toggle="tooltip" title="{{ translate('webhooks', 'run', data['lang']) }}" class="btn btn-outline-warning test-socket">
+                            <i class="fa-solid fa-vial"></i>
+                          </button>
+                        </td>
+                      </tr>
+                      {% end %}
+                    </tbody>
+                  </table>
+                  <table class="table table-hover d-block d-lg-none responsive-table" id="webhook_table_mini" width="100%" style="table-layout:fixed;">
+                    <thead>
+                      <tr class="rounded">
+                        <th style="width: 33.33%; min-width: 10px;">Name
+                        </th>
+                        <th style="width: 33.33%; min-width: 50px;">{{ translate('webhooks', 'enabled',
+                          data['lang']) }}</th>
+                        <th style="width: 33.33%; min-width: 50px;">{{ translate('webhooks', 'edit', data['lang'])
+                          }}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {% for webhook in data['webhooks'] %}
+                      <tr>
+                        <td id="{{webhook.name}}" class="id">
+                          <p>{{webhook.name}}</p>
+                        </td>
+                        <td id="{{webhook.enabled}}" class="enabled">
+                          <input style="width: 10px !important;" type="checkbox" class="webhook-enabled-toggle" data-webhook-id="{{webhook.id}}" data-webhook-enabled="{{ 'true' if webhook.enabled else 'false' }}">
+                        </td>
+                        <td id="webhook_edit" class="action">
+                          <button onclick="window.location.href='/panel/webhook_edit?id={{ data['server_stats']['server_id']['server_id'] }}&webhook_id={{webhook.id}}'" class="btn btn-info">
+                            <i class="fas fa-pencil-alt"></i>
+                          </button>
+                          <br>
+                          <br>
+                          <button data-webhook={{ webhook.id }} class="btn btn-danger del_button">
+                            <i class="fas fa-trash" aria-hidden="true"></i>
+                          </button>
+                          <button data-webhook={{ webhook.id }} data-toggle="tooltip" title="{{ translate('webhooks', 'run', data['lang']) }}" class="btn btn-outline-warning test-socket">
                             <i class="fa-solid fa-vial"></i>
                           </button>
                         </td>
@@ -153,6 +189,49 @@
 
 {% block js %}
 <script>
+    $(document).ready(function () {
+    console.log('ready for JS!')
+    $('#webhook_table').DataTable({
+      'order': [4, 'asc'],
+    }
+    );
+
+  });
+  $(document).ready(function () {
+    console.log('ready for JS!')
+    $('#webhook_table_mini').DataTable({
+      'order': [2, 'asc']
+    }
+    );
+    document.getElementById('webhook_table_mini_wrapper').hidden = true;
+  });
+  $(document).ready(function () {
+    $('[data-toggle="popover"]').popover();
+    if ($(window).width() < 1000) {
+      $('.too_small').popover("show");
+      document.getElementById('webhook_table_wrapper').hidden = true;
+      document.getElementById('webhook_table_mini_wrapper').hidden = false;
+    }
+
+  });
+  $(window).ready(function () {
+    $('body').click(function () {
+      $('.too_small').popover("hide");
+    });
+  });
+  $(window).resize(function () {
+    // This will execute whenever the window is resized
+    if ($(window).width() < 1000) {
+      $('.too_small').popover("show");
+      document.getElementById('webhook_table_wrapper').hidden = true;
+      document.getElementById('webhook_table_mini_wrapper').hidden = false;
+    }
+    else {
+      $('.too_small').popover("hide");
+      document.getElementById('webhook_table_wrapper').hidden = false;
+      document.getElementById('webhook_table_mini_wrapper').hidden = true;
+    } // New width
+  });
 
   function debounce(func, timeout = 300) {
     let timer;
@@ -208,8 +287,7 @@
     var webhook_id = $(this).data('webhook');
 
     bootbox.confirm({
-      title: "{{ translate('serverSchedules', 'areYouSure', data['lang']) }}",
-      message: "{{ translate('serverSchedules', 'confirmDelete', data['lang']) }}",
+      message: "{{ translate('webhooks', 'areYouSureDel', data['lang']) }}",
       buttons: {
         cancel: {
           label: '<i class="fas fa-times"></i> {{ translate("serverSchedules", "cancel", data['lang']) }}'
@@ -232,8 +310,7 @@
     var webhook_id = $(this).data('webhook');
 
     bootbox.confirm({
-      title: "{{ translate('serverSchedules', 'areYouSure', data['lang']) }}",
-      message: "{{ translate('serverSchedules', 'confirmDelete', data['lang']) }}",
+      message: "{{ translate('webhooks', 'areYouSureRun', data['lang']) }}",
       buttons: {
         cancel: {
           label: '<i class="fas fa-times"></i> {{ translate("serverSchedules", "cancel", data['lang']) }}'
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 54895ca4..1044eff0 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -626,5 +626,20 @@
         "uses": "Number of uses allowed (-1==No Limit)",
         "manager": "Manager",
         "selectManager": "Select Manager for User"
+    },
+    "webhooks": {
+        "webhooks": "Webhooks",
+        "name": "Name",
+        "type": "Webhook Type",
+        "trigger": "Trigger",
+        "enabled": "Enabled",
+        "url": "Webhook URL",
+        "bot_name": "Bot Name",
+        "webhook_body": "Webhook Body",
+        "areYouSureDel": "Are you sure you want to delete this webhook?",
+        "areYouSureRun": "Are you sure you want to test this websocket?",
+        "edit": "Edit",
+        "run": "Test Run Webhook",
+        "new": "New Webhook"
     }
 }
\ No newline at end of file

From 14193d1233058d86235b91805e97bd14cf57b19c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 18:44:18 -0400
Subject: [PATCH 024/210] Fix fonts

---
 .../templates/panel/parts/m_server_controls_list.html       | 2 +-
 .../templates/panel/parts/server_controls_list.html         | 2 +-
 app/frontend/templates/panel/server_webhooks.html           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/frontend/templates/panel/parts/m_server_controls_list.html b/app/frontend/templates/panel/parts/m_server_controls_list.html
index e8cd34e2..f311ef10 100644
--- a/app/frontend/templates/panel/parts/m_server_controls_list.html
+++ b/app/frontend/templates/panel/parts/m_server_controls_list.html
@@ -32,7 +32,7 @@
             {% end %}
             <a class="dropdown-item {% if data['active_link'] == 'metrics' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=metrics" role="tab" aria-selected="true"><i class="fa-solid fa-chart-line"></i> {{ translate('serverDetails', 'metrics', data['lang']) }}</a>
             {% if data['permissions']['Config'] in data['user_permissions'] %}
-            <a class="dropdown-item {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true"><i class="fa-solid fa-webhook"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
+            <a class="dropdown-item {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true"><i class="fa-regular fa-bell"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
             {% end %}
         </div>
     </div>
diff --git a/app/frontend/templates/panel/parts/server_controls_list.html b/app/frontend/templates/panel/parts/server_controls_list.html
index 660c6700..df63f13d 100644
--- a/app/frontend/templates/panel/parts/server_controls_list.html
+++ b/app/frontend/templates/panel/parts/server_controls_list.html
@@ -56,7 +56,7 @@
     {% if data['permissions']['Config'] in data['user_permissions'] %}
     <li class="nav-item term-nav-item">
         <a class="nav-link {% if data['active_link'] == 'webhooks' %}active{% end %}" href="/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=webhooks" role="tab" aria-selected="true">
-            <i class="fa-solid fa-webhook"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
+            <i class="fa-regular fa-bell"></i>{{ translate('webhooks', 'webhooks', data['lang']) }}</a>
     </li>
     {% end %}
 </ul>
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
index 140e2999..247f1212 100644
--- a/app/frontend/templates/panel/server_webhooks.html
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -44,7 +44,7 @@
             <div class="col-md-12 col-sm-12" style="overflow-x:auto;">
               <div class="card">
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                  <h4 class="card-title"><i class="fas fa-calendar"></i> {{ translate('webhooks', 'webhooks', data['lang']) }} </h4>
+                  <h4 class="card-title"><i class="fa-regular fa-bell"></i> {{ translate('webhooks', 'webhooks', data['lang']) }} </h4>
                   {% if data['user_data']['hints'] %}
                   <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" ,
                     data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" ,
@@ -359,11 +359,11 @@
       },
     });
     let responseData = await res.json();
-    if (responseData.statusText === "OK") {
+    if (responseData.status === "ok") {
       window.location.reload();
     }else{
       bootbox.alert({
-          title: responseData.stats,
+          title: responseData.status,
           message: responseData.error
           });
     }

From 2ebbb1fdab91b42050f9c1428bbb1d14fc244483 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 3 Jun 2023 22:40:39 -0400
Subject: [PATCH 025/210] Fix webhook patch

---
 app/classes/web/panel_handler.py                     |  2 +-
 .../api/servers/server/webhooks/webhook/index.py     |  6 ++++++
 .../templates/panel/server_webhook_edit.html         | 12 ++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 50dd1837..536b07f0 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1130,7 +1130,7 @@ class PanelHandler(BaseHandler):
             page_data["server_stats"][
                 "server_type"
             ] = self.controller.servers.get_server_type_by_id(server_id)
-            page_data["new_webhook"] = True
+            page_data["new_webhook"] = False
             page_data["webhook"] = self.controller.management.get_webhook_by_id(
                 webhook_id
             )
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index b12603b4..499c99cb 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -120,6 +120,12 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         data["server_id"] = server_id
+        if "trigger" in data.keys():
+            triggers = ""
+            for item in data["trigger"]:
+                string = item + ","
+                triggers += string
+            data["trigger"] = triggers
         self.controller.management.modify_webhook(webhook_id, data)
 
         self.controller.management.add_to_audit_log(
diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index c050ebfd..493e3fda 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -40,7 +40,7 @@
               <form class="forms-sample" method="post" id="new_webhook_form"
                 action="/panel/new_webhook?id={{ data['server_stats']['server_id']['server_id'] }}">
               {% else %}
-              <form class="forms-sample" method="post" id="schedule_form"
+              <form class="forms-sample" method="post" id="webhook_form"
                 action="/panel/edit_webhook?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['webhook']['id'] }}">
               {% end %}
                 <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type">
@@ -196,10 +196,10 @@
       } 
     });
 
-    $("#schedule_form").on("submit", async function (e) {
+    $("#webhook_form").on("submit", async function (e) {
       e.preventDefault();
       var token = getCookie("_xsrf");
-      let webhookForm = document.getElementById("new_webhook_form");
+      let webhookForm = document.getElementById("webhook_form");
       let select_val = JSON.stringify($('#trigger-select').val());
       select_val = JSON.parse(select_val);
 
@@ -214,7 +214,7 @@
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
-      let res = await fetch(`/api/v2/servers/${serverId}/webhooks/${webhookId}`, {
+      let res = await fetch(`/api/v2/servers/${serverId}/webhook/${webhookId}`, {
         method: 'PATCH',
         headers: {
           'X-XSRFToken': token,
@@ -228,8 +228,8 @@
       } else {
 
         bootbox.alert({
-          title: responseData.error,
-          message: responseData.error_data
+          title: responseData.status,
+          message: responseData.error
           });
       } 
     });

From 7db5f400ab6f9870e9613ad5c40eefd04c5ab374 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 11:42:08 -0400
Subject: [PATCH 026/210] Add backup delete and restore functions to API

---
 .../servers/server/backups/backup/index.py    | 163 +++++++++++++++++-
 .../api/servers/server/backups/index.py       |   2 -
 .../templates/panel/server_backup.html        |  59 ++++---
 3 files changed, 199 insertions(+), 25 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 5c7a6f86..23782158 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -1,12 +1,24 @@
 import logging
 import json
 import os
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
+from app.classes.shared.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
+backup_schema = {
+    "type": "object",
+    "properties": {
+        "filename": {"type": "string", "minLength": 5},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
 
 class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
     def get(self, server_id: str):
@@ -23,7 +35,7 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
         self.finish_json(200, self.controller.management.get_backup_config(server_id))
 
-    def delete(self, server_id: str, backup_name: str):
+    def delete(self, server_id: str):
         auth_data = self.authenticate_user()
         backup_conf = self.controller.management.get_backup_config(server_id)
         if not auth_data:
@@ -38,14 +50,159 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         try:
-            FileHelpers.del_file(os.path.join(backup_conf["backup_path"], backup_name))
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, backup_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        try:
+            FileHelpers.del_file(
+                os.path.join(backup_conf["backup_path"], data["filename"])
+            )
         except Exception:
             return self.finish_json(
                 400, {"status": "error", "error": "NO BACKUP FOUND"}
             )
         self.controller.management.add_to_audit_log(
             auth_data[4]["user_id"],
-            f"Edited server {server_id}: removed backup {backup_name}",
+            f"Edited server {server_id}: removed backup {data['filename']}",
+            server_id,
+            self.get_remote_ip(),
+        )
+
+        return self.finish_json(200, {"status": "ok"})
+
+    def post(self, server_id: str):
+        auth_data = self.authenticate_user()
+        backup_conf = self.controller.management.get_backup_config(server_id)
+        if not auth_data:
+            return
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Schedule permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, backup_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        try:
+            svr_obj = self.controller.servers.get_server_obj(server_id)
+            server_data = self.controller.servers.get_server_data_by_id(server_id)
+            zip_name = data["filename"]
+            # import the server again based on zipfile
+            if server_data["type"] == "minecraft-java":
+                backup_path = svr_obj.backup_path
+                if Helpers.validate_traversal(backup_path, zip_name):
+                    temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
+                    new_server = self.controller.import_zip_server(
+                        svr_obj.server_name,
+                        temp_dir,
+                        server_data["executable"],
+                        "1",
+                        "2",
+                        server_data["server_port"],
+                        server_data["created_by"],
+                    )
+                    new_server_id = new_server
+                    new_server = self.controller.servers.get_server_data(new_server)
+                    self.controller.rename_backup_dir(
+                        server_id, new_server_id, new_server["server_uuid"]
+                    )
+                    # preserve current schedules
+                    for schedule in self.controller.management.get_schedules_by_server(
+                        server_id
+                    ):
+                        self.tasks_manager.update_job(
+                            schedule.schedule_id, {"server_id": new_server_id}
+                        )
+                    # preserve execution command
+                    new_server_obj = self.controller.servers.get_server_obj(
+                        new_server_id
+                    )
+                    new_server_obj.execution_command = server_data["execution_command"]
+                    # reset executable path
+                    if svr_obj.path in svr_obj.executable:
+                        new_server_obj.executable = str(svr_obj.executable).replace(
+                            svr_obj.path, new_server_obj.path
+                        )
+                    # reset run command path
+                    if svr_obj.path in svr_obj.execution_command:
+                        new_server_obj.execution_command = str(
+                            svr_obj.execution_command
+                        ).replace(svr_obj.path, new_server_obj.path)
+                    # reset log path
+                    if svr_obj.path in svr_obj.log_path:
+                        new_server_obj.log_path = str(svr_obj.log_path).replace(
+                            svr_obj.path, new_server_obj.path
+                        )
+                    self.controller.servers.update_server(new_server_obj)
+
+                    # preserve backup config
+                    backup_config = self.controller.management.get_backup_config(
+                        server_id
+                    )
+                    excluded_dirs = []
+                    server_obj = self.controller.servers.get_server_obj(server_id)
+                    loop_backup_path = self.helper.wtol_path(server_obj.path)
+                    for item in self.controller.management.get_excluded_backup_dirs(
+                        server_id
+                    ):
+                        item_path = self.helper.wtol_path(item)
+                        bu_path = os.path.relpath(item_path, loop_backup_path)
+                        bu_path = os.path.join(new_server_obj.path, bu_path)
+                        excluded_dirs.append(bu_path)
+                    self.controller.management.set_backup_config(
+                        new_server_id,
+                        new_server_obj.backup_path,
+                        backup_config["max_backups"],
+                        excluded_dirs,
+                        backup_config["compress"],
+                        backup_config["shutdown"],
+                    )
+                    # remove old server's tasks
+                    try:
+                        self.tasks_manager.remove_all_server_tasks(server_id)
+                    except:
+                        logger.info("No active tasks found for server")
+                    self.controller.remove_server(server_id, True)
+        except Exception:
+            return self.finish_json(
+                400, {"status": "error", "error": "NO BACKUP FOUND"}
+            )
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Restored server {server_id} backup {data['filename']}",
             server_id,
             self.get_remote_ip(),
         )
diff --git a/app/classes/web/routes/api/servers/server/backups/index.py b/app/classes/web/routes/api/servers/server/backups/index.py
index ac2111db..b3f6f7ed 100644
--- a/app/classes/web/routes/api/servers/server/backups/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/index.py
@@ -1,10 +1,8 @@
 import logging
 import json
-import os
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 1cb8f087..6b9ba68f 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -333,25 +333,23 @@
     });
     return;
   }
-
-  function del_backup(filename, id) {
+  async function del_backup(filename, id) {
     var token = getCookie("_xsrf")
-
-    data_to_send = { file_name: filename }
-
-    console.log('Sending Command to delete backup: ' + filename)
-    $.ajax({
-      type: "DELETE",
-      headers: { 'X-XSRFToken': token },
-      url: '/ajax/del_backup?server_id=' + id,
-      data: {
-        file_path: filename,
-        id: id
-      },
-      success: function (data) {
-        location.reload();
+    let contents = JSON.stringify({"filename": filename})
+    let res = await fetch(`/api/v2/servers/${id}/backups/backup/`, {
+      method: 'DELETE',
+      headers: {
+        'token': token,
       },
+      body: contents
     });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.reload();
+    }else{
+      bootbox.alert({"title": responseData.status,
+                    "message": responseData.error})
+    }
   }
 
   function restore_backup(filename, id) {
@@ -366,9 +364,8 @@
       type: "POST",
       headers: { 'X-XSRFToken': token },
       url: '/ajax/restore_backup?server_id=' + id,
-      data: {
-        zip_file: filename,
-        id: id
+      body: {
+        "filename": filename,
       },
       success: function (data) {
         setTimeout(function () {
@@ -377,6 +374,28 @@
       },
     });
   }
+  async function restore_backup(filename, id) {
+    var token = getCookie("_xsrf")
+    let contents = JSON.stringify({"filename": filename})
+    var dialog = bootbox.dialog({
+      message: "<i class='fa fa-spin fa-spinner'></i> {{ translate('serverBackups', 'restoring', data['lang']) }}",
+      closeButton: false
+    });
+    let res = await fetch(`/api/v2/servers/${id}/backups/backup/`, {
+      method: 'POST',
+      headers: {
+        'token': token,
+      },
+      body: contents
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.href = "/panel/dashboard";
+    }else{
+      bootbox.alert({"title": responseData.status,
+                    "message": responseData.error})
+    }
+  }
 
   $("#before-check").on("click", function () {
     if ($("#before-check:checked").val()) {
@@ -457,7 +476,7 @@
           console.log(result);
           if (result == true) {
             var full_path = backup_path + '/' + file_to_del;
-            del_backup(full_path, server_id);
+            del_backup(file_to_del, server_id);
           }
         }
       });

From 27cb3dc37abc5726f47d656ded95503cc6c5b552 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 11:48:39 -0400
Subject: [PATCH 027/210] Remove backups delete/restore from ajax handler

---
 app/classes/web/ajax_handler.py               | 299 +-----------------
 .../servers/server/backups/backup/index.py    |   1 -
 2 files changed, 1 insertion(+), 299 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index e3da33a8..ef634027 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -267,87 +267,12 @@ class AjaxHandler(BaseHandler):
 
         server_id = self.get_argument("id", None)
 
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-
-        if page == "send_command":
-            command = self.get_body_argument("command", default=None, strip=True)
-            server_id = self.get_argument("id", None)
-
-            if server_id is None:
-                logger.warning("Server ID not found in send_command ajax call")
-                Console.warning("Server ID not found in send_command ajax call")
-
-            svr_obj = self.controller.servers.get_server_instance_by_id(server_id)
-
-            if command == svr_obj.settings["stop_command"]:
-                logger.info(
-                    "Stop command detected as terminal input - intercepting."
-                    + f"Starting Crafty's stop process for server with id: {server_id}"
-                )
-                self.controller.management.send_command(
-                    exec_user["user_id"], server_id, self.get_remote_ip(), "stop_server"
-                )
-                command = None
-            elif command == "restart":
-                logger.info(
-                    "Restart command detected as terminal input - intercepting."
-                    + f"Starting Crafty's stop process for server with id: {server_id}"
-                )
-                self.controller.management.send_command(
-                    exec_user["user_id"],
-                    server_id,
-                    self.get_remote_ip(),
-                    "restart_server",
-                )
-                command = None
-            if command:
-                if svr_obj.check_running():
-                    svr_obj.send_command(command)
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Sent command to "
-                f"{self.controller.servers.get_server_friendly_name(server_id)} "
-                f"terminal: {command}",
-                server_id,
-                self.get_remote_ip(),
-            )
-
-        elif page == "send_order":
+        if page == "send_order":
             self.controller.users.update_server_order(
                 exec_user["user_id"], bleach.clean(self.get_argument("order"))
             )
             return
 
-        elif page == "backup_now":
-            server_id = self.get_argument("id", None)
-            if server_id is None:
-                logger.error("Server ID is none. Canceling backup!")
-                return
-
-            server = self.controller.servers.get_server_instance_by_id(server_id)
-            self.controller.management.add_to_audit_log_raw(
-                self.controller.users.get_user_by_id(exec_user["user_id"])["username"],
-                exec_user["user_id"],
-                server_id,
-                f"Backup now executed for server {server_id} ",
-                source_ip=self.get_remote_ip(),
-            )
-
-            server.backup_server()
-
         elif page == "select_photo":
             if exec_user["superuser"]:
                 photo = urllib.parse.unquote(self.get_argument("photo", ""))
@@ -387,168 +312,6 @@ class AjaxHandler(BaseHandler):
             svr = self.controller.servers.get_server_instance_by_id(server_id)
             svr.agree_eula(exec_user["user_id"])
 
-        elif page == "restore_backup":
-            if not permissions["Backup"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Backups")
-                    return
-            server_id = bleach.clean(self.get_argument("id", None))
-            zip_name = bleach.clean(self.get_argument("zip_file", None))
-            svr_obj = self.controller.servers.get_server_obj(server_id)
-            server_data = self.controller.servers.get_server_data_by_id(server_id)
-
-            # import the server again based on zipfile
-            if server_data["type"] == "minecraft-java":
-                backup_path = svr_obj.backup_path
-                if Helpers.validate_traversal(backup_path, zip_name):
-                    temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
-                    new_server = self.controller.import_zip_server(
-                        svr_obj.server_name,
-                        temp_dir,
-                        server_data["executable"],
-                        "1",
-                        "2",
-                        server_data["server_port"],
-                        server_data["created_by"],
-                    )
-                    new_server_id = new_server
-                    new_server = self.controller.servers.get_server_data(new_server)
-                    self.controller.rename_backup_dir(
-                        server_id, new_server_id, new_server["server_uuid"]
-                    )
-                    # preserve current schedules
-                    for schedule in self.controller.management.get_schedules_by_server(
-                        server_id
-                    ):
-                        self.tasks_manager.update_job(
-                            schedule.schedule_id, {"server_id": new_server_id}
-                        )
-                    # preserve execution command
-                    new_server_obj = self.controller.servers.get_server_obj(
-                        new_server_id
-                    )
-                    new_server_obj.execution_command = server_data["execution_command"]
-                    # reset executable path
-                    if svr_obj.path in svr_obj.executable:
-                        new_server_obj.executable = str(svr_obj.executable).replace(
-                            svr_obj.path, new_server_obj.path
-                        )
-                    # reset run command path
-                    if svr_obj.path in svr_obj.execution_command:
-                        new_server_obj.execution_command = str(
-                            svr_obj.execution_command
-                        ).replace(svr_obj.path, new_server_obj.path)
-                    # reset log path
-                    if svr_obj.path in svr_obj.log_path:
-                        new_server_obj.log_path = str(svr_obj.log_path).replace(
-                            svr_obj.path, new_server_obj.path
-                        )
-                    self.controller.servers.update_server(new_server_obj)
-
-                    # preserve backup config
-                    backup_config = self.controller.management.get_backup_config(
-                        server_id
-                    )
-                    excluded_dirs = []
-                    server_obj = self.controller.servers.get_server_obj(server_id)
-                    loop_backup_path = self.helper.wtol_path(server_obj.path)
-                    for item in self.controller.management.get_excluded_backup_dirs(
-                        server_id
-                    ):
-                        item_path = self.helper.wtol_path(item)
-                        bu_path = os.path.relpath(item_path, loop_backup_path)
-                        bu_path = os.path.join(new_server_obj.path, bu_path)
-                        excluded_dirs.append(bu_path)
-                    self.controller.management.set_backup_config(
-                        new_server_id,
-                        new_server_obj.backup_path,
-                        backup_config["max_backups"],
-                        excluded_dirs,
-                        backup_config["compress"],
-                        backup_config["shutdown"],
-                    )
-                    # remove old server's tasks
-                    try:
-                        self.tasks_manager.remove_all_server_tasks(server_id)
-                    except:
-                        logger.info("No active tasks found for server")
-                    self.controller.remove_server(server_id, True)
-                    self.redirect("/panel/dashboard")
-
-            else:
-                backup_path = svr_obj.backup_path
-                if Helpers.validate_traversal(backup_path, zip_name):
-                    temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
-                    new_server = self.controller.import_bedrock_zip_server(
-                        svr_obj.server_name,
-                        temp_dir,
-                        server_data["executable"],
-                        server_data["server_port"],
-                        server_data["created_by"],
-                    )
-                    new_server_id = new_server
-                    new_server = self.controller.servers.get_server_data(new_server)
-                    self.controller.rename_backup_dir(
-                        server_id, new_server_id, new_server["server_uuid"]
-                    )
-                    # preserve current schedules
-                    for schedule in self.controller.management.get_schedules_by_server(
-                        server_id
-                    ):
-                        self.tasks_manager.update_job(
-                            schedule.schedule_id, {"server_id": new_server_id}
-                        )
-                    # preserve execution command
-                    new_server_obj = self.controller.servers.get_server_obj(
-                        new_server_id
-                    )
-                    new_server_obj.execution_command = server_data["execution_command"]
-                    # reset executable path
-                    if server_obj.path in server_obj.executable:
-                        new_server_obj.executable = str(server_obj.executable).replace(
-                            server_obj.path, new_server_obj.path
-                        )
-                    # reset run command path
-                    if server_obj.path in server_obj.execution_command:
-                        new_server_obj.execution_command = str(
-                            server_obj.execution_command
-                        ).replace(server_obj.path, new_server_obj.path)
-                    # reset log path
-                    if server_obj.path in server_obj.log_path:
-                        new_server_obj.log_path = str(server_obj.log_path).replace(
-                            server_obj.path, new_server_obj.path
-                        )
-                    self.controller.servers.update_server(new_server_obj)
-
-                    # preserve backup config
-                    backup_config = self.controller.management.get_backup_config(
-                        server_id
-                    )
-                    excluded_dirs = []
-                    server_obj = self.controller.servers.get_server_obj(server_id)
-                    loop_backup_path = self.helper.wtol_path(server_obj.path)
-                    for item in self.controller.management.get_excluded_backup_dirs(
-                        server_id
-                    ):
-                        item_path = self.helper.wtol_path(item)
-                        bu_path = os.path.relpath(item_path, loop_backup_path)
-                        bu_path = os.path.join(new_server_obj.path, bu_path)
-                        excluded_dirs.append(bu_path)
-                    self.controller.management.set_backup_config(
-                        new_server_id,
-                        new_server_obj.backup_path,
-                        backup_config["max_backups"],
-                        excluded_dirs,
-                        backup_config["compress"],
-                        backup_config["shutdown"],
-                    )
-                    try:
-                        self.tasks_manager.remove_all_server_tasks(server_id)
-                    except:
-                        logger.info("No active tasks found for server")
-                    self.controller.remove_server(server_id, True)
-                    self.redirect("/panel/dashboard")
-
         elif page == "unzip_server":
             path = urllib.parse.unquote(self.get_argument("path", ""))
             if not path:
@@ -615,66 +378,6 @@ class AjaxHandler(BaseHandler):
             self.controller.update_master_server_dir(new_dir, exec_user["user_id"])
             return
 
-    @tornado.web.authenticated
-    def delete(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-
-        if page == "del_backup":
-            if not permissions["Backup"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Backups")
-                    return
-            file_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("file_path", default=None, strip=True)
-            )
-            server_id = self.get_argument("id", None)
-
-            Console.warning(f"Delete {file_path} for server {server_id}")
-
-            if not self.check_server_id(server_id, "del_backup"):
-                return
-            server_id = bleach.clean(server_id)
-
-            server_info = self.controller.servers.get_server_data_by_id(server_id)
-            if not (
-                Helpers.in_path(
-                    Helpers.get_os_understandable_path(server_info["path"]), file_path
-                )
-                or Helpers.in_path(
-                    Helpers.get_os_understandable_path(server_info["backup_path"]),
-                    file_path,
-                )
-            ) or not Helpers.check_file_exists(os.path.abspath(file_path)):
-                logger.warning(f"Invalid path in del_backup ajax call ({file_path})")
-                Console.warning(f"Invalid path in del_backup ajax call ({file_path})")
-                return
-
-            # Delete the file
-            if Helpers.validate_traversal(
-                Helpers.get_os_understandable_path(server_info["backup_path"]),
-                file_path,
-            ):
-                os.remove(file_path)
-
     def check_server_id(self, server_id, page_name):
         if server_id is None:
             logger.warning(
diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 23782158..56a42cbb 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -86,7 +86,6 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
 
     def post(self, server_id: str):
         auth_data = self.authenticate_user()
-        backup_conf = self.controller.management.get_backup_config(server_id)
         if not auth_data:
             return
         if (

From 1ff9bc9e83d024930361beea7e60f8edc4573c77 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 14:43:45 -0400
Subject: [PATCH 028/210] Setup backup file trees through API

---
 app/classes/web/ajax_handler.py               | 132 ------------------
 app/classes/web/routes/api/api_handlers.py    |   8 ++
 .../api/servers/server/backups/files.py       | 125 +++++++++++++++++
 .../templates/panel/server_backup.html        | 132 ++++++++++--------
 4 files changed, 208 insertions(+), 189 deletions(-)
 create mode 100644 app/classes/web/routes/api/servers/server/backups/files.py

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index ef634027..9419d82d 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -108,138 +108,6 @@ class AjaxHandler(BaseHandler):
             )
             self.finish()
 
-        elif page == "get_backup_tree":
-            server_id = self.get_argument("id", None)
-            folder = self.get_argument("path", None)
-
-            output = ""
-
-            dir_list = []
-            unsorted_files = []
-            file_list = os.listdir(folder)
-            for item in file_list:
-                if os.path.isdir(os.path.join(folder, item)):
-                    dir_list.append(item)
-                else:
-                    unsorted_files.append(item)
-            file_list = sorted(dir_list, key=str.casefold) + sorted(
-                unsorted_files, key=str.casefold
-            )
-            output += f"""<ul class="tree-nested d-block" id="{folder}ul">"""
-            for raw_filename in file_list:
-                filename = html.escape(raw_filename)
-                rel = os.path.join(folder, raw_filename)
-                dpath = os.path.join(folder, filename)
-                if str(dpath) in self.controller.management.get_excluded_backup_dirs(
-                    server_id
-                ):
-                    if os.path.isdir(rel):
-                        output += f"""<li class="tree-item" data-path="{dpath}">
-                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" class="checkBoxClass" name="root_path" value="{dpath}" checked>
-                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                            <i style="color: var(--info);" class="far fa-folder"></i>
-                            <i style="color: var(--info);" class="far fa-folder-open"></i>
-                            <strong>{filename}</strong>
-                            </span>
-                            </input></div><li>
-                            \n"""
-                    else:
-                        output += f"""<li
-                        class="d-block tree-ctx-item tree-file"
-                        data-path="{dpath}"
-                        data-name="{filename}"
-                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="{dpath}" checked><span style="margin-right: 6px;">
-                        <i class="far fa-file"></i></span></input>{filename}</li>"""
-
-                else:
-                    if os.path.isdir(rel):
-                        output += f"""<li class="tree-item" data-path="{dpath}">
-                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" class="checkBoxClass" name="root_path" value="{dpath}">
-                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                            <i style="color: var(--info);" class="far fa-folder"></i>
-                            <i style="color: var(--info);" class="far fa-folder-open"></i>
-                            <strong>{filename}</strong>
-                            </span>
-                            </input></div><li>
-                            \n"""
-                    else:
-                        output += f"""<li
-                        class="d-block tree-ctx-item tree-file"
-                        data-path="{dpath}"
-                        data-name="{filename}"
-                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="{dpath}">
-                        <span style="margin-right: 6px;"><i class="far fa-file">
-                        </i></span></input>{filename}</li>"""
-            self.write(Helpers.get_os_understandable_path(folder) + "\n" + output)
-            self.finish()
-
-        elif page == "get_backup_dir":
-            server_id = self.get_argument("id", None)
-            folder = self.get_argument("path", None)
-            output = ""
-
-            dir_list = []
-            unsorted_files = []
-            file_list = os.listdir(folder)
-            for item in file_list:
-                if os.path.isdir(os.path.join(folder, item)):
-                    dir_list.append(item)
-                else:
-                    unsorted_files.append(item)
-            file_list = sorted(dir_list, key=str.casefold) + sorted(
-                unsorted_files, key=str.casefold
-            )
-            output += f"""<ul class="tree-nested d-block" id="{folder}ul">"""
-            for raw_filename in file_list:
-                filename = html.escape(raw_filename)
-                rel = os.path.join(folder, raw_filename)
-                dpath = os.path.join(folder, filename)
-                if str(dpath) in self.controller.management.get_excluded_backup_dirs(
-                    server_id
-                ):
-                    if os.path.isdir(rel):
-                        output += f"""<li class="tree-item" data-path="{dpath}">
-                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" name="root_path" value="{dpath}" checked>
-                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                            <i class="far fa-folder"></i>
-                            <i class="far fa-folder-open"></i>
-                            <strong>{filename}</strong>
-                            </span>
-                            </input></div><li>"""
-                    else:
-                        output += f"""<li
-                        class="tree-item tree-nested d-block tree-ctx-item tree-file"
-                        data-path="{dpath}"
-                        data-name="{filename}"
-                        onclick=""><input type='checkbox' name='root_path' value='{dpath}' checked><span style="margin-right: 6px;">
-                        <i class="far fa-file"></i></span></input>{filename}</li>"""
-
-                else:
-                    if os.path.isdir(rel):
-                        output += f"""<li class="tree-item" data-path="{dpath}">
-                            \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" name="root_path" value="{dpath}">
-                            <span id="{dpath}span" class="files-tree-title" data-path="{dpath}" data-name="{filename}" onclick="getDirView(event)">
-                            <i class="far fa-folder"></i>
-                            <i class="far fa-folder-open"></i>
-                            <strong>{filename}</strong>
-                            </span>
-                            </input></div><li>"""
-                    else:
-                        output += f"""<li
-                        class="tree-item tree-nested d-block tree-ctx-item tree-file"
-                        data-path="{dpath}"
-                        data-name="{filename}"
-                        onclick=""><input type='checkbox' name='root_path' value='{dpath}'>
-                        <span style="margin-right: 6px;"><i class="far fa-file">
-                        </i></span></input>{filename}</li>"""
-
-            self.write(Helpers.get_os_understandable_path(folder) + "\n" + output)
-            self.finish()
-
         elif page == "get_dir":
             server_id = self.get_argument("id", None)
             path = self.get_argument("path", None)
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 8e4b7ac3..eb5d1297 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -32,6 +32,9 @@ from app.classes.web.routes.api.servers.server.backups.index import (
 from app.classes.web.routes.api.servers.server.backups.backup.index import (
     ApiServersServerBackupsBackupIndexHandler,
 )
+from app.classes.web.routes.api.servers.server.backups.files import (
+    ApiServersServerBackupsFilesIndexHandler,
+)
 from app.classes.web.routes.api.servers.server.tasks.task.children import (
     ApiServersServerTasksTaskChildrenHandler,
 )
@@ -128,6 +131,11 @@ def api_handlers(handler_args):
             ApiServersServerBackupsBackupIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/([0-9]+)/backups/files/?",
+            ApiServersServerBackupsFilesIndexHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/tasks/?",
             ApiServersServerTasksIndexHandler,
diff --git a/app/classes/web/routes/api/servers/server/backups/files.py b/app/classes/web/routes/api/servers/server/backups/files.py
new file mode 100644
index 00000000..44945409
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/backups/files.py
@@ -0,0 +1,125 @@
+import os
+import logging
+import json
+import html
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
+from app.classes.models.server_permissions import EnumPermissionsServer
+from app.classes.shared.helpers import Helpers
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+files_get_schema = {
+    "type": "object",
+    "properties": {
+        "page": {"type": "string", "minLength": 1},
+        "folder": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiServersServerBackupsFilesIndexHandler(BaseApiHandler):
+    def post(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Config permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_get_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            data["folder"],
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        # TODO: limit some columns for specific permissions?
+        folder = data["folder"]
+        return_json = {
+            "root_path": {
+                "path": folder,
+                "top": data["folder"]
+                == self.controller.servers.get_server_data_by_id(server_id)["path"],
+            }
+        }
+
+        dir_list = []
+        unsorted_files = []
+        file_list = os.listdir(folder)
+        for item in file_list:
+            if os.path.isdir(os.path.join(folder, item)):
+                dir_list.append(item)
+            else:
+                unsorted_files.append(item)
+        file_list = sorted(dir_list, key=str.casefold) + sorted(
+            unsorted_files, key=str.casefold
+        )
+        for raw_filename in file_list:
+            filename = html.escape(raw_filename)
+            rel = os.path.join(folder, raw_filename)
+            dpath = os.path.join(folder, filename)
+            if str(dpath) in self.controller.management.get_excluded_backup_dirs(
+                server_id
+            ):
+                if os.path.isdir(rel):
+                    return_json[filename] = {
+                        "path": dpath,
+                        "dir": True,
+                        "excluded": True,
+                    }
+                else:
+                    return_json[filename] = {
+                        "path": dpath,
+                        "dir": False,
+                        "excluded": True,
+                    }
+            else:
+                if os.path.isdir(rel):
+                    return_json[filename] = {
+                        "path": dpath,
+                        "dir": True,
+                        "excluded": False,
+                    }
+                else:
+                    return_json[filename] = {
+                        "path": dpath,
+                        "dir": False,
+                        "excluded": False,
+                    }
+        self.finish_json(200, {"status": "ok", "data": return_json})
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 6b9ba68f..195eb4d9 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -577,68 +577,81 @@
     });
   }
 
-  function getTreeView(path) {
-    path = path
+  function getDirView(event){
+    let path = event.target.parentElement.getAttribute("data-path");
+    if (document.getElementById(path).classList.contains('clicked')) {
+      return;
+    }else{
+      getTreeView(path);
+    }
 
-    $.ajax({
-      type: "GET",
-      url: '/ajax/get_backup_tree?id=' + server_id + '&path=' + path,
-      dataType: 'text',
-      success: function (data) {
-        console.log("got response:");
-        console.log(data);
+  }
+  async function getTreeView(path){
+    var token = getCookie("_xsrf");
+    let res = await fetch(`/api/v2/servers/${server_id}/backups/files`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"page": "backups", "folder": path}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        console.log(responseData);
+        process_tree_response(responseData);
 
-        dataArr = data.split('\n');
-        serverDir = dataArr.shift(); // Remove & return first element (server directory)
-        text = dataArr.join('\n');
+      } else {
 
-        try {
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
+  }
+
+  function process_tree_response(response) {
+    let path = response.data.root_path.path;
+    let text = `<ul class="tree-nested d-block" id="${path}ul">`;
+      Object.entries(response.data).forEach(([key, value]) => {
+        if (key === "root_path" || key === "db_stats"){
+          //continue is not valid in for each. Return acts as a continue.
+          return;
+        }
+      let checked = ""
+      let dpath = value.path;
+      let filename = key;
+      if (value.dir){
+        if (value.excluded){
+          checked = "checked"
+        }
+        text += `<li class="tree-item" data-path="${dpath}">
+                            \n<div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" class="checkBoxClass" name="root_path" value="${dpath}" ${checked}>
+                            <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
+                            <i style="color: var(--info);" class="far fa-folder"></i>
+                            <i style="color: var(--info);" class="far fa-folder-open"></i>
+                            <strong>${filename}</strong>
+                            </span>
+                            </input></div><li>`
+      }else{
+        text += `<li
+                        class="d-block tree-ctx-item tree-file"
+                        data-path="${dpath}"
+                        data-name="${filename}"
+                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="${dpath}" ${checked}><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>${filename}</li>`
+      }
+    });
+    text += `</ul>`;
+    if(response.data.root_path.top){
+      try {
           document.getElementById('main-tree-div').innerHTML += text;
           document.getElementById('main-tree').parentElement.classList.add("clicked");
         } catch {
           document.getElementById('files-tree').innerHTML = text;
         }
-
-
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-      },
-    });
-  }
-  function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    document.getElementById("files-tree").classList.toggle("d-block");
-    document.getElementById(path + "span").classList.toggle("tree-caret-down");
-    document.getElementById(path + "span").classList.toggle("tree-caret");
-  }
-
-
-  function getDirView(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-
-    if (document.getElementById(path).classList.contains('clicked')) {
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        document.getElementById(path + "ul").classList.toggle("d-block");
-        document.getElementById(path + "span").classList.toggle("tree-caret-down");
-      }
-      return;
-    } else {
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_backup_dir?id=' + server_id + '&path=' + path,
-        dataType: 'text',
-        success: function (data) {
-          console.log("got response:");
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-
-          try {
+    }else{
+      try {
             document.getElementById(path + "span").classList.add('tree-caret-down');
             document.getElementById(path).innerHTML += text;
             document.getElementById(path).classList.add("clicked");
@@ -646,7 +659,7 @@
             console.log("Bad")
           }
 
-          var toggler = document.getElementById(path);
+          var toggler = document.getElementById(path + "span");
 
           if (toggler.classList.contains('files-tree-title')) {
             document.getElementById(path + "span").addEventListener("click", function caretListener() {
@@ -654,10 +667,15 @@
               document.getElementById(path + "span").classList.toggle("tree-caret-down");
             });
           }
-        },
-      });
     }
   }
+
+  function getToggleMain(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+    document.getElementById("files-tree").classList.toggle("d-block");
+    document.getElementById(path + "span").classList.toggle("tree-caret-down");
+    document.getElementById(path + "span").classList.toggle("tree-caret");
+  }
   function show_file_tree() {
     $("#dir_select").modal();
   }

From 12088f133250df2f6ef6b3731c0ac9c63d029b14 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 17:47:56 -0400
Subject: [PATCH 029/210] Fix response data

---
 .../web/routes/api/servers/server/webhooks/index.py       | 6 +++++-
 .../routes/api/servers/server/webhooks/webhook/index.py   | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/webhooks/index.py b/app/classes/web/routes/api/servers/server/webhooks/index.py
index 599a4f4c..328d4885 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/index.py
@@ -43,7 +43,11 @@ class ApiServersServerWebhooksIndexHandler(BaseApiHandler):
             # if the user doesn't have Schedule permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
         self.finish_json(
-            200, self.controller.management.get_webhooks_by_server(server_id)
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.management.get_webhooks_by_server(server_id),
+            },
         )
 
     def post(self, server_id: str):
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 499c99cb..9c0b705e 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -52,7 +52,13 @@ class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
             return self.finish_json(
                 400, {"status": "error", "error": "NO WEBHOOK FOUND"}
             )
-        self.finish_json(200, self.controller.management.get_webhook_by_id(webhook_id))
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.management.get_webhook_by_id(webhook_id),
+            },
+        )
 
     def delete(self, server_id: str, webhook_id: str):
         auth_data = self.authenticate_user()

From 768d3c0d14a81e9d5f5c32941ff5479b90367e8a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 20:55:48 -0400
Subject: [PATCH 030/210] Move files request to files API

---
 app/classes/web/routes/api/api_handlers.py                | 8 ++++----
 .../web/routes/api/servers/server/{backups => }/files.py  | 2 +-
 app/frontend/templates/panel/server_backup.html           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename app/classes/web/routes/api/servers/server/{backups => }/files.py (98%)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index eb5d1297..249899ef 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -32,8 +32,8 @@ from app.classes.web.routes.api.servers.server.backups.index import (
 from app.classes.web.routes.api.servers.server.backups.backup.index import (
     ApiServersServerBackupsBackupIndexHandler,
 )
-from app.classes.web.routes.api.servers.server.backups.files import (
-    ApiServersServerBackupsFilesIndexHandler,
+from app.classes.web.routes.api.servers.server.files import (
+    ApiServersServerFilesIndexHandler,
 )
 from app.classes.web.routes.api.servers.server.tasks.task.children import (
     ApiServersServerTasksTaskChildrenHandler,
@@ -132,8 +132,8 @@ def api_handlers(handler_args):
             handler_args,
         ),
         (
-            r"/api/v2/servers/([0-9]+)/backups/files/?",
-            ApiServersServerBackupsFilesIndexHandler,
+            r"/api/v2/servers/([0-9]+)/files/?",
+            ApiServersServerFilesIndexHandler,
             handler_args,
         ),
         (
diff --git a/app/classes/web/routes/api/servers/server/backups/files.py b/app/classes/web/routes/api/servers/server/files.py
similarity index 98%
rename from app/classes/web/routes/api/servers/server/backups/files.py
rename to app/classes/web/routes/api/servers/server/files.py
index 44945409..a6baf1d6 100644
--- a/app/classes/web/routes/api/servers/server/backups/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -21,7 +21,7 @@ files_get_schema = {
 }
 
 
-class ApiServersServerBackupsFilesIndexHandler(BaseApiHandler):
+class ApiServersServerFilesIndexHandler(BaseApiHandler):
     def post(self, server_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 195eb4d9..4061d58d 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -588,7 +588,7 @@
   }
   async function getTreeView(path){
     var token = getCookie("_xsrf");
-    let res = await fetch(`/api/v2/servers/${server_id}/backups/files`, {
+    let res = await fetch(`/api/v2/servers/${server_id}/files`, {
         method: 'POST',
         headers: {
           'X-XSRFToken': token

From 2e58a2adc109ccb6f4edbe4a712347800cd25871 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 4 Jun 2023 23:08:27 -0400
Subject: [PATCH 031/210] Remove files from ajax

---
 app/classes/shared/helpers.py                 |  81 ----------
 app/classes/web/ajax_handler.py               |  18 ---
 .../templates/panel/server_files.html         | 145 ++++++++++--------
 3 files changed, 83 insertions(+), 161 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 65bc853a..e150cd0b 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -1092,87 +1092,6 @@ class Helpers:
 
         return data
 
-    def generate_tree(self, folder, output=""):
-        dir_list = []
-        unsorted_files = []
-        file_list = os.listdir(folder)
-        for item in file_list:
-            if os.path.isdir(os.path.join(folder, item)):
-                dir_list.append(item)
-            elif str(item) != self.ignored_names:
-                unsorted_files.append(item)
-        file_list = sorted(dir_list, key=str.casefold) + sorted(
-            unsorted_files, key=str.casefold
-        )
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if os.path.isdir(rel):
-                if filename not in self.ignored_names:
-                    output += f"""<li id="{dpath}li" class="tree-item"
-                        data-path="{dpath}">
-                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}"
-                        class="tree-caret tree-ctx-item tree-folder">
-                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}"
-                        data-name="{filename}" onclick="getDirView(event)">
-                        <i style="color: var(--info);" class="far fa-folder"></i>
-                        <i style="color: var(--info);" class="far fa-folder-open"></i>
-                        {filename}
-                        </span>
-                        </div><li>
-                        \n"""
-            else:
-                if filename not in self.ignored_names:
-                    output += f"""<li id="{dpath}li"
-                    class="d-block tree-ctx-item tree-file tree-item"
-                    data-path="{dpath}"
-                    data-name="{filename}"
-                    onclick="clickOnFile(event)"><span style="margin-right: 6px;">
-                    <i class="far fa-file"></i></span>{filename}</li>"""
-        return output
-
-    def generate_dir(self, folder, output=""):
-        dir_list = []
-        unsorted_files = []
-        file_list = os.listdir(folder)
-        for item in file_list:
-            if os.path.isdir(os.path.join(folder, item)):
-                dir_list.append(item)
-            elif str(item) != self.ignored_names:
-                unsorted_files.append(item)
-        file_list = sorted(dir_list, key=str.casefold) + sorted(
-            unsorted_files, key=str.casefold
-        )
-        output += f"""<ul class="tree-nested d-block" id="{folder}ul">"""
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            dpath = os.path.join(folder, filename)
-            rel = os.path.join(folder, raw_filename)
-            if os.path.isdir(rel):
-                if filename not in self.ignored_names:
-                    output += f"""<li id="{dpath}li" class="tree-item"
-                        data-path="{dpath}">
-                        \n<div id="{dpath}" data-path="{dpath}" data-name="{filename}"
-                        class="tree-caret tree-ctx-item tree-folder">
-                        <span id="{dpath}span" class="files-tree-title" data-path="{dpath}"
-                        data-name="{filename}" onclick="getDirView(event)">
-                        <i style="color: var(--info);" class="far fa-folder"></i>
-                        <i style="color: var(--info);" class="far fa-folder-open"></i>
-                        {filename}
-                        </span>
-                        </div><li>"""
-            else:
-                if filename not in self.ignored_names:
-                    output += f"""<li id="{dpath}li"
-                    class="d-block tree-ctx-item tree-file tree-item"
-                    data-path="{dpath}"
-                    data-name="{filename}"
-                    onclick="clickOnFile(event)"><span style="margin-right: 6px;">
-                    <i class="far fa-file"></i></span>{filename}</li>"""
-        output += "</ul>\n"
-        return output
-
     @staticmethod
     def generate_zip_tree(folder, output=""):
         file_list = os.listdir(folder)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 9419d82d..f3b22d32 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -108,24 +108,6 @@ class AjaxHandler(BaseHandler):
             )
             self.finish()
 
-        elif page == "get_dir":
-            server_id = self.get_argument("id", None)
-            path = self.get_argument("path", None)
-
-            if not self.check_server_id(server_id, "get_tree"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if Helpers.validate_traversal(
-                self.controller.servers.get_server_data_by_id(server_id)["path"], path
-            ):
-                self.write(
-                    Helpers.get_os_understandable_path(path)
-                    + "\n"
-                    + Helpers.generate_dir(path)
-                )
-            self.finish()
-
     @tornado.web.authenticated
     def post(self, page):
         api_key, _, exec_user = self.current_user
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 7dbcebb6..f3fa1179 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -882,68 +882,86 @@
     });
   }
 
-  function getTreeView(event) {
-    const path = $('#root_dir').data('path');;
+  function getDirView(event){
+    let path = event.target.parentElement.getAttribute("data-path");
+    if (document.getElementById(path).classList.contains('clicked')) {
+      return;
+    }else{
+      getTreeView(path);
+    }
 
-    $.ajax({
-      type: "GET",
-      url: "/files/get_tree?id=" + serverId + "&path=" + path,
-      dataType: 'text',
-      success: function (data) {
-        console.log("got response:");
+  }
+  async function getTreeView(path){
+    var token = getCookie("_xsrf");
+    let res = await fetch(`/api/v2/servers/${serverId}/files`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"page": "files", "folder": path}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        console.log(responseData);
+        process_tree_response(responseData);
 
-        dataArr = data.split('\n');
-        serverDir = dataArr.shift(); // Remove & return first element (server directory)
-        text = dataArr.join('\n');
+      } else {
 
-        try {
-          document.getElementById(path).innerHTML += text;
-          event.target.parentElement.classList.add("clicked");
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
+  }
+
+  function process_tree_response(response) {
+    let path = response.data.root_path.path;
+    let text = ``;
+    if (!response.data.root_path.top){
+      text = `<ul class="tree-nested d-block" id="${path}ul">`;
+    }
+      Object.entries(response.data).forEach(([key, value]) => {
+        if (key === "root_path" || key === "db_stats"){
+          //continue is not valid in for each. Return acts as a continue.
+          return;
+        }
+      let checked = ""
+      let dpath = value.path;
+      let filename = key;
+      if (value.dir){
+        if (value.excluded){
+          checked = "checked"
+        }
+        text += `<li class="tree-item" id="${dpath}li" data-path="${dpath}">
+                            \n<div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
+                            <input type="checkbox" class="checkBoxClass d-none file-check" name="root_path" value="${dpath}" ${checked}>
+                            <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
+                            <i style="color: var(--info);" class="far fa-folder"></i>
+                            <i style="color: var(--info);" class="far fa-folder-open"></i>
+                            ${filename}
+                            </span>
+                            </input></div></li>`
+      }else{
+        text += `<li
+                        class="d-block tree-ctx-item tree-file"
+                        data-path="${dpath}"
+                        data-name="${filename}"
+                        onclick="clickOnFile(event)" id="${dpath}li"><input type='checkbox' class="checkBoxClass d-none file-check" name='root_path' value="${dpath}" ${checked}><span style="margin-right: 6px;">
+                        <i class="far fa-file"></i></span></input>${filename}</li>`
+      }
+    });
+    if (! response.data.root_path.top){
+      text += `</ul>`;
+    }
+    if(response.data.root_path.top){
+      try {
+          document.getElementById('main-tree-div').innerHTML += text;
+          document.getElementById('main-tree').parentElement.classList.add("clicked");
         } catch {
           document.getElementById('files-tree').innerHTML = text;
         }
-
-
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-        setTimeout(function () { setTreeViewContext() }, 1000);
-      },
-    });
-  }
-
-  function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    document.getElementById("files-tree").classList.toggle("d-block");
-    document.getElementById(path + "span").classList.toggle("tree-caret-down");
-    document.getElementById(path + "span").classList.toggle("tree-caret");
-  }
-
-  function getDirView(event) {
-    let path = event.target.parentElement.getAttribute('data-path');
-
-    if (document.getElementById(path).classList.contains('clicked')) {
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        document.getElementById(path + "ul").classList.toggle("d-block");
-        document.getElementById(path + "span").classList.toggle("tree-caret-down");
-      }
-      return;
-    } else {
-      $.ajax({
-        type: "GET",
-        url: "/files/get_dir?id=" + serverId + "&path=" + path,
-        dataType: 'text',
-        success: function (data) {
-          console.log("got response:");
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-
-          try {
+    }else{
+      try {
             document.getElementById(path + "span").classList.add('tree-caret-down');
             document.getElementById(path).innerHTML += text;
             document.getElementById(path).classList.add("clicked");
@@ -951,9 +969,7 @@
             console.log("Bad")
           }
 
-          setTimeout(function () { setTreeViewContext() }, 1000);
-
-          var toggler = document.getElementById(path);
+          var toggler = document.getElementById(path + "span");
 
           if (toggler.classList.contains('files-tree-title')) {
             document.getElementById(path + "span").addEventListener("click", function caretListener() {
@@ -961,9 +977,14 @@
               document.getElementById(path + "span").classList.toggle("tree-caret-down");
             });
           }
-        },
-      });
     }
+    setTimeout(function () { setTreeViewContext() }, 1000);
+  }
+  function getToggleMain(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+    document.getElementById("files-tree").classList.toggle("d-block");
+    document.getElementById(path + "span").classList.toggle("tree-caret-down");
+    document.getElementById(path + "span").classList.toggle("tree-caret");
   }
 
   function setTreeViewContext() {
@@ -1172,7 +1193,7 @@
     });
   }
 
-  getTreeView();
+  getTreeView($('#root_dir').data('path'));
   setTreeViewContext();
 
   function setKeyboard(target) {

From 4ef31864cadee5a0d9679ff494e8283d09f6d4dd Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 5 Jun 2023 18:03:06 -0400
Subject: [PATCH 032/210] Add delete file

---
 .../web/routes/api/servers/server/files.py    | 71 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index a6baf1d6..466e5292 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -6,6 +6,7 @@ from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.shared.helpers import Helpers
+from app.classes.shared.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
@@ -20,6 +21,15 @@ files_get_schema = {
     "minProperties": 1,
 }
 
+file_delete_schema = {
+    "type": "object",
+    "properties": {
+        "filename": {"type": "string", "minLength": 5},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
 
 class ApiServersServerFilesIndexHandler(BaseApiHandler):
     def post(self, server_id: str):
@@ -32,12 +42,16 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         if (
-            EnumPermissionsServer.BACKUP
+            EnumPermissionsServer.FILES
             not in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )
+            or EnumPermissionsServer.BACKUP
+            in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
         ):
-            # if the user doesn't have Config permission, return an error
+            # if the user doesn't have Files or Backup permission, return an error
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         try:
@@ -123,3 +137,56 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
                         "excluded": False,
                     }
         self.finish_json(200, {"status": "ok", "data": return_json})
+
+    def delete(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, file_delete_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            data["filename"],
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+
+        if os.path.isdir(data["filename"]):
+            FileHelpers.del_dirs(data["filename"])
+        else:
+            FileHelpers.del_file(data["filename"])
+        return self.finish_json(200, {"status": "ok"})

From ad7ba9d6a71ccae181385c872c7af00d5f8e406e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 5 Jun 2023 18:20:37 -0400
Subject: [PATCH 033/210] Fix logical issue

---
 app/classes/web/routes/api/servers/server/files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index 466e5292..becd3681 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -46,7 +46,7 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             not in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )
-            or EnumPermissionsServer.BACKUP
+            or not EnumPermissionsServer.BACKUP
             in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )

From c0fb5cf179277ac7ca0461cc0ef9e391feb71d4e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 5 Jun 2023 18:20:45 -0400
Subject: [PATCH 034/210] Add delete to front end

---
 .../templates/panel/server_files.html         | 62 +++++++------------
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index f3fa1179..dcc315a4 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -648,37 +648,27 @@
     });
   }
 
-  function deleteFile(path, callback) {
-    console.log('Deleting: ' + path)
-    var token = getCookie("_xsrf")
-    $.ajax({
-      type: "DELETE",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/del_file?id=" + serverId,
-      data: {
-        file_path: path
-      },
-      success: function (data) {
-        console.log("got response:");
-        callback();
-      },
-    });
-  }
+  async function deleteItem(path, el, callback) {
+    var token = getCookie("_xsrf");
+    let res = await fetch(`/api/v2/servers/${serverId}/files`, {
+        method: 'DELETE',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"filename": path}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        el = document.getElementById(path + "li");
+        $(el).remove();
+        document.getElementById('files-tree-nav').style.display = 'none';
+      } else {
 
-  function deleteDir(path, callback) {
-    var token = getCookie("_xsrf")
-    $.ajax({
-      type: "DELETE",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/del_dir?id=" + serverId,
-      data: {
-        dir_path: path
-      },
-      success: function (data) {
-        console.log("got response:");
-        callback();
-      },
-    });
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
   function unZip(path, callback) {
@@ -1155,11 +1145,7 @@
       },
       callback: function (result) {
         if (!result) return;
-        deleteFile(path, function () {
-          el = document.getElementById(path + "li");
-          $(el).remove();
-          document.getElementById('files-tree-nav').style.display = 'none';
-        });
+        deleteItem(path);
       }
     });
   }
@@ -1184,11 +1170,7 @@
       },
       callback: function (result) {
         if (!result) return;
-        deleteDir(path, function () {
-          el = document.getElementById(path + "li");
-          $(el).remove();
-          document.getElementById('files-tree-nav').style.display = 'none';
-        });
+        deleteItem(path);
       }
     });
   }

From 1b9e284f520c2362fc39b5b458aa89a02cc2b99a Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 5 Jul 2023 19:34:42 -0400
Subject: [PATCH 035/210] Change backup_now post for better error handling

---
 .../templates/panel/server_backup.html        | 51 ++++++++-----------
 1 file changed, 20 insertions(+), 31 deletions(-)

diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 4061d58d..761226bc 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -316,21 +316,32 @@
     return r ? r[1] : undefined;
   }
 
-  function backup_started() {
+  async function backup_started() {
     var token = getCookie("_xsrf")
     document.getElementById('backup_button').style.visibility = 'hidden';
     var dialog = bootbox.dialog({
       message: "{{ translate('serverBackups', 'backupTask', data['lang']) }}",
       closeButton: false
     });
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: `/api/v2/servers/${server_id}/action/backup_server`,
-      success: function (data) {
-        return;
-      },
-    });
+    var token = getCookie("_xsrf");
+    let res = await fetch(`/api/v2/servers/${server_id}/action/backup_server`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        }
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        console.log(responseData);
+        process_tree_response(responseData);
+
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
     return;
   }
   async function del_backup(filename, id) {
@@ -352,28 +363,6 @@
     }
   }
 
-  function restore_backup(filename, id) {
-    var token = getCookie("_xsrf")
-    var dialog = bootbox.dialog({
-      message: "<i class='fa fa-spin fa-spinner'></i> {{ translate('serverBackups', 'restoring', data['lang']) }}",
-      closeButton: false
-    });
-
-    console.log('Sending Command to restore backup: ' + filename)
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: '/ajax/restore_backup?server_id=' + id,
-      body: {
-        "filename": filename,
-      },
-      success: function (data) {
-        setTimeout(function () {
-          location.href = ('/panel/dashboard');
-        }, 15000);
-      },
-    });
-  }
   async function restore_backup(filename, id) {
     var token = getCookie("_xsrf")
     let contents = JSON.stringify({"filename": filename})

From 4e776113756a27864d91225d4f6b1c06f4c1c6e1 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 5 Jul 2023 20:11:27 -0400
Subject: [PATCH 036/210] Remove ajax call for exclusions

---
 app/classes/shared/helpers.py                 |  6 ------
 app/classes/web/ajax_handler.py               |  5 -----
 .../templates/panel/server_backup.html        | 21 ++++++-------------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index e150cd0b..d8b26399 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -1146,12 +1146,6 @@ class Helpers:
                     user_id, "send_temp_path", {"path": temp_dir}
                 )
 
-    def backup_select(self, path, user_id):
-        if user_id:
-            self.websocket_helper.broadcast_user(
-                user_id, "send_temp_path", {"path": path}
-            )
-
     @staticmethod
     def unzip_backup_archive(backup_path, zip_name):
         zip_path = os.path.join(backup_path, zip_name)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index f3b22d32..0cbc5e58 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -188,11 +188,6 @@ class AjaxHandler(BaseHandler):
                     )
             return
 
-        elif page == "backup_select":
-            path = self.get_argument("path", None)
-            self.helper.backup_select(path, exec_user["user_id"])
-            return
-
         elif page == "jar_cache":
             if not superuser:
                 self.redirect("/panel/error?error=Not a super user")
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 761226bc..7c470e2a 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -523,17 +523,6 @@
         closeButton: false
       });
 
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/backup_select?id=' + server_id + '&path=' + path,
-      });
-    } else {
-      bootbox.alert("You must input a path before selecting this button");
-    }
-  });
-  if (webSocket) {
-    webSocket.on('send_temp_path', function (data) {
       setTimeout(function () {
         var x = document.querySelector('.bootbox');
         if (x) {
@@ -543,13 +532,15 @@
         if (x) {
           x.remove()
         }
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        getTreeView(data.path);
+        document.getElementById('main-tree-input').setAttribute('value', path)
+        getTreeView(path);
         show_file_tree();
 
       }, 5000);
-    });
-  }
+    } else {
+      bootbox.alert("You must input a path before selecting this button");
+    }
+  });
   if (webSocket) {
     webSocket.on('backup_status', function (backup) {
       if (backup.percent >= 100) {

From 41411b8c2d0d1c6ce4f7a7265584801e65adbcab Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 12 Jul 2023 12:22:46 -0400
Subject: [PATCH 037/210] Remove unused import

---
 app/classes/web/ajax_handler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index f3b22d32..dba2b6d2 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -9,7 +9,6 @@ import bleach
 import tornado.web
 import tornado.escape
 
-from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.server import ServerOutBuf

From c82e0fe20a49ab19878653d266c7b351af5e0012 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 12 Jul 2023 12:23:09 -0400
Subject: [PATCH 038/210] Add semi-colon in js

---
 app/frontend/templates/panel/server_schedules.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html
index e2627b42..78e43bb2 100644
--- a/app/frontend/templates/panel/server_schedules.html
+++ b/app/frontend/templates/panel/server_schedules.html
@@ -310,7 +310,7 @@
   const serverId = new URLSearchParams(document.location.search).get('id')
 
   $(document).ready(function () {
-    console.log('ready for JS!')
+    console.log('ready for JS!');
     $('#schedule_table').DataTable({
       'order': [4, 'asc'],
     }

From 6a8fea3ff1c18ec0379864b1ab3a64df1e1d0177 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 12 Jul 2023 12:23:49 -0400
Subject: [PATCH 039/210] Add HTML form logic

---
 .../templates/panel/server_backup.html        | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 4061d58d..e271eaf2 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -44,11 +44,8 @@
             <div class="col-md-6 col-sm-12">
               <br>
               <br>
-              <form class="forms-sample" method="post" action="/panel/server_backup">
+              <form id="backup-form" class="forms-sample" method="post" action="/panel/server_backup">
                 {% raw xsrf_form_html() %}
-                <input type="hidden" name="id" value="{{ data['server_stats']['server_id']['server_id'] }}">
-                <input type="hidden" name="subpage" value="backup">
-
 
                 {% if data['backing_up'] %}
                 <div class="progress" style="height: 15px;">
@@ -415,6 +412,46 @@
   });
 
   $(document).ready(function () {
+    $("#config_form").on("submit", async function (e) {
+      e.preventDefault();
+      var token = getCookie("_xsrf")
+      let backupForm = document.getElementById("backup_form");
+      //Remove checks that we don't need in form data.
+      $(this).children("before-check").remove();
+      $(this).children("after-check").remove();
+      let formData = new FormData(backupForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      //We need to make sure these are sent regardless of whether or not they're checked
+      formDataObject.compress = $("#compress").prop('checked');
+      formDataObject.shutdown = $("#shutdown").prop('checked');
+      console.log(formDataObject);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(formDataObject, replacer);
+      formDataJsonString["ignored_exits"] = toString(formDataJsonString["ignored_exits"]);
+      console.log(formDataJsonString.ignored_exits)
+
+      console.log(formDataJsonString);
+
+      let res = await fetch(`/api/v2/servers/${serverId}`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.reload();
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+      }
+    });
+  
     try {
       if ($('#backup_path').val() == '') {
         console.log('true')

From 76e1ee471ad6d575395719382b9949ac8f2246e7 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 12 Jul 2023 18:01:14 -0400
Subject: [PATCH 040/210] Add backups API

---
 app/classes/web/panel_handler.py              | 63 +------------------
 .../api/servers/server/backups/index.py       | 59 +++++++++++------
 .../templates/panel/server_backup.html        | 46 +++++++++-----
 3 files changed, 71 insertions(+), 97 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index df58263d..17478b8d 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1580,68 +1580,7 @@ class PanelHandler(BaseHandler):
                 role = self.controller.roles.get_role(r)
                 exec_user_role.add(role["role_name"])
 
-        if page == "server_backup":
-            logger.debug(self.request.arguments)
-
-            server_id = self.check_server_id()
-            if not server_id:
-                return
-
-            if (
-                not permissions["Backup"]
-                in self.controller.server_perms.get_user_id_permissions_list(
-                    exec_user["user_id"], server_id
-                )
-                and not superuser
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: User not authorized"
-                )
-                return
-
-            server_obj = self.controller.servers.get_server_obj(server_id)
-            compress = self.get_argument("compress", False)
-            shutdown = self.get_argument("shutdown", False)
-            check_changed = self.get_argument("changed")
-            before = self.get_argument("backup_before", "")
-            after = self.get_argument("backup_after", "")
-            if str(check_changed) == str(1):
-                checked = self.get_body_arguments("root_path")
-            else:
-                checked = self.controller.management.get_excluded_backup_dirs(server_id)
-            if superuser:
-                backup_path = self.get_argument("backup_path", None)
-                if Helpers.is_os_windows():
-                    backup_path.replace(" ", "^ ")
-                    backup_path = Helpers.wtol_path(backup_path)
-            else:
-                backup_path = server_obj.backup_path
-            max_backups = bleach.clean(self.get_argument("max_backups", None))
-
-            server_obj = self.controller.servers.get_server_obj(server_id)
-
-            server_obj.backup_path = backup_path
-            self.controller.servers.update_server(server_obj)
-            self.controller.management.set_backup_config(
-                server_id,
-                max_backups=max_backups,
-                excluded_dirs=checked,
-                compress=bool(compress),
-                shutdown=bool(shutdown),
-                before=before,
-                after=after,
-            )
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Edited server {server_id}: updated backups",
-                server_id,
-                self.get_remote_ip(),
-            )
-            self.tasks_manager.reload_schedule_from_db()
-            self.redirect(f"/panel/server_detail?id={server_id}&subpage=backup")
-
-        elif page == "config_json":
+        if page == "config_json":
             try:
                 data = {}
                 with open(self.helper.settings_file, "r", encoding="utf-8") as f:
diff --git a/app/classes/web/routes/api/servers/server/backups/index.py b/app/classes/web/routes/api/servers/server/backups/index.py
index b3f6f7ed..9e47bcfc 100644
--- a/app/classes/web/routes/api/servers/server/backups/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/index.py
@@ -10,13 +10,13 @@ logger = logging.getLogger(__name__)
 backup_patch_schema = {
     "type": "object",
     "properties": {
-        "path": {"type": "string", "minLength": 1},
-        "max": {"type": "int"},
+        "backup_path": {"type": "string", "minLength": 1},
+        "max_backups": {"type": "integer"},
         "compress": {"type": "boolean"},
         "shutdown": {"type": "boolean"},
-        "before_command": {"type": "string"},
-        "after_command": {"type": "string"},
-        "exclusions": {"type": "string"},
+        "backup_before": {"type": "string"},
+        "backup_after": {"type": "string"},
+        "exclusions": {"type": "array"},
     },
     "additionalProperties": False,
     "minProperties": 1,
@@ -25,12 +25,12 @@ backup_patch_schema = {
 basic_backup_patch_schema = {
     "type": "object",
     "properties": {
-        "max": {"type": "int"},
+        "max_backups": {"type": "integer"},
         "compress": {"type": "boolean"},
         "shutdown": {"type": "boolean"},
-        "before_command": {"type": "string"},
-        "after_command": {"type": "string"},
-        "exclusions": {"type": "string"},
+        "backup_before": {"type": "string"},
+        "backup_after": {"type": "string"},
+        "exclusions": {"type": "array"},
     },
     "additionalProperties": False,
     "minProperties": 1,
@@ -65,7 +65,10 @@ class ApiServersServerBackupsIndexHandler(BaseApiHandler):
             )
 
         try:
-            validate(data, backup_patch_schema)
+            if auth_data[4]["superuser"]:
+                validate(data, backup_patch_schema)
+            else:
+                validate(data, basic_backup_patch_schema)
         except ValidationError as e:
             return self.finish_json(
                 400,
@@ -90,13 +93,31 @@ class ApiServersServerBackupsIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
         self.controller.management.set_backup_config(
-            data["server_id"],
-            data["backup_path"],
-            data["max_backups"],
-            data["excluded_dirs"],
-            data["compress"],
-            data["shutdown"],
-            data["before"],
-            data["after"],
+            server_id,
+            data.get(
+                "backup_path",
+                self.controller.management.get_backup_config(server_id)["backup_path"],
+            ),
+            data.get(
+                "max_backups",
+                self.controller.management.get_backup_config(server_id)["max_backups"],
+            ),
+            data.get("exclusions"),
+            data.get(
+                "compress",
+                self.controller.management.get_backup_config(server_id)["compress"],
+            ),
+            data.get(
+                "shutdown",
+                self.controller.management.get_backup_config(server_id)["shutdown"],
+            ),
+            data.get(
+                "backup_before",
+                self.controller.management.get_backup_config(server_id)["before"],
+            ),
+            data.get(
+                "backup_after",
+                self.controller.management.get_backup_config(server_id)["after"],
+            ),
         )
-        return self.finish(200, {"status": "ok"})
+        return self.finish_json(200, {"status": "ok"})
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index a05741d4..43e9d89f 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -44,9 +44,7 @@
             <div class="col-md-6 col-sm-12">
               <br>
               <br>
-              <form id="backup-form" class="forms-sample" method="post" action="/panel/server_backup">
-                {% raw xsrf_form_html() %}
-
+              <form id="backup-form" class="forms-sample">
                 {% if data['backing_up'] %}
                 <div class="progress" style="height: 15px;">
                   <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
@@ -146,8 +144,6 @@
                     data-server_path="{{ data['server_stats']['server_id']['path']}}" type="button">{{
                     translate('serverBackups', 'clickExclude', data['lang']) }}</button>
                 </div>
-                <input type="number" class="form-control" name="changed" id="changed" value="0"
-                  style="visibility: hidden;"></input>
                 <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                   aria-hidden="true">
                   <div class="modal-dialog" role="document">
@@ -400,29 +396,48 @@
     }
   });
 
+  function replacer(key, value) {
+    if (key != "backup_before" && key != "backup_after") {
+      if (typeof value == "boolean" || key === "executable_update_url") {
+        return value
+      } else {
+        return (isNaN(value) ? value : +value);
+      }
+    } else {
+      return value;
+    }
+  }
+
   $(document).ready(function () {
-    $("#config_form").on("submit", async function (e) {
+    $("#backup-form").on("submit", async function (e) {
       e.preventDefault();
       var token = getCookie("_xsrf")
-      let backupForm = document.getElementById("backup_form");
-      //Remove checks that we don't need in form data.
-      $(this).children("before-check").remove();
-      $(this).children("after-check").remove();
+      let backupForm = document.getElementById("backup-form");
+
       let formData = new FormData(backupForm);
+      //Remove checks that we don't need in form data.
+      formData.delete("after-check");
+      formData.delete("before-check");
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
       //We need to make sure these are sent regardless of whether or not they're checked
       formDataObject.compress = $("#compress").prop('checked');
       formDataObject.shutdown = $("#shutdown").prop('checked');
+      let excluded = [];
+      $('input.excluded:checkbox:checked').each(function () {
+        excluded.push($(this).val());
+      });
+      if ($("#root_files_button").hasClass("clicked")){
+        formDataObject.exclusions = excluded;
+      }
+      console.log(excluded);
       console.log(formDataObject);
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
-      formDataJsonString["ignored_exits"] = toString(formDataJsonString["ignored_exits"]);
-      console.log(formDataJsonString.ignored_exits)
 
       console.log(formDataJsonString);
 
-      let res = await fetch(`/api/v2/servers/${serverId}`, {
+      let res = await fetch(`/api/v2/servers/${server_id}/backups/`, {
         method: 'PATCH',
         headers: {
           'X-XSRFToken': token
@@ -550,7 +565,6 @@
         return;
       } else {
         document.getElementById('root_files_button').classList.add('clicked');
-        document.getElementById("changed").value = 1;
       }
       path = $("#root_files_button").data('server_path')
       console.log($("#root_files_button").data('server_path'))
@@ -643,7 +657,7 @@
         }
         text += `<li class="tree-item" data-path="${dpath}">
                             \n<div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
-                            <input type="checkbox" class="checkBoxClass" name="root_path" value="${dpath}" ${checked}>
+                            <input type="checkbox" class="checkBoxClass excluded" value="${dpath}" ${checked}>
                             <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
                             <i style="color: var(--info);" class="far fa-folder"></i>
                             <i style="color: var(--info);" class="far fa-folder-open"></i>
@@ -655,7 +669,7 @@
                         class="d-block tree-ctx-item tree-file"
                         data-path="${dpath}"
                         data-name="${filename}"
-                        onclick=""><input type='checkbox' class="checkBoxClass" name='root_path' value="${dpath}" ${checked}><span style="margin-right: 6px;">
+                        onclick=""><input type='checkbox' class="checkBoxClass excluded" name='root_path' value="${dpath}" ${checked}><span style="margin-right: 6px;">
                         <i class="far fa-file"></i></span></input>${filename}</li>`
       }
     });

From b23a08be5fb0459a528795aed9943a748a7c11a9 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 13 Jul 2023 10:39:25 -0400
Subject: [PATCH 041/210] Add eula agree to api

---
 app/classes/web/ajax_handler.py               |  5 ----
 .../web/routes/api/servers/server/action.py   |  7 +++++
 app/frontend/templates/base.html              | 26 ++++++++++++-------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 69e113cf..13def1a6 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -156,11 +156,6 @@ class AjaxHandler(BaseHandler):
                         self.controller.cached_login = "login_1.jpg"
             return
 
-        elif page == "eula":
-            server_id = self.get_argument("id", None)
-            svr = self.controller.servers.get_server_instance_by_id(server_id)
-            svr.agree_eula(exec_user["user_id"])
-
         elif page == "unzip_server":
             path = urllib.parse.unquote(self.get_argument("path", ""))
             if not path:
diff --git a/app/classes/web/routes/api/servers/server/action.py b/app/classes/web/routes/api/servers/server/action.py
index e5b3ae23..3b000d1b 100644
--- a/app/classes/web/routes/api/servers/server/action.py
+++ b/app/classes/web/routes/api/servers/server/action.py
@@ -31,6 +31,8 @@ class ApiServersServerActionHandler(BaseApiHandler):
 
         if action == "clone_server":
             return self._clone_server(server_id, auth_data[4]["user_id"])
+        elif action == "eula":
+            return self._agree_eula(server_id, auth_data[4]["user_id"])
 
         self.controller.management.send_command(
             auth_data[4]["user_id"], server_id, self.get_remote_ip(), action
@@ -41,6 +43,11 @@ class ApiServersServerActionHandler(BaseApiHandler):
             {"status": "ok"},
         )
 
+    def _agree_eula(self, server_id, user):
+        svr = self.controller.servers.get_server_instance_by_id(server_id)
+        svr.agree_eula(user)
+        return self.finish_json(200, {"status": "ok"})
+
     def _clone_server(self, server_id, user_id):
         def is_name_used(name):
             return Servers.select().where(Servers.server_name == name).exists()
diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 58d49c53..fc56d45b 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -412,20 +412,26 @@
       });
     }
 
-    function eulaAgree(server_id, command) {
+    async function eulaAgree(server_id, command) {
       //< !--this getCookie function is in base.html-- >
       var token = getCookie("_xsrf");
 
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/eula?id=' + server_id,
-        success: function (data) {
-          console.log("got response:");
-          console.log(data);
-          location.reload();
-        }
+      let res = await fetch(`/api/v2/servers/${server_id}/action/eula/`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
       });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.reload();
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+      }
     }
 
 

From eccac2508dcfcd002aa2d988bbc3c3c2a4cb95d4 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Wed, 9 Aug 2023 23:47:53 +0200
Subject: [PATCH 042/210] Fix Issue #255 Rework how the websockets are managed

---
 app/classes/minecraft/serverjars.py           |  11 +-
 app/classes/models/management.py              |   5 +-
 app/classes/shared/command.py                 |   3 +-
 app/classes/shared/file_helpers.py            |  26 ++-
 app/classes/shared/helpers.py                 |  19 --
 app/classes/shared/import_helper.py           |  11 +-
 app/classes/shared/main_controller.py         |  29 ++--
 app/classes/shared/server.py                  | 106 +++++------
 app/classes/shared/tasks.py                   |   7 +-
 .../websocket_manager.py}                     |  59 +++++--
 app/classes/web/ajax_handler.py               |  10 +-
 app/classes/web/server_handler.py             |   3 +-
 app/classes/web/tornado_handler.py            |   7 +-
 app/classes/web/upload_handler.py             |   7 +-
 app/classes/web/websocket_handler.py          | 164 +++++++++++++++---
 app/frontend/templates/base.html              |  27 +--
 app/frontend/templates/public/status.html     |  27 +--
 app/frontend/templates/public_base.html       |   4 +-
 main.py                                       |   3 +
 19 files changed, 327 insertions(+), 201 deletions(-)
 rename app/classes/{web/websocket_helper.py => shared/websocket_manager.py} (63%)

diff --git a/app/classes/minecraft/serverjars.py b/app/classes/minecraft/serverjars.py
index faa12a7d..447cf80b 100644
--- a/app/classes/minecraft/serverjars.py
+++ b/app/classes/minecraft/serverjars.py
@@ -8,6 +8,7 @@ import requests
 
 from app.classes.controllers.servers_controller import ServersController
 from app.classes.models.server_permissions import PermissionsServers
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -179,9 +180,7 @@ class ServerJars:
             try:
                 ServersController.set_import(server_id)
                 for user in server_users:
-                    self.helper.websocket_helper.broadcast_user(
-                        user, "send_start_reload", {}
-                    )
+                    WebSocketManager().broadcast_user(user, "send_start_reload", {})
 
                 break
             except Exception as ex:
@@ -206,11 +205,9 @@ class ServerJars:
                 server_users = PermissionsServers.get_server_user_list(server_id)
 
             for user in server_users:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user, "notification", "Executable download finished"
                 )
                 time.sleep(3)
-                self.helper.websocket_helper.broadcast_user(
-                    user, "send_start_reload", {}
-                )
+                WebSocketManager().broadcast_user(user, "send_start_reload", {})
             return success
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 2c64a8ff..1213bda0 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -17,6 +17,7 @@ from app.classes.models.users import HelperUsers
 from app.classes.models.servers import Servers
 from app.classes.models.server_permissions import PermissionsServers
 from app.classes.shared.main_models import DatabaseShortcuts
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -158,9 +159,7 @@ class HelpersManagement:
         server_users = PermissionsServers.get_server_user_list(server_id)
         for user in server_users:
             try:
-                self.helper.websocket_helper.broadcast_user(
-                    user, "notification", audit_msg
-                )
+                WebSocketManager().broadcast_user(user, "notification", audit_msg)
             except Exception as e:
                 logger.error(f"Error broadcasting to user {user} - {e}")
 
diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py
index 26fdd2f0..413f74b2 100644
--- a/app/classes/shared/command.py
+++ b/app/classes/shared/command.py
@@ -11,6 +11,7 @@ from app.classes.shared.helpers import Helpers
 from app.classes.shared.tasks import TasksManager
 from app.classes.shared.migration import MigrationManager
 from app.classes.shared.main_controller import Controller
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -115,7 +116,7 @@ class MainPrompt(cmd.Cmd):
         Console.info(
             "Stopping all server daemons / threads - This may take a few seconds"
         )
-        self.helper.websocket_helper.disconnect_all()
+        WebSocketManager().disconnect_all()
         Console.info("Waiting for main thread to stop")
         while True:
             if self.tasks_manager.get_main_thread_run_status():
diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index 4005e965..f42930f7 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -8,6 +8,7 @@ from zipfile import ZipFile, ZIP_DEFLATED
 
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.console import Console
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -149,7 +150,7 @@ class FileHelpers:
             "percent": 0,
             "total_files": self.helper.human_readable_file_size(dir_bytes),
         }
-        self.helper.websocket_helper.broadcast_page_params(
+        WebSocketManager().broadcast_page_params(
             "/panel/server_detail",
             {"id": str(server_id)},
             "backup_status",
@@ -194,7 +195,7 @@ class FileHelpers:
                         "percent": percent,
                         "total_files": self.helper.human_readable_file_size(dir_bytes),
                     }
-                    self.helper.websocket_helper.broadcast_page_params(
+                    WebSocketManager().broadcast_page_params(
                         "/panel/server_detail",
                         {"id": str(server_id)},
                         "backup_status",
@@ -215,7 +216,7 @@ class FileHelpers:
             "percent": 0,
             "total_files": self.helper.human_readable_file_size(dir_bytes),
         }
-        self.helper.websocket_helper.broadcast_page_params(
+        WebSocketManager().broadcast_page_params(
             "/panel/server_detail",
             {"id": str(server_id)},
             "backup_status",
@@ -274,7 +275,7 @@ class FileHelpers:
                         "total_files": self.helper.human_readable_file_size(dir_bytes),
                     }
                     # send status results to page.
-                    self.helper.websocket_helper.broadcast_page_params(
+                    WebSocketManager().broadcast_page_params(
                         "/panel/server_detail",
                         {"id": str(server_id)},
                         "backup_status",
@@ -325,3 +326,20 @@ class FileHelpers:
         else:
             return "false"
         return
+
+    # TODO Look if not redundant with the precendent function prefixed ajax_ de differentiate and not broke things
+
+    def ajax_unzip_server(self, zip_path, user_id):
+        if Helpers.check_file_perms(zip_path):
+            temp_dir = tempfile.mkdtemp()
+            with zipfile.ZipFile(zip_path, "r") as zip_ref:
+                # extracts archive to temp directory
+                zip_ref.extractall(temp_dir)
+            if user_id:
+                WebSocketManager().broadcast_user(
+                    user_id, "send_temp_path", {"path": temp_dir}
+                )
+
+    def ajax_backup_select(self, path, user_id):
+        if user_id:
+            WebSocketManager().broadcast_user(user_id, "send_temp_path", {"path": path})
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 489115ae..30f70d3a 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -29,7 +29,6 @@ from app.classes.shared.null_writer import NullWriter
 from app.classes.shared.console import Console
 from app.classes.shared.installer import installer
 from app.classes.shared.translation import Translation
-from app.classes.web.websocket_helper import WebSocketHelper
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -78,7 +77,6 @@ class Helpers:
         self.passhasher = PasswordHasher()
         self.exiting = False
 
-        self.websocket_helper = WebSocketHelper(self)
         self.translation = Translation(self)
         self.update_available = False
         self.ignored_names = ["crafty_managed.txt", "db_stats"]
@@ -1216,23 +1214,6 @@ class Helpers:
                     </input></div><li>"""
         return output
 
-    def unzip_server(self, zip_path, user_id):
-        if Helpers.check_file_perms(zip_path):
-            temp_dir = tempfile.mkdtemp()
-            with zipfile.ZipFile(zip_path, "r") as zip_ref:
-                # extracts archive to temp directory
-                zip_ref.extractall(temp_dir)
-            if user_id:
-                self.websocket_helper.broadcast_user(
-                    user_id, "send_temp_path", {"path": temp_dir}
-                )
-
-    def backup_select(self, path, user_id):
-        if user_id:
-            self.websocket_helper.broadcast_user(
-                user_id, "send_temp_path", {"path": path}
-            )
-
     @staticmethod
     def unzip_backup_archive(backup_path, zip_name):
         zip_path = os.path.join(backup_path, zip_name)
diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index e3762aad..1acf7a03 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -9,6 +9,7 @@ from app.classes.controllers.server_perms_controller import PermissionsServers
 from app.classes.controllers.servers_controller import ServersController
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -64,7 +65,7 @@ class ImportHelpers:
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
 
     def import_java_zip_server(self, temp_dir, new_server_dir, port, new_id):
         import_thread = threading.Thread(
@@ -108,7 +109,7 @@ class ImportHelpers:
         server_users = PermissionsServers.get_server_user_list(new_id)
         ServersController.finish_import(new_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
         # deletes temp dir
         FileHelpers.del_dirs(temp_dir)
 
@@ -162,7 +163,7 @@ class ImportHelpers:
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
 
     def import_bedrock_zip_server(
         self, temp_dir, new_server_dir, full_jar_path, port, new_id
@@ -209,7 +210,7 @@ class ImportHelpers:
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
         if os.name != "nt":
             if Helpers.check_file_exists(full_jar_path):
                 os.chmod(full_jar_path, 0o2760)
@@ -253,4 +254,4 @@ class ImportHelpers:
         ServersController.finish_import(new_id)
         server_users = PermissionsServers.get_server_user_list(new_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 95872884..2a299934 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -32,6 +32,7 @@ from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.import_helper import ImportHelpers
 from app.classes.minecraft.serverjars import ServerJars
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -101,7 +102,7 @@ class Controller:
                     self.del_support_file(exec_user["support_logs"])
         # pausing so on screen notifications can run for user
         time.sleep(7)
-        self.helper.websocket_helper.broadcast_user(
+        WebSocketManager().broadcast_user(
             exec_user["user_id"], "notification", "Preparing your support logs"
         )
         self.helper.ensure_dir_exists(
@@ -197,17 +198,15 @@ class Controller:
         ) as f:
             f.write(sys_info_string)
         FileHelpers.make_compressed_archive(temp_zip_storage, temp_dir, sys_info_string)
-        if len(self.helper.websocket_helper.clients) > 0:
-            self.helper.websocket_helper.broadcast_user(
+        if len(WebSocketManager().clients) > 0:
+            WebSocketManager().broadcast_user(
                 exec_user["user_id"],
                 "support_status_update",
                 Helpers.calc_percent(temp_dir, temp_zip_storage + ".zip"),
             )
 
         temp_zip_storage += ".zip"
-        self.helper.websocket_helper.broadcast_user(
-            exec_user["user_id"], "send_logs_bootbox", {}
-        )
+        WebSocketManager().broadcast_user(exec_user["user_id"], "send_logs_bootbox", {})
 
         self.users.set_support_path(exec_user["user_id"], temp_zip_storage)
 
@@ -240,8 +239,8 @@ class Controller:
         results = Helpers.calc_percent(source_path, dest_path)
         self.log_stats = results
 
-        if len(self.helper.websocket_helper.clients) > 0:
-            self.helper.websocket_helper.broadcast_user(
+        if len(WebSocketManager().clients) > 0:
+            WebSocketManager().broadcast_user(
                 exec_user["user_id"], "support_status_update", results
             )
 
@@ -1025,7 +1024,7 @@ class Controller:
     def t_update_master_server_dir(self, new_server_path, user_id):
         new_server_path = self.helper.wtol_path(new_server_path)
         new_server_path = os.path.join(new_server_path, "servers")
-        self.helper.websocket_helper.broadcast_page(
+        WebSocketManager().broadcast_page(
             "/panel/panel_config", "move_status", "Checking dir"
         )
         current_master = self.helper.wtol_path(
@@ -1035,7 +1034,7 @@ class Controller:
             logger.info(
                 "Admin tried to change server dir to current server dir. Canceling..."
             )
-            self.helper.websocket_helper.broadcast_page(
+            WebSocketManager().broadcast_page(
                 "/panel/panel_config",
                 "move_status",
                 "done",
@@ -1046,18 +1045,18 @@ class Controller:
                 "Admin tried to change server dir to be inside a sub directory of the"
                 " current server dir. This will result in a copy loop."
             )
-            self.helper.websocket_helper.broadcast_page(
+            WebSocketManager().broadcast_page(
                 "/panel/panel_config",
                 "move_status",
                 "done",
             )
             return
 
-        self.helper.websocket_helper.broadcast_page(
+        WebSocketManager().broadcast_page(
             "/panel/panel_config", "move_status", "Checking permissions"
         )
         if not self.helper.ensure_dir_exists(new_server_path):
-            self.helper.websocket_helper.broadcast_user(
+            WebSocketManager().broadcast_user(
                 user_id,
                 "send_start_error",
                 {
@@ -1079,7 +1078,7 @@ class Controller:
                 new_server_path, server.get("server_uuid")
             )
             if os.path.isdir(server_path):
-                self.helper.websocket_helper.broadcast_page(
+                WebSocketManager().broadcast_page(
                     "/panel/panel_config",
                     "move_status",
                     f"Moving {server.get('server_name')}",
@@ -1120,7 +1119,7 @@ class Controller:
                 self.servers.update_unloaded_server(server_obj)
         self.servers.init_all_servers()
         self.helper.dir_migration = False
-        self.helper.websocket_helper.broadcast_page(
+        WebSocketManager().broadcast_page(
             "/panel/panel_config",
             "move_status",
             "done",
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index c1a11158..abf63362 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -32,6 +32,8 @@ from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
+from app.classes.shared.websocket_manager import WebSocketManager
+from app.classes.shared.websocket_manager import WebSocketManager
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -92,12 +94,13 @@ class ServerOutBuf:
 
         # TODO: Do not send data to clients who do not have permission to view
         # this server's console
-        self.helper.websocket_helper.broadcast_page_params(
-            "/panel/server_detail",
-            {"id": self.server_id},
-            "vterm_new_line",
-            {"line": highlighted + "<br />"},
-        )
+        if len(WebSocketManager().auth_clients) > 0:
+            WebSocketManager().broadcast_page_params(
+                "/panel/server_detail",
+                {"id": self.server_id},
+                "vterm_new_line",
+                {"line": highlighted + "<br />"},
+            )
 
 
 # **********************************************************************************
@@ -322,7 +325,7 @@ class ServerInstance:
         # Checks if user is currently attempting to move global server
         # dir
         if self.helper.dir_migration:
-            self.helper.websocket_helper.broadcast_user(
+            WebSocketManager().broadcast_user(
                 user_id,
                 "send_start_error",
                 {
@@ -337,7 +340,7 @@ class ServerInstance:
 
         if self.stats_helper.get_import_status() and not forge_install:
             if user_id:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user_id,
                     "send_start_error",
                     {
@@ -383,7 +386,7 @@ class ServerInstance:
             e_flag = True
         if not e_flag and self.settings["type"] == "minecraft-java":
             if user_id:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user_id, "send_eula_bootbox", {"id": self.server_id}
                 )
             else:
@@ -416,7 +419,7 @@ class ServerInstance:
 
         except:
             if user_id:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user_id,
                     "send_start_error",
                     {
@@ -452,7 +455,7 @@ class ServerInstance:
                     f"Server {self.name} failed to start with error code: {ex}"
                 )
                 if user_id:
-                    self.helper.websocket_helper.broadcast_user(
+                    WebSocketManager().broadcast_user(
                         user_id,
                         "send_start_error",
                         {
@@ -479,7 +482,7 @@ class ServerInstance:
                 # Checks for java on initial fail
                 if not self.helper.detect_java():
                     if user_id:
-                        self.helper.websocket_helper.broadcast_user(
+                        WebSocketManager().broadcast_user(
                             user_id,
                             "send_start_error",
                             {
@@ -493,7 +496,7 @@ class ServerInstance:
                     f"Server {self.name} failed to start with error code: {ex}"
                 )
                 if user_id:
-                    self.helper.websocket_helper.broadcast_user(
+                    WebSocketManager().broadcast_user(
                         user_id,
                         "send_start_error",
                         {
@@ -540,7 +543,7 @@ class ServerInstance:
                 self.stats_helper.set_first_run()
                 loc_server_port = self.stats_helper.get_server_stats()["server_port"]
                 # Sends port reminder message.
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user_id,
                     "send_start_error",
                     {
@@ -552,15 +555,11 @@ class ServerInstance:
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:
                     if user != user_id:
-                        self.helper.websocket_helper.broadcast_user(
-                            user, "send_start_reload", {}
-                        )
+                        WebSocketManager().broadcast_user(user, "send_start_reload", {})
             else:
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
                 for user in server_users:
-                    self.helper.websocket_helper.broadcast_user(
-                        user, "send_start_reload", {}
-                    )
+                    WebSocketManager().broadcast_user(user, "send_start_reload", {})
         else:
             logger.warning(
                 f"Server PID {self.process.pid} died right after starting "
@@ -592,7 +591,7 @@ class ServerInstance:
     def check_internet_thread(self, user_id, user_lang):
         if user_id:
             if not Helpers.check_internet():
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user_id,
                     "send_start_error",
                     {
@@ -719,9 +718,7 @@ class ServerInstance:
                 server_users = PermissionsServers.get_server_user_list(self.server_id)
 
                 for user in server_users:
-                    self.helper.websocket_helper.broadcast_user(
-                        user, "send_start_reload", {}
-                    )
+                    WebSocketManager().broadcast_user(user, "send_start_reload", {})
                 break
 
     def stop_crash_detection(self):
@@ -834,7 +831,7 @@ class ServerInstance:
         self.record_server_stats()
 
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
+            WebSocketManager().broadcast_user(user, "send_start_reload", {})
 
     def restart_threaded_server(self, user_id):
         bu_conf = HelpersManagement.get_backup_config(self.server_id)
@@ -1034,8 +1031,8 @@ class ServerInstance:
         logger.info(f"Backup Thread started for server {self.settings['server_name']}.")
 
     def a_backup_server(self):
-        if len(self.helper.websocket_helper.clients) > 0:
-            self.helper.websocket_helper.broadcast_page_params(
+        if len(WebSocketManager().auth_clients) > 0:
+            WebSocketManager().broadcast_page_params(
                 "/panel/server_detail",
                 {"id": str(self.server_id)},
                 "backup_reload",
@@ -1045,7 +1042,7 @@ class ServerInstance:
         logger.info(f"Starting server {self.name} (ID {self.server_id}) backup")
         server_users = PermissionsServers.get_server_user_list(self.server_id)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(
+            WebSocketManager().broadcast_user(
                 user,
                 "notification",
                 self.helper.translation.translate(
@@ -1120,8 +1117,8 @@ class ServerInstance:
             self.is_backingup = False
             logger.info(f"Backup of server: {self.name} completed")
             results = {"percent": 100, "total_files": 0, "current_file": 0}
-            if len(self.helper.websocket_helper.clients) > 0:
-                self.helper.websocket_helper.broadcast_page_params(
+            if len(WebSocketManager().auth_clients) > 0:
+                WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
                     {"id": str(self.server_id)},
                     "backup_status",
@@ -1129,7 +1126,7 @@ class ServerInstance:
                 )
             server_users = PermissionsServers.get_server_user_list(self.server_id)
             for user in server_users:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user,
                     "notification",
                     self.helper.translation.translate(
@@ -1158,8 +1155,8 @@ class ServerInstance:
                 f"Failed to create backup of server {self.name} (ID {self.server_id})"
             )
             results = {"percent": 100, "total_files": 0, "current_file": 0}
-            if len(self.helper.websocket_helper.clients) > 0:
-                self.helper.websocket_helper.broadcast_page_params(
+            if len(WebSocketManager().clients) > 0:
+                WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
                     {"id": str(self.server_id)},
                     "backup_status",
@@ -1176,8 +1173,8 @@ class ServerInstance:
     def backup_status(self, source_path, dest_path):
         results = Helpers.calc_percent(source_path, dest_path)
         self.backup_stats = results
-        if len(self.helper.websocket_helper.clients) > 0:
-            self.helper.websocket_helper.broadcast_page_params(
+        if len(WebSocketManager().auth_clients) > 0:
+            WebSocketManager().broadcast_page_params(
                 "/panel/server_detail",
                 {"id": str(self.server_id)},
                 "backup_status",
@@ -1280,14 +1277,14 @@ class ServerInstance:
             self.stop_threaded_server()
         else:
             was_started = False
-        if len(self.helper.websocket_helper.clients) > 0:
+        if len(WebSocketManager().auth_clients) > 0:
             # There are clients
             self.check_update()
             message = (
                 '<a data-id="' + str(self.server_id) + '" class=""> UPDATING...</i></a>'
             )
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user_page(
+            WebSocketManager().broadcast_user_page(
                 "/panel/server_detail",
                 user,
                 "update_button_status",
@@ -1340,7 +1337,7 @@ class ServerInstance:
         # check if backup was successful
         if self.last_backup_failed:
             for user in server_users:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user,
                     "notification",
                     "Backup failed for " + self.name + ". canceling update.",
@@ -1386,11 +1383,11 @@ class ServerInstance:
             logger.info("Executable updated successfully. Starting Server")
 
             self.stats_helper.set_update(False)
-            if len(self.helper.websocket_helper.clients) > 0:
+            if len(WebSocketManager().auth_clients) > 0:
                 # There are clients
                 self.check_update()
                 for user in server_users:
-                    self.helper.websocket_helper.broadcast_user(
+                    WebSocketManager().broadcast_user(
                         user,
                         "notification",
                         "Executable update finished for " + self.name,
@@ -1398,7 +1395,7 @@ class ServerInstance:
                 # sleep so first notif can completely run
                 time.sleep(3)
             for user in server_users:
-                self.helper.websocket_helper.broadcast_user_page(
+                WebSocketManager().broadcast_user_page(
                     "/panel/server_detail",
                     user,
                     "update_button_status",
@@ -1408,10 +1405,10 @@ class ServerInstance:
                         "wasRunning": was_started,
                     },
                 )
-                self.helper.websocket_helper.broadcast_user_page(
+                WebSocketManager().broadcast_user_page(
                     user, "/panel/dashboard", "send_start_reload", {}
                 )
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user,
                     "notification",
                     "Executable update finished for " + self.name,
@@ -1428,7 +1425,7 @@ class ServerInstance:
                 self.run_threaded_server(HelperUsers.get_user_id_by_name("system"))
         else:
             for user in server_users:
-                self.helper.websocket_helper.broadcast_user(
+                WebSocketManager().broadcast_user(
                     user,
                     "notification",
                     "Executable update failed for "
@@ -1438,7 +1435,7 @@ class ServerInstance:
             logger.error("Executable download failed.")
             self.stats_helper.set_update(False)
         for user in server_users:
-            self.helper.websocket_helper.broadcast_user(user, "remove_spinner", {})
+            WebSocketManager().broadcast_user(user, "remove_spinner", {})
 
     def start_dir_calc_task(self):
         server_dt = HelperServers.get_server_data_by_id(self.server_id)
@@ -1467,7 +1464,7 @@ class ServerInstance:
     def realtime_stats(self):
         # only get stats if clients are connected.
         # no point in burning cpu
-        if len(self.helper.websocket_helper.clients) > 0:
+        if len(WebSocketManager().public_clients | WebSocketManager().auth_clients) > 0:
             total_players = 0
             max_players = 0
             servers_ping = []
@@ -1498,8 +1495,8 @@ class ServerInstance:
                     "crashed": self.is_crashed,
                 }
             )
-            if len(self.helper.websocket_helper.clients) > 0:
-                self.helper.websocket_helper.broadcast_page_params(
+            if len(WebSocketManager().auth_clients) > 0:
+                WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
                     {"id": str(self.server_id)},
                     "update_server_details",
@@ -1532,14 +1529,17 @@ class ServerInstance:
 
             self.record_server_stats()
 
-            if (len(servers_ping) > 0) & (
-                len(self.helper.websocket_helper.clients) > 0
-            ):
+            if (len(servers_ping) > 0) & (len(WebSocketManager().auth_clients) > 0):
                 try:
-                    self.helper.websocket_helper.broadcast_page(
+                    WebSocketManager().broadcast_page(
                         "/panel/dashboard", "update_server_status", servers_ping
                     )
-                    self.helper.websocket_helper.broadcast_page(
+                except:
+                    Console.critical("Can't broadcast server status to websocket")
+
+            if (len(servers_ping) > 0) & (len(WebSocketManager().public_clients) > 0):
+                try:
+                    WebSocketManager().broadcast_page(
                         "/status", "update_server_status", servers_ping
                     )
                 except:
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index acdc1cac..d35cf8dd 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -20,6 +20,7 @@ from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_controller import Controller
 from app.classes.web.tornado_handler import Webserver
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger("apscheduler")
 scheduler_intervals = {
@@ -688,10 +689,10 @@ class TasksManager:
                 # Stats are different
 
                 host_stats = HelpersManagement.get_latest_hosts_stats()
-                if len(self.helper.websocket_helper.clients) > 0:
+                if len(WebSocketManager().auth_clients) > 0:
                     # There are clients
                     try:
-                        self.helper.websocket_helper.broadcast_page(
+                        WebSocketManager().broadcast_page(
                             "/panel/dashboard",
                             "update_host_stats",
                             {
@@ -708,7 +709,7 @@ class TasksManager:
                             },
                         )
                     except:
-                        self.helper.websocket_helper.broadcast_page(
+                        WebSocketManager().broadcast_page(
                             "/panel/dashboard",
                             "update_host_stats",
                             {
diff --git a/app/classes/web/websocket_helper.py b/app/classes/shared/websocket_manager.py
similarity index 63%
rename from app/classes/web/websocket_helper.py
rename to app/classes/shared/websocket_manager.py
index cd70df50..b1729c76 100644
--- a/app/classes/web/websocket_helper.py
+++ b/app/classes/shared/websocket_manager.py
@@ -1,44 +1,65 @@
 import json
 import logging
+from enum import Enum
 
+from app.classes.shared.singleton import Singleton
 from app.classes.shared.console import Console
+from app.classes.models.users import HelperUsers
 
 logger = logging.getLogger(__name__)
 
 
-class WebSocketHelper:
-    def __init__(self, helper):
-        self.helper = helper
-        self.clients = set()
+class EnumWebSocketState(Enum):
+    WS_UNKNOWN = -1
+    WS_PUBLIC = 0
+    WS_USER_AUTH = 1
+
+
+class WebSocketManager(metaclass=Singleton):
+    def __init__(self):
+        self.auth_clients = set()
+        self.public_clients = set()
 
     def add_client(self, client):
-        self.clients.add(client)
+        if client.ws_state == EnumWebSocketState.WS_PUBLIC:
+            self.public_clients.add(client)
+        elif client.ws_state == EnumWebSocketState.WS_USER_AUTH:
+            self.auth_clients.add(client)
+        else:
+            logging.debug("Unknown WebSocket")
+            client.close()
 
     def remove_client(self, client):
-        self.clients.remove(client)
-
-    def send_message(self, client, event_type: str, data):
-        if client.check_auth():
-            message = str(json.dumps({"event": event_type, "data": data}))
-            client.write_message_helper(message)
+        if client.ws_state == EnumWebSocketState.WS_PUBLIC:
+            self.public_clients.remove(client)
+        elif client.ws_state == EnumWebSocketState.WS_USER_AUTH:
+            self.auth_clients.remove(client)
 
     def broadcast(self, event_type: str, data):
         logger.debug(
-            f"Sending to {len(self.clients)} clients: "
+            f"Sending to {len(self.public_clients | self.auth_clients)} clients: "
             f"{json.dumps({'event': event_type, 'data': data})}"
         )
-        for client in self.clients:
+        for client in self.public_clients | self.auth_clients:
             try:
-                self.send_message(client, event_type, data)
+                client.send_message(event_type, data)
             except Exception as e:
                 logger.exception(
                     f"Error caught while sending WebSocket message to "
                     f"{client.get_remote_ip()} {e}"
                 )
 
+    def broadcast_to_admins(self, event_type: str, data):
+        def filter_fn(client):
+            if client.get_user_id in HelperUsers.get_super_user_list():
+                return True
+            return False
+
+        self.broadcast_with_fn(filter_fn, event_type, data)
+
     def broadcast_page(self, page: str, event_type: str, data):
         def filter_fn(client):
-            return client.page == page
+            return client.check_policy(event_type) and client.page == page
 
         self.broadcast_with_fn(filter_fn, event_type, data)
 
@@ -87,16 +108,16 @@ class WebSocketHelper:
     def broadcast_with_fn(self, filter_fn, event_type: str, data):
         # assign self.clients to a static variable here so hopefully
         # the set size won't change
-        static_clients = self.clients
+        static_clients = self.public_clients | self.auth_clients
         clients = list(filter(filter_fn, static_clients))
         logger.debug(
-            f"Sending to {len(clients)} out of {len(self.clients)} "
+            f"Sending to {len(clients)} out of {len(self.public_clients | self.auth_clients)} "
             f"clients: {json.dumps({'event': event_type, 'data': data})}"
         )
 
         for client in clients[:]:
             try:
-                self.send_message(client, event_type, data)
+                client.send_message(event_type, data)
             except Exception as e:
                 logger.exception(
                     f"Error catched while sending WebSocket message to "
@@ -105,6 +126,6 @@ class WebSocketHelper:
 
     def disconnect_all(self):
         Console.info("Disconnecting WebSocket clients")
-        for client in self.clients:
+        for client in self.public_clients | self.auth_clients:
             client.close()
         Console.info("Disconnected WebSocket clients")
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index efe8d2fa..7202bfd6 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -12,8 +12,10 @@ import tornado.escape
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
+from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.server import ServerOutBuf
 from app.classes.web.base_handler import BaseHandler
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -558,13 +560,13 @@ class AjaxHandler(BaseHandler):
                     urllib.parse.unquote(self.get_argument("file", "")),
                 )
             if Helpers.check_file_exists(path):
-                self.helper.unzip_server(path, exec_user["user_id"])
+                FileHelpers.ajax_unzip_server(path, exec_user["user_id"])
             else:
                 user_id = exec_user["user_id"]
                 if user_id:
                     time.sleep(5)
                     user_lang = self.controller.users.get_user_lang_by_id(user_id)
-                    self.helper.websocket_helper.broadcast_user(
+                    WebSocketManager().broadcast_user(
                         user_id,
                         "send_start_error",
                         {
@@ -577,7 +579,7 @@ class AjaxHandler(BaseHandler):
 
         elif page == "backup_select":
             path = self.get_argument("path", None)
-            self.helper.backup_select(path, exec_user["user_id"])
+            FileHelpers.ajax_backup_select(path, exec_user["user_id"])
             return
 
         elif page == "jar_cache":
@@ -593,7 +595,7 @@ class AjaxHandler(BaseHandler):
                 return
             for server in self.controller.servers.get_all_servers_stats():
                 if server["stats"]["running"]:
-                    self.helper.websocket_helper.broadcast_user(
+                    WebSocketManager().broadcast_user(
                         exec_user["user_id"],
                         "send_start_error",
                         {
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index eae3ce0c..dbff9003 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -11,6 +11,7 @@ from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -207,7 +208,7 @@ class ServerHandler(BaseHandler):
                         )
                     ):
                         time.sleep(3)
-                        self.helper.websocket_helper.broadcast_user(
+                        WebSocketManager().broadcast_user(
                             exec_user["user_id"],
                             "send_start_error",
                             {
diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index d2b047d7..0a7f0cb8 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -34,7 +34,7 @@ from app.classes.web.api_handler import (
     ListServers,
     SendCommand,
 )
-from app.classes.web.websocket_handler import SocketHandler
+from app.classes.web.websocket_handler import AuthSocketHandler, PublicSocketHandler
 from app.classes.web.static_handler import CustomStaticHandler
 from app.classes.web.upload_handler import UploadHandler
 from app.classes.web.http_handler import HTTPHandler, HTTPHandlerPage
@@ -48,7 +48,7 @@ class Webserver:
     controller: Controller
     helper: Helpers
 
-    def __init__(self, helper, controller, tasks_manager):
+    def __init__(self, helper: Helpers, controller: Controller, tasks_manager):
         self.ioloop = None
         self.http_server = None
         self.https_server = None
@@ -153,7 +153,8 @@ class Webserver:
             (r"/server/(.*)", ServerHandler, handler_args),
             (r"/ajax/(.*)", AjaxHandler, handler_args),
             (r"/files/(.*)", FileHandler, handler_args),
-            (r"/ws", SocketHandler, handler_args),
+            (r"/ws/auth", AuthSocketHandler, handler_args),
+            (r"/ws/public", PublicSocketHandler, handler_args),
             (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),
             # API Routes V1
diff --git a/app/classes/web/upload_handler.py b/app/classes/web/upload_handler.py
index adce3ab9..21b6c64c 100644
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@@ -12,6 +12,7 @@ from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_controller import Controller
 from app.classes.web.base_handler import BaseHandler
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
@@ -113,7 +114,7 @@ class UploadHandler(BaseHandler):
                 self.request.headers.get("X-FileName", None)
             )
             if not str(filename).endswith(".zip"):
-                self.helper.websocket_helper.broadcast("close_upload_box", "error")
+                WebSocketManager().broadcast("close_upload_box", "error")
                 self.finish("error")
             full_path = os.path.join(path, filename)
 
@@ -313,13 +314,13 @@ class UploadHandler(BaseHandler):
         if self.do_upload:
             time.sleep(5)
             if files_left == 0:
-                self.helper.websocket_helper.broadcast("close_upload_box", "success")
+                WebSocketManager().broadcast("close_upload_box", "success")
             self.finish("success")  # Nope, I'm sending "success"
             self.f.close()
         else:
             time.sleep(5)
             if files_left == 0:
-                self.helper.websocket_helper.broadcast("close_upload_box", "error")
+                WebSocketManager().broadcast("close_upload_box", "error")
             self.finish("error")
 
     def data_received(self, chunk):
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index 78b33951..d15d6c7d 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -4,15 +4,20 @@ import asyncio
 from urllib.parse import parse_qsl
 import tornado.websocket
 
+from app.classes.shared.main_controller import Controller
 from app.classes.shared.helpers import Helpers
+from app.classes.shared.websocket_manager import WebSocketManager, EnumWebSocketState
 
 logger = logging.getLogger(__name__)
 
 
-class SocketHandler(tornado.websocket.WebSocketHandler):
+class BaseSocketHandler(tornado.websocket.WebSocketHandler):
+    ws_state = EnumWebSocketState.WS_UNKNOWN  # Must be overridden at init
+    ws_authorized_pages = {}  # Must be overridden at init
+    ws_authorized_events = {}  # Must be overridden at init
     page = None
     page_query_params = None
-    controller = None
+    controller: Controller = None
     tasks_manager = None
     translator = None
     io_loop = None
@@ -34,6 +39,102 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
         )
         return remote_ip
 
+    # pylint: disable=arguments-differ
+    def open(self):
+        """
+        This method must be overridden
+        """
+        raise NotImplementedError
+
+    def handle(self):
+        """
+        This method must be overridden
+        """
+        raise NotImplementedError
+
+    def get_user_id(self):
+        """
+        This method must be overridden
+        """
+        raise NotImplementedError
+
+    def check_auth(self):
+        """
+        This method must be overridden
+        """
+        raise NotImplementedError
+
+    # pylint: disable=arguments-renamed
+    def on_message(self, raw_message):
+        logger.debug(f"Got message from WebSocket connection {raw_message}")
+        message = json.loads(raw_message)
+        logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")
+
+    def on_close(self):
+        WebSocketManager().remove_client(self)
+        logger.debug("Closed WebSocket connection")
+
+    async def write_message_int(self, message):
+        self.write_message(message)
+
+    def write_message_async(self, message):
+        asyncio.run_coroutine_threadsafe(
+            self.write_message_int(message), self.io_loop.asyncio_loop
+        )
+
+    def send_message(self, event_type: str, data):
+        message = str(json.dumps({"event": event_type, "data": data}))
+        self.write_message_async(message)
+
+    def check_policy(self, event_type: str):
+        # Looking if the client is the right one for the page
+        if self.page.split("/")[1] not in self.ws_authorized_pages:
+            return False
+        # Looking if the event is send to the right page
+        if event_type not in self.ws_authorized_events:
+            return False
+        # All seams good so we can agree
+        return True
+
+
+class AuthSocketHandler(BaseSocketHandler):
+    ws_state = EnumWebSocketState.WS_USER_AUTH
+    ws_authorized_pages = {"panel", "server", "ajax", "files", "upload", "api"}
+    ws_authorized_events = {
+        "notification",
+        "update_host_stats",
+        "update_server_details",
+        "update_server_status",
+        "send_start_reload",
+        "send_start_error",
+        # TODO "send_temp_path",
+        "support_status_update",
+        "send_logs_bootbox",
+        "move_status",
+        "vterm_new_line",
+        "send_eula_bootbox",
+        "backup_reload",
+        "backup_status",
+        "update_button_status",
+        "remove_spinner",
+        "close_upload_box",
+    }  # Must be overridden at init
+    page = None
+    page_query_params = None
+    controller = None
+    tasks_manager = None
+    translator = None
+    io_loop = None
+
+    def initialize(
+        self, helper=None, controller=None, tasks_manager=None, translator=None
+    ):
+        self.helper = helper
+        self.controller = controller
+        self.tasks_manager = tasks_manager
+        self.translator = translator
+        self.io_loop = tornado.ioloop.IOLoop.current()
+
     def get_user_id(self):
         _, _, user = self.controller.authentication.check(self.get_cookie("token"))
         return user["user_id"]
@@ -47,10 +148,10 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
         if self.check_auth():
             self.handle()
         else:
-            self.helper.websocket_helper.send_message(
+            WebSocketManager().broadcast_to_admins(
                 self, "notification", "Not authenticated for WebSocket connection"
             )
-            self.close()
+            self.close(1011, "Forbidden WS Access")
             self.controller.management.add_to_audit_log_raw(
                 "unknown",
                 0,
@@ -58,7 +159,7 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
                 "Someone tried to connect via WebSocket without proper authentication",
                 self.get_remote_ip(),
             )
-            self.helper.websocket_helper.broadcast(
+            WebSocketManager().broadcast(
                 "notification",
                 "Someone tried to connect via WebSocket without proper authentication",
             )
@@ -73,24 +174,47 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
                 Helpers.remove_prefix(self.get_query_argument("page_query_params"), "?")
             )
         )
-        self.helper.websocket_helper.add_client(self)
+        WebSocketManager().add_client(self)
         logger.debug("Opened WebSocket connection")
 
-    # pylint: disable=arguments-renamed
-    @staticmethod
-    def on_message(raw_message):
-        logger.debug(f"Got message from WebSocket connection {raw_message}")
-        message = json.loads(raw_message)
-        logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")
 
-    def on_close(self):
-        self.helper.websocket_helper.remove_client(self)
-        logger.debug("Closed WebSocket connection")
+class PublicSocketHandler(BaseSocketHandler):
+    ws_state = EnumWebSocketState.WS_PUBLIC
+    ws_authorized_pages = {"404", "error", "login", "offline", "status"}
+    ws_authorized_events = {"update_server_status"}  # Must be overridden at init
+    page = None
+    page_query_params = None
+    controller = None
+    tasks_manager = None
+    translator = None
+    io_loop = None
 
-    async def write_message_int(self, message):
-        self.write_message(message)
+    def initialize(
+        self, helper=None, controller=None, tasks_manager=None, translator=None
+    ):
+        self.helper = helper
+        self.controller = controller
+        self.tasks_manager = tasks_manager
+        self.translator = translator
+        self.io_loop = tornado.ioloop.IOLoop.current()
 
-    def write_message_helper(self, message):
-        asyncio.run_coroutine_threadsafe(
-            self.write_message_int(message), self.io_loop.asyncio_loop
+    def get_user_id(self):
+        return None
+
+    def check_auth(self):
+        return False
+
+    # pylint: disable=arguments-differ
+    def open(self):
+        logger.debug("Checking Public WebSocket")
+        self.handle()
+
+    def handle(self):
+        self.page = self.get_query_argument("page")
+        self.page_query_params = dict(
+            parse_qsl(
+                Helpers.remove_prefix(self.get_query_argument("page_query_params"), "?")
+            )
         )
+        WebSocketManager().add_client(self)
+        logger.debug("Opened Public WebSocket connection")
diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 58d49c53..72e73cbd 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -14,11 +14,10 @@
   <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
   <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
   <link rel="stylesheet" href="/static/assets/vendors/fontawesome6/css/all.css">
-  <link rel="stylesheet" type="text/css"
-    href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
+  <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
   <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
   <link rel="stylesheet" href="/static/assets/css/crafty.css">
-  
+
   <link rel="manifest" href="/static/assets/crafty.webmanifest">
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -50,15 +49,9 @@
   <!-- Bootstrap Toggle -->
   <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
   <script defer src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"
-    integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
-    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js"
-    integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g=="
-    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-zoom/1.2.1/chartjs-plugin-zoom.min.js"
-    integrity="sha512-klQv6lz2YR+MecyFYMFRuU2eAl8IPRo6zHnsc9n142TJuJHS8CG0ix4Oq9na9ceeg1u5EkBfZsFcV3U7J51iew=="
-    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js" integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js" integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-zoom/1.2.1/chartjs-plugin-zoom.min.js" integrity="sha512-klQv6lz2YR+MecyFYMFRuU2eAl8IPRo6zHnsc9n142TJuJHS8CG0ix4Oq9na9ceeg1u5EkBfZsFcV3U7J51iew==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
   <!-- End Bootstrap Toggle -->
 
@@ -91,8 +84,7 @@
 
         {% include notify.html %}
 
-        <button class="navbar-toggler navbar-toggler-right d-lg-none align-self-center" type="button"
-          data-toggle="offcanvas">
+        <button class="navbar-toggler navbar-toggler-right d-lg-none align-self-center" type="button" data-toggle="offcanvas">
           <span class="mdi mdi-menu"></span>
         </button>
       </div>
@@ -183,8 +175,7 @@
   <script src="/static/assets/js/shared/off-canvas.js"></script>
   <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
   <script src="/static/assets/js/shared/misc.js"></script>
-  <script type="text/javascript"
-    src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
+  <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/5.4.0/bootbox.min.js"></script>
   <script type="text/javascript" src="/static/assets/js/motd.js"></script>
 
@@ -264,7 +255,7 @@
     function startWebSocket() {
       console.log('%c[Crafty Controller] %cConnecting the WebSocket', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
       try {
-        var wsInternal = new WebSocket('wss://' + location.host + '/ws?' + wsPage + '&' + wsPageQueryParams);
+        var wsInternal = new WebSocket('wss://' + location.host + '/ws/auth?' + wsPage + '&' + wsPageQueryParams);
         wsInternal.onopen = function () {
           console.log('opened WebSocket connection:', wsInternal)
           wsOpen = true;
@@ -538,7 +529,7 @@
     });
     $(document).ready(() => {
       if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
+        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', { scope: '/' })
           .then(function (registration) {
             console.log('Service Worker Registered');
           });
diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html
index a190745a..b93c0479 100644
--- a/app/frontend/templates/public/status.html
+++ b/app/frontend/templates/public/status.html
@@ -30,9 +30,6 @@
           </tr>
         </thead>
         <tbody>
-          {% if data['running'] != 0 %}
-          <span id="sync" style="margin-left: 5px;"><i class="fas fa-sync fa-spin"></i></span></h4>
-          {% end %}
           {% for server in data['servers'] %}
           {% if server['server_data']['show_status'] %}
           <tr>
@@ -47,8 +44,7 @@
             </td>
             <td id="server_motd_{{ server['stats']['server_id']['server_id'] }}">
               {% if server['stats']['desc'] != 'False' %}
-              <img src="/static/assets/images/pack.png" alt="icon"
-                style="-webkit-filter:grayscale(100%); filter:grayscale(100%)" />
+              <img src="/static/assets/images/pack.png" alt="icon" style="-webkit-filter:grayscale(100%); filter:grayscale(100%)" />
               <span id="input_motd_{{ server['stats']['server_id']['server_id'] }}" class="input_motd">{{
                 server['stats']['desc'] }}</span> <br />
               {% end %}
@@ -89,12 +85,9 @@
 </div>
 <!-- View for Small screen -->
 <div class="row justify-content-center align-items-sm-center">
-  <div class="content-wrapper login-modal d-sm-none d-block"  style="background-color: var(--dropdown-bg);">
+  <div class="content-wrapper login-modal d-sm-none d-block" style="background-color: var(--dropdown-bg);">
     <img src="/static/assets/images/logo_long.png" style='width: 100%;'>
     <hr />
-    {% if data['running'] != 0 %}
-    <span id="m_sync" style="margin-left: 5px;"><i class="fas fa-sync fa-spin"></i></span></h4>
-    {% end %}
     <div class="accordion" id="accordionServers">
       {% for server in data['servers'] %}
       <div class="card mb-0">
@@ -102,17 +95,13 @@
           <h2 class="mb-0 container overflow-hidden">
             <div class="row">
               <div class="col-8 mx-0 px-0">
-                <a id="m_server_name_{{ server['stats']['server_id']['server_id'] }}"
-                  class="btn btn-link d-flex justify-content-center" type="button" data-toggle="collapse"
-                  data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false"
-                  aria-controls="collapse-{{server['server_data']['server_id']}}">
+                <a id="m_server_name_{{ server['stats']['server_id']['server_id'] }}" class="btn btn-link d-flex justify-content-center" type="button" data-toggle="collapse" data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false" aria-controls="collapse-{{server['server_data']['server_id']}}">
                   <i class="fas fa-server"></i>
                   {{ server['server_data']['server_name'] }}
                 </a>
               </div>
               <div class="col-4 mx-0 px-0">
-                <a id="m_server_online_status_{{ server['stats']['server_id']['server_id'] }}"
-                  class="btn btn-link d-flex justify-content-center" type="button">
+                <a id="m_server_online_status_{{ server['stats']['server_id']['server_id'] }}" class="btn btn-link d-flex justify-content-center" type="button">
                   {% if server['stats']['running'] %}
                   <div id="m_server_players_{{ server['stats']['server_id']['server_id'] }}">
                     <span class="text-success"><i class="fas fa-signal"></i> {{ server['stats']['online'] }} / {{
@@ -128,14 +117,12 @@
           </h2>
         </div>
 
-        <div id="collapse-{{server['server_data']['server_id']}}" class="collapse"
-          aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
+        <div id="collapse-{{server['server_data']['server_id']}}" class="collapse" aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
           <div class="card-body">
             {% if server['stats']['int_ping_results'] != 'False' %}
             <div id="m_server_motd_{{ server['stats']['server_id']['server_id'] }}" class="media">
               {% if server['stats']['desc'] != 'False' %}
-              <img src="/static/assets/images/pack.png" class="w-25 mr-3" alt="icon"
-                style="-webkit-filter:grayscale(100%); filter:grayscale(100%);" />
+              <img src="/static/assets/images/pack.png" class="w-25 mr-3" alt="icon" style="-webkit-filter:grayscale(100%); filter:grayscale(100%);" />
               {% end %}
               <div class="media-body">
                 {% if server['stats']['desc'] != 'False' %}
@@ -197,8 +184,6 @@
 
     /* TODO Update each element */
     if (server.int_ping_results) {
-      document.getElementById('sync').innerHTML = '';
-      document.getElementById('m_sync').innerHTML = '';
       /* Update Players */
       if (server.players) {
         server_players.innerHTML = server.online + ` / ` + server.max + ` {{ translate('dashboard', 'max', data['lang']) }}<br />`
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index 1629642c..4640b2aa 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -65,7 +65,7 @@
     try {
       pageQueryParams = 'page_query_params=' + encodeURIComponent(location.search)
       page = 'page=' + encodeURIComponent(location.pathname)
-      var wsInternal = new WebSocket('wss://' + location.host + '/ws?' + page + '&' + pageQueryParams);
+      var wsInternal = new WebSocket('wss://' + location.host + '/ws/public?' + page + '&' + pageQueryParams);
       wsInternal.onopen = function () {
         console.log('opened WebSocket connection:', wsInternal)
       };
@@ -120,7 +120,7 @@
       document.getElementById('login-form-background').style.background = 'rgb(34, 36, 55, ' + (opacity / 100) + ')';
       //Register Service worker for mobile app
       if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
+        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', { scope: '/' })
           .then(function (registration) {
             console.error('Service Worker Registered');
           });
diff --git a/main.py b/main.py
index 2338517b..3bbde34c 100644
--- a/main.py
+++ b/main.py
@@ -16,6 +16,7 @@ from app.classes.shared.helpers import Helpers
 from app.classes.models.users import HelperUsers
 from app.classes.models.management import HelpersManagement
 from app.classes.shared.import_helper import ImportHelpers
+from app.classes.shared.websocket_manager import WebSocketManager
 
 console = Console()
 helper = Helpers()
@@ -164,6 +165,8 @@ if __name__ == "__main__":
         Console.info("No flag found. Secrets are staying")
     file_helper = FileHelpers(helper)
     import_helper = ImportHelpers(helper, file_helper)
+    # Init WebSocket Manager Here
+    WebSocketManager()
     # now the tables are created, we can load the tasks_manager and server controller
     controller = Controller(database, helper, file_helper, import_helper)
     Console.info("Checking for remote changes to config.json")

From 372fd04948c26459e2837350dedbeae7022a696f Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Thu, 10 Aug 2023 18:40:32 +0200
Subject: [PATCH 043/210] Modifying the management of the webSocket when Out of
 Focus of Tab

---
 app/frontend/templates/base.html        |  39 ++++--
 app/frontend/templates/public_base.html | 165 ++++++++++++++++--------
 2 files changed, 137 insertions(+), 67 deletions(-)

diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 72e73cbd..ee700bf0 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -232,6 +232,7 @@
 
     let usingWebSockets = false;
     let webSocket = null;
+    let websocketTimeoutId = null;
     // {% if request.protocol == 'https' %}
     usingWebSockets = true;
 
@@ -282,18 +283,19 @@
           wsOpen = false;
           console.log('Closed WebSocket', closeEvent);
 
-          if (typeof reconnectorId !== 'number') {
-            setTimeout(sendWssError, 7000);
+          if (!document.hidden) {
+            if (typeof reconnectorId !== 'number') {
+              setTimeout(sendWssError, 7000);
+            }
+            console.info("Reconnecting with a timeout of", (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000, "milliseconds");
+            // Discard old websocket and create a new one in 5 seconds
+            wsInternal = null
+            reconnectorId = setTimeout(startWebSocket, (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000)
+
+            failedConnectionCounter++;
           }
-          console.info("Reconnecting with a timeout of", (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000, "milliseconds");
-          // Discard old websocket and create a new one in 5 seconds
-          wsInternal = null
-          reconnectorId = setTimeout(startWebSocket, (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000)
-
-          failedConnectionCounter++;
         };
 
-
         webSocket = {
           on: function (event, callback) {
             console.log('registered ' + event + ' event');
@@ -319,6 +321,21 @@
     warn('WebSockets are not supported in Crafty if not using the https protocol')
     // {% end%}
 
+    // Managing Connexions for Multi Tab opened to reduce bandwith usage
+    document.addEventListener("visibilitychange", () => {
+      if (document.hidden) {
+        websocketTimeoutId = setTimeout(() => {
+          webSocket.close(1000, "Closed due to Inactivity");
+          console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
+        }, 5000);
+      } else {
+        clearTimeout(websocketTimeoutId)
+        if (webSocket.getStatus() == WebSocket.CLOSED) {
+          startWebSocket();
+        }
+      }
+    });
+
     if (webSocket) {
       webSocket.on('send_start_error', function (start_error) {
         var x = document.querySelector('.bootbox');
@@ -509,10 +526,10 @@
 
     document.addEventListener('alpine:init', () => {
       console.log('%c[Crafty Controller] %cAlpine.js pre-initialization!', 'font-weight: 900; color: #800080;', 'color: #eee;');
-    })
+    });
     document.addEventListener('alpine:initialized', () => {
       console.log('%c[Crafty Controller] %cAlpine.js initialized!', 'font-weight: 900; color: #800080;', 'color: #eee;');
-    })
+    });
 
     $(document).ready(function () {
       console.log('%c[Crafty Controller] %cReady for JS!', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index 4640b2aa..d71b0161 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -55,64 +55,117 @@
   <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
   <script src="/static/assets/js/shared/misc.js"></script>
   <!-- endinject -->
-  <script>
-
-    // {% if request.protocol == 'https' %}
-    let usingWebSockets = true;
-
-    let listenEvents = [];
-
-    try {
-      pageQueryParams = 'page_query_params=' + encodeURIComponent(location.search)
-      page = 'page=' + encodeURIComponent(location.pathname)
-      var wsInternal = new WebSocket('wss://' + location.host + '/ws/public?' + page + '&' + pageQueryParams);
-      wsInternal.onopen = function () {
-        console.log('opened WebSocket connection:', wsInternal)
-      };
-      wsInternal.onmessage = function (rawMessage) {
-        var message = JSON.parse(rawMessage.data);
-
-        console.log('got message: ', message)
-
-        listenEvents
-          .filter(listenedEvent => listenedEvent.event == message.event)
-          .forEach(listenedEvent => listenedEvent.callback(message.data))
-      };
-      wsInternal.onerror = function (errorEvent) {
-        console.error('WebSocket Error', errorEvent);
-      };
-      wsInternal.onclose = function (closeEvent) {
-        console.log('Closed WebSocket', closeEvent);
-      };
-
-
-      webSocket = {
-        on: function (event, callback) {
-          console.log('registered ' + event + ' event');
-          listenEvents.push({ event: event, callback: callback })
-        },
-        emit: function (event, data) {
-          var message = {
-            event: event,
-            data: data
-          }
-
-          wsInternal.send(JSON.stringify(message));
-        }
-      }
-    } catch (error) {
-      console.error('Error while making websocket helpers', error);
-      usingWebSockets = false;
-    }
-    // {% else %}
-    usingWebSockets = false;
-    warn('WebSockets are not supported in Crafty if not using the https protocol')
-    var webSocket;
-// {% end%}
-
-  </script>
   {% block js %}
   <!-- Custom js for this page -->
+  <script>
+    /* Script for WebSockets */
+    let usingWebSockets = false;
+    let webSocket = null;
+    let websocketTimeoutId = null;
+    // {% if request.protocol == 'https' %}
+    usingWebSockets = true;
+
+    let listenEvents = [];
+    let wsOpen = false;
+    /**
+      * @type {number | null} reconnectorId An interval ID for the reconnector.
+      */
+    let reconnectorId = null;
+    let failedConnectionCounter = 0; // https://stackoverflow.com/a/37038217/15388424
+
+    const wsPageQueryParams = 'page_query_params=' + encodeURIComponent(location.search)
+    const wsPage = 'page=' + encodeURIComponent(location.pathname)
+
+    const sendWssError = () => wsOpen || warn(
+      'WebSockets are required for Crafty to work. This websocket connection has been closed. Are you using a reverse proxy?',
+      'https://docs.craftycontrol.com/pages/getting-started/proxies/',
+      'wssError'
+    )
+
+    function startWebSocket() {
+      console.log('%c[Crafty Controller] %cConnecting the WebSocket', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
+      try {
+        var wsInternal = new WebSocket('wss://' + location.host + '/ws/public?' + wsPage + '&' + wsPageQueryParams);
+        wsInternal.onopen = function () {
+          console.log('opened WebSocket connection:', wsInternal)
+          wsOpen = true;
+          failedConnectionCounter = 0;
+          if (typeof reconnectorId === 'number') {
+            document.querySelectorAll('.wssError').forEach(el => el.remove())
+            clearInterval(reconnectorId);
+            reconnectorId = null;
+          }
+        };
+        wsInternal.onmessage = function (rawMessage) {
+          var message = JSON.parse(rawMessage.data);
+
+          console.log('got message: ', message)
+
+          listenEvents
+            .filter(listenedEvent => listenedEvent.event == message.event)
+            .forEach(listenedEvent => listenedEvent.callback(message.data))
+        };
+        wsInternal.onerror = function (errorEvent) {
+          console.error('WebSocket Error', errorEvent);
+        };
+        wsInternal.onclose = function (closeEvent) {
+          wsOpen = false;
+          console.log('Closed WebSocket', closeEvent);
+
+          if (!document.hidden) {
+            if (typeof reconnectorId !== 'number') {
+              setTimeout(sendWssError, 7000);
+            }
+            console.info("Reconnecting with a timeout of", (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000, "milliseconds");
+            // Discard old websocket and create a new one in 5 seconds
+            wsInternal = null
+            reconnectorId = setTimeout(startWebSocket, (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000)
+
+            failedConnectionCounter++;
+          }
+        };
+
+        webSocket = {
+          on: function (event, callback) {
+            console.log('registered ' + event + ' event');
+            listenEvents.push({ event: event, callback: callback })
+          },
+          emit: function (event, data) {
+            var message = {
+              event: event,
+              data: data
+            }
+
+            wsInternal.send(JSON.stringify(message));
+          }
+        }
+      } catch (error) {
+        console.error('Error while making websocket helpers', error);
+        usingWebSockets = false;
+      }
+    }
+
+    startWebSocket();
+    // {% else %}
+    warn('WebSockets are not supported in Crafty if not using the https protocol')
+    // {% end%}
+
+    // Managing Connexions for Multi Tab opened to reduce bandwith usage
+    document.addEventListener("visibilitychange", () => {
+      if (document.hidden) {
+        websocketTimeoutId = setTimeout(() => {
+          webSocket.close(1000, "Closed due to Inactivity");
+          console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
+        }, 5000);
+      } else {
+        clearTimeout(websocketTimeoutId)
+        if (webSocket.getStatus() == WebSocket.CLOSED) {
+          startWebSocket();
+        }
+      }
+    });
+  </script>
+
   <script>
     $(document).ready(function () {
       let login_opacity_div = document.getElementById('login_opacity');

From d172e9cd0223b52aba6cb966ab960d935d52bf5c Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Fri, 11 Aug 2023 11:32:38 +0200
Subject: [PATCH 044/210] Forgot usefull functions

---
 app/frontend/templates/base.html        |  8 +++++++-
 app/frontend/templates/public_base.html | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index ee700bf0..0325c376 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -308,6 +308,12 @@
             }
 
             wsInternal.send(JSON.stringify(message));
+          },
+          close: function (code, reason) {
+            wsInternal.close(code, reason);
+          },
+          getStatus: function () {
+            return wsInternal.readyState;
           }
         }
       } catch (error) {
@@ -323,7 +329,7 @@
 
     // Managing Connexions for Multi Tab opened to reduce bandwith usage
     document.addEventListener("visibilitychange", () => {
-      if (document.hidden) {
+      if (document.visibilityState == "hidden") {
         websocketTimeoutId = setTimeout(() => {
           webSocket.close(1000, "Closed due to Inactivity");
           console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index d71b0161..e3eb5d89 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -54,9 +54,7 @@
   <script src="/static/assets/js/shared/off-canvas.js"></script>
   <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
   <script src="/static/assets/js/shared/misc.js"></script>
-  <!-- endinject -->
-  {% block js %}
-  <!-- Custom js for this page -->
+
   <script>
     /* Script for WebSockets */
     let usingWebSockets = false;
@@ -137,6 +135,12 @@
             }
 
             wsInternal.send(JSON.stringify(message));
+          },
+          close: function (code, reason) {
+            wsInternal.close(code, reason);
+          },
+          getStatus: function () {
+            return wsInternal.readyState;
           }
         }
       } catch (error) {
@@ -152,7 +156,7 @@
 
     // Managing Connexions for Multi Tab opened to reduce bandwith usage
     document.addEventListener("visibilitychange", () => {
-      if (document.hidden) {
+      if (document.visibilityState == "hidden") {
         websocketTimeoutId = setTimeout(() => {
           webSocket.close(1000, "Closed due to Inactivity");
           console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
@@ -165,7 +169,9 @@
       }
     });
   </script>
-
+  <!-- endinject -->
+  {% block js %}
+  <!-- Custom js for this page -->
   <script>
     $(document).ready(function () {
       let login_opacity_div = document.getElementById('login_opacity');

From 79449082ffb868640923fd433f6a056443edff07 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Fri, 11 Aug 2023 17:20:44 +0200
Subject: [PATCH 045/210] Put timeout to 10 seconds

---
 app/frontend/templates/base.html        | 2 +-
 app/frontend/templates/public_base.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 0325c376..76e6eb89 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -333,7 +333,7 @@
         websocketTimeoutId = setTimeout(() => {
           webSocket.close(1000, "Closed due to Inactivity");
           console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
-        }, 5000);
+        }, 10000);
       } else {
         clearTimeout(websocketTimeoutId)
         if (webSocket.getStatus() == WebSocket.CLOSED) {
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index e3eb5d89..77632762 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -160,7 +160,7 @@
         websocketTimeoutId = setTimeout(() => {
           webSocket.close(1000, "Closed due to Inactivity");
           console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
-        }, 5000);
+        }, 10000);
       } else {
         clearTimeout(websocketTimeoutId)
         if (webSocket.getStatus() == WebSocket.CLOSED) {

From 93428b2e0581aba1740696a6be22698600c5d26e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Tue, 15 Aug 2023 16:09:06 -0400
Subject: [PATCH 046/210] Use API for config.json

---
 app/classes/shared/main_controller.py         |   8 ++
 app/classes/web/routes/api/api_handlers.py    |   6 +
 .../web/routes/api/crafty/config/index.py     | 113 ++++++++++++++++++
 app/frontend/templates/panel/config_json.html |  82 ++++++++-----
 4 files changed, 182 insertions(+), 27 deletions(-)
 create mode 100644 app/classes/web/routes/api/crafty/config/index.py

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 95872884..e8d3454b 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -5,6 +5,7 @@ from datetime import datetime
 import platform
 import shutil
 import time
+import json
 import logging
 import threading
 from peewee import DoesNotExist
@@ -84,6 +85,13 @@ class Controller:
     def set_project_root(self, root_dir):
         self.project_root = root_dir
 
+    def set_config_json(self, data):
+        keys = list(data.keys())
+        keys.sort()
+        sorted_data = {i: data[i] for i in keys}
+        with open(self.helper.settings_file, "w", encoding="utf-8") as f:
+            json.dump(sorted_data, f, indent=4)
+
     def package_support_logs(self, exec_user):
         if exec_user["preparing"]:
             return
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 249899ef..3eb159b8 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -49,6 +49,7 @@ from app.classes.web.routes.api.users.user.permissions import (
 )
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
+from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
 
 
 def api_handlers(handler_args):
@@ -64,6 +65,11 @@ def api_handlers(handler_args):
             ApiAuthInvalidateTokensHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/config/?",
+            ApiCraftyConfigIndexHandler,
+            handler_args,
+        ),
         # User routes
         (
             r"/api/v2/users/?",
diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
new file mode 100644
index 00000000..a5c57b79
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -0,0 +1,113 @@
+from jsonschema import ValidationError, validate
+import orjson
+from playhouse.shortcuts import model_to_dict
+from app.classes.web.base_api_handler import BaseApiHandler
+
+config_json_schema = {
+    "type": "object",
+    "properties": {
+        "http_port": {"type": "integer"},
+        "https_port": {"type": "integer"},
+        "language": {
+            "type": "string",
+        },
+        "cookie_expire": {"type": "integer"},
+        "show_errors": {"type": "boolean"},
+        "history_max_age": {"type": "integer"},
+        "stats_update_frequency_seconds": {"type": "integer"},
+        "delete_default_json": {"type": "boolean"},
+        "show_contribute_link": {"type": "boolean"},
+        "virtual_terminal_lines": {"type": "integer"},
+        "max_log_lines": {"type": "integer"},
+        "max_audit_entries": {"type": "integer"},
+        "disabled_language_files": {"type": "array"},
+        "stream_size_GB": {"type": "integer"},
+        "keywords": {"type": "string"},
+        "allow_nsfw_profile_pictures": {"type": "boolean"},
+        "enable_user_self_delete": {"type": "boolean"},
+        "reset_secrets_on_next_boot": {"type": "boolean"},
+        "monitored_mounts": {"type": "array"},
+        "dir_size_poll_freq_minutes": {"type": "integer"},
+        "crafty_logs_delete_after_days": {"type": "integer"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiCraftyConfigIndexHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            _,
+        ) = auth_data
+
+        # GET /api/v2/roles?ids=true
+        get_only_ids = self.get_query_argument("ids", None) == "true"
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.roles.get_all_role_ids()
+                if get_only_ids
+                else [model_to_dict(r) for r in self.controller.roles.get_all_roles()],
+            },
+        )
+
+    def patch(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            user,
+        ) = auth_data
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = orjson.loads(self.request.body)
+        except orjson.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, config_json_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        self.controller.set_config_json(data)
+
+        self.controller.management.add_to_audit_log(
+            user["user_id"],
+            "edited config.json",
+            server_id=0,
+            source_ip=self.get_remote_ip(),
+        )
+
+        self.finish_json(
+            200,
+            {"status": "ok"},
+        )
diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html
index 6867fb90..dc9a7051 100644
--- a/app/frontend/templates/panel/config_json.html
+++ b/app/frontend/templates/panel/config_json.html
@@ -50,7 +50,6 @@
           <!-- Page Title Header Ends-->
 
           <form id="config-form" class="forms-sample" method="post" action="/panel/config_json">
-            {% raw xsrf_form_html() %}
 
             {% for item in data['config-json'].items() %}
             {% if item[0] == "reset_secrets_on_next_boot" %}
@@ -156,37 +155,66 @@
 
 {% block js %}
 <script>
-  $("#config-form").submit(function (e) {
-    let uuid = uuidv4();
-    var token = getCookie("_xsrf")
+    function replacer(key, value) {
+    if (key == "disabled_language_files") {
+      if (value == 0){
+        return []
+      } else {
+        return value
+      }
+    }
+    if (typeof value == "boolean") {
+      return value
+    } else {
+      return (isNaN(value) ? value : +value);
+    }
+  }
+  $("#config-form").on("submit", async function (e) {
     e.preventDefault();
-
     $("#submit-status").html('<i class="fa fa-spinner fa-spin"></i>');
-    /* Convert multiple select to text list */
-    let selected_Lang = $('#lang_select').val();
-    $('#disabled_lang').val(selected_Lang);
+    var token = getCookie("_xsrf")
+    let configForm = document.getElementById("config-form");
 
-    let mounts = $('#mount_select').val();
-    $('#monitored_mounts').val(mounts);
+    let formData = new FormData(configForm);
+    formData.delete("disabled_lang");
+    formData.delete("lang_select");
 
-    let class_list = document.getElementsByClassName("list");
-    let form_json = convertFormToJSON($("#config-form"));
-    for (let i = 0; i < class_list.length; i++) {
-      let str = String($(class_list.item(i)).val())
-      form_json[$(class_list.item(i)).attr("name")] = uuid + "," + str.replace(/\s/g, '');
-    };
-    form_json['uuid'] = uuid;
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      dataType: "text",
-      url: '/panel/config_json',
-      data: form_json,
-      success: function (data) {
-        $("#submit-status").html('<i class="fa fa-check"></i>');
-      },
+    //Create an object from the form data entries
+    let formDataObject = Object.fromEntries(formData.entries());
+    //We need to make sure these are sent regardless of whether or not they're checked
+    formDataObject.disabled_language_files = $('#lang_select').val();
+    formDataObject.monitored_mounts = $('#mount_select').val();
+    $('#config-form input[type="radio"]:checked').each(function() {
+      if ($(this).val() == 'True'){
+        formDataObject[this.name] = true;
+      }else{
+        formDataObject[this.name] = false;
+      }
     });
-  });
+    console.log(formDataObject);
+    // Format the plain form data as JSON
+    let formDataJsonString = JSON.stringify(formDataObject, replacer);
+
+    console.log(formDataJsonString);
+
+    let res = await fetch(`/api/v2/crafty/config/`, {
+      method: 'PATCH',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: formDataJsonString,
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      $("#submit-status").html('<i class="fa fa-check"></i>');
+    } else {
+
+      bootbox.alert({
+        title: responseData.error,
+        message: responseData.error_data
+      });
+    }
+});
 
   function uuidv4() {
     return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>

From 185702169aa1bac4fc6a397629ad6b8f83b8fa00 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Tue, 15 Aug 2023 16:29:53 -0400
Subject: [PATCH 047/210] Make keywords an array

---
 app/classes/web/routes/api/crafty/config/index.py | 2 +-
 app/frontend/templates/panel/config_json.html     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
index a5c57b79..94c1847d 100644
--- a/app/classes/web/routes/api/crafty/config/index.py
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -22,7 +22,7 @@ config_json_schema = {
         "max_audit_entries": {"type": "integer"},
         "disabled_language_files": {"type": "array"},
         "stream_size_GB": {"type": "integer"},
-        "keywords": {"type": "string"},
+        "keywords": {"type": "array"},
         "allow_nsfw_profile_pictures": {"type": "boolean"},
         "enable_user_self_delete": {"type": "boolean"},
         "reset_secrets_on_next_boot": {"type": "boolean"},
diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html
index dc9a7051..a8d5e040 100644
--- a/app/frontend/templates/panel/config_json.html
+++ b/app/frontend/templates/panel/config_json.html
@@ -99,7 +99,7 @@
                   <textarea id="monitored_mounts" name="{{item[0]}}" class="form-control list hidden" rows="{{ len(data['all_partitions']) }}" value="{{','.join(item[1])}}" hidden>{{','.join(item[1])}}</textarea>
                 </div>
                 {% elif isinstance(item[1], list) %}
-                <textarea value="{{','.join(item[1])}}" type="text" name="{{item[0]}}" class="form-control list">{{','.join(item[1])}}</textarea>
+                <textarea id="{{item[0]}}" value="{{','.join(item[1])}}" type="text" name="{{item[0]}}" class="form-control list">{{','.join(item[1])}}</textarea>
                 {% elif isinstance(item[1], bool) %}
                 <div style="margin-left: 30px;">
                   {% if item[1] == True %}
@@ -184,6 +184,7 @@
     //We need to make sure these are sent regardless of whether or not they're checked
     formDataObject.disabled_language_files = $('#lang_select').val();
     formDataObject.monitored_mounts = $('#mount_select').val();
+    formDataObject.keywords = $('#keywords').val().split(",");
     $('#config-form input[type="radio"]:checked').each(function() {
       if ($(this).val() == 'True'){
         formDataObject[this.name] = true;

From e701fc1888399514c7c10d7ec28854cb64a9a780 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Tue, 15 Aug 2023 16:46:04 -0400
Subject: [PATCH 048/210] Edit values. Don't delete them all

---
 app/classes/shared/main_controller.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index e8d3454b..071a4111 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -86,9 +86,13 @@ class Controller:
         self.project_root = root_dir
 
     def set_config_json(self, data):
-        keys = list(data.keys())
+        current_config = self.helper.get_all_settings()
+        for key in current_config:
+            if key in data:
+                current_config[key] = data[key]
+        keys = list(current_config.keys())
         keys.sort()
-        sorted_data = {i: data[i] for i in keys}
+        sorted_data = {i: current_config[i] for i in keys}
         with open(self.helper.settings_file, "w", encoding="utf-8") as f:
             json.dump(sorted_data, f, indent=4)
 

From 36e500fda5e0e4e4ace742efbcb4c320518c62e6 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Tue, 15 Aug 2023 16:47:55 -0400
Subject: [PATCH 049/210] Remove config.json from panel handler

---
 app/classes/web/panel_handler.py | 37 +-------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index dc29310e..f119e1f2 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1568,42 +1568,7 @@ class PanelHandler(BaseHandler):
                 role = self.controller.roles.get_role(r)
                 exec_user_role.add(role["role_name"])
 
-        if page == "config_json":
-            try:
-                data = {}
-                with open(self.helper.settings_file, "r", encoding="utf-8") as f:
-                    keys = json.load(f).keys()
-                this_uuid = self.get_argument("uuid")
-                for key in keys:
-                    arg_data = self.get_argument(key)
-                    if arg_data.startswith(this_uuid):
-                        arg_data = arg_data.split(",")
-                        arg_data.pop(0)
-                        data[key] = arg_data
-                    else:
-                        try:
-                            data[key] = int(arg_data)
-                        except:
-                            if arg_data == "True":
-                                data[key] = True
-                            elif arg_data == "False":
-                                data[key] = False
-                            else:
-                                data[key] = arg_data
-                keys = list(data.keys())
-                keys.sort()
-                sorted_data = {i: data[i] for i in keys}
-                with open(self.helper.settings_file, "w", encoding="utf-8") as f:
-                    json.dump(sorted_data, f, indent=4)
-            except Exception as e:
-                logger.critical(
-                    "Config File Error: Unable to read "
-                    f"{self.helper.settings_file} due to {e}"
-                )
-
-            self.redirect("/panel/config_json")
-
-        elif page == "edit_user":
+        if page == "edit_user":
             if bleach.clean(self.get_argument("username", None)).lower() == "system":
                 self.redirect(
                     "/panel/error?error=Unauthorized access: "

From 6f535a11b075b344d2e9108f2fd8051496782412 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 16 Aug 2023 13:34:52 -0400
Subject: [PATCH 050/210] Use API to make/edit roles

---
 app/classes/web/panel_handler.py              | 102 ------------------
 app/classes/web/routes/api/roles/index.py     |  44 +++++++-
 .../web/routes/api/roles/role/index.py        |  11 +-
 .../templates/panel/panel_edit_role.html      | 100 +++++++++++++----
 4 files changed, 129 insertions(+), 128 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index f119e1f2..ba1ac472 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1538,17 +1538,6 @@ class PanelHandler(BaseHandler):
         if api_key is not None:
             superuser = superuser and api_key.superuser
 
-        server_id = self.get_argument("id", None)
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
         if superuser:
             # defined_servers = self.controller.servers.list_defined_servers()
             exec_user_role = {"Super User"}
@@ -1874,97 +1863,6 @@ class PanelHandler(BaseHandler):
             )
             self.redirect("/panel/panel_config")
 
-        elif page == "edit_role":
-            role_id = bleach.clean(self.get_argument("id", None))
-            role_name = bleach.clean(self.get_argument("role_name", None))
-
-            role = self.controller.roles.get_role(role_id)
-
-            if (
-                EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_crafty_permissions
-                and exec_user["user_id"] != role["manager"]
-                and not exec_user["superuser"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: not a role editor"
-                )
-                return
-            if role_name is None or role_name == "":
-                self.redirect("/panel/error?error=Invalid username")
-                return
-            if role_id is None:
-                self.redirect("/panel/error?error=Invalid Role ID")
-                return
-            # does this user id exist?
-            if not self.controller.roles.role_id_exists(role_id):
-                self.redirect("/panel/error?error=Invalid Role ID")
-                return
-
-            if exec_user["superuser"]:
-                manager = self.get_argument("manager", None)
-                if manager == "":
-                    manager = None
-            else:
-                manager = role["manager"]
-
-            servers = self.get_role_servers()
-
-            self.controller.roles.update_role_advanced(
-                role_id, role_name, servers, manager
-            )
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"edited role {role_name} (RID:{role_id}) with servers {servers}",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.redirect("/panel/panel_config")
-
-        elif page == "add_role":
-            role_name = bleach.clean(self.get_argument("role_name", None))
-            if exec_user["superuser"]:
-                manager = self.get_argument("manager", None)
-                if manager == "":
-                    manager = None
-            else:
-                manager = exec_user["user_id"]
-
-            if EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_crafty_permissions:
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: not a role editor"
-                )
-                return
-            if (
-                not self.controller.crafty_perms.can_add_role(exec_user["user_id"])
-                and not exec_user["superuser"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: quantity limit reached"
-                )
-                return
-            if role_name is None or role_name == "":
-                self.redirect("/panel/error?error=Invalid role name")
-                return
-            # does this user id exist?
-            if self.controller.roles.get_roleid_by_name(role_name) is not None:
-                self.redirect("/panel/error?error=Role exists")
-                return
-
-            servers = self.get_role_servers()
-
-            role_id = self.controller.roles.add_role_advanced(
-                role_name, servers, manager
-            )
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"created role {role_name} (RID:{role_id})",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.redirect("/panel/panel_config")
-
         else:
             self.set_status(404)
             page_data = {
diff --git a/app/classes/web/routes/api/roles/index.py b/app/classes/web/routes/api/roles/index.py
index 150bff0c..0d46e11b 100644
--- a/app/classes/web/routes/api/roles/index.py
+++ b/app/classes/web/routes/api/roles/index.py
@@ -28,9 +28,39 @@ create_role_schema = {
                 "required": ["server_id", "permissions"],
             },
         },
+        "manager": {"type": ["integer", "null"]},
     },
-    "required": ["name"],
     "additionalProperties": False,
+    "minProperties": 1,
+}
+
+basic_create_role_schema = {
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1,
+        },
+        "servers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "server_id": {
+                        "type": "integer",
+                        "minimum": 1,
+                    },
+                    "permissions": {
+                        "type": "string",
+                        "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                    },
+                },
+                "required": ["server_id", "permissions"],
+            },
+        },
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
 }
 
 
@@ -86,7 +116,10 @@ class ApiRolesIndexHandler(BaseApiHandler):
             )
 
         try:
-            validate(data, create_role_schema)
+            if auth_data[4]["superuser"]:
+                validate(data, create_role_schema)
+            else:
+                validate(data, basic_create_role_schema)
         except ValidationError as e:
             return self.finish_json(
                 400,
@@ -98,6 +131,9 @@ class ApiRolesIndexHandler(BaseApiHandler):
             )
 
         role_name = data["name"]
+        manager = data.get("manager", None)
+        if manager == self.controller.users.get_id_by_name("SYSTEM") or manager == 0:
+            manager = None
 
         # Get the servers
         servers_dict = {server["server_id"]: server for server in data["servers"]}
@@ -116,9 +152,7 @@ class ApiRolesIndexHandler(BaseApiHandler):
                 400, {"status": "error", "error": "ROLE_NAME_ALREADY_EXISTS"}
             )
 
-        role_id = self.controller.roles.add_role_advanced(
-            role_name, servers, user["user_id"]
-        )
+        role_id = self.controller.roles.add_role_advanced(role_name, servers, manager)
 
         self.controller.management.add_to_audit_log(
             user["user_id"],
diff --git a/app/classes/web/routes/api/roles/role/index.py b/app/classes/web/routes/api/roles/role/index.py
index 20354722..0dd7d6c8 100644
--- a/app/classes/web/routes/api/roles/role/index.py
+++ b/app/classes/web/routes/api/roles/role/index.py
@@ -153,9 +153,18 @@ class ApiRolesRoleIndexHandler(BaseApiHandler):
                 },
             )
 
+        manager = data.get(
+            "manager", self.controller.roles.get_role(role_id)["manager"]
+        )
+        if manager == self.controller.users.get_id_by_name("system") or manager == 0:
+            manager = None
+
         try:
             self.controller.roles.update_role_advanced(
-                role_id, data.get("role_name", None), data.get("servers", None)
+                role_id,
+                data.get("name", None),
+                data.get("servers", None),
+                manager,
             )
         except DoesNotExist:
             return self.finish_json(404, {"status": "error", "error": "ROLE_NOT_FOUND"})
diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index 273bddec..db760201 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -50,9 +50,6 @@
           <div class="">
             <div class="">
               <form id="role_form" class="forms-sample" method="post" action="{{ '/panel/add_role' if data['new_role'] else '/panel/edit_role' }}">
-                {% raw xsrf_form_html() %}
-                <input type="hidden" name="id" value="{{ data['role']['role_id'] }}">
-                <input type="hidden" name="subpage" value="config">
 
                 <div class="card">
                   <div class="card-header header-sm d-flex justify-content-between align-items-center">
@@ -61,7 +58,7 @@
                   <div class="card-body">
                     <div class="form-group">
                       <label for="role_name">{{ translate('rolesConfig', 'roleName', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('rolesConfig', 'roleDesc', data['lang']) }}</small> </label>
-                      <input type="text" class="form-control" name="role_name" id="role_name" value="{{ data['role']['role_name']  }}" placeholder="Role Name" >
+                      <input type="text" class="form-control" name="name" id="role_name" value="{{ data['role']['role_name']  }}" placeholder="Role Name" >
                     </div>
 
                     <br />
@@ -188,11 +185,11 @@
                             <tr>
                               <td>{{ server['server_name'] }}</td>
                               <td>
-                                <input type="checkbox" class="" onclick="enable_disable(event)" data-id="{{server['server_id']}}"
+                                <input type="checkbox" class="access" onclick="enable_disable(event)" data-id="{{server['server_id']}}"
                                 id="server_{{ server['server_id'] }}_access"
                                 name="server_{{ server['server_id'] }}_access"
                                 {{ 'checked' if server['server_id'] in data['role']['servers'] else '' }}
-                                autocomplete="off" value="1">
+                                autocomplete="off" value="1" form="dummy">
                               </td>
                               {% for permission in data['permissions_all'] %}
                               {% if server['server_id'] in data['role']['servers'] %}
@@ -201,14 +198,14 @@
                                   id="permission_{{ server['server_id'] }}_{{ permission.name }}"
                                   name="permission_{{ server['server_id'] }}_{{ permission.name }}"
                                   {{ 'checked' if permission in data['permissions_dict'].get(server['server_id'], []) else '' }}
-                                  autocomplete="off" value="1">
+                                  autocomplete="off" value="1" form="dummy">
                                 </td>
                               {% else %}
                               <td>
                                 <input type="checkbox" class="{{server['server_id']}}_perms"
                                 id="permission_{{ server['server_id'] }}_{{ permission.name }}"
                                 name="permission_{{ server['server_id'] }}_{{ permission.name }}"
-                                autocomplete="off" value="1" disabled>
+                                autocomplete="off" value="1" disabled form="dummy">
                               </td>
                               {% end %}
                               {% end %}
@@ -284,7 +281,7 @@
                       <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a><br />
                       <small>{{ translate('rolesConfig', 'doesNotExist', data['lang']) }}</small>
                     {% else %}
-                      <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a>
+                      <button onclick="del_role()" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</button>
                     {% end %}
                 </div>
               </div>
@@ -341,24 +338,87 @@
         console.log( "ready!" );
     });
     const roleId = new URLSearchParams(document.location.search).get('id');
+    
+    function replacer(key, value) {
+      if (key === "permissions"){
+        return value;
+      }
+      if (key === "servers" && value.length === 0){
+        return value;
+      }
+      if (typeof value == "boolean") {
+        console.log(value);
+        return value
+      } else {
+        return (isNaN(value) ? value : +value);
+      }
+  }
 
-    $("#config_form").on("submit", async function (e) {
+  async function del_role(){
+    var token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/roles/${roleId}`, {
+        method: "DELETE",
+        headers: {
+          'X-XSRFToken': token
+        },
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = "/panel/panel_config";
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+      }
+  }
+
+    $("#role_form").on("submit", async function (e) {
       e.preventDefault();
       var token = getCookie("_xsrf")
-      let configForm = document.getElementById("config_form");
+      let roleForm = document.getElementById("role_form");
 
-      let formData = new FormData(configForm);
+      let server_ids = $('.access').map(function() {
+        if ($(this).is(':checked')){
+          return $(this).data('id');
+        }
+      }).get();
+
+      let servers = []
+      for(i=0; i < server_ids.length; i++){
+        arrchecked = $(`.${server_ids[i]}_perms`).map(function() {
+        if(this.checked){
+          return "1";
+        }else{
+          return "0"
+        }
+      }).get();
+        servers.push({"server_id": server_ids[i], "permissions": arrchecked.join("")});
+      }
+      console.log(servers)
+
+      let formData = new FormData(roleForm);
       //Create an object from the form data entries
       let formDataObject = Object.fromEntries(formData.entries());
-      let send_object = Object()
-      send_object.servers = []
-      send_object.name = formDataObject.role_name
+      formDataObject.servers = servers;
+      console.log(formDataObject);
+
+      //We need to make sure these are sent regardless of whether or not they're checked
 
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
-      let res = await fetch(`/api/v2/roles/${roleId}`, {
-        method: 'PATCH',
+      console.log(formDataJsonString);
+      if (roleId){
+        url = `/api/v2/roles/${roleId}`
+        method = 'PATCH'
+      }else{
+        url = `/api/v2/roles/`
+        method = 'POST'
+      }
+      let res = await fetch(url, {
+        method: method,
         headers: {
           'X-XSRFToken': token
         },
@@ -366,14 +426,14 @@
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
-        window.location.reload();
+        window.location.href = "/panel/panel_config";
       } else {
 
         bootbox.alert({
           title: responseData.error,
           message: responseData.error_data
-          });
-      } 
+        });
+      }
     });
 
 

From d6dd30b6859aa62aacef8c5dd4eb02673c84bb0f Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 16 Aug 2023 13:38:10 -0400
Subject: [PATCH 051/210] Remove delete method from panel handler

---
 app/classes/web/ajax_handler.py  |  2 --
 app/classes/web/panel_handler.py | 32 --------------------------------
 2 files changed, 34 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 13def1a6..9be31b99 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -114,8 +114,6 @@ class AjaxHandler(BaseHandler):
         if api_key is not None:
             superuser = superuser and api_key.superuser
 
-        server_id = self.get_argument("id", None)
-
         if page == "send_order":
             self.controller.users.update_server_order(
                 exec_user["user_id"], bleach.clean(self.get_argument("order"))
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index ba1ac472..f674b1fb 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1415,38 +1415,6 @@ class PanelHandler(BaseHandler):
 
             template = "panel/panel_edit_role.html"
 
-        elif page == "remove_role":
-            role_id = bleach.clean(self.get_argument("id", None))
-
-            if (
-                not superuser
-                and self.controller.roles.get_role(role_id)["manager"]
-                != exec_user["user_id"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: not superuser not"
-                    " role manager"
-                )
-                return
-            if role_id is None:
-                self.redirect("/panel/error?error=Invalid Role ID")
-                return
-            # does this user id exist?
-            target_role = self.controller.roles.get_role(role_id)
-            if not target_role:
-                self.redirect("/panel/error?error=Invalid Role ID")
-                return
-
-            self.controller.roles.remove_role(role_id)
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Removed role {target_role['role_name']} (RID:{role_id})",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.redirect("/panel/panel_config")
-
         elif page == "activity_logs":
             page_data["audit_logs"] = self.controller.management.get_actity_log()
 

From 481eff9486211c17ca57593ab33345e9aaad1b6b Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 16 Aug 2023 13:41:18 -0400
Subject: [PATCH 052/210] Remove send_order from ajax handler

---
 app/classes/web/ajax_handler.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 9be31b99..e38648f4 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -114,13 +114,7 @@ class AjaxHandler(BaseHandler):
         if api_key is not None:
             superuser = superuser and api_key.superuser
 
-        if page == "send_order":
-            self.controller.users.update_server_order(
-                exec_user["user_id"], bleach.clean(self.get_argument("order"))
-            )
-            return
-
-        elif page == "select_photo":
+        if page == "select_photo":
             if exec_user["superuser"]:
                 photo = urllib.parse.unquote(self.get_argument("photo", ""))
                 opacity = self.get_argument("opacity", 100)

From 134b35b2dd536a381590fdb21354b616a63fef6b Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 16 Aug 2023 18:00:00 -0400
Subject: [PATCH 053/210] Setup users for API handling

---
 app/classes/controllers/users_controller.py   |   8 +-
 app/classes/web/routes/api/users/index.py     |  11 +-
 .../web/routes/api/users/user/index.py        |  29 +++-
 .../templates/panel/panel_edit_role.html      |   2 +-
 .../templates/panel/panel_edit_user.html      | 163 +++++++++++++++---
 5 files changed, 172 insertions(+), 41 deletions(-)

diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py
index 667e01b4..99147a63 100644
--- a/app/classes/controllers/users_controller.py
+++ b/app/classes/controllers/users_controller.py
@@ -31,7 +31,7 @@ class UsersController:
                     for permission in PermissionsCrafty.get_permissions_list()
                 ],
             },
-            "quantity": {"type": "number", "minimum": 0},
+            "quantity": {"type": "number", "minimum": -1},
             "enabled": {"type": "boolean"},
         }
         self.user_jsonschema_props: t.Final = {
@@ -46,7 +46,7 @@ class UsersController:
             "password": {
                 "type": "string",
                 "maxLength": 20,
-                "minLength": 4,
+                "minLength": 6,
                 "examples": ["crafty"],
                 "title": "Password",
             },
@@ -73,6 +73,8 @@ class UsersController:
                 "examples": [False],
                 "title": "Superuser",
             },
+            "manager": {"type": ["integer", "null"]},
+            "theme": {"type": "string"},
             "permissions": {
                 "type": "array",
                 "items": {
@@ -84,7 +86,7 @@ class UsersController:
             "roles": {
                 "type": "array",
                 "items": {
-                    "type": "string",
+                    "type": "integer",
                     "minLength": 1,
                 },
             },
diff --git a/app/classes/web/routes/api/users/index.py b/app/classes/web/routes/api/users/index.py
index a1f849ef..f7341d38 100644
--- a/app/classes/web/routes/api/users/index.py
+++ b/app/classes/web/routes/api/users/index.py
@@ -93,10 +93,17 @@ class ApiUsersIndexHandler(BaseApiHandler):
                     "error_data": str(e),
                 },
             )
-
         username = data["username"]
         username = str(username).lower()
-        manager = int(user["user_id"])
+        manager = data.get("manager", None)
+        if user["superuser"]:
+            if (
+                manager == self.controller.users.get_id_by_name("SYSTEM")
+                or manager == 0
+            ):
+                manager = None
+        else:
+            manager = int(user["user_id"])
         password = data["password"]
         email = data.get("email", "default@example.com")
         enabled = data.get("enabled", True)
diff --git a/app/classes/web/routes/api/users/user/index.py b/app/classes/web/routes/api/users/user/index.py
index 47d8dd68..898a9fda 100644
--- a/app/classes/web/routes/api/users/user/index.py
+++ b/app/classes/web/routes/api/users/user/index.py
@@ -166,7 +166,13 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                 return self.finish_json(
                     400, {"status": "error", "error": "INVALID_USERNAME"}
                 )
-            if self.controller.users.get_id_by_name(data["username"]) is not None:
+            if self.controller.users.get_id_by_name(
+                data["username"]
+            ) is not None and self.controller.users.get_id_by_name(
+                data["username"]
+            ) != int(
+                user_id
+            ):
                 return self.finish_json(
                     400, {"status": "error", "error": "USER_EXISTS"}
                 )
@@ -210,13 +216,13 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                     400, {"status": "error", "error": "INVALID_ROLES_MODIFY"}
                 )
 
-        if "password" in data and str(user["user_id"] == str(user_id)):
-            # TODO: edit your own password
-            return self.finish_json(
-                400, {"status": "error", "error": "INVALID_PASSWORD_MODIFY"}
-            )
-
         user_obj = HelperUsers.get_user_model(user_id)
+        if "password" in data and str(user["user_id"]) != str(user_id):
+            if str(user["user_id"]) != str(user_obj.manager):
+                # TODO: edit your own password
+                return self.finish_json(
+                    400, {"status": "error", "error": "INVALID_PASSWORD_MODIFY"}
+                )
 
         if "roles" in data:
             roles: t.Set[str] = set(data.pop("roles"))
@@ -236,6 +242,13 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                     user_id, removed_roles
                 )
 
+        if "manager" in data:
+            if (
+                data["manager"] == self.controller.users.get_id_by_name("SYSTEM")
+                or data["manager"] == 0
+            ):
+                data["manager"] = None
+
         if "permissions" in data:
             permissions: t.List[UsersController.ApiPermissionDict] = data.pop(
                 "permissions"
@@ -246,7 +259,7 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
             limit_role_creation = 0
 
             for permission in permissions:
-                self.controller.crafty_perms.set_permission(
+                permissions_mask = self.controller.crafty_perms.set_permission(
                     permissions_mask,
                     EnumPermissionsCrafty.__members__[permission["name"]],
                     "1" if permission["enabled"] else "0",
diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index db760201..f614b7a3 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -49,7 +49,7 @@
           </ul>
           <div class="">
             <div class="">
-              <form id="role_form" class="forms-sample" method="post" action="{{ '/panel/add_role' if data['new_role'] else '/panel/edit_role' }}">
+              <form id="role_form" class="forms-sample">
 
                 <div class="card">
                   <div class="card-header header-sm d-flex justify-content-between align-items-center">
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index a40d2903..b61c6619 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -58,13 +58,11 @@ data['lang']) }}{% end %}
           <div class="row">
             <div class="col-md-6 col-sm-12">
               {% if data['new_user'] %}
-              <form id="user_form" class="forms-sample" method="post" action="/panel/add_user">
+              <form id="user_form" class="forms-sample">
                 {% else %}
-                <form id="user_form" class="forms-sample" method="post" action="/panel/edit_user">
+                <form id="user_form" class="forms-sample">
                   {% end %}
-                  {% raw xsrf_form_html() %}
-                  <input type="hidden" name="id" value="{{ data['user']['user_id'] }}">
-                  <input type="hidden" name="subpage" value="config">
+
 
 
                   <div class="card">
@@ -85,7 +83,7 @@ data['lang']) }}{% end %}
                           }}<small class="text-muted ml-1"> - {{ translate('userConfig', 'leaveBlank', data['lang']) }}
                           </small> </label>
                         <input type="password" class="form-control" name="password0" id="password0" value=""
-                          autocomplete="new-password" data-lpignore="true" placeholder="Password">
+                          autocomplete="new-password" data-lpignore="true" placeholder="Password" form="dummy">
                         <span class="passwords-match" ,
                           data-content="{{ translate('panelConfig', 'match', data['lang']) }}" ,
                           data-placement="right"></span>
@@ -95,7 +93,7 @@ data['lang']) }}{% end %}
                           <small class="text-muted ml-1"> - {{ translate('userConfig', 'leaveBlank', data['lang'])
                             }}</small> </label>
                         <input type="password" class="form-control" name="password1" id="password1" value=""
-                          autocomplete="new-password" data-lpignore="true" placeholder="Repeat Password">
+                          autocomplete="new-password" data-lpignore="true" placeholder="Repeat Password" form="dummy">
                         <span class="passwords-match" ,
                           data-content="{{ translate('panelConfig', 'match', data['lang']) }}" ,
                           data-placement="right"></span>
@@ -111,7 +109,7 @@ data['lang']) }}{% end %}
                         <label class="form-label" for="language">{{ translate('userConfig', 'userLang', data['lang'])
                           }}</label>
                         <select class="form-select form-control form-control-lg select-css" id="language"
-                          name="language" form="user_form">
+                          name="lang" form="user_form">
                           {% for lang in data['languages'] %}
                           {% if not 'incomplete' in lang %}
                           <option value="{{lang}}">{{lang}}</option>
@@ -182,18 +180,18 @@ data['lang']) }}{% end %}
                                 <td>
                                   {% if role.role_id in data['user']['roles'] %}
                                   {% if role.manager == data['exec_user'] or data['superuser'] %}
-                                  <input type="checkbox" class="form-check-input"
+                                  <input type="checkbox" class="form-check-input role_check"
                                     id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership"
-                                    checked="" value="1">
+                                    checked="" value="{{role.role_id}}" form="dummy">
                                   {% else %}
-                                  <input type="checkbox" class="form-check-input"
+                                  <input type="checkbox" class="form-check-input role_check"
                                     id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership"
-                                    checked="" value="1" disabled>
+                                    checked="" value="{{role.role_id}}" disabled form="dummy">
                                   {% end %}
                                   {% elif data['superuser'] or role.manager == data['exec_user'] %}
-                                  <input type="checkbox" class="form-check-input"
+                                  <input type="checkbox" class="form-check-input role_check"
                                     id="role_{{ role.role_id }}_membership" name="role_{{ role.role_id }}_membership"
-                                    value="1">
+                                    value="{{role.role_id}}" form="dummy">
                                   {% end %}
 
                                 </td>
@@ -219,7 +217,7 @@ data['lang']) }}{% end %}
                     <div class="card-body">
                       <div class="form-group">
                         <div class="table-responsive">
-                          <table class="table table-hover">
+                          <table id="permissions" class="table table-hover">
                             <thead>
                               <tr class="rounded">
                                 <th>{{ translate('userConfig', 'permName', data['lang']) }}</th>
@@ -233,16 +231,16 @@ data['lang']) }}{% end %}
                                 <td>{{ permission.name }}</td>
                                 <td>
                                   {% if permission in data['permissions_list'] %}
-                                  <input type="checkbox" class="form-check-input" id="permission_{{ permission.name }}"
-                                    name="permission_{{ permission.name }}" checked="" value="1">
+                                  <input type="checkbox" class="form-check-input perm-name" id="permission_{{ permission.name }}"
+                                    name="permission_{{ permission.name }}" checked="" value="1" data-perm="{{permission.name}}" form="dummy">
                                   {% else %}
-                                  <input type="checkbox" class="form-check-input" id="permission_{{ permission.name }}"
-                                    name="permission_{{ permission.name }}" value="1">
+                                  <input type="checkbox" class="form-check-input perm-name" id="permission_{{ permission.name }}"
+                                    name="permission_{{ permission.name }}" value="1" data-perm="{{permission.name}}" form="dummy">
                                   {% end %}
                                 </td>
                                 <td><input type="text" class="form-control" name="quantity_{{ permission.name }}"
                                     id="quantity_{{ permission.name }}"
-                                    value="{{ data['quantity_server'][permission.name] }}"></td>
+                                    value="{{ data['quantity_server'][permission.name] }}" data-perm="{{permission.name}}" form="dummy"></td>
                               </tr>
                               {% end %}
                             </tbody>
@@ -287,7 +285,7 @@ data['lang']) }}{% end %}
 
                   </div>
 
-                  <button class="btn btn-success mr-2" onclick="submit_user(event);"><i class="fas fa-save"></i> {{
+                  <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{
                     translate('panelConfig', 'save', data['lang']) }}</button>
                   <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i
                       class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}</button>
@@ -363,9 +361,12 @@ data['lang']) }}{% end %}
     }
   }
   function validateForm() {
-    let password0 = document.getElementById("password0").value
-    let password1 = document.getElementById("password1").value
-    if (password0 != password1) {
+    let password0 = document.getElementById("password0").value;
+    let password1 = document.getElementById("password1").value;
+    if (password0 === "" && password1 === "" && userId){
+      return true
+    }
+    else if (password0 != password1) {
       $('.passwords-match').popover('show');
       $('.popover-body').click(function () {
         $('.passwords-match').popover("hide");
@@ -376,11 +377,103 @@ data['lang']) }}{% end %}
       $("#password1").css("outline", "1px solid red");
       return false;
     } else {
-      return true;
+      return password1;
     }
   }
+  function replacer(key, value) {
+      if (typeof value == "boolean" || key === "email" || key === "permissions" || key === "roles") {
+        return value
+      } else {
+        console.log(key, value)
+        return (isNaN(value) ? value : +value);
+      }
+  }
   const userId = new URLSearchParams(document.location.search).get('id')
+  $("#user_form").on("submit", async function (e) {
+      e.preventDefault();
+      let password = validateForm();
+      if (!password){
+        return;
+      }
+      var token = getCookie("_xsrf")
+      let userForm = document.getElementById("user_form");
 
+      let disabled_flag = false;
+      let roles = $('.role_check').map(function() {
+        if ($(this).attr("disabled")){
+          disabled_flag = true;
+        }
+        if ($(this).is(':checked')){
+          return $(this).val();
+        }
+      }).get();
+
+      let avail_permissions = $('.perm-name').map(function() {
+          return $(this).data("perm");
+      }).get();
+
+      permissions = []
+      for(i=0; i < avail_permissions.length; i++){
+        permissions.push({"name": avail_permissions[i], "quantity": $(`#quantity_${avail_permissions[i]}`).val(), "enabled": $(`#permission_${avail_permissions[i]}`).is(':checked')})
+      }
+      console.log(permissions);
+
+      let formData = new FormData(userForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      if (!disabled_flag){
+        formDataObject.roles = roles;
+      }
+      if ($("#permissions").length){
+        formDataObject.permissions = permissions;
+      }
+      if(typeof password === "string"){
+        formDataObject.password = password;
+      }
+      formDataObject.enabled = $("#enabled").is(":checked");
+      if ($("#superuser").is(":enabled")){
+        formDataObject.superuser = $("#superuser").is(":checked");
+      }
+      formDataObject.hints = $("#hints").is(":checked");
+      console.log(formDataObject);
+
+      //We need to make sure these are sent regardless of whether or not they're checked
+
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(formDataObject, replacer);
+
+      console.log(formDataJsonString);
+      if (userId){
+        url = `/api/v2/users/${userId}`
+        method = 'PATCH'
+      }else{
+        url = `/api/v2/users/`
+        method = 'POST'
+      }
+      let res = await fetch(url, {
+        method: method,
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = "/panel/panel_config";
+      } else {
+        if (responseData.hasOwnProperty("error_data")){
+          bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+        }else{
+          bootbox.alert(responseData.error
+        );
+        }
+      }
+    });
+
+  
   $(".delete-user").click(function () {
     var file_to_del = $(this).data("file");
 
@@ -398,10 +491,26 @@ data['lang']) }}{% end %}
           label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "confirm", data['lang']) }}'
             }
       },
-      callback: function (result) {
+      callback: async function (result) {
         console.log(result);
         if (result === true) {
-          location.href = "/panel/remove_user?id=" + userId;
+            var token = getCookie("_xsrf")
+            let res = await fetch(`/api/v2/users/${userId}`, {
+              method: "DELETE",
+              headers: {
+                'X-XSRFToken': token
+              },
+            });
+            let responseData = await res.json();
+            if (responseData.status === "ok") {
+              window.location.href = "/panel/panel_config";
+            } else {
+
+              bootbox.alert({
+                title: responseData.error,
+                message: responseData.error
+              });
+            }
         }
       }
     });

From 4358a78e938e59cb063c30b78e38ab59be3d3cf5 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 17 Aug 2023 15:11:11 -0400
Subject: [PATCH 054/210] Require category. Not eula

---
 app/classes/web/routes/api/servers/index.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/classes/web/routes/api/servers/index.py b/app/classes/web/routes/api/servers/index.py
index edfec8fc..62282d9d 100644
--- a/app/classes/web/routes/api/servers/index.py
+++ b/app/classes/web/routes/api/servers/index.py
@@ -133,8 +133,13 @@ new_server_schema = {
                         "mem_min",
                         "mem_max",
                         "server_properties_port",
-                        "agree_to_eula",
+                        "category",
                     ],
+                    "category": {
+                        "title": "Jar Category",
+                        "type": "string",
+                        "examples": ["modded", "vanilla"],
+                    },
                     "properties": {
                         "type": {
                             "title": "Server JAR Type",
@@ -185,7 +190,6 @@ new_server_schema = {
                         "mem_min",
                         "mem_max",
                         "server_properties_port",
-                        "agree_to_eula",
                     ],
                     "properties": {
                         "existing_server_path": {
@@ -240,7 +244,6 @@ new_server_schema = {
                         "mem_min",
                         "mem_max",
                         "server_properties_port",
-                        "agree_to_eula",
                     ],
                     "properties": {
                         "zip_path": {

From 470ab04bb222b8bb257ac0cf176887af014c2d49 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 17 Aug 2023 15:11:29 -0400
Subject: [PATCH 055/210] Use API v2 for jar creation and jar import

---
 app/classes/shared/main_controller.py     |  54 ++++++--
 app/frontend/templates/server/wizard.html | 146 ++++++++++++++++++++--
 2 files changed, 178 insertions(+), 22 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 071a4111..d5607d17 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -348,12 +348,14 @@ class Controller:
                 server_file = f"{create_data['type']}-{create_data['version']}.jar"
 
                 # Create an EULA file
-                with open(
-                    os.path.join(new_server_path, "eula.txt"), "w", encoding="utf-8"
-                ) as file:
-                    file.write(
-                        "eula=" + ("true" if create_data["agree_to_eula"] else "false")
-                    )
+                if "agree_to_eula" in create_data:
+                    with open(
+                        os.path.join(new_server_path, "eula.txt"), "w", encoding="utf-8"
+                    ) as file:
+                        file.write(
+                            "eula="
+                            + ("true" if create_data["agree_to_eula"] else "false")
+                        )
             elif root_create_data["create_type"] == "import_server":
                 _copy_import_dir_files(create_data["existing_server_path"])
                 server_file = create_data["jarfile"]
@@ -376,11 +378,41 @@ class Controller:
             def _wrap_jar_if_windows():
                 return f'"{server_file}"' if Helpers.is_os_windows() else server_file
 
-            server_command = (
-                f"java -Xms{_gibs_to_mibs(min_mem)}M "
-                f"-Xmx{_gibs_to_mibs(max_mem)}M "
-                f"-jar {_wrap_jar_if_windows()} nogui"
-            )
+            if root_create_data["create_type"] == "download_jar":
+                if Helpers.is_os_windows():
+                    # Let's check for and setup for install server commands
+                    if create_data["type"] == "forge":
+                        server_command = (
+                            f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                            f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                            f'-jar "{server_file}" --installServer'
+                        )
+                    else:
+                        server_command = (
+                            f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                            f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                            f'-jar "{server_file}" nogui'
+                        )
+                else:
+                    if create_data["type"] == "forge":
+                        server_command = (
+                            f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                            f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                            f"-jar {server_file} --installServer"
+                        )
+                    else:
+                        server_command = (
+                            f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                            f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                            f"-jar {server_file} nogui"
+                        )
+            else:
+                server_command = (
+                    f"java -Xms{_gibs_to_mibs(min_mem)}M "
+                    f"-Xmx{_gibs_to_mibs(max_mem)}M "
+                    f"-jar {_wrap_jar_if_windows()} nogui"
+                )
+
         elif data["create_type"] == "minecraft_bedrock":
             if root_create_data["create_type"] == "import_server":
                 existing_server_path = Helpers.get_os_understandable_path(
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 69f9e5af..61fb8c46 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -29,7 +29,7 @@
           <br />
           <p class="card-description">
 
-          <form method="post" class="server-wizard" onSubmit="wait_msg()">
+          <form method="post" id="download_jar">
             {% if data["server_api"] and data["online"] %}
             <fieldset>
               {% else %}
@@ -89,7 +89,7 @@
                   <div class="col-sm-12">
                     <div class="form-group">
                       <label for="server_type">{{ translate('serverWizard', 'serverSelect', data['lang']) }}</label>
-                      <select required class="form-control form-control-lg select-css" id="server_type" name="server_type" onchange="serverTypeChange(this)">
+                      <select required class="form-control form-control-lg select-css" id="server_type" name="type" onchange="serverTypeChange(this)">
                         <option value="">{{ translate('serverWizard', 'selectServer', data['lang']) }}</option>
                       </select>
                     </div>
@@ -98,7 +98,7 @@
                   <div class="col-sm-12">
                     <div class="form-group">
                       <label for="server_version">{{ translate('serverWizard', 'serverVersion', data['lang']) }}</label>
-                      <select required class="form-control form-control-lg select-css" id="server" name="server">
+                      <select required class="form-control form-control-lg select-css" id="server" name="version">
                         <option value="">{{ translate('serverWizard', 'selectVersion', data['lang']) }}</option>
                       </select>
                     </div>
@@ -107,7 +107,7 @@
                   <div class="col-sm-12">
                     <div class="form-group">
                       <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_name" name="server_name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                      <input type="text" class="form-control" id="server_name" name="name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                     </div>
                   </div>
 
@@ -122,7 +122,7 @@
                     <div class="form-group">
                       <label for="min_memory1">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                           translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="min_memory1" name="min_memory" value="1" step="0.5" min="0.5" required>
+                      <input type="number" class="form-control" id="min_memory1" name="mem_min" value="1" step="0.5" min="0.5" required>
                     </div>
                   </div>
 
@@ -130,7 +130,7 @@
                     <div class="form-group">
                       <label for="max_memory1">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                           translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="max_memory1" name="max_memory" value="2" step="0.5" min="0.5" required>
+                      <input type="number" class="form-control" id="max_memory1" name="mem_max" value="2" step="0.5" min="0.5" required>
                     </div>
                   </div>
 
@@ -197,7 +197,7 @@
           <br />
           <p class="card-description">
 
-          <form method="post" class="server-wizard" onSubmit="wait_msg(true)">
+          <form class="server-wizard" id="jar-import">
             {% raw xsrf_form_html() %}
             <input type="hidden" value="import_jar" name="create_type">
             <div class="row">
@@ -205,7 +205,7 @@
               <div class="col-sm-12">
                 <div class="form-group">
                   <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                  <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                  <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                 </div>
               </div>
 
@@ -237,7 +237,7 @@
                 <div class="form-group">
                   <label for="min_memory2">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                       translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                  <input type="number" class="form-control" id="min_memory2" name="min_memory" value="1" step="0.5" min="0.5" required>
+                  <input type="number" class="form-control" id="min_memory2" name="mem_min" value="1" step="0.5" min="0.5" required>
                 </div>
               </div>
 
@@ -245,7 +245,7 @@
                 <div class="form-group">
                   <label for="max_memory2">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                       translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                  <input type="number" class="form-control" id="max_memory2" name="max_memory" value="2" step="0.5" min="0.5" required>
+                  <input type="number" class="form-control" id="max_memory2" name="mem_max" value="2" step="0.5" min="0.5" required>
                 </div>
               </div>
 
@@ -759,7 +759,7 @@
 
 {% end %}
 
-{% block js%}
+{% block js %}
 
 <script>
   document.getElementById("root_files_button").addEventListener("click", function () {
@@ -893,6 +893,130 @@
     });
 </script>
 
+<script>
+      function replacer(key, value) {
+        if (key != "ignored_exits") {
+          if (typeof value == "boolean" || key === "host" || key === "version") {
+            return value
+          } else {
+            return (isNaN(value) ? value : +value);
+          }
+        } else {
+          return value;
+        }
+      }
+    $(document).ready(function () {
+
+      $("#download_jar").on("submit", async function (e) {
+        wait_msg();
+      e.preventDefault();
+      var token = getCookie("_xsrf")
+      let jarForm = document.getElementById("download_jar");
+
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name, 
+        "monitoring_type": "minecraft_java", 
+        "minecraft_java_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_java",
+        "minecraft_java_create_data": {
+        "create_type": "download_jar",
+        "download_jar_create_data": {
+          "category": formDataObject.version.split("|")[0],
+          "type": formDataObject.version.split("|")[1],
+          "version": formDataObject.version.split("|")[2],
+          "mem_min": formDataObject.mem_min,
+          "mem_max": formDataObject.mem_max,
+          "server_properties_port": formDataObject.port
+        }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
+
+
+      console.log(formDataJsonString);
+
+      let res = await fetch(`/api/v2/servers/`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = '/panel/dashboard';
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+      }
+    });
+
+  $("#import-jar").on("submit", async function (e) {
+        wait_msg();
+      e.preventDefault();
+      var token = getCookie("_xsrf")
+      let jarForm = document.getElementById("import-jar");
+
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name, 
+        "monitoring_type": "minecraft_java", 
+        "minecraft_java_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_java",
+        "minecraft_java_create_data": {
+        "create_type": "import_server",
+        "import_server_create_data": {
+          "existing_server_path": formDataObject.server_path,
+          "jarfile": formDataObject.server_jar,
+          "mem_min": formDataObject.mem_min,
+          "mem_max": formDataObject.mem_max,
+          "server_properties_port": formDataObject.port
+        }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
+
+      let res = await fetch(`/api/v2/servers/`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: formDataJsonString,
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.href = '/panel/dashboard';
+      } else {
+
+        bootbox.alert({
+          title: responseData.error,
+          message: responseData.error_data
+        });
+      }
+    });
+  });
+</script>
+
 <script>
     $(".tree-reset").on("click", function () {
       location.href = "/server/step1";

From 2847cab1d8ec3f577a1eee3926c9d69b9df71f31 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 17 Aug 2023 16:46:35 -0400
Subject: [PATCH 056/210] Zip imports by API v2

---
 app/classes/shared/main_controller.py     | 102 +--------------
 app/frontend/templates/server/wizard.html | 148 +++++++++++++++-------
 2 files changed, 103 insertions(+), 147 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index d5607d17..e522d462 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -362,6 +362,7 @@ class Controller:
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
                 server_file = create_data["jarfile"]
+                self.import_zip_server()
                 raise NotImplementedError("Not yet implemented")
             _create_server_properties_if_needed(
                 create_data["server_properties_port"],
@@ -519,107 +520,6 @@ class Controller:
 
         return new_server_id, server_fs_uuid
 
-    def create_jar_server(
-        self,
-        jar: str,
-        server: str,
-        version: str,
-        name: str,
-        min_mem: int,
-        max_mem: int,
-        port: int,
-        user_id: int,
-    ):
-        server_id = Helpers.create_uuid()
-        server_dir = os.path.join(self.helper.servers_dir, server_id)
-        backup_path = os.path.join(self.helper.backup_path, server_id)
-        if Helpers.is_os_windows():
-            server_dir = Helpers.wtol_path(server_dir)
-            backup_path = Helpers.wtol_path(backup_path)
-            server_dir.replace(" ", "^ ")
-            backup_path.replace(" ", "^ ")
-
-        server_file = f"{server}-{version}.jar"
-
-        # make the dir - perhaps a UUID?
-        Helpers.ensure_dir_exists(server_dir)
-        Helpers.ensure_dir_exists(backup_path)
-
-        try:
-            # do a eula.txt
-            with open(
-                os.path.join(server_dir, "eula.txt"), "w", encoding="utf-8"
-            ) as file:
-                file.write("eula=false")
-                file.close()
-
-            # setup server.properties with the port
-            with open(
-                os.path.join(server_dir, "server.properties"), "w", encoding="utf-8"
-            ) as file:
-                file.write(f"server-port={port}")
-                file.close()
-
-        except Exception as e:
-            logger.error(f"Unable to create required server files due to :{e}")
-            return False
-
-        if Helpers.is_os_windows():
-            # Let's check for and setup for install server commands
-            if server == "forge":
-                server_command = (
-                    f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                    f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                    f'-jar "{server_file}" --installServer'
-                )
-            else:
-                server_command = (
-                    f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                    f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                    f'-jar "{server_file}" nogui'
-                )
-        else:
-            if server == "forge":
-                server_command = (
-                    f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                    f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                    f"-jar {server_file} --installServer"
-                )
-            else:
-                server_command = (
-                    f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                    f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                    f"-jar {server_file} nogui"
-                )
-        server_log_file = "./logs/latest.log"
-        server_stop = "stop"
-
-        new_id = self.register_server(
-            name,
-            server_id,
-            server_dir,
-            backup_path,
-            server_command,
-            server_file,
-            server_log_file,
-            server_stop,
-            port,
-            user_id,
-            server_type="minecraft-java",
-        )
-        # modded update urls from server jars will only update the installer
-        if jar != "modded":
-            server_obj = self.servers.get_server_obj(new_id)
-            url = f"https://serverjars.com/api/fetchJar/{jar}/{server}/{version}"
-            server_obj.executable_update_url = url
-            self.servers.update_server(server_obj)
-        # download the jar
-        self.server_jars.download_jar(
-            jar, server, version, os.path.join(server_dir, server_file), new_id
-        )
-
-        return new_id
-
     @staticmethod
     def verify_jar_server(server_path: str, server_jar: str):
         server_path = Helpers.get_os_understandable_path(server_path)
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 61fb8c46..e51dbfff 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -302,7 +302,7 @@
           <br />
           <p class="card-description">
 
-          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
+          <form name="zip" id="import-zip" class="server-wizard">
             {% raw xsrf_form_html() %}
             <input type="hidden" value="import_zip" name="create_type">
 
@@ -311,7 +311,7 @@
                 <div class="col-sm-12">
                   <div class="form-group">
                     <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                    <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                    <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                   </div>
                 </div>
 
@@ -354,7 +354,7 @@
                   <div class="form-group">
                     <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                         translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                    <input type="number" class="form-control" id="min_memory3" name="min_memory" value="1" step="0.5" min="0.5" required>
+                    <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5" min="0.5" required>
                   </div>
                 </div>
 
@@ -362,7 +362,7 @@
                   <div class="form-group">
                     <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                         translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                    <input type="number" class="form-control" id="max_memory3" name="max_memory" value="2" step="0.5" min="0.5" required>
+                    <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5" min="0.5" required>
                   </div>
                 </div>
 
@@ -455,13 +455,13 @@
           <br />
           <p class="card-description">
 
-          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
+          <form name="zip" id="import-upload" class="server-wizard">
             {% raw xsrf_form_html() %}
             <input type="hidden" value="import_zip" name="create_type">
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
             <div class="form-group">
               <label for="server">{{ translate('serverWizard', 'serverUpload', data['lang']) }}</label>
@@ -498,13 +498,13 @@
               <div class="form-group">
                 <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                     translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="min_memory3" name="min_memory" value="1" step="0.5" min="0.5" required>
+                <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5" min="0.5" required>
               </div>
 
               <div class="form-group">
                 <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                     translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="max_memory3" name="max_memory" value="2" step="0.5" min="0.5" required>
+                <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5" min="0.5" required>
               </div>
 
               <div class="form-group">
@@ -905,12 +905,31 @@
           return value;
         }
       }
+      async function send_server(data){
+        let token = getCookie("_xsrf")
+        let res = await fetch(`/api/v2/servers/`, {
+          method: 'POST',
+          headers: {
+            'X-XSRFToken': token
+          },
+          body: data,
+        });
+        let responseData = await res.json();
+        if (responseData.status === "ok") {
+          window.location.href = '/panel/dashboard';
+        } else {
+
+          bootbox.alert({
+            title: responseData.error,
+            message: responseData.error_data
+          });
+        }
+      }
     $(document).ready(function () {
 
       $("#download_jar").on("submit", async function (e) {
         wait_msg();
       e.preventDefault();
-      var token = getCookie("_xsrf")
       let jarForm = document.getElementById("download_jar");
 
       let formData = new FormData(jarForm);
@@ -944,29 +963,12 @@
 
       console.log(formDataJsonString);
 
-      let res = await fetch(`/api/v2/servers/`, {
-        method: 'POST',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: formDataJsonString,
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        window.location.href = '/panel/dashboard';
-      } else {
-
-        bootbox.alert({
-          title: responseData.error,
-          message: responseData.error_data
-        });
-      }
+      send_server(formDataJsonString);
     });
 
   $("#import-jar").on("submit", async function (e) {
-        wait_msg();
+        wait_msg(true);
       e.preventDefault();
-      var token = getCookie("_xsrf")
       let jarForm = document.getElementById("import-jar");
 
       let formData = new FormData(jarForm);
@@ -996,24 +998,78 @@
       // Format the plain form data as JSON
       let formDataJsonString = JSON.stringify(send_data, replacer);
 
-      let res = await fetch(`/api/v2/servers/`, {
-        method: 'POST',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: formDataJsonString,
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        window.location.href = '/panel/dashboard';
-      } else {
-
-        bootbox.alert({
-          title: responseData.error,
-          message: responseData.error_data
-        });
-      }
+      send_server(formDataJsonString);
     });
+
+      $("#import-zip").on("submit", async function (e) {
+        wait_msg(true);
+      e.preventDefault();
+      let jarForm = document.getElementById("import-zip");
+
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name, 
+        "monitoring_type": "minecraft_java", 
+        "minecraft_java_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_java",
+        "minecraft_java_create_data": {
+        "create_type": "import_server",
+        "import_server_create_data": {
+          "existing_server_path": formDataObject.root_path,
+          "jarfile": formDataObject.server_jar,
+          "mem_min": formDataObject.mem_min,
+          "mem_max": formDataObject.mem_max,
+          "server_properties_port": formDataObject.port
+        }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
+
+      send_server(formDataJsonString);
+    });
+
+    $("#import-upload").on("submit", async function (e) {
+        wait_msg(true);
+      e.preventDefault();
+      let jarForm = document.getElementById("import-upload");
+
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name, 
+        "monitoring_type": "minecraft_java", 
+        "minecraft_java_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_java",
+        "minecraft_java_create_data": {
+        "create_type": "import_server",
+        "import_server_create_data": {
+          "existing_server_path": formDataObject.root_path,
+          "jarfile": formDataObject.server_jar,
+          "mem_min": formDataObject.mem_min,
+          "mem_max": formDataObject.mem_max,
+          "server_properties_port": formDataObject.port
+        }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
+      send_server(formDataJsonString);
+    });
+
   });
 </script>
 
@@ -1199,7 +1255,7 @@
     }
 
     function refreshCache() {
-      var token = getCookie("_xsrf")
+      let token = getCookie("_xsrf")
       document.getElementById("refresh-cache").classList.add("fa-spin")
       $.ajax({
         type: "POST",

From a90dd546a1f9dbb56ce6c287a30cf2e1416ea94a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 17 Aug 2023 17:14:51 -0400
Subject: [PATCH 057/210] Add role detection to creation

---
 app/classes/shared/main_controller.py       | 25 ++++++++++++++++
 app/classes/web/routes/api/servers/index.py |  1 +
 app/frontend/templates/server/wizard.html   | 32 +++++++++++++++------
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index e522d462..098406d1 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -518,6 +518,31 @@ class Controller:
                 new_server_id,
             )
 
+            exec_user = self.users.get_user_by_id(int(user_id))
+            captured_roles = data.get("roles", [])
+            # These lines create a new Role for the Server with full permissions
+            # and add the user to it if he's not a superuser
+            if len(captured_roles) == 0:
+                if not exec_user["superuser"]:
+                    new_server_uuid = self.servers.get_server_data_by_id(
+                        new_server_id
+                    ).get("server_uuid")
+                    role_id = self.roles.add_role(
+                        f"Creator of Server with uuid={new_server_uuid}",
+                        exec_user["user_id"],
+                    )
+                    self.server_perms.add_role_server(
+                        new_server_id, role_id, "11111111"
+                    )
+                    self.users.add_role_to_user(exec_user["user_id"], role_id)
+
+            else:
+                for role in captured_roles:
+                    role_id = role
+                    self.server_perms.add_role_server(
+                        new_server_id, role_id, "11111111"
+                    )
+
         return new_server_id, server_fs_uuid
 
     @staticmethod
diff --git a/app/classes/web/routes/api/servers/index.py b/app/classes/web/routes/api/servers/index.py
index 62282d9d..d54a5916 100644
--- a/app/classes/web/routes/api/servers/index.py
+++ b/app/classes/web/routes/api/servers/index.py
@@ -24,6 +24,7 @@ new_server_schema = {
             "examples": ["My Server"],
             "minLength": 2,
         },
+        "roles": {"title": "Roles to add", "type": "array", "examples": [1, 2, 3]},
         "stop_command": {
             "title": "Stop command",
             "description": '"" means the default for the server creation type.',
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index e51dbfff..f5847e15 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -156,7 +156,7 @@
                             <div class="card-body scroll">
                               <div class="form-group">
                                 {% for r in data['roles'] %}
-                                <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp; {{ r['role_name'].capitalize() }}</label></span>
+                                <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp; {{ r['role_name'].capitalize() }}</label></span>
                                 {% end %}
                               </div>
                             </div>
@@ -271,7 +271,7 @@
                         <div class="card-body scroll">
                           <div class="form-group">
                             {% for r in data['roles'] %}
-                            <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
                                 {{ r['role_name'].capitalize() }}</label></span>
                             {% end %}
                           </div>
@@ -389,7 +389,7 @@
                           <div class="card-body scroll">
                             <div class="form-group">
                               {% for r in data['roles'] %}
-                              <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                              <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
                                   {{ r['role_name'].capitalize() }}</label></span>
                               {% end %}
                             </div>
@@ -528,7 +528,7 @@
                       <div class="card-body scroll">
                         <div class="form-group">
                           {% for r in data['roles'] %}
-                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                          <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
                               {{ r['role_name'].capitalize() }}</label></span>
                           {% end %}
                         </div>
@@ -895,6 +895,9 @@
 
 <script>
       function replacer(key, value) {
+        if (key === "roles"){
+          return value
+        }
         if (key != "ignored_exits") {
           if (typeof value == "boolean" || key === "host" || key === "version") {
             return value
@@ -905,6 +908,15 @@
           return value;
         }
       }
+      function calcRoles() {
+        let role_ids = $('.roles').map(function() {
+        if ($(this).is(':checked')){
+          return $(this).val();
+        }
+        }).get();
+        console.log(role_ids)
+        return role_ids
+      }
       async function send_server(data){
         let token = getCookie("_xsrf")
         let res = await fetch(`/api/v2/servers/`, {
@@ -937,7 +949,8 @@
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
       let send_data = {
-        "name": formDataObject.name, 
+        "name": formDataObject.name,
+        "roles": calcRoles(), 
         "monitoring_type": "minecraft_java", 
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
@@ -976,7 +989,8 @@
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
       let send_data = {
-        "name": formDataObject.name, 
+        "name": formDataObject.name,
+        "roles": calcRoles(),
         "monitoring_type": "minecraft_java", 
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
@@ -1011,7 +1025,8 @@
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
       let send_data = {
-        "name": formDataObject.name, 
+        "name": formDataObject.name,
+        "roles": calcRoles(), 
         "monitoring_type": "minecraft_java", 
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
@@ -1046,7 +1061,8 @@
       let formDataObject = Object.fromEntries(formData.entries());
       console.log(formDataObject);
       let send_data = {
-        "name": formDataObject.name, 
+        "name": formDataObject.name,
+        "roles": calcRoles(),
         "monitoring_type": "minecraft_java", 
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",

From 61057bce818be79e7f06e73813b76471c4968a11 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 17 Aug 2023 17:18:09 -0400
Subject: [PATCH 058/210] Remove step 1 handling

---
 app/classes/web/server_handler.py | 168 ------------------------------
 1 file changed, 168 deletions(-)

diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index eae3ce0c..210d7848 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -297,172 +297,6 @@ class ServerHandler(BaseHandler):
                     exec_user["user_id"], server_id, self.get_remote_ip(), command
                 )
 
-        if page == "step1":
-            if not superuser and not self.controller.crafty_perms.can_create_server(
-                exec_user["user_id"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: "
-                    "not a server creator or server limit reached"
-                )
-                return
-
-            if not superuser:
-                user_roles = self.controller.roles.get_all_roles()
-            else:
-                user_roles = self.get_user_roles()
-            server = bleach.clean(self.get_argument("server", ""))
-            server_name = bleach.clean(self.get_argument("server_name", ""))
-            min_mem = bleach.clean(self.get_argument("min_memory", ""))
-            max_mem = bleach.clean(self.get_argument("max_memory", ""))
-            port = bleach.clean(self.get_argument("port", ""))
-            if int(port) < 1 or int(port) > 65535:
-                self.redirect(
-                    "/panel/error?error=Constraint Error: "
-                    "Port must be greater than 0 and less than 65535"
-                )
-                return
-            import_type = bleach.clean(self.get_argument("create_type", ""))
-            import_server_path = bleach.clean(self.get_argument("server_path", ""))
-            import_server_jar = bleach.clean(self.get_argument("server_jar", ""))
-            server_parts = server.split("|")
-            captured_roles = []
-            for role in user_roles:
-                if bleach.clean(self.get_argument(str(role), "")) == "on":
-                    captured_roles.append(role)
-
-            if not server_name:
-                self.redirect("/panel/error?error=Server name cannot be empty!")
-                return
-
-            if import_type == "import_jar":
-                if self.helper.is_subdir(
-                    self.controller.project_root, import_server_path
-                ):
-                    self.redirect(
-                        "/panel/error?error=Loop Error: The selected path will cause"
-                        " an infinite copy loop. Make sure Crafty's directory is not"
-                        " in your server path."
-                    )
-                    return
-                good_path = self.controller.verify_jar_server(
-                    import_server_path, import_server_jar
-                )
-
-                if not good_path:
-                    self.redirect(
-                        "/panel/error?error=Server path or Server Jar not found!"
-                    )
-                    return
-
-                new_server_id = self.controller.import_jar_server(
-                    server_name,
-                    import_server_path,
-                    import_server_jar,
-                    min_mem,
-                    max_mem,
-                    port,
-                    exec_user["user_id"],
-                )
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f'imported a jar server named "{server_name}"',
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-            elif import_type == "import_zip":
-                # here import_server_path means the zip path
-                zip_path = bleach.clean(self.get_argument("root_path"))
-                good_path = Helpers.check_path_exists(zip_path)
-                if not good_path:
-                    self.redirect("/panel/error?error=Temp path not found!")
-                    return
-
-                new_server_id = self.controller.import_zip_server(
-                    server_name,
-                    zip_path,
-                    import_server_jar,
-                    min_mem,
-                    max_mem,
-                    port,
-                    exec_user["user_id"],
-                )
-                if new_server_id == "false":
-                    self.redirect(
-                        f"/panel/error?error=Zip file not accessible! "
-                        f"You can fix this permissions issue with "
-                        f"sudo chown -R crafty:crafty {import_server_path} "
-                        f"And sudo chmod 2775 -R {import_server_path}"
-                    )
-                    return
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f'imported a zip server named "{server_name}"',
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-            else:
-                if len(server_parts) != 3:
-                    self.redirect("/panel/error?error=Invalid server data")
-                    return
-                jar_type, server_type, server_version = server_parts
-                # TODO: add server type check here and call the correct server
-                # add functions if not a jar
-                if server_type == "forge" and not self.helper.detect_java():
-                    translation = self.helper.translation.translate(
-                        "error",
-                        "installerJava",
-                        self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
-                    ).format(server_name)
-                    self.redirect(f"/panel/error?error={translation}")
-                    return
-                new_server_id = self.controller.create_jar_server(
-                    jar_type,
-                    server_type,
-                    server_version,
-                    server_name,
-                    min_mem,
-                    max_mem,
-                    port,
-                    exec_user["user_id"],
-                )
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f"created a {server_version} {str(server_type).capitalize()}"
-                    f' server named "{server_name}"',
-                    # Example: Admin created a 1.16.5 Bukkit server named "survival"
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-
-            # These lines create a new Role for the Server with full permissions
-            # and add the user to it if he's not a superuser
-            if len(captured_roles) == 0:
-                if not superuser:
-                    new_server_uuid = self.controller.servers.get_server_data_by_id(
-                        new_server_id
-                    ).get("server_uuid")
-                    role_id = self.controller.roles.add_role(
-                        f"Creator of Server with uuid={new_server_uuid}",
-                        exec_user["user_id"],
-                    )
-                    self.controller.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
-                    self.controller.users.add_role_to_user(
-                        exec_user["user_id"], role_id
-                    )
-
-            else:
-                for role in captured_roles:
-                    role_id = role
-                    self.controller.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
-
-            self.controller.servers.stats.record_stats()
-            self.redirect("/panel/dashboard")
-
         if page == "bedrock_step1":
             if not superuser and not self.controller.crafty_perms.can_create_server(
                 exec_user["user_id"]
@@ -476,7 +310,6 @@ class ServerHandler(BaseHandler):
                 user_roles = self.controller.roles.get_all_roles()
             else:
                 user_roles = self.controller.roles.get_all_roles()
-            server = bleach.clean(self.get_argument("server", ""))
             server_name = bleach.clean(self.get_argument("server_name", ""))
             port = bleach.clean(self.get_argument("port", ""))
 
@@ -491,7 +324,6 @@ class ServerHandler(BaseHandler):
             import_type = bleach.clean(self.get_argument("create_type", ""))
             import_server_path = bleach.clean(self.get_argument("server_path", ""))
             import_server_exe = bleach.clean(self.get_argument("server_jar", ""))
-            server_parts = server.split("|")
             captured_roles = []
             for role in user_roles:
                 if bleach.clean(self.get_argument(str(role), "")) == "on":

From a8894757cfe0cab25081114107ca23d64f11ecb0 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 20 Aug 2023 17:01:32 -0400
Subject: [PATCH 059/210] Rename activity logs

---
 app/classes/controllers/management_controller.py | 4 ++--
 app/classes/models/management.py                 | 2 +-
 app/classes/web/panel_handler.py                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index 7c423da9..cda74fea 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -79,8 +79,8 @@ class ManagementController:
     #                                   Audit_Log Methods
     # **********************************************************************************
     @staticmethod
-    def get_actity_log():
-        return HelpersManagement.get_actity_log()
+    def get_activity_log():
+        return HelpersManagement.get_activity_log()
 
     def add_to_audit_log(self, user_id, log_msg, server_id=None, source_ip=None):
         return self.management_helper.add_to_audit_log(
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 2c64a8ff..51bf71a3 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -145,7 +145,7 @@ class HelpersManagement:
     #                                   Audit_Log Methods
     # **********************************************************************************
     @staticmethod
-    def get_actity_log():
+    def get_activity_log():
         query = AuditLog.select()
         return DatabaseShortcuts.return_db_rows(query)
 
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index f674b1fb..9d1404ef 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1416,7 +1416,7 @@ class PanelHandler(BaseHandler):
             template = "panel/panel_edit_role.html"
 
         elif page == "activity_logs":
-            page_data["audit_logs"] = self.controller.management.get_actity_log()
+            page_data["audit_logs"] = self.controller.management.get_activity_log()
 
             template = "panel/activity_logs.html"
 

From 52e44f090e0aa3b27694e2785e9cada2c72b5fd8 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 20 Aug 2023 17:03:01 -0400
Subject: [PATCH 060/210] Add audit log end point

---
 app/classes/web/routes/api/api_handlers.py    |  6 ++++
 .../web/routes/api/crafty/clogs/index.py      | 34 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/classes/web/routes/api/crafty/clogs/index.py

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 3eb159b8..43d21d08 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -50,6 +50,7 @@ from app.classes.web.routes.api.users.user.permissions import (
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
 from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
+from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
 
 
 def api_handlers(handler_args):
@@ -70,6 +71,11 @@ def api_handlers(handler_args):
             ApiCraftyConfigIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/logs/([a-z0-9_]+)/?",
+            ApiCraftyLogIndexHandler,
+            handler_args,
+        ),
         # User routes
         (
             r"/api/v2/users/?",
diff --git a/app/classes/web/routes/api/crafty/clogs/index.py b/app/classes/web/routes/api/crafty/clogs/index.py
new file mode 100644
index 00000000..97a24a34
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/clogs/index.py
@@ -0,0 +1,34 @@
+from app.classes.web.base_api_handler import BaseApiHandler
+
+
+class ApiCraftyLogIndexHandler(BaseApiHandler):
+    def get(self, log_type: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            _,
+        ) = auth_data
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        log_types = ["audit", "session", "schedule"]
+        if log_type not in log_types:
+            raise NotImplementedError
+
+        if log_type == "audit":
+            return self.finish_json(
+                200,
+                {"status": "ok", "data": self.controller.management.get_activity_log()},
+            )
+
+        if log_type == "session":
+            raise NotImplementedError
+
+        if log_type == "schedule":
+            raise NotImplementedError

From 14c0065124e5917db49e0b2ccb0ddb9697c3a607 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 23 Aug 2023 20:44:11 -0400
Subject: [PATCH 061/210] Edit API handler to thread server creation.
 (Untested)

---
 app/classes/shared/main_controller.py       | 252 ++++++--------------
 app/classes/web/routes/api/servers/index.py |  18 +-
 2 files changed, 95 insertions(+), 175 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 098406d1..2946db79 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -312,15 +312,6 @@ class Controller:
         Helpers.ensure_dir_exists(new_server_path)
         Helpers.ensure_dir_exists(backup_path)
 
-        def _copy_import_dir_files(existing_server_path):
-            existing_server_path = Helpers.get_os_understandable_path(
-                existing_server_path
-            )
-            try:
-                FileHelpers.copy_dir(existing_server_path, new_server_path, True)
-            except shutil.Error as ex:
-                logger.error(f"Server import failed with error: {ex}")
-
         def _create_server_properties_if_needed(port, empty=False):
             properties_file = os.path.join(new_server_path, "server.properties")
             has_properties = os.path.exists(properties_file)
@@ -357,7 +348,6 @@ class Controller:
                             + ("true" if create_data["agree_to_eula"] else "false")
                         )
             elif root_create_data["create_type"] == "import_server":
-                _copy_import_dir_files(create_data["existing_server_path"])
                 server_file = create_data["jarfile"]
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
@@ -419,10 +409,13 @@ class Controller:
                 existing_server_path = Helpers.get_os_understandable_path(
                     create_data["existing_server_path"]
                 )
-                try:
-                    FileHelpers.copy_dir(existing_server_path, new_server_path, True)
-                except shutil.Error as ex:
-                    logger.error(f"Server import failed with error: {ex}")
+                if Helpers.is_os_windows():
+                    server_command = (
+                        f'"{os.path.join(new_server_path, create_data["executable"])}"'
+                    )
+                else:
+                    server_command = f"./{create_data['executable']}"
+                logger.debug("command: " + server_command)
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
                 raise NotImplementedError("Not yet implemented")
@@ -496,52 +489,80 @@ class Controller:
             server_host=monitoring_host,
             server_type=monitoring_type,
         )
-
-        if (
-            data["create_type"] == "minecraft_java"
-            and root_create_data["create_type"] == "download_jar"
-        ):
-            # modded update urls from server jars will only update the installer
-            if create_data["category"] != "modded":
-                server_obj = self.servers.get_server_obj(new_server_id)
-                url = (
-                    f"https://serverjars.com/api/fetchJar/{create_data['category']}"
-                    f"/{create_data['type']}/{create_data['version']}"
+        if data["create_type"] == "minecraft_java":
+            if root_create_data["create_type"] == "download_jar":
+                # modded update urls from server jars will only update the installer
+                if create_data["category"] != "modded":
+                    server_obj = self.servers.get_server_obj(new_server_id)
+                    url = (
+                        f"https://serverjars.com/api/fetchJar/{create_data['category']}"
+                        f"/{create_data['type']}/{create_data['version']}"
+                    )
+                    server_obj.executable_update_url = url
+                    self.servers.update_server(server_obj)
+                self.server_jars.download_jar(
+                    create_data["category"],
+                    create_data["type"],
+                    create_data["version"],
+                    full_jar_path,
+                    new_server_id,
                 )
-                server_obj.executable_update_url = url
-                self.servers.update_server(server_obj)
-            self.server_jars.download_jar(
-                create_data["category"],
-                create_data["type"],
-                create_data["version"],
-                full_jar_path,
-                new_server_id,
-            )
+            elif root_create_data["create_type"] == "import_server":
+                ServersController.set_import(new_server_id)
+                self.import_helper.import_jar_server(
+                    create_data["existing_server_path"],
+                    os.path.join(new_server_path, server_fs_uuid),
+                    monitoring_port,
+                    new_server_id,
+                )
+            elif root_create_data["create_type"] == "import_zip":
+                ServersController.set_import(new_server_id)
 
-            exec_user = self.users.get_user_by_id(int(user_id))
-            captured_roles = data.get("roles", [])
-            # These lines create a new Role for the Server with full permissions
-            # and add the user to it if he's not a superuser
-            if len(captured_roles) == 0:
-                if not exec_user["superuser"]:
-                    new_server_uuid = self.servers.get_server_data_by_id(
-                        new_server_id
-                    ).get("server_uuid")
-                    role_id = self.roles.add_role(
-                        f"Creator of Server with uuid={new_server_uuid}",
-                        exec_user["user_id"],
-                    )
-                    self.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
-                    self.users.add_role_to_user(exec_user["user_id"], role_id)
+        elif data["create_type"] == "minecraft-bedrock":
+            if root_create_data["create_type"] == "download_executable":
+                ServersController.set_import(new_server_id)
+                self.import_helper.download_bedrock_server(
+                    new_server_path, new_server_id
+                )
+            elif root_create_data["create_type"] == "import_executable":
+                full_exe_path = os.path.join(new_server_path, create_data["executable"])
+                self.import_helper.import_bedrock_server(
+                    create_data["existing_server_path"],
+                    os.path.join(new_server_path, server_fs_uuid),
+                    monitoring_port,
+                    full_exe_path,
+                    new_server_id,
+                )
+            elif root_create_data["create_type"] == "import_zip":
+                full_exe_path = os.path.join(new_server_path, create_data["executable"])
+                self.import_helper.import_bedrock_zip_server(
+                    create_data["zip_path"],
+                    new_server_path,
+                    os.path.join(create_data["zip_root"], create_data["executable"]),
+                    monitoring_port,
+                    new_server_id,
+                )
 
-            else:
-                for role in captured_roles:
-                    role_id = role
-                    self.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
+        exec_user = self.users.get_user_by_id(int(user_id))
+        captured_roles = data.get("roles", [])
+        # These lines create a new Role for the Server with full permissions
+        # and add the user to it if he's not a superuser
+        if len(captured_roles) == 0:
+            if not exec_user["superuser"]:
+                new_server_uuid = self.servers.get_server_data_by_id(new_server_id).get(
+                    "server_uuid"
+                )
+                role_id = self.roles.add_role(
+                    f"Creator of Server with uuid={new_server_uuid}",
+                    exec_user["user_id"],
+                )
+                self.server_perms.add_role_server(new_server_id, role_id, "11111111")
+                self.users.add_role_to_user(exec_user["user_id"], role_id)
+
+        else:
+            for role in captured_roles:
+                role_id = role
+                self.server_perms.add_role_server(new_server_id, role_id, "11111111")
 
         return new_server_id, server_fs_uuid
 
@@ -562,123 +583,6 @@ class Controller:
             return False
         return True
 
-    def import_jar_server(
-        self,
-        server_name: str,
-        server_path: str,
-        server_jar: str,
-        min_mem: int,
-        max_mem: int,
-        port: int,
-        user_id: int,
-    ):
-        server_id = Helpers.create_uuid()
-        new_server_dir = os.path.join(self.helper.servers_dir, server_id)
-        backup_path = os.path.join(self.helper.backup_path, server_id)
-        if Helpers.is_os_windows():
-            new_server_dir = Helpers.wtol_path(new_server_dir)
-            backup_path = Helpers.wtol_path(backup_path)
-            new_server_dir.replace(" ", "^ ")
-            backup_path.replace(" ", "^ ")
-
-        Helpers.ensure_dir_exists(new_server_dir)
-        Helpers.ensure_dir_exists(backup_path)
-        server_path = Helpers.get_os_understandable_path(server_path)
-
-        full_jar_path = os.path.join(new_server_dir, server_jar)
-
-        if Helpers.is_os_windows():
-            server_command = (
-                f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                f'-jar "{full_jar_path}" nogui'
-            )
-        else:
-            server_command = (
-                f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                f"-jar {full_jar_path} nogui"
-            )
-        server_log_file = "./logs/latest.log"
-        server_stop = "stop"
-
-        new_id = self.register_server(
-            server_name,
-            server_id,
-            new_server_dir,
-            backup_path,
-            server_command,
-            server_jar,
-            server_log_file,
-            server_stop,
-            port,
-            user_id,
-            server_type="minecraft-java",
-        )
-        ServersController.set_import(new_id)
-        self.import_helper.import_jar_server(server_path, new_server_dir, port, new_id)
-        return new_id
-
-    def import_zip_server(
-        self,
-        server_name: str,
-        zip_path: str,
-        server_jar: str,
-        min_mem: int,
-        max_mem: int,
-        port: int,
-        user_id: int,
-    ):
-        server_id = Helpers.create_uuid()
-        new_server_dir = os.path.join(self.helper.servers_dir, server_id)
-        backup_path = os.path.join(self.helper.backup_path, server_id)
-        if Helpers.is_os_windows():
-            new_server_dir = Helpers.wtol_path(new_server_dir)
-            backup_path = Helpers.wtol_path(backup_path)
-            new_server_dir.replace(" ", "^ ")
-            backup_path.replace(" ", "^ ")
-
-        temp_dir = Helpers.get_os_understandable_path(zip_path)
-        Helpers.ensure_dir_exists(new_server_dir)
-        Helpers.ensure_dir_exists(backup_path)
-
-        full_jar_path = os.path.join(new_server_dir, server_jar)
-
-        if Helpers.is_os_windows():
-            server_command = (
-                f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                f'-jar "{full_jar_path}" nogui'
-            )
-        else:
-            server_command = (
-                f"java -Xms{Helpers.float_to_string(min_mem)}M "
-                f"-Xmx{Helpers.float_to_string(max_mem)}M "
-                f"-jar {full_jar_path} nogui"
-            )
-        logger.debug("command: " + server_command)
-        server_log_file = "./logs/latest.log"
-        server_stop = "stop"
-
-        new_id = self.register_server(
-            server_name,
-            server_id,
-            new_server_dir,
-            backup_path,
-            server_command,
-            server_jar,
-            server_log_file,
-            server_stop,
-            port,
-            user_id,
-            server_type="minecraft-java",
-        )
-        ServersController.set_import(new_id)
-        self.import_helper.import_java_zip_server(
-            temp_dir, new_server_dir, port, new_id
-        )
-        return new_id
-
     # **********************************************************************************
     #                                   BEDROCK IMPORTS
     # **********************************************************************************
diff --git a/app/classes/web/routes/api/servers/index.py b/app/classes/web/routes/api/servers/index.py
index d54a5916..cd879e2d 100644
--- a/app/classes/web/routes/api/servers/index.py
+++ b/app/classes/web/routes/api/servers/index.py
@@ -345,7 +345,7 @@ new_server_schema = {
                 "import_server_create_data": {
                     "title": "Import server data",
                     "type": "object",
-                    "required": ["existing_server_path", "command"],
+                    "required": ["existing_server_path"],
                     "properties": {
                         "existing_server_path": {
                             "title": "Server path",
@@ -354,6 +354,14 @@ new_server_schema = {
                             "examples": ["/var/opt/server"],
                             "minLength": 1,
                         },
+                        "executable": {
+                            "title": "Executable File",
+                            "description": "File Crafty should execute"
+                            "on server launch",
+                            "type": "string",
+                            "examples": "bedrock_server.exe",
+                            "minlength": 1,
+                        },
                         "command": {
                             "title": "Command",
                             "type": "string",
@@ -375,6 +383,14 @@ new_server_schema = {
                             "examples": ["/var/opt/server.zip"],
                             "minLength": 1,
                         },
+                        "executable": {
+                            "title": "Executable File",
+                            "description": "File Crafty should execute"
+                            "on server launch",
+                            "type": "string",
+                            "examples": "bedrock_server.exe",
+                            "minlength": 1,
+                        },
                         "zip_root": {
                             "title": "Server root directory",
                             "description": "The server root in the ZIP archive",

From 4f7d18362c617eff3df8f08d3d96487c26057f0f Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 25 Aug 2023 13:54:31 -0400
Subject: [PATCH 062/210] Add download server option for bedrock servers

---
 app/classes/shared/main_controller.py         |  27 ++-
 app/classes/web/routes/api/servers/index.py   |  21 +-
 .../templates/server/bedrock_wizard.html      | 205 ++++++++++++++++--
 3 files changed, 224 insertions(+), 29 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 2946db79..abf79b7f 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -352,11 +352,12 @@ class Controller:
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
                 server_file = create_data["jarfile"]
-                self.import_zip_server()
                 raise NotImplementedError("Not yet implemented")
-            _create_server_properties_if_needed(
-                create_data["server_properties_port"],
-            )
+                self.import_helper.import_java_zip_server()
+            if create_data["minecraft_java"]:
+                _create_server_properties_if_needed(
+                    create_data["server_properties_port"],
+                )
 
             min_mem = create_data["mem_min"]
             max_mem = create_data["mem_max"]
@@ -419,13 +420,21 @@ class Controller:
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
                 raise NotImplementedError("Not yet implemented")
+            else:
+                server_file = "bedrock_server"
+                if Helpers.is_os_windows():
+                    # if this is windows we will override the linux bedrock server name.
+                    server_file = "bedrock_server.exe"
 
+                full_jar_path = os.path.join(new_server_path, server_file)
+
+                if self.helper.is_os_windows():
+                    create_data["command"] = f'"{full_jar_path}"'
+                else:
+                    create_data["command"] = f"./{server_file}"
             _create_server_properties_if_needed(0, True)
 
             server_command = create_data["command"]
-            server_file = (
-                "./bedrock_server"  # HACK: This is a hack to make the server start
-            )
         elif data["create_type"] == "custom":
             # TODO: working_directory, executable_update
             if root_create_data["create_type"] == "raw_exec":
@@ -518,8 +527,8 @@ class Controller:
             elif root_create_data["create_type"] == "import_zip":
                 ServersController.set_import(new_server_id)
 
-        elif data["create_type"] == "minecraft-bedrock":
-            if root_create_data["create_type"] == "download_executable":
+        elif data["create_type"] == "minecraft_bedrock":
+            if root_create_data["create_type"] == "download_exe":
                 ServersController.set_import(new_server_id)
                 self.import_helper.download_bedrock_server(
                     new_server_path, new_server_id
diff --git a/app/classes/web/routes/api/servers/index.py b/app/classes/web/routes/api/servers/index.py
index cd879e2d..3952b042 100644
--- a/app/classes/web/routes/api/servers/index.py
+++ b/app/classes/web/routes/api/servers/index.py
@@ -340,7 +340,13 @@ new_server_schema = {
                     "title": "Creation type",
                     "type": "string",
                     "default": "import_server",
-                    "enum": ["import_server", "import_zip"],
+                    "enum": ["download_exe", "import_server", "import_zip"],
+                },
+                "download_exe_create_data": {
+                    "title": "Import server data",
+                    "type": "object",
+                    "required": [],
+                    "properties": {},
                 },
                 "import_server_create_data": {
                     "title": "Import server data",
@@ -359,7 +365,7 @@ new_server_schema = {
                             "description": "File Crafty should execute"
                             "on server launch",
                             "type": "string",
-                            "examples": "bedrock_server.exe",
+                            "examples": ["bedrock_server.exe"],
                             "minlength": 1,
                         },
                         "command": {
@@ -388,7 +394,7 @@ new_server_schema = {
                             "description": "File Crafty should execute"
                             "on server launch",
                             "type": "string",
-                            "examples": "bedrock_server.exe",
+                            "examples": ["bedrock_server.exe"],
                             "minlength": 1,
                         },
                         "zip_root": {
@@ -424,11 +430,18 @@ new_server_schema = {
                             },
                             "then": {"required": ["import_zip_create_data"]},
                         },
+                        {
+                            "if": {
+                                "properties": {"create_type": {"const": "download_exe"}}
+                            },
+                            "then": {"required": []},
+                        },
                     ],
                 },
                 {
                     "title": "Only one creation data",
                     "oneOf": [
+                        {"required": []},
                         {"required": ["import_server_create_data"]},
                         {"required": ["import_zip_create_data"]},
                     ],
@@ -671,7 +684,7 @@ class ApiServersIndexHandler(BaseApiHandler):
             return self.finish_json(
                 400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
             )
-
+        print(data)
         try:
             validate(data, new_server_schema)
         except ValidationError as e:
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 7e7f6a4a..5c58a2ca 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -24,7 +24,7 @@
           <h4>{{ translate('serverWizard', 'newServer', data['lang']) }}</h4>
           <br />
 
-          <form method="post" name="create_server" class="server-wizard" onSubmit="wait_msg()">
+          <form method="post" id="download_exe" name="create_server" class="server-wizard">
             {% if data["server_api"] and data["online"] %}
             <fieldset>
             {% else %}
@@ -54,10 +54,9 @@
                 }
               </style>
             {% end %}
-            {% raw xsrf_form_html() %}
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="server_name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
 
             <div class="form-group">
@@ -110,12 +109,10 @@
           <h4>{{ translate('serverWizard', 'importServer', data['lang']) }}</h4>
           <br />
 
-          <form method="post" class="server-wizard" onSubmit="wait_msg(true)">
-            {% raw xsrf_form_html() %}
-            <input type="hidden" value="import_jar" name="create_type">
+          <form method="post" id="import-jar" class="server-wizard">
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
             <div class="form-group">
               <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{
@@ -172,13 +169,11 @@
 
           <h4>{{ translate('serverWizard', 'importZip', data['lang']) }}</h4>
           <br />
-          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
-            {% raw xsrf_form_html() %}
-            <input type="hidden" value="import_zip" name="create_type">
+          <form name="zip" id="import-zip" method="post" class="server-wizard">\
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
 
             <div class="form-group">
@@ -281,13 +276,11 @@
           <br />
           <p class="card-description">
 
-          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
-            {% raw xsrf_form_html() %}
-            <input type="hidden" value="import_zip" name="create_type">
+          <form name="zip" id="import-upload" method="post" class="server-wizard">
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="server_name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
 
             <div class="form-group">
@@ -587,7 +580,7 @@
       },
       callback: function (result) {
         if (result == true) {
-          document.create_server.submit();
+          $("#download_exe").submit();
         }
         else {
           return;
@@ -781,6 +774,186 @@
       console.log("File changed good");
     }
   });
+  function replacer(key, value) {
+    if (key === "roles"){
+      return value
+    }
+    if (key != "ignored_exits") {
+      if (typeof value == "boolean" || key === "host" || key === "version") {
+        return value
+      } else {
+        return (isNaN(value) ? value : +value);
+      }
+    } else {
+      return value;
+    }
+  }
+  function calcRoles() {
+    let role_ids = $('.roles').map(function() {
+    if ($(this).is(':checked')){
+      return $(this).val();
+    }
+    }).get();
+    console.log(role_ids)
+    return role_ids
+  }
+  async function send_server(data){
+    let token = getCookie("_xsrf")
+    console.log(token)
+    let res = await fetch(`/api/v2/servers/`, {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: data,
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.href = '/panel/dashboard';
+    } else {
 
+      bootbox.alert({
+        title: responseData.error,
+        message: responseData.error_data
+      });
+    }
+  }
+$(document).ready(function () {
+
+  $("#download_exe").on("submit", async function (e) {
+    wait_msg();
+  e.preventDefault();
+  let jarForm = document.getElementById("download_exe");
+
+  let formData = new FormData(jarForm);
+  //Create an object from the form data entries
+  let formDataObject = Object.fromEntries(formData.entries());
+  console.log(formDataObject);
+  let send_data = {
+    "name": formDataObject.name,
+    "roles": calcRoles(), 
+    "monitoring_type": "minecraft_bedrock", 
+    "minecraft_bedrock_monitoring_data": {
+      "host": "127.0.0.1",
+      "port": 19132
+    },
+    "create_type": "minecraft_bedrock",
+    "minecraft_bedrock_create_data": {
+    "create_type": "download_exe",
+    "download_exe_create_data": {}
+    }
+  }
+  console.log(send_data);
+  // Format the plain form data as JSON
+  let formDataJsonString = JSON.stringify(send_data, replacer);
+
+
+  console.log(formDataJsonString);
+
+  send_server(formDataJsonString);
+});
+
+$("#import-jar").on("submit", async function (e) {
+    wait_msg(true);
+  e.preventDefault();
+  let jarForm = document.getElementById("import-jar");
+
+  let formData = new FormData(jarForm);
+  //Create an object from the form data entries
+  let formDataObject = Object.fromEntries(formData.entries());
+  console.log(formDataObject);
+  let send_data = {
+    "name": formDataObject.name,
+    "roles": calcRoles(),
+    "monitoring_type": "minecraft_bedrock", 
+    "minecraft_bedrock_monitoring_data": {
+      "host": "127.0.0.1",
+      "port": formDataObject.port
+    },
+    "create_type": "minecraft_bedrock",
+    "minecraft_bedrock_create_data": {
+    "create_type": "import_server",
+    "import_server_create_data": {
+      "existing_server_path": formDataObject.server_path,
+      "executable": formDataObject.server_jar,
+      "server_properties_port": formDataObject.port
+    }
+    }
+  }
+  console.log(send_data);
+  // Format the plain form data as JSON
+  let formDataJsonString = JSON.stringify(send_data, replacer);
+
+  send_server(formDataJsonString);
+});
+
+  $("#import-zip").on("submit", async function (e) {
+    wait_msg(true);
+  e.preventDefault();
+  let jarForm = document.getElementById("import-zip");
+
+  let formData = new FormData(jarForm);
+  //Create an object from the form data entries
+  let formDataObject = Object.fromEntries(formData.entries());
+  console.log(formDataObject);
+  let send_data = {
+    "name": formDataObject.name,
+    "roles": calcRoles(), 
+    "monitoring_type": "minecraft_bedrock", 
+    "minecraft_bedrock_monitoring_data": {
+      "host": "127.0.0.1",
+      "port": formDataObject.port
+    },
+    "create_type": "minecraft_bedrock",
+    "minecraft_bedrock_create_data": {
+    "create_type": "import_server",
+    "import_server_create_data": {
+      "existing_server_path": formDataObject.root_path,
+      "executable": formDataObject.server_jar,
+      "server_properties_port": formDataObject.port
+    }
+    }
+  }
+  console.log(send_data);
+  // Format the plain form data as JSON
+  let formDataJsonString = JSON.stringify(send_data, replacer);
+
+  send_server(formDataJsonString);
+});
+
+$("#import-upload").on("submit", async function (e) {
+    wait_msg(true);
+  e.preventDefault();
+  let jarForm = document.getElementById("import-upload");
+
+  let formData = new FormData(jarForm);
+  //Create an object from the form data entries
+  let formDataObject = Object.fromEntries(formData.entries());
+  console.log(formDataObject);
+  let send_data = {
+    "name": formDataObject.name,
+    "roles": calcRoles(),
+    "monitoring_type": "minecraft_bedrock", 
+    "minecraft_bedrock_monitoring_data": {
+      "host": "127.0.0.1",
+      "port": formDataObject.port
+    },
+    "create_type": "minecraft_bedrock",
+    "minecraft_bedrock_create_data": {
+    "create_type": "import_server",
+    "import_server_create_data": {
+      "existing_server_path": formDataObject.root_path,
+      "executable": formDataObject.server_jar,
+      "server_properties_port": formDataObject.port
+    }
+    }
+  }
+  console.log(send_data);
+  // Format the plain form data as JSON
+  let formDataJsonString = JSON.stringify(send_data, replacer);
+  send_server(formDataJsonString);
+});
+
+});
 </script>
 {% end %}
\ No newline at end of file

From 29f739970858cdcb9eb9378ba365e95c1fbc8b97 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 27 Aug 2023 13:50:22 +0200
Subject: [PATCH 063/210] Adding API route for history stats Fixing close db
 connexion for stats

---
 app/classes/models/server_stats.py            |  8 ++++--
 app/classes/shared/server.py                  |  5 +++-
 app/classes/web/routes/api/api_handlers.py    |  6 ++++
 .../web/routes/api/servers/server/history.py  | 28 +++++++++++++++++++
 .../templates/panel/server_metrics.html       |  8 +++---
 5 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 app/classes/web/routes/api/servers/server/history.py

diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index 14f85ad3..448508d0 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -144,13 +144,17 @@ class HelperServerStats:
     def get_history_stats(self, server_id, num_days):
         self.database.connect(reuse_if_open=True)
         max_age = datetime.datetime.now() - timedelta(days=num_days)
-        server_stats = (
+        query_stats = (
             ServerStats.select()
             .where(ServerStats.created > max_age)
             .where(ServerStats.server_id == server_id)
+            #.order_by(ServerStats.created.desc())
             .execute(self.database)
         )
-        self.database.connect(reuse_if_open=True)
+        server_stats = []
+        for stat in query_stats:
+            server_stats.append(DatabaseShortcuts.get_data_obj(stat))
+        self.database.close()
         return server_stats
 
     def insert_server_stats(self, server_stats):
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index abf63362..f08322e8 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -33,7 +33,6 @@ from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
 from app.classes.shared.websocket_manager import WebSocketManager
-from app.classes.shared.websocket_manager import WebSocketManager
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -1805,3 +1804,7 @@ class ServerInstance:
         minimum_to_exist = now - datetime.timedelta(days=max_age)
 
         self.stats_helper.remove_old_stats(minimum_to_exist)
+
+    def get_server_history(self):
+        history = self.stats_helper.get_history_stats(self.server_id, 3)
+        return history
\ No newline at end of file
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 29ee02c5..a91cca82 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -22,6 +22,7 @@ from app.classes.web.routes.api.servers.server.public import (
     ApiServersServerPublicHandler,
 )
 from app.classes.web.routes.api.servers.server.stats import ApiServersServerStatsHandler
+from app.classes.web.routes.api.servers.server.history import ApiServersServerHistoryHandler
 from app.classes.web.routes.api.servers.server.stdin import ApiServersServerStdinHandler
 from app.classes.web.routes.api.servers.server.tasks.index import (
     ApiServersServerTasksIndexHandler,
@@ -132,6 +133,11 @@ def api_handlers(handler_args):
             ApiServersServerStatsHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/([0-9]+)/history/?",
+            ApiServersServerHistoryHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/action/([a-z_]+)/?",
             ApiServersServerActionHandler,
diff --git a/app/classes/web/routes/api/servers/server/history.py b/app/classes/web/routes/api/servers/server/history.py
new file mode 100644
index 00000000..1a4aac24
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/history.py
@@ -0,0 +1,28 @@
+import logging
+from app.classes.web.base_api_handler import BaseApiHandler
+from app.classes.controllers.servers_controller import ServersController
+
+
+logger = logging.getLogger(__name__)
+
+
+class ApiServersServerHistoryHandler(BaseApiHandler):
+    def get(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        srv = ServersController().get_server_instance_by_id(server_id)
+        history = srv.get_server_history()
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": history,
+            },
+        )
diff --git a/app/frontend/templates/panel/server_metrics.html b/app/frontend/templates/panel/server_metrics.html
index d10fec51..5067e709 100644
--- a/app/frontend/templates/panel/server_metrics.html
+++ b/app/frontend/templates/panel/server_metrics.html
@@ -89,11 +89,11 @@
   const cpu = []
   {% for item in data['history_stats'] %}
   {% if 'minecraft-java' in data['server_stats']['server_type'] %}
-  players.push("{{ item.online }}");
+  players.push("{{ item.get('online') }}");
   {% end %}
-  dates.push("{{ item.created.strftime('%Y/%m/%d, %H:%M:%S') }}");
-  ram.push("{{ item.mem_percent }}")
-  cpu.push("{{ item.cpu }}")
+  dates.push("{{ item.get('created').strftime('%Y/%m/%d, %H:%M:%S') }}");
+  ram.push("{{ item.get('mem_percent') }}")
+  cpu.push("{{ item.get('cpu') }}")
   {% end %}
   var hist_chart = new Chart(ctxL, {
     type: 'line',

From 58cdfe9ee57f319c60da92abc249e31327f506c1 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 27 Aug 2023 14:10:20 +0200
Subject: [PATCH 064/210] Fixing Black issues

---
 app/classes/shared/file_helpers.py         | 3 ++-
 app/classes/shared/server.py               | 2 +-
 app/classes/shared/websocket_manager.py    | 3 ++-
 app/classes/web/routes/api/api_handlers.py | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index f42930f7..53a5a56a 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -327,7 +327,8 @@ class FileHelpers:
             return "false"
         return
 
-    # TODO Look if not redundant with the precendent function prefixed ajax_ de differentiate and not broke things
+    # TODO Look if not redundant with the precendent function
+    # TODO Prefixed ajax_ to differentiate and not broke things
 
     def ajax_unzip_server(self, zip_path, user_id):
         if Helpers.check_file_perms(zip_path):
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index f08322e8..4682c22a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1807,4 +1807,4 @@ class ServerInstance:
 
     def get_server_history(self):
         history = self.stats_helper.get_history_stats(self.server_id, 3)
-        return history
\ No newline at end of file
+        return history
diff --git a/app/classes/shared/websocket_manager.py b/app/classes/shared/websocket_manager.py
index b1729c76..9031f868 100644
--- a/app/classes/shared/websocket_manager.py
+++ b/app/classes/shared/websocket_manager.py
@@ -111,7 +111,8 @@ class WebSocketManager(metaclass=Singleton):
         static_clients = self.public_clients | self.auth_clients
         clients = list(filter(filter_fn, static_clients))
         logger.debug(
-            f"Sending to {len(clients)} out of {len(self.public_clients | self.auth_clients)} "
+            f"Sending to {len(clients)}  \
+            out of {len(self.public_clients | self.auth_clients)} "
             f"clients: {json.dumps({'event': event_type, 'data': data})}"
         )
 
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index a91cca82..36eeb4f0 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -22,7 +22,9 @@ from app.classes.web.routes.api.servers.server.public import (
     ApiServersServerPublicHandler,
 )
 from app.classes.web.routes.api.servers.server.stats import ApiServersServerStatsHandler
-from app.classes.web.routes.api.servers.server.history import ApiServersServerHistoryHandler
+from app.classes.web.routes.api.servers.server.history import (
+    ApiServersServerHistoryHandler,
+)
 from app.classes.web.routes.api.servers.server.stdin import ApiServersServerStdinHandler
 from app.classes.web.routes.api.servers.server.tasks.index import (
     ApiServersServerTasksIndexHandler,

From b67a38574cf0bb4ad11e956469669d5b39f93cce Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 27 Aug 2023 14:31:51 +0200
Subject: [PATCH 065/210] fixing black

---
 app/classes/models/server_stats.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index 448508d0..d3b8cdf0 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -148,7 +148,7 @@ class HelperServerStats:
             ServerStats.select()
             .where(ServerStats.created > max_age)
             .where(ServerStats.server_id == server_id)
-            #.order_by(ServerStats.created.desc())
+            # .order_by(ServerStats.created.desc())
             .execute(self.database)
         )
         server_stats = []

From 5c6407d300dc937952671c0db140fa80572c3916 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 27 Aug 2023 14:40:28 +0200
Subject: [PATCH 066/210] Fixing vulnerabilities

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 98e095f1..a840a1c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ bleach==4.1
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5
-cryptography==41.0.1
+cryptography==41.0.2
 libgravatar==1.0.0
 peewee==3.13
 pexpect==4.8
@@ -15,7 +15,7 @@ pyjwt==2.4.0
 PyYAML==6.0.1
 requests==2.31
 termcolor==1.1
-tornado==6.3.2
+tornado==6.3.3
 tzlocal==4.0
 jsonschema==4.5.1
 orjson==3.8.12

From 2cd0b527d907a41559220a5f961ae014cf6e2864 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 27 Aug 2023 14:41:25 +0200
Subject: [PATCH 067/210] Fixing last vulnerability

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index a840a1c1..4f76592f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ bleach==4.1
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5
-cryptography==41.0.2
+cryptography==41.0.3
 libgravatar==1.0.0
 peewee==3.13
 pexpect==4.8

From 18252fae0fc3ce8c8f6ca031e25a72db07fd648e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 27 Aug 2023 14:55:10 -0400
Subject: [PATCH 068/210] Fix naming issues with import server

---
 app/classes/shared/main_controller.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index abf79b7f..eb067e7e 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -429,12 +429,12 @@ class Controller:
                 full_jar_path = os.path.join(new_server_path, server_file)
 
                 if self.helper.is_os_windows():
-                    create_data["command"] = f'"{full_jar_path}"'
+                    server_command = f'"{full_jar_path}"'
                 else:
-                    create_data["command"] = f"./{server_file}"
+                    server_command = f"./{server_file}"
             _create_server_properties_if_needed(0, True)
 
-            server_command = create_data["command"]
+            server_command = create_data.get("command", server_command)
         elif data["create_type"] == "custom":
             # TODO: working_directory, executable_update
             if root_create_data["create_type"] == "raw_exec":
@@ -533,11 +533,11 @@ class Controller:
                 self.import_helper.download_bedrock_server(
                     new_server_path, new_server_id
                 )
-            elif root_create_data["create_type"] == "import_executable":
+            elif root_create_data["create_type"] == "import_server":
                 full_exe_path = os.path.join(new_server_path, create_data["executable"])
                 self.import_helper.import_bedrock_server(
                     create_data["existing_server_path"],
-                    os.path.join(new_server_path, server_fs_uuid),
+                    new_server_path,
                     monitoring_port,
                     full_exe_path,
                     new_server_id,

From d9e405e56c348418f6ead9f3047dac6da14d895e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 27 Aug 2023 14:55:21 -0400
Subject: [PATCH 069/210] Add eula to download

---
 app/classes/web/routes/api/servers/index.py   | 23 ++++++++++++++-----
 .../templates/server/bedrock_wizard.html      |  8 +++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/classes/web/routes/api/servers/index.py b/app/classes/web/routes/api/servers/index.py
index 3952b042..d468f979 100644
--- a/app/classes/web/routes/api/servers/index.py
+++ b/app/classes/web/routes/api/servers/index.py
@@ -346,12 +346,18 @@ new_server_schema = {
                     "title": "Import server data",
                     "type": "object",
                     "required": [],
-                    "properties": {},
+                    "properties": {
+                        "agree_to_eula": {
+                            "title": "Agree to the EULA",
+                            "type": "boolean",
+                            "enum": [True],
+                        },
+                    },
                 },
                 "import_server_create_data": {
                     "title": "Import server data",
                     "type": "object",
-                    "required": ["existing_server_path"],
+                    "required": ["existing_server_path", "executable"],
                     "properties": {
                         "existing_server_path": {
                             "title": "Server path",
@@ -420,7 +426,9 @@ new_server_schema = {
                     "allOf": [
                         {
                             "if": {
-                                "properties": {"create_type": {"const": "import_exec"}}
+                                "properties": {
+                                    "create_type": {"const": "import_server"}
+                                }
                             },
                             "then": {"required": ["import_server_create_data"]},
                         },
@@ -434,16 +442,20 @@ new_server_schema = {
                             "if": {
                                 "properties": {"create_type": {"const": "download_exe"}}
                             },
-                            "then": {"required": []},
+                            "then": {
+                                "required": [
+                                    "download_exe_create_data",
+                                ]
+                            },
                         },
                     ],
                 },
                 {
                     "title": "Only one creation data",
                     "oneOf": [
-                        {"required": []},
                         {"required": ["import_server_create_data"]},
                         {"required": ["import_zip_create_data"]},
+                        {"required": ["download_exe_create_data"]},
                     ],
                 },
             ],
@@ -684,7 +696,6 @@ class ApiServersIndexHandler(BaseApiHandler):
             return self.finish_json(
                 400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
             )
-        print(data)
         try:
             validate(data, new_server_schema)
         except ValidationError as e:
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 5c58a2ca..e0100bb5 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -840,7 +840,10 @@ $(document).ready(function () {
     "create_type": "minecraft_bedrock",
     "minecraft_bedrock_create_data": {
     "create_type": "download_exe",
-    "download_exe_create_data": {}
+    "download_exe_create_data": {
+      //agree to eula since we confirmed before calling this function
+      "agree_to_eula": true,
+    }
     }
   }
   console.log(send_data);
@@ -876,7 +879,6 @@ $("#import-jar").on("submit", async function (e) {
     "import_server_create_data": {
       "existing_server_path": formDataObject.server_path,
       "executable": formDataObject.server_jar,
-      "server_properties_port": formDataObject.port
     }
     }
   }
@@ -910,7 +912,6 @@ $("#import-jar").on("submit", async function (e) {
     "import_server_create_data": {
       "existing_server_path": formDataObject.root_path,
       "executable": formDataObject.server_jar,
-      "server_properties_port": formDataObject.port
     }
     }
   }
@@ -944,7 +945,6 @@ $("#import-upload").on("submit", async function (e) {
     "import_server_create_data": {
       "existing_server_path": formDataObject.root_path,
       "executable": formDataObject.server_jar,
-      "server_properties_port": formDataObject.port
     }
     }
   }

From 27f6c4c926fd1566149dc62d147866ea111f13c2 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 31 Aug 2023 21:35:30 -0400
Subject: [PATCH 070/210] Add unzip/dir request handler to api v2

---
 app/classes/shared/file_helpers.py            |   9 ++
 app/classes/shared/helpers.py                 |  11 --
 app/classes/shared/tasks.py                   |   4 +-
 app/classes/web/ajax_handler.py               |  50 +------
 app/classes/web/base_handler.py               |  10 +-
 app/classes/web/routes/api/api_handlers.py    |   6 +
 .../web/routes/api/crafty/imports/index.py    | 123 ++++++++++++++++++
 app/classes/web/tornado_handler.py            |   4 +-
 app/classes/web/websocket_handler.py          |   8 +-
 main.py                                       |   2 +-
 10 files changed, 161 insertions(+), 66 deletions(-)
 create mode 100644 app/classes/web/routes/api/crafty/imports/index.py

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index 4005e965..27d68141 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -325,3 +325,12 @@ class FileHelpers:
         else:
             return "false"
         return
+
+    def unzip_server(self, zip_path, user_id):
+        if Helpers.check_file_perms(zip_path):
+            temp_dir = tempfile.mkdtemp()
+            with zipfile.ZipFile(zip_path, "r") as zip_ref:
+                # extracts archive to temp directory
+                zip_ref.extractall(temp_dir)
+            if user_id:
+                return temp_dir
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 9acf1187..576dc654 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -1135,17 +1135,6 @@ class Helpers:
                     </input></div><li>"""
         return output
 
-    def unzip_server(self, zip_path, user_id):
-        if Helpers.check_file_perms(zip_path):
-            temp_dir = tempfile.mkdtemp()
-            with zipfile.ZipFile(zip_path, "r") as zip_ref:
-                # extracts archive to temp directory
-                zip_ref.extractall(temp_dir)
-            if user_id:
-                self.websocket_helper.broadcast_user(
-                    user_id, "send_temp_path", {"path": temp_dir}
-                )
-
     @staticmethod
     def unzip_backup_archive(backup_path, zip_name):
         zip_path = os.path.join(backup_path, zip_name)
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index acdc1cac..cc2a8671 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -41,10 +41,10 @@ scheduler_intervals = {
 class TasksManager:
     controller: Controller
 
-    def __init__(self, helper, controller):
+    def __init__(self, helper, controller, file_helper):
         self.helper: Helpers = helper
         self.controller: Controller = controller
-        self.tornado: Webserver = Webserver(helper, controller, self)
+        self.tornado: Webserver = Webserver(helper, controller, self, file_helper)
         try:
             self.tz = get_localzone()
         except ZoneInfoNotFoundError as e:
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index e38648f4..0fa17dcf 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -9,7 +9,7 @@ import bleach
 import tornado.web
 import tornado.escape
 
-from app.classes.shared.console import Console
+from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.server import ServerOutBuf
 from app.classes.web.base_handler import BaseHandler
@@ -148,32 +148,6 @@ class AjaxHandler(BaseHandler):
                         self.controller.cached_login = "login_1.jpg"
             return
 
-        elif page == "unzip_server":
-            path = urllib.parse.unquote(self.get_argument("path", ""))
-            if not path:
-                path = os.path.join(
-                    self.controller.project_root,
-                    "imports",
-                    urllib.parse.unquote(self.get_argument("file", "")),
-                )
-            if Helpers.check_file_exists(path):
-                self.helper.unzip_server(path, exec_user["user_id"])
-            else:
-                user_id = exec_user["user_id"]
-                if user_id:
-                    time.sleep(5)
-                    user_lang = self.controller.users.get_user_lang_by_id(user_id)
-                    self.helper.websocket_helper.broadcast_user(
-                        user_id,
-                        "send_start_error",
-                        {
-                            "error": self.helper.translation.translate(
-                                "error", "no-file", user_lang
-                            )
-                        },
-                    )
-            return
-
         elif page == "jar_cache":
             if not superuser:
                 self.redirect("/panel/error?error=Not a super user")
@@ -208,25 +182,3 @@ class AjaxHandler(BaseHandler):
             new_dir = urllib.parse.unquote(self.get_argument("server_dir"))
             self.controller.update_master_server_dir(new_dir, exec_user["user_id"])
             return
-
-    def check_server_id(self, server_id, page_name):
-        if server_id is None:
-            logger.warning(
-                f"Server ID not defined in {page_name} ajax call ({server_id})"
-            )
-            Console.warning(
-                f"Server ID not defined in {page_name} ajax call ({server_id})"
-            )
-            return
-        server_id = bleach.clean(server_id)
-
-        # does this server id exist?
-        if not self.controller.servers.server_id_exists(server_id):
-            logger.warning(
-                f"Server ID not found in {page_name} ajax call ({server_id})"
-            )
-            Console.warning(
-                f"Server ID not found in {page_name} ajax call ({server_id})"
-            )
-            return
-        return True
diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index e772d633..33fe9936 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -8,6 +8,7 @@ import tornado.web
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.models.users import ApiKeys
 from app.classes.shared.helpers import Helpers
+from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.main_controller import Controller
 from app.classes.shared.translation import Translation
 from app.classes.models.management import DatabaseShortcuts
@@ -24,15 +25,22 @@ class BaseHandler(tornado.web.RequestHandler):
     helper: Helpers
     controller: Controller
     translator: Translation
+    file_helper: FileHelpers
 
     # noinspection PyAttributeOutsideInit
     def initialize(
-        self, helper=None, controller=None, tasks_manager=None, translator=None
+        self,
+        helper=None,
+        controller=None,
+        tasks_manager=None,
+        translator=None,
+        file_helper=None,
     ):
         self.helper = helper
         self.controller = controller
         self.tasks_manager = tasks_manager
         self.translator = translator
+        self.file_helper = file_helper
 
     def set_default_headers(self) -> None:
         """
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 43d21d08..102161ab 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -51,6 +51,7 @@ from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
 from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
 from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
+from app.classes.web.routes.api.crafty.imports.index import ApiImportFilesIndexHandler
 
 
 def api_handlers(handler_args):
@@ -76,6 +77,11 @@ def api_handlers(handler_args):
             ApiCraftyLogIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/import/file/unzip/?",
+            ApiImportFilesIndexHandler,
+            handler_args,
+        ),
         # User routes
         (
             r"/api/v2/users/?",
diff --git a/app/classes/web/routes/api/crafty/imports/index.py b/app/classes/web/routes/api/crafty/imports/index.py
new file mode 100644
index 00000000..3bcae9af
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/imports/index.py
@@ -0,0 +1,123 @@
+import os
+import logging
+import json
+import html
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
+from app.classes.models.crafty_permissions import EnumPermissionsCrafty
+from app.classes.shared.helpers import Helpers
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+files_get_schema = {
+    "type": "object",
+    "properties": {
+        "page": {"type": "string", "minLength": 1},
+        "folder": {"type": "string"},
+        "unzip": {"type": "boolean", "default": "True"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiImportFilesIndexHandler(BaseApiHandler):
+    def post(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if (
+            EnumPermissionsCrafty.SERVER_CREATION
+            not in self.controller.crafty_perms.get_crafty_permissions_list(
+                auth_data[4]["user_id"]
+            )
+            and not auth_data[4]["superuser"]
+        ):
+            # if the user doesn't have Files or Backup permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_get_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        # TODO: limit some columns for specific permissions?
+        folder = data["folder"]
+        user_id = auth_data[4]["user_id"]
+        root_path = False
+        if data["unzip"]:
+            if Helpers.check_file_exists(folder):
+                folder = self.file_helper.unzip_server(folder, user_id)
+                root_path = True
+            else:
+                if user_id:
+                    user_lang = self.controller.users.get_user_lang_by_id(user_id)
+                    self.helper.websocket_helper.broadcast_user(
+                        user_id,
+                        "send_start_error",
+                        {
+                            "error": self.helper.translation.translate(
+                                "error", "no-file", user_lang
+                            )
+                        },
+                    )
+        else:
+            if not self.helper.check_path_exists(folder):
+                if user_id:
+                    user_lang = self.controller.users.get_user_lang_by_id(user_id)
+                    self.helper.websocket_helper.broadcast_user(
+                        user_id,
+                        "send_start_error",
+                        {
+                            "error": self.helper.translation.translate(
+                                "error", "no-file", user_lang
+                            )
+                        },
+                    )
+        return_json = {
+            "root_path": {
+                "path": folder,
+                "top": root_path,
+            }
+        }
+
+        dir_list = []
+        unsorted_files = []
+        file_list = os.listdir(folder)
+        for item in file_list:
+            if os.path.isdir(os.path.join(folder, item)):
+                dir_list.append(item)
+            else:
+                unsorted_files.append(item)
+        file_list = sorted(dir_list, key=str.casefold) + sorted(
+            unsorted_files, key=str.casefold
+        )
+        for raw_filename in file_list:
+            filename = html.escape(raw_filename)
+            rel = os.path.join(folder, raw_filename)
+            dpath = os.path.join(folder, filename)
+            dpath = self.helper.wtol_path(dpath)
+            if os.path.isdir(rel):
+                return_json[filename] = {
+                    "path": dpath,
+                    "dir": True,
+                }
+            else:
+                return_json[filename] = {
+                    "path": dpath,
+                    "dir": False,
+                }
+        self.finish_json(200, {"status": "ok", "data": return_json})
diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index d2b047d7..7b56220b 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -48,13 +48,14 @@ class Webserver:
     controller: Controller
     helper: Helpers
 
-    def __init__(self, helper, controller, tasks_manager):
+    def __init__(self, helper, controller, tasks_manager, file_helper):
         self.ioloop = None
         self.http_server = None
         self.https_server = None
         self.helper = helper
         self.controller = controller
         self.tasks_manager = tasks_manager
+        self.file_helper = file_helper
         self._asyncio_patch()
 
     @staticmethod
@@ -146,6 +147,7 @@ class Webserver:
             "controller": self.controller,
             "tasks_manager": self.tasks_manager,
             "translator": self.helper.translation,
+            "file_helper": self.file_helper,
         }
         handlers = [
             (r"/", DefaultHandler, handler_args),
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index 78b33951..a2e7f5a4 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -18,12 +18,18 @@ class SocketHandler(tornado.websocket.WebSocketHandler):
     io_loop = None
 
     def initialize(
-        self, helper=None, controller=None, tasks_manager=None, translator=None
+        self,
+        helper=None,
+        controller=None,
+        tasks_manager=None,
+        translator=None,
+        file_helper=None,
     ):
         self.helper = helper
         self.controller = controller
         self.tasks_manager = tasks_manager
         self.translator = translator
+        self.file_helper = file_helper
         self.io_loop = tornado.ioloop.IOLoop.current()
 
     def get_remote_ip(self):
diff --git a/main.py b/main.py
index 2338517b..8ba07b6a 100644
--- a/main.py
+++ b/main.py
@@ -171,7 +171,7 @@ if __name__ == "__main__":
     Console.info("Remote change complete.")
 
     import3 = Import3(helper, controller)
-    tasks_manager = TasksManager(helper, controller)
+    tasks_manager = TasksManager(helper, controller, file_helper)
     tasks_manager.start_webserver()
 
     def signal_handler(signum, _frame):

From f6c61e17643d348f7d3d218f4e35cfd27736a1b4 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 31 Aug 2023 21:35:50 -0400
Subject: [PATCH 071/210] Add bedrock request for files

TODO: Finish zip imports
---
 .../templates/server/bedrock_wizard.html      | 722 ++++++++++--------
 1 file changed, 384 insertions(+), 338 deletions(-)

diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index e0100bb5..c10285a1 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -27,77 +27,86 @@
           <form method="post" id="download_exe" name="create_server" class="server-wizard">
             {% if data["server_api"] and data["online"] %}
             <fieldset>
-            {% else %}
-            <fieldset disabled="disabled">
-              <style>
-                .api-alert{
-                position:absolute;
-                top:-5px;
-                left:0;
-                font-size: 50px !important;
-                color:#fff;
-                background:rgb(127, 133, 133);
-                opacity:.4;
-                width:100%;
-                height:100%;
-                z-index: 100;
-                }
-                .api-alert p {
-                  margin: 0;
-                  position: absolute;
-                  top: 50%;
-                  left: 50%;
-                  text-align: center;
-                  font-size: 20px;
-                  -ms-transform: translate(-50%, -50%);
-                  transform: translate(-50%, -50%);
-                }
-              </style>
-            {% end %}
-            <div class="form-group">
-              <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
-            </div>
+              {% else %}
+              <fieldset disabled="disabled">
+                <style>
+                  .api-alert {
+                    position: absolute;
+                    top: -5px;
+                    left: 0;
+                    font-size: 50px !important;
+                    color: #fff;
+                    background: rgb(127, 133, 133);
+                    opacity: .4;
+                    width: 100%;
+                    height: 100%;
+                    z-index: 100;
+                  }
 
-            <div class="form-group">
-              <div id="accordion-1">
-                <div class="card">
-                  <div class="card-header p-2" id="Role-1">
-                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true" aria-controls="collapseRole-1">
-                      <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
-                      <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                        data['lang']) }}</small>
-                    </p>
-                  </div>
-                  <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
-                    <div class="card-body scroll">
-                      <div class="form-group">
-                        {% for r in data['roles'] %}
-                        <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
-                            {{ r['role_name'].capitalize() }}</label></span>
-                        {% end %}
+                  .api-alert p {
+                    margin: 0;
+                    position: absolute;
+                    top: 50%;
+                    left: 50%;
+                    text-align: center;
+                    font-size: 20px;
+                    -ms-transform: translate(-50%, -50%);
+                    transform: translate(-50%, -50%);
+                  }
+                </style>
+                {% end %}
+                <div class="form-group">
+                  <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                  <input type="text" class="form-control" id="server_name" name="name"
+                    placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                </div>
+
+                <div class="form-group">
+                  <div id="accordion-1">
+                    <div class="card">
+                      <div class="card-header p-2" id="Role-1">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true"
+                          aria-controls="collapseRole-1">
+                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                          <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                            data['lang']) }}</small>
+                        </p>
+                      </div>
+                      <div id="collapseRole-1" class="collapse" aria-labelledby="Role-1" data-parent="">
+                        <div class="card-body scroll">
+                          <div class="form-group">
+                            {% for r in data['roles'] %}
+                            <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                  type="checkbox">&nbsp;
+                                {{ r['role_name'].capitalize() }}</label></span>
+                            {% end %}
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
+                <button onclick="eula_confirm()" type="button" class="btn btn-primary mr-2">{{ translate('serverWizard',
+                  'buildServer',
+                  data['lang']) }}</button>
+                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                  }}</button>
+              </fieldset>
+              {% if not data["server_api"] and data["online"] %}
+              <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
+                <p style="color: white !important;"><i class="fas fa-exclamation-triangle"
+                    style="color: red;"></i>&nbsp;{{ translate('error', 'bedrockError', data['lang']) }}<a
+                    style="color: red;" ; href="https://status.craftycontrol.com/status/craftycontrol"
+                    target="_blank">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
+                  &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
               </div>
-            </div>
-            <button onclick="eula_confirm()" type="button" class="btn btn-primary mr-2">{{ translate('serverWizard',
-              'buildServer',
-              data['lang']) }}</button>
-            <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
-              }}</button>
-            </fieldset>
-            {% if not data["server_api"] and data["online"] %}
-            <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
-              <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{ translate('error', 'bedrockError', data['lang']) }}<a style="color: red;"; href="https://status.craftycontrol.com/status/craftycontrol" 
-                target="_blank">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
-                &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p></div>
-            {% end %}
-            {% if not data["online"] %}
-            <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
-              <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{ translate('error', 'noInternet', data['lang']) }}</p></div>
-            {% end %}
+              {% end %}
+              {% if not data["online"] %}
+              <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
+                <p style="color: white !important;"><i class="fas fa-exclamation-triangle"
+                    style="color: red;"></i>&nbsp;{{ translate('error', 'noInternet', data['lang']) }}</p>
+              </div>
+              {% end %}
         </div>
         </form>
       </div>
@@ -112,31 +121,37 @@
           <form method="post" id="import-jar" class="server-wizard">
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value=""
+                placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
             <div class="form-group">
               <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{
                   translate('serverWizard', 'absoluteServerPath', data['lang']) }}</small></label>
-              <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server" required>
+              <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server"
+                required>
             </div>
             <div class="form-group">
               <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="bedrock_server" required>
+              <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                placeholder="bedrock_server" required>
             </div>
             <br />
-            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                 data['lang']) }}</small></h4>
             <hr>
             <div class="form-group">
               <label for="port2">{{ translate('serverWizard', 'serverPort', data['lang']) }}
                 <small></small></label>
-              <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1" max="65535" required>
+              <input type="number" class="form-control" id="port2" name="port" value="19132" step="1" min="1"
+                max="65535" required>
             </div>
             <div class="form-group">
               <div id="accordion-2">
                 <div class="card">
                   <div class="card-header p-2" id="Role-2">
-                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true" aria-controls="collapseRole-2">
+                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                      aria-controls="collapseRole-2">
                       <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
                       <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                         data['lang']) }}</small>
@@ -173,13 +188,15 @@
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value=""
+                placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
 
             <div class="form-group">
               <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{
                   translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
-              <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server.zip" required>
+              <input type="text" class="form-control" id="zip_server_path" name="server_path"
+                placeholder="/var/opt/server.zip" required>
             </div>
 
             <div class="form-group">
@@ -191,21 +208,26 @@
             </div>
             <div class="form-group">
               <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="bedrock_server" required>
+              <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                placeholder="bedrock_server" required>
             </div>
-            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang']) }}</small>
+            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription', data['lang'])
+                }}</small>
             </h4>
             <hr>
             <div class="form-group">
               <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }}
                 <small></small></label>
-              <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1" max="65535" required>
+              <input type="number" class="form-control" id="port3" name="port" value="19132" step="1" min="1"
+                max="65535" required>
             </div>
             <div class="form-group">
               <div id="accordion-3">
                 <div class="card">
                   <div class="card-header p-2" id="Role-3">
-                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
+                    <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                      aria-controls="collapseRole-3">
                       <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
                       }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                         data['lang']) }}</small>
@@ -229,7 +251,8 @@
                 <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
               </div>
             </div>
-            <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
+            <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+              aria-hidden="true">
               <div class="modal-dialog" role="document">
                 <div class="modal-content">
                   <div class="modal-header">
@@ -240,7 +263,8 @@
                     </button>
                   </div>
                   <div class="modal-body">
-                    <div class="tree-ctx-item" id="main-tree-div" data-path="" style="overflow: scroll; max-height:75%;">
+                    <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                      style="overflow: scroll; max-height:75%;">
                       <input type="radio" id="main-tree-input" name="root_path" value="" checked>
                       <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                         <i class="far fa-folder"></i>
@@ -259,7 +283,8 @@
                 </div>
               </div>
             </div>
-            <button id="zip_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+            <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
+              class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
               }}</button>
             <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
               data['lang'])
@@ -280,7 +305,8 @@
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value=""
+                placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
 
             <div class="form-group">
@@ -288,10 +314,12 @@
               <div id="upload_input" class="input-group">
                 <div class="custom-file">
                   <input type="file" multiple="false" class="custom-file-input" id="file" name="file" required>
-                  <label id="fileLabel" class="custom-file-label" for="file">{{ translate('serverWizard', 'labelZipFile', data['lang']) }}</label>
+                  <label id="fileLabel" class="custom-file-label" for="file">{{ translate('serverWizard',
+                    'labelZipFile', data['lang']) }}</label>
                 </div>
                 <div class="input-group-append">
-                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()" disabled>{{ translate('serverWizard',
+                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()"
+                    disabled>{{ translate('serverWizard',
                     'uploadButton', data['lang']) }}</button>
                 </div>
               </div>
@@ -308,24 +336,28 @@
 
               <div class="form-group">
                 <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
+                <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                  placeholder="paper.jar" required>
               </div>
 
-              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                  style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                   data['lang']) }}</small></h4>
               <hr>
 
               <div class="form-group">
                 <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                     translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="port4" name="port" value="19132" step="1" min="1" max="65535" required>
+                <input type="number" class="form-control" id="port4" name="port" value="19132" step="1" min="1"
+                  max="65535" required>
               </div>
 
               <div class="form-group">
                 <div id="accordion-3">
                   <div class="card">
                     <div class="card-header p-2" id="Role-3">
-                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
+                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                        aria-controls="collapseRole-3">
                         <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
                         data['lang'])
                         }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
@@ -336,7 +368,8 @@
                       <div class="card-body scroll">
                         <div class="form-group">
                           {% for r in data['roles'] %}
-                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}" type="checkbox">&nbsp;
+                          <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                type="checkbox">&nbsp;
                               {{ r['role_name'].capitalize() }}</label></span>
                           {% end %}
                         </div>
@@ -350,7 +383,8 @@
                   <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                 </div>
               </div>
-              <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
+              <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                aria-hidden="true">
                 <div class="modal-dialog" role="document">
                   <div class="modal-content">
                     <div class="modal-header">
@@ -361,7 +395,8 @@
                       </button>
                     </div>
                     <div class="modal-body">
-                      <div class="tree-ctx-item" id="main-tree-div-upload" data-path="" style="overflow: scroll; max-height:75%;">
+                      <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
+                        style="overflow: scroll; max-height:75%;">
                         <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
                         <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                           <i class="far fa-folder"></i>
@@ -380,7 +415,8 @@
                   </div>
                 </div>
               </div>
-              <button id="upload_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+              <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
+                class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                 }}</button>
               <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
                 data['lang'])
@@ -541,7 +577,7 @@
     xmlHttpRequest.send(file);
   }
 
-  document.getElementById("root_upload_button").addEventListener("click", function () {
+  document.getElementById("root_upload_button").addEventListener("click", function (event) {
     if (file) {
       upload = true;
       if (document.getElementById('root_upload_button').classList.contains('clicked')) {
@@ -554,11 +590,7 @@
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/unzip_server?id=-1&file=' + encodeURIComponent(file.name),
-      });
+      getDirView();
     } else {
       bootbox.alert("You must input a path before selecting this button");
     }
@@ -593,25 +625,22 @@
   $(".tree-reset").on("click", function () {
     location.href = "/server/bedrock_step1";
   });
-  document.getElementById("root_files_button").addEventListener("click", function () {
+  document.getElementById("root_files_button").addEventListener("click", function (event) {
     if (document.forms["zip"]["server_path"].value != "") {
       if (document.getElementById('root_files_button').classList.contains('clicked')) {
         document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
       } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-      path = document.forms["zip"]["server_path"].value;
+      let path = document.forms["zip"]["server_path"].value;
       console.log(document.forms["zip"]["server_path"].value)
       var token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/unzip_server?id=-1&path=' + encodeURIComponent(path),
-      });
+      console.log("TEST");
+      getDirView();
     } else {
       bootbox.alert("You must input a path before selecting this button");
     }
@@ -645,50 +674,135 @@
       $("#dir_select").modal();
     }
   }
+  function getDirView(event=false) {
+    if(event){
+      try{
+      path = event.target.parentElement.getAttribute('data-path');
+    if (event.target.parentElement.classList.contains('clicked')) {
 
-  function getTreeView(path) {
-    const styles = window.getComputedStyle(document.getElementById("lower_half"));
-    //If this value is still hidden we know the user is executing a zip import and not an upload
-    if (styles.visibility === "hidden") {
-      document.getElementById('zip_submit').disabled = false;
+      var toggler = document.getElementById(path + "span");
+
+      if (toggler.classList.contains('files-tree-title')) {
+        console.log("Toggling")
+        console.log(path + "ul")
+        console.log($(`#${path}ul`).attr("data-path"))
+        document.getElementById(path + "ul").classList.toggle("d-block");
+        document.getElementById(path + "span").classList.toggle("tree-caret-down");
+      }
+      return;
     } else {
-      document.getElementById('upload_submit').disabled = false;
+      getTreeView(path);
+    }
+    } catch {
+      console.log("Well that failed");
+    }
+    }else{
+      path = $("#zip_server_path").val();
+      console.log("path")
+      getTreeView(path, true);
     }
-    path = path
 
-    $.ajax({
-      type: "GET",
-      url: '/ajax/get_zip_tree?id=-1&path=' + path,
-      dataType: 'text',
-      success: function (data) {
-        console.log("got response:");
-        console.log(data);
-
-        dataArr = data.split('\n');
-        serverDir = dataArr.shift(); // Remove & return first element (server directory)
-        text = dataArr.join('\n');
-        if (styles.visibility === "hidden") {
-          try {
-            document.getElementById('main-tree-div').innerHTML += text;
-            document.getElementById('main-tree').parentElement.classList.add("clicked");
-          } catch {
-            document.getElementById('files-tree').innerHTML = text;
-          }
-        } else {
-          try {
-            document.getElementById('main-tree-div-upload').innerHTML += text;
-            document.getElementById('main-tree-upload').parentElement.classList.add("clicked");
-          } catch {
-            document.getElementById('files-tree').innerHTML = text;
-          }
-        }
-
-
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
+  }
 
+  async function getTreeView(path, unzip=false) {
+    var token = getCookie("_xsrf");
+    console.log("IN TREE VIEW")
+    console.log({ "page": "import", "folder": path});
+    let res = await fetch(`/api/v2/import/file/unzip/`, {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
       },
+      body: JSON.stringify({ "page": "import", "folder": path, "unzip": unzip }),
     });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      console.log(responseData);
+      process_tree_response(responseData);
+      var x = document.querySelector('.bootbox');
+      if (x) {
+        x.remove()
+      }
+      var x = document.querySelector('.modal-backdrop');
+      if (x) {
+        x.remove()
+      }
+      show_file_tree();
+
+    } else {
+
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
+  }
+
+  function process_tree_response(response) {
+    const styles = window.getComputedStyle(document.getElementById("lower_half"));
+      //If this value is still hidden we know the user is executing a zip import and not an upload
+      if (styles.visibility === "hidden") {
+        document.getElementById('zip_submit').disabled = false;
+      } else {
+        document.getElementById('upload_submit').disabled = false;
+      }
+    let path = response.data.root_path.path;
+    text = `<ul class="tree-nested d-block" id="${path}ul">`;
+    Object.entries(response.data).forEach(([key, value]) => {
+      if (key === "root_path" || key === "db_stats") {
+        //continue is not valid in for each. Return acts as a continue.
+        return;
+      }
+      let checked = ""
+      let dpath = value.path;
+      let filename = key;
+      if (value.dir) {
+        text += `<li class="tree-item" id="${dpath}li"  data-path="${dpath}">
+                    <div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
+                    <input type="radio" name="root_path" value="${dpath}">
+                    <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
+                      <i style="color: var(--info);" class="far fa-folder"></i>
+                      <i style="color: var(--info);" class="far fa-folder-open"></i>
+                      ${filename}
+                      </span>
+                    </input></div><li>`
+      } else {
+        text += `<li
+          class="d-block tree-ctx-item tree-file"
+          data-path="${dpath}"
+          data-name="${filename}"
+          onclick="" id="${dpath}li"><input type='radio' class="checkBoxClass d-none file-check" name='root_path' value="${dpath}" disabled><span style="margin-right: 6px;">
+          <i class="far fa-file"></i></span></input>${filename}</li>
+      `
+      }
+    });
+      text += `</ul>`;
+
+    if(response.data.root_path.top){
+      try {
+          document.getElementById('main-tree-div').innerHTML += text;
+          document.getElementById('main-tree').parentElement.classList.add("clicked");
+        } catch {
+          document.getElementById('files-tree').innerHTML = text;
+        }
+    }else{
+      try {
+            document.getElementById(path + "span").classList.add('tree-caret-down');
+            document.getElementById(path).innerHTML += text;
+            document.getElementById(path).classList.add("clicked");
+          } catch {
+            console.log("Bad")
+          }
+
+          var toggler = document.getElementById(path + "span");
+
+          if (toggler.classList.contains('files-tree-title')) {
+            document.getElementById(path + "span").addEventListener("click", function caretListener() {
+              document.getElementById(path + "ul").classList.toggle("d-block");
+              document.getElementById(path + "span").classList.toggle("tree-caret-down");
+            });
+          }
+    }
   }
 
   function getToggleMain(event) {
@@ -698,74 +812,6 @@
     document.getElementById(path + "span").classList.toggle("tree-caret");
   }
 
-
-  function getDirView(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-
-    if (document.getElementById(path).classList.contains('clicked')) {
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        document.getElementById(path + "ul").classList.toggle("d-block");
-        document.getElementById(path + "span").classList.toggle("tree-caret-down");
-      }
-      return;
-    } else {
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_zip_dir?id=-1&path=' + path,
-        dataType: 'text',
-        success: function (data) {
-          console.log("got response:");
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-
-          try {
-            document.getElementById(path + "span").classList.add('tree-caret-down');
-            document.getElementById(path).innerHTML += text;
-            document.getElementById(path).classList.add("clicked");
-          } catch {
-            console.log("Bad")
-          }
-
-          var toggler = document.getElementById(path);
-
-          if (toggler.classList.contains('files-tree-title')) {
-            document.getElementById(path + "span").addEventListener("click", function caretListener() {
-              document.getElementById(path + "ul").classList.toggle("d-block");
-              document.getElementById(path + "span").classList.toggle("tree-caret-down");
-            });
-          }
-        },
-      });
-    }
-  }
-  if (webSocket) {
-    webSocket.on('send_temp_path', function (data) {
-      setTimeout(function () {
-        var x = document.querySelector('.bootbox');
-        if (x) {
-          x.remove()
-        }
-        var x = document.querySelector('.modal-backdrop');
-        if (x) {
-          x.remove()
-        }
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
-        getTreeView(data.path);
-        show_file_tree();
-        $("#root_files_button").attr("disabled", "disabled");
-        $("#root_upload_button").attr("disabled", "disabled");
-
-      }, 5000);
-    });
-  }
-
-
   $('#file').change(function () {
     console.log("File changed");
     if ($('#file').val()) {
@@ -775,7 +821,7 @@
     }
   });
   function replacer(key, value) {
-    if (key === "roles"){
+    if (key === "roles") {
       return value
     }
     if (key != "ignored_exits") {
@@ -789,15 +835,15 @@
     }
   }
   function calcRoles() {
-    let role_ids = $('.roles').map(function() {
-    if ($(this).is(':checked')){
-      return $(this).val();
-    }
+    let role_ids = $('.roles').map(function () {
+      if ($(this).is(':checked')) {
+        return $(this).val();
+      }
     }).get();
     console.log(role_ids)
     return role_ids
   }
-  async function send_server(data){
+  async function send_server(data) {
     let token = getCookie("_xsrf")
     console.log(token)
     let res = await fetch(`/api/v2/servers/`, {
@@ -818,142 +864,142 @@
       });
     }
   }
-$(document).ready(function () {
+  $(document).ready(function () {
 
-  $("#download_exe").on("submit", async function (e) {
-    wait_msg();
-  e.preventDefault();
-  let jarForm = document.getElementById("download_exe");
+    $("#download_exe").on("submit", async function (e) {
+      wait_msg();
+      e.preventDefault();
+      let jarForm = document.getElementById("download_exe");
 
-  let formData = new FormData(jarForm);
-  //Create an object from the form data entries
-  let formDataObject = Object.fromEntries(formData.entries());
-  console.log(formDataObject);
-  let send_data = {
-    "name": formDataObject.name,
-    "roles": calcRoles(), 
-    "monitoring_type": "minecraft_bedrock", 
-    "minecraft_bedrock_monitoring_data": {
-      "host": "127.0.0.1",
-      "port": 19132
-    },
-    "create_type": "minecraft_bedrock",
-    "minecraft_bedrock_create_data": {
-    "create_type": "download_exe",
-    "download_exe_create_data": {
-      //agree to eula since we confirmed before calling this function
-      "agree_to_eula": true,
-    }
-    }
-  }
-  console.log(send_data);
-  // Format the plain form data as JSON
-  let formDataJsonString = JSON.stringify(send_data, replacer);
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name,
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_bedrock",
+        "minecraft_bedrock_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": 19132
+        },
+        "create_type": "minecraft_bedrock",
+        "minecraft_bedrock_create_data": {
+          "create_type": "download_exe",
+          "download_exe_create_data": {
+            //agree to eula since we confirmed before calling this function
+            "agree_to_eula": true,
+          }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
 
 
-  console.log(formDataJsonString);
+      console.log(formDataJsonString);
 
-  send_server(formDataJsonString);
-});
+      send_server(formDataJsonString);
+    });
 
-$("#import-jar").on("submit", async function (e) {
-    wait_msg(true);
-  e.preventDefault();
-  let jarForm = document.getElementById("import-jar");
+    $("#import-jar").on("submit", async function (e) {
+      wait_msg(true);
+      e.preventDefault();
+      let jarForm = document.getElementById("import-jar");
 
-  let formData = new FormData(jarForm);
-  //Create an object from the form data entries
-  let formDataObject = Object.fromEntries(formData.entries());
-  console.log(formDataObject);
-  let send_data = {
-    "name": formDataObject.name,
-    "roles": calcRoles(),
-    "monitoring_type": "minecraft_bedrock", 
-    "minecraft_bedrock_monitoring_data": {
-      "host": "127.0.0.1",
-      "port": formDataObject.port
-    },
-    "create_type": "minecraft_bedrock",
-    "minecraft_bedrock_create_data": {
-    "create_type": "import_server",
-    "import_server_create_data": {
-      "existing_server_path": formDataObject.server_path,
-      "executable": formDataObject.server_jar,
-    }
-    }
-  }
-  console.log(send_data);
-  // Format the plain form data as JSON
-  let formDataJsonString = JSON.stringify(send_data, replacer);
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name,
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_bedrock",
+        "minecraft_bedrock_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_bedrock",
+        "minecraft_bedrock_create_data": {
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.server_path,
+            "executable": formDataObject.server_jar,
+          }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
 
-  send_server(formDataJsonString);
-});
+      send_server(formDataJsonString);
+    });
 
-  $("#import-zip").on("submit", async function (e) {
-    wait_msg(true);
-  e.preventDefault();
-  let jarForm = document.getElementById("import-zip");
+    $("#import-zip").on("submit", async function (e) {
+      wait_msg(true);
+      e.preventDefault();
+      let jarForm = document.getElementById("import-zip");
 
-  let formData = new FormData(jarForm);
-  //Create an object from the form data entries
-  let formDataObject = Object.fromEntries(formData.entries());
-  console.log(formDataObject);
-  let send_data = {
-    "name": formDataObject.name,
-    "roles": calcRoles(), 
-    "monitoring_type": "minecraft_bedrock", 
-    "minecraft_bedrock_monitoring_data": {
-      "host": "127.0.0.1",
-      "port": formDataObject.port
-    },
-    "create_type": "minecraft_bedrock",
-    "minecraft_bedrock_create_data": {
-    "create_type": "import_server",
-    "import_server_create_data": {
-      "existing_server_path": formDataObject.root_path,
-      "executable": formDataObject.server_jar,
-    }
-    }
-  }
-  console.log(send_data);
-  // Format the plain form data as JSON
-  let formDataJsonString = JSON.stringify(send_data, replacer);
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name,
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_bedrock",
+        "minecraft_bedrock_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_bedrock",
+        "minecraft_bedrock_create_data": {
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.root_path,
+            "executable": formDataObject.server_jar,
+          }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
 
-  send_server(formDataJsonString);
-});
+      send_server(formDataJsonString);
+    });
 
-$("#import-upload").on("submit", async function (e) {
-    wait_msg(true);
-  e.preventDefault();
-  let jarForm = document.getElementById("import-upload");
+    $("#import-upload").on("submit", async function (e) {
+      wait_msg(true);
+      e.preventDefault();
+      let jarForm = document.getElementById("import-upload");
 
-  let formData = new FormData(jarForm);
-  //Create an object from the form data entries
-  let formDataObject = Object.fromEntries(formData.entries());
-  console.log(formDataObject);
-  let send_data = {
-    "name": formDataObject.name,
-    "roles": calcRoles(),
-    "monitoring_type": "minecraft_bedrock", 
-    "minecraft_bedrock_monitoring_data": {
-      "host": "127.0.0.1",
-      "port": formDataObject.port
-    },
-    "create_type": "minecraft_bedrock",
-    "minecraft_bedrock_create_data": {
-    "create_type": "import_server",
-    "import_server_create_data": {
-      "existing_server_path": formDataObject.root_path,
-      "executable": formDataObject.server_jar,
-    }
-    }
-  }
-  console.log(send_data);
-  // Format the plain form data as JSON
-  let formDataJsonString = JSON.stringify(send_data, replacer);
-  send_server(formDataJsonString);
-});
+      let formData = new FormData(jarForm);
+      //Create an object from the form data entries
+      let formDataObject = Object.fromEntries(formData.entries());
+      console.log(formDataObject);
+      let send_data = {
+        "name": formDataObject.name,
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_bedrock",
+        "minecraft_bedrock_monitoring_data": {
+          "host": "127.0.0.1",
+          "port": formDataObject.port
+        },
+        "create_type": "minecraft_bedrock",
+        "minecraft_bedrock_create_data": {
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.root_path,
+            "executable": formDataObject.server_jar,
+          }
+        }
+      }
+      console.log(send_data);
+      // Format the plain form data as JSON
+      let formDataJsonString = JSON.stringify(send_data, replacer);
+      send_server(formDataJsonString);
+    });
 
-});
+  });
 </script>
 {% end %}
\ No newline at end of file

From 6c1e1b4737a5aa5ccef4512bb403e7c61997305e Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 1 Sep 2023 14:48:20 -0400
Subject: [PATCH 072/210] Add Arcadia Notifications to Front end

---
 app/classes/models/users.py                   |   2 +
 app/classes/shared/helpers.py                 |  16 ++-
 app/classes/web/routes/api/api_handlers.py    |   6 +
 .../routes/api/crafty/announcements/index.py  | 106 ++++++++++++++++
 app/frontend/templates/notify.html            | 120 ++++++++++++++++--
 app/migrations/20230901_user_notif.py         |  16 +++
 6 files changed, 248 insertions(+), 18 deletions(-)
 create mode 100644 app/classes/web/routes/api/crafty/announcements/index.py
 create mode 100644 app/migrations/20230901_user_notif.py

diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index b0612017..ccd8f1b0 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -45,6 +45,7 @@ class Users(BaseModel):
     manager = IntegerField(default=None, null=True)
     pfp = CharField(default="/static/assets/images/faces-clipart/pic-3.png")
     theme = CharField(default="default")
+    cleared_notifs = CharField(default="default")
 
     class Meta:
         table_name = "users"
@@ -171,6 +172,7 @@ class HelperUsers:
                 "roles": [],
                 "servers": [],
                 "support_logs": "",
+                "cleared_notifs": "",
             }
         user = model_to_dict(Users.get(Users.user_id == user_id))
 
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 489115ae..59c1ae3a 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -581,12 +581,16 @@ class Helpers:
 
     @staticmethod
     def get_announcements():
-        data = (
-            '[{"id":"1","date":"Unknown",'
-            '"title":"Error getting Announcements",'
-            '"desc":"Error getting Announcements","link":""}]'
-        )
-
+        data = []
+        data = [
+            {
+                "id": "4db1a43b-d451-4abc-bb10-5a45676d95f7",
+                "date": "Unknown",
+                "title": "Error getting Announcements",
+                "desc": "Error getting Announcements",
+                "link": "",
+            }
+        ]
         try:
             response = requests.get("https://craftycontrol.com/notify.json", timeout=2)
             data = json.loads(response.content)
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 29ee02c5..c3558a65 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -40,6 +40,7 @@ from app.classes.web.routes.api.users.user.permissions import (
 )
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
+from app.classes.web.routes.api.crafty.announcements.index import ApiAnnounceIndexHandler
 
 
 def api_handlers(handler_args):
@@ -55,6 +56,11 @@ def api_handlers(handler_args):
             ApiAuthInvalidateTokensHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/announcements/?",
+            ApiAnnounceIndexHandler,
+            handler_args,
+        ),
         # User routes
         (
             r"/api/v2/users/?",
diff --git a/app/classes/web/routes/api/crafty/announcements/index.py b/app/classes/web/routes/api/crafty/announcements/index.py
new file mode 100644
index 00000000..a7012466
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/announcements/index.py
@@ -0,0 +1,106 @@
+import logging
+import json
+from jsonschema import ValidationError, validate
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+notif_schema = {
+    "type": "object",
+    "properties": {
+        "id": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiAnnounceIndexHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _exec_user_crafty_permissions,
+            _,
+            _,
+            _user,
+        ) = auth_data
+
+        data = self.helper.get_announcements()
+        cleared = str(
+            self.controller.users.get_user_by_id(auth_data[4]["user_id"])[
+                "cleared_notifs"
+            ]
+        ).split(",")
+        res = [d.get("id", None) for d in data]
+        # remove notifs that are no longer in Crafty.
+        for item in cleared[:]:
+            if item not in res:
+                cleared.remove(item)
+        if len(cleared) > 0:
+            for item in data[:]:
+                if item["id"] in cleared:
+                    data.remove(item)
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": data,
+            },
+        )
+
+    def post(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _exec_user_crafty_permissions,
+            _,
+            _,
+            _user,
+        ) = auth_data
+        print(self.request)
+        try:
+            data = json.loads(self.request.body)
+            print(data)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, notif_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        announcements = self.helper.get_announcements()
+        res = [d.get("id", None) for d in announcements]
+        cleared_notifs = str(
+            self.controller.users.get_user_by_id(auth_data[4]["user_id"])[
+                "cleared_notifs"
+            ]
+        ).split(",")
+        # remove notifs that are no longer in Crafty.
+        for item in cleared_notifs[:]:
+            if item not in res:
+                cleared_notifs.remove(item)
+        cleared_notifs.append(data["id"])
+        updata = {"cleared_notifs": ",".join(cleared_notifs)}
+        self.controller.users.update_user(auth_data[4]["user_id"], updata)
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": {},
+            },
+        )
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 9d41d17d..1600e0f5 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -1,27 +1,32 @@
 <ul class="navbar-nav ml-auto">
   <li class="nav-item dropdown">
-    <a class="nav-link count-indicator">
+    <a class="nav-link count-indicator dropdown-toggle" id="notifDropdown" href="#" data-toggle="dropdown"
+      aria-expanded="false">
       <i class="fas fa-broadcast-tower
         {% if data.get('update_available') %}
             text-danger
         {% end %}
-        "></i>
-      <!--        <span class="count bg-success">3</span>-->
-    </a>
+        "></i><span id="notif-count" class="badge badge-notify"></span> </a>
+    <div class="dropdown-menu dropdown-menu-right navbar-dropdown" style="width: 40vw;" aria-labelledby="notifDropdown">
+      <ul id="announcements">
+      </ul>
+    </div>
   </li>
 
   <li class="nav-item dropdown">
-    <a class="nav-link count-indicator" href="/panel/panel_config">
+    <a class="nav-link" href="/panel/panel_config">
       <i class="fas fa-cogs"></i>
     </a>
   </li>
 
   <li class="nav-item dropdown user-dropdown">
     <a class="nav-link dropdown-toggle" id="UserDropdown" href="#" data-toggle="dropdown" aria-expanded="false">
-      <img class="img-xs rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}" alt="Profile image"> </a>
+      <img class="img-xs rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}"
+        alt="Profile image"> </a>
     <div class="dropdown-menu dropdown-menu-right navbar-dropdown" aria-labelledby="UserDropdown">
       <div class="dropdown-header text-center">
-        <img class="img-md rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}" alt="Profile image">
+        <img class="img-md rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}"
+          alt="Profile image">
         <p class="mb-1 mt-3 font-weight-semibold">{{ data['user_data']['username'] }}</p>
         <p class="font-weight-light text-muted mb-0">Roles: </p>
         {% for r in data['user_role'] %}
@@ -33,27 +38,118 @@
         <p class="font-weight-light text-muted mb-0">Email: {{ data['user_data']['email'] }}</p>
       </div>
       {% if data['user_data']['preparing'] %}
-      <span class="dropdown-item" id="support_progress"><i class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs', data['lang']) }}<br><br></span>
+      <span class="dropdown-item" id="support_progress"><i
+          class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
+        data['lang']) }}<br><br></span>
       <span class="dropdown-item" id="support_progress">
         <div class="support_progress" style="height: 15px; width: 100%;">
-          <div class="progress-bar progress-bar-striped progress-bar-animated" id="logs_progress_bar" role="progressbar" style="width:0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+          <div class="progress-bar progress-bar-striped progress-bar-animated" id="logs_progress_bar" role="progressbar"
+            style="width:0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
         </div>
       </span>
       {% else %}
-      <a class="dropdown-item" id="support_logs"><i class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs', data['lang']) }}</i></a>
+      <a class="dropdown-item" id="support_logs"><i
+          class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
+        data['lang']) }}</i></a>
       {% end %}
       {% if data['superuser'] %}
-      <a class="dropdown-item" href="/panel/activity_logs"><i class="dropdown-item-icon mdi mdi-calendar-check-outline text-primary"></i>{{ translate('notify', 'activityLog', data['lang']) }}</a>
+      <a class="dropdown-item" href="/panel/activity_logs"><i
+          class="dropdown-item-icon mdi mdi-calendar-check-outline text-primary"></i>{{ translate('notify',
+        'activityLog', data['lang']) }}</a>
       {% end %}
-      <a class="dropdown-item" href="/logout"><i class="dropdown-item-icon mdi mdi-power text-primary"></i>{{ translate('notify', 'logout', data['lang']) }}</a>
+      <a class="dropdown-item" href="/logout"><i class="dropdown-item-icon mdi mdi-power text-primary"></i>{{
+        translate('notify', 'logout', data['lang']) }}</a>
     </div>
   </li>
 </ul>
+<style>
+  .badge-notify {
+    background: var(--purple);
+    position: absolute;
+    -moz-transform: translate(-70%, -70%);
+    /* For Firefox */
+    -ms-transform: translate(-70%, -70%);
+    /* for IE */
+    -webkit-transform: translate(-70%, -70%);
+    /* For Safari, Chrome, iOS */
+    -o-transform: translate(-70%, -70%);
+  }
 
+  .clear-button:hover {
+    cursor: pointer;
+  }
+</style>
 <script>
   function pfpError(image) {
     image.onerror = "";
     image.src = "/static/assets/images/faces-clipart/pic-3.png";
     return true;
   }
+  function updateAnnouncements(data) {
+    console.log(data)
+    let text = "";
+    for (i = 0; i < data.length; i++) {
+      text += `<li id="${data[i].id}"><p style="float: right;"><i data-id="${data[i].id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${data[i].link} target="_blank"><h6>${data[i].title}</h6><small><p>${data[i].date}</p></small><p>${data[i].desc}</p></li></a>`
+    }
+    if (data.length > 0) {
+      localStorage.setItem("notif-count", data.length);
+      $("#notif-count").html(data.length);
+      $("#announcements").html(text);
+    } else {
+      $("#announcements").html("<p style='margin-top: 15px;' class='text-center'>No notifications</p>");
+    }
+    $(".clear-button").on("click", function (event) {
+      console.log("CLEAR BUTTON")
+      let uuid = event.target.getAttribute("data-id");
+      $(`#${uuid}`).remove();
+      send_clear(uuid);
+      notif_count = localStorage.getItem("notif-count") - 1;
+      if (notif_count > 0) {
+        localStorage.setItem("notif-count", notif_count);
+        $("#notif-count").html(notif_count);
+      } else {
+        $("#announcements").html("<p style='margin-top: 15px;' class='text-center'>No notifications</p>")
+        $("#notif-count").html("");
+      }
+
+    });
+  }
+  async function getAnnouncements() {
+    var token = getCookie("_xsrf");
+    let res = await fetch(`/api/v2/crafty/announcements/`, {
+      method: 'GET',
+      headers: {
+        'X-XSRFToken': token
+      },
+    });
+    let responseData = await res.json();
+    console.log(responseData);
+    if (responseData.status === "ok") {
+      updateAnnouncements(responseData.data)
+    } else {
+      updateAnnouncements("<li><p>Trouble Getting Annoucements</p></li>")
+    }
+  }
+  async function send_clear(uuid) {
+    var token = getCookie("_xsrf");
+    let body = JSON.stringify({ "id": uuid });
+    console.log(body)
+    let res = await fetch(`/api/v2/crafty/announcements/`, {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token,
+      },
+      body: body,
+    });
+    let responseData = await res.json();
+    console.log(responseData);
+    if (responseData.status === "ok") {
+      return
+    } else {
+      bootbox.alert(responseData.error)
+    }
+  }
+  $(document).ready(function () {
+    getAnnouncements();
+  })
 </script>
\ No newline at end of file
diff --git a/app/migrations/20230901_user_notif.py b/app/migrations/20230901_user_notif.py
new file mode 100644
index 00000000..eaefc159
--- /dev/null
+++ b/app/migrations/20230901_user_notif.py
@@ -0,0 +1,16 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns("users", cleared_notifs=peewee.CharField(default=""))
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns("users", ["cleared_notifs"])
+    """
+    Write your rollback migrations here.
+    """

From 02df6de6d5337647b0a48673cf8882b901bea453 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 1 Sep 2023 14:54:38 -0400
Subject: [PATCH 073/210] Remove prints. Remove test notif

---
 app/classes/shared/helpers.py                            | 9 ---------
 app/classes/web/routes/api/crafty/announcements/index.py | 2 --
 2 files changed, 11 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 59c1ae3a..9c74135d 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -582,15 +582,6 @@ class Helpers:
     @staticmethod
     def get_announcements():
         data = []
-        data = [
-            {
-                "id": "4db1a43b-d451-4abc-bb10-5a45676d95f7",
-                "date": "Unknown",
-                "title": "Error getting Announcements",
-                "desc": "Error getting Announcements",
-                "link": "",
-            }
-        ]
         try:
             response = requests.get("https://craftycontrol.com/notify.json", timeout=2)
             data = json.loads(response.content)
diff --git a/app/classes/web/routes/api/crafty/announcements/index.py b/app/classes/web/routes/api/crafty/announcements/index.py
index a7012466..79899e9e 100644
--- a/app/classes/web/routes/api/crafty/announcements/index.py
+++ b/app/classes/web/routes/api/crafty/announcements/index.py
@@ -63,10 +63,8 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
             _,
             _user,
         ) = auth_data
-        print(self.request)
         try:
             data = json.loads(self.request.body)
-            print(data)
         except json.decoder.JSONDecodeError as e:
             return self.finish_json(
                 400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}

From f03e8d48a24e3ac5ac5036868e7e467fe701162f Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 1 Sep 2023 17:04:56 -0400
Subject: [PATCH 074/210] Appease the linter

---
 app/classes/web/routes/api/api_handlers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index c3558a65..97147c92 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -40,7 +40,9 @@ from app.classes.web.routes.api.users.user.permissions import (
 )
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
-from app.classes.web.routes.api.crafty.announcements.index import ApiAnnounceIndexHandler
+from app.classes.web.routes.api.crafty.announcements.index import (
+    ApiAnnounceIndexHandler,
+)
 
 
 def api_handlers(handler_args):

From 9d870f06113a85d22a26295726116d92f171e0c2 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 1 Sep 2023 20:15:33 -0400
Subject: [PATCH 075/210] Check for valid uuid

---
 .../web/routes/api/crafty/announcements/index.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/crafty/announcements/index.py b/app/classes/web/routes/api/crafty/announcements/index.py
index 79899e9e..12430725 100644
--- a/app/classes/web/routes/api/crafty/announcements/index.py
+++ b/app/classes/web/routes/api/crafty/announcements/index.py
@@ -1,5 +1,6 @@
 import logging
 import json
+import uuid
 from jsonschema import ValidationError, validate
 from app.classes.web.base_api_handler import BaseApiHandler
 
@@ -92,7 +93,11 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
         for item in cleared_notifs[:]:
             if item not in res:
                 cleared_notifs.remove(item)
-        cleared_notifs.append(data["id"])
+        if is_valid_uuid(data["id"]):
+            cleared_notifs.append(data["id"])
+        else:
+            self.finish_json(200, {"status": "error", "error": "INVALID_DATA"})
+            return
         updata = {"cleared_notifs": ",".join(cleared_notifs)}
         self.controller.users.update_user(auth_data[4]["user_id"], updata)
         self.finish_json(
@@ -102,3 +107,12 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
                 "data": {},
             },
         )
+
+
+def is_valid_uuid(value):
+    try:
+        uuid.UUID(str(value))
+
+        return True
+    except ValueError:
+        return False

From 5266e6e098bec5565d02855b6b9b79e47e155631 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 1 Sep 2023 20:38:10 -0400
Subject: [PATCH 076/210] style ul

---
 app/frontend/templates/notify.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 1600e0f5..9848e98a 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -8,7 +8,7 @@
         {% end %}
         "></i><span id="notif-count" class="badge badge-notify"></span> </a>
     <div class="dropdown-menu dropdown-menu-right navbar-dropdown" style="width: 40vw;" aria-labelledby="notifDropdown">
-      <ul id="announcements">
+      <ul style="padding-top: 10px;" id="announcements">
       </ul>
     </div>
   </li>
@@ -96,7 +96,8 @@
       $("#notif-count").html(data.length);
       $("#announcements").html(text);
     } else {
-      $("#announcements").html("<p style='margin-top: 15px;' class='text-center'>No notifications</p>");
+      $("#announcements").html(`<p style='margin-top: 15px;' class='text-center'><i class="fa fa-bell-slash" aria-hidden="true"></i>
+</p>`);
     }
     $(".clear-button").on("click", function (event) {
       console.log("CLEAR BUTTON")
@@ -108,7 +109,8 @@
         localStorage.setItem("notif-count", notif_count);
         $("#notif-count").html(notif_count);
       } else {
-        $("#announcements").html("<p style='margin-top: 15px;' class='text-center'>No notifications</p>")
+        $("#announcements").html(`<p style='margin-top: 15px;' class='text-center'><i class="fa fa-bell-slash" aria-hidden="true"></i>
+</p>`)
         $("#notif-count").html("");
       }
 

From d61da42fa9362df423ffe05438fc25075d1fbb5c Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 2 Sep 2023 14:17:44 +0100
Subject: [PATCH 077/210] Bump crypto to resolve #267 & #268

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 98e095f1..4c182563 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ bleach==4.1
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5
-cryptography==41.0.1
+cryptography==41.0.3
 libgravatar==1.0.0
 peewee==3.13
 pexpect==4.8

From 5f088c4a1cff41a886a21d1e5385710e8e8d933e Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 2 Sep 2023 14:24:40 +0100
Subject: [PATCH 078/210] Bump tornado to resolve #269

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 98e095f1..79a37409 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ pyjwt==2.4.0
 PyYAML==6.0.1
 requests==2.31
 termcolor==1.1
-tornado==6.3.2
+tornado==6.3.3
 tzlocal==4.0
 jsonschema==4.5.1
 orjson==3.8.12

From 34fe9c13267c0757bdb7c4447f79821810da5f76 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sat, 2 Sep 2023 21:51:28 +0200
Subject: [PATCH 079/210] Using API Call for Status Page

---
 app/classes/models/server_stats.py            |   2 +
 app/classes/shared/server.py                  |  11 +-
 app/classes/web/routes/api/api_handlers.py    |   9 ++
 .../web/routes/api/servers/server/status.py   |  32 +++++
 app/classes/web/tornado_handler.py            |   3 +-
 app/classes/web/websocket_handler.py          |  42 ------
 app/frontend/templates/panel/dashboard.html   | 130 ++++++------------
 app/frontend/templates/public/status.html     |  47 +++++--
 app/frontend/templates/public_base.html       | 113 ---------------
 app/migrations/stats/20230827_add_icon.py     |  16 +++
 10 files changed, 137 insertions(+), 268 deletions(-)
 create mode 100644 app/classes/web/routes/api/servers/server/status.py
 create mode 100644 app/migrations/stats/20230827_add_icon.py

diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index d3b8cdf0..5a38ac1e 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -50,6 +50,7 @@ class ServerStats(Model):
     max = IntegerField(default=0)
     players = CharField(default="")
     desc = CharField(default="Unable to Connect")
+    icon = CharField(default="")
     version = CharField(default="")
     updating = BooleanField(default=False)
     waiting_start = BooleanField(default=False)
@@ -183,6 +184,7 @@ class HelperServerStats:
                 ServerStats.max: server_stats.get("max", False),
                 ServerStats.players: server_stats.get("players", False),
                 ServerStats.desc: server_stats.get("desc", False),
+                ServerStats.icon: server_stats.get("icon", None),
                 ServerStats.version: server_stats.get("version", False),
             }
         ).execute(self.database)
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 4682c22a..45675de5 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1536,14 +1536,6 @@ class ServerInstance:
                 except:
                     Console.critical("Can't broadcast server status to websocket")
 
-            if (len(servers_ping) > 0) & (len(WebSocketManager().public_clients) > 0):
-                try:
-                    WebSocketManager().broadcast_page(
-                        "/status", "update_server_status", servers_ping
-                    )
-                except:
-                    Console.critical("Can't broadcast server status to websocket")
-
     def get_servers_stats(self):
         server_stats = {}
 
@@ -1605,6 +1597,7 @@ class ServerInstance:
                 "players": ping_data.get("players", False),
                 "desc": ping_data.get("server_description", False),
                 "version": ping_data.get("server_version", False),
+                "icon": ping_data.get("server_icon"),
             }
         else:
             server_stats = {
@@ -1623,6 +1616,7 @@ class ServerInstance:
                 "players": False,
                 "desc": False,
                 "version": False,
+                "icon": None,
             }
 
         return server_stats
@@ -1671,7 +1665,6 @@ class ServerInstance:
             }
 
         server_stats = {}
-        server = HelperServers.get_server_obj(server_id)
         if not server:
             return {}
         server_dt = HelperServers.get_server_data_by_id(server_id)
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 36eeb4f0..30e4d0d0 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -12,6 +12,7 @@ from app.classes.web.routes.api.roles.index import ApiRolesIndexHandler
 from app.classes.web.routes.api.roles.role.index import ApiRolesRoleIndexHandler
 from app.classes.web.routes.api.roles.role.servers import ApiRolesRoleServersHandler
 from app.classes.web.routes.api.roles.role.users import ApiRolesRoleUsersHandler
+
 from app.classes.web.routes.api.servers.index import ApiServersIndexHandler
 from app.classes.web.routes.api.servers.server.action import (
     ApiServersServerActionHandler,
@@ -21,6 +22,9 @@ from app.classes.web.routes.api.servers.server.logs import ApiServersServerLogsH
 from app.classes.web.routes.api.servers.server.public import (
     ApiServersServerPublicHandler,
 )
+from app.classes.web.routes.api.servers.server.status import (
+    ApiServersServerStatusHandler,
+)
 from app.classes.web.routes.api.servers.server.stats import ApiServersServerStatsHandler
 from app.classes.web.routes.api.servers.server.history import (
     ApiServersServerHistoryHandler,
@@ -110,6 +114,11 @@ def api_handlers(handler_args):
             ApiServersIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/status/?",
+            ApiServersServerStatusHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/?",
             ApiServersServerIndexHandler,
diff --git a/app/classes/web/routes/api/servers/server/status.py b/app/classes/web/routes/api/servers/server/status.py
new file mode 100644
index 00000000..aab501d8
--- /dev/null
+++ b/app/classes/web/routes/api/servers/server/status.py
@@ -0,0 +1,32 @@
+import logging
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+
+class ApiServersServerStatusHandler(BaseApiHandler):
+    def get(self):
+        servers_status = []
+        servers_list = self.controller.servers.get_all_servers_stats()
+        for server in servers_list:
+            if server.get("server_data").get("show_status") is True:
+                servers_status.append(
+                    {
+                        "id": server.get("server_data").get("server_id"),
+                        "world_name": server.get("stats").get("world_name"),
+                        "running": server.get("stats").get("running"),
+                        "online": server.get("stats").get("online"),
+                        "max": server.get("stats").get("max"),
+                        "version": server.get("stats").get("version"),
+                        "desc": server.get("stats").get("desc"),
+                        "icon": server.get("stats").get("icon"),
+                    }
+                )
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": servers_status,
+            },
+        )
diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index 0a7f0cb8..643a018a 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -34,7 +34,7 @@ from app.classes.web.api_handler import (
     ListServers,
     SendCommand,
 )
-from app.classes.web.websocket_handler import AuthSocketHandler, PublicSocketHandler
+from app.classes.web.websocket_handler import AuthSocketHandler
 from app.classes.web.static_handler import CustomStaticHandler
 from app.classes.web.upload_handler import UploadHandler
 from app.classes.web.http_handler import HTTPHandler, HTTPHandlerPage
@@ -154,7 +154,6 @@ class Webserver:
             (r"/ajax/(.*)", AjaxHandler, handler_args),
             (r"/files/(.*)", FileHandler, handler_args),
             (r"/ws/auth", AuthSocketHandler, handler_args),
-            (r"/ws/public", PublicSocketHandler, handler_args),
             (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),
             # API Routes V1
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index d15d6c7d..ae166e3a 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -176,45 +176,3 @@ class AuthSocketHandler(BaseSocketHandler):
         )
         WebSocketManager().add_client(self)
         logger.debug("Opened WebSocket connection")
-
-
-class PublicSocketHandler(BaseSocketHandler):
-    ws_state = EnumWebSocketState.WS_PUBLIC
-    ws_authorized_pages = {"404", "error", "login", "offline", "status"}
-    ws_authorized_events = {"update_server_status"}  # Must be overridden at init
-    page = None
-    page_query_params = None
-    controller = None
-    tasks_manager = None
-    translator = None
-    io_loop = None
-
-    def initialize(
-        self, helper=None, controller=None, tasks_manager=None, translator=None
-    ):
-        self.helper = helper
-        self.controller = controller
-        self.tasks_manager = tasks_manager
-        self.translator = translator
-        self.io_loop = tornado.ioloop.IOLoop.current()
-
-    def get_user_id(self):
-        return None
-
-    def check_auth(self):
-        return False
-
-    # pylint: disable=arguments-differ
-    def open(self):
-        logger.debug("Checking Public WebSocket")
-        self.handle()
-
-    def handle(self):
-        self.page = self.get_query_argument("page")
-        self.page_query_params = dict(
-            parse_qsl(
-                Helpers.remove_prefix(self.get_query_argument("page_query_params"), "?")
-            )
-        )
-        WebSocketManager().add_client(self)
-        logger.debug("Opened Public WebSocket connection")
diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 9aa207eb..377a109f 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -58,13 +58,11 @@
 
                 </div>
                 <div class="wrapper my-auto ml-auto ml-lg-4">
-                  <p id="cpu_data" class="mb-0 text-success" data-toggle="tooltip" data-placement="top" data-html="true"
-                    title="{% raw translate('dashboard', 'cpuCores', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cores') }} <br /> {% raw translate('dashboard', 'cpuCurFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cur_freq') }} <br /> {% raw translate('dashboard', 'cpuMaxFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_max_freq') }}">
+                  <p id="cpu_data" class="mb-0 text-success" data-toggle="tooltip" data-placement="top" data-html="true" title="{% raw translate('dashboard', 'cpuCores', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cores') }} <br /> {% raw translate('dashboard', 'cpuCurFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_cur_freq') }} <br /> {% raw translate('dashboard', 'cpuMaxFreq', data['lang']) %}: {{ data.get('hosts_data').get('cpu_max_freq') }}">
                     {{ translate('dashboard', 'cpuUsage', data['lang']) }}: <span id="cpu_usage">{{
                       data.get('hosts_data').get('cpu_usage') }}</span>
                   </p>
-                  <p id="mem_usage" class="mb-0 text-danger" data-toggle="tooltip" data-placement="top"
-                    title="{{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_usage') }}">
+                  <p id="mem_usage" class="mb-0 text-danger" data-toggle="tooltip" data-placement="top" title="{{ translate('dashboard', 'memUsage', data['lang']) }}: {{ data.get('hosts_data').get('mem_usage') }}">
                     {{ translate('dashboard', 'memUsage', data['lang']) }}: <span id="mem_percent">{{
                       data.get('hosts_data').get('mem_percent') }}%</span>
                   </p>
@@ -111,12 +109,9 @@
                       {% for item in data['hosts_data']['disk_json'] %}
                       {% if item["mount"] in data["monitored"] %}
                       <div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
-                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading"
-                          id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom"
-                          title="{{item['mount']}}" style="max-width: 100%;"><i class="fas fa-hdd"></i>
+                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="{{item['mount']}}" style="max-width: 100%;"><i class="fas fa-hdd"></i>
                           {{item["mount"]}}</h4>
-                        <div class="progress d-inline-block"
-                          style="height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
+                        <div class="progress d-inline-block" style="height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
                           <div class="progress-bar
                         {% if item['percent_used'] <= 58 %}
                         bg-success
@@ -125,8 +120,7 @@
                         {% else %}
                         bg-danger
                         {% end %}
-                        " role="progressbar" style="color: black; height: 100%; width: {{item['percent_used']}}%;"
-                            aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">{{item["used"]}} /
+                        " role="progressbar" style="color: black; height: 100%; width: {{item['percent_used']}}%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">{{item["used"]}} /
                             {{item["total"]}}
                           </div>
                         </div>
@@ -153,9 +147,7 @@
             data['lang']) }}</h4>
           {% if len(data['servers']) > 0 %}
           {% if data['user_data']['hints'] %}
-          <span class="too_small" title="{{ translate('dashboard', 'cannotSeeOnMobile', data['lang']) }}" ,
-            data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}" ,
-            data-placement="top"></span>
+          <span class="too_small" title="{{ translate('dashboard', 'cannotSeeOnMobile', data['lang']) }}" , data-content="{{ translate('dashboard', 'cannotSeeOnMobile2', data['lang']) }}" , data-placement="top"></span>
           {% end %}
           {% end %}
           <div><a class="nav-link" href="/server/step1"><i class="fas fa-plus-circle"></i> &nbsp; {{
@@ -193,8 +185,7 @@
                   <td draggable="false">
                     <i class="fas fa-server"></i>
                     {% if server['alert'] %}
-                    <a style="color: red !important;" draggable="false"
-                      href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                    <a style="color: red !important;" draggable="false" href="/panel/server_detail?id={{server['server_data']['server_id']}}">
                       {{ server['server_data']['server_name'] }}&nbsp; <i class="fas fa-exclamation-triangle"></i>
                     </a>
                     {% else %}
@@ -208,13 +199,11 @@
                     {% if server['user_command_permission'] %}
                     {% if server['stats']['importing'] and server['stats']['running'] %}
                     <!-- WHAT HAPPENED HERE -->
-                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
-                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'installing',
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'installing',
                       data['lang']) }}</i></a>
                     {% elif server['stats']['updating']%}
                     <!-- WHAT HAPPENED HERE -->
-                    <a data-id="{{server['server_data']['server_id']}}" class=""><i
-                        class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
+                    <a data-id="{{server['server_data']['server_id']}}" class=""><i class="fa fa-spinner fa-spin"></i>&nbsp;{{ translate('serverTerm', 'updating',
                       data['lang']) }}</i></a>
                     {% elif server['stats']['waiting_start']%}
                     <!-- WHAT HAPPENED HERE -->
@@ -226,31 +215,25 @@
                       {{ translate('serverTerm', 'importing',
                       data['lang']) }}</a>
                     {% elif server['stats']['running'] %}
-                    <a data-id="{{server['server_data']['server_id']}}" class="stop_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'stop' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="stop_button" data-toggle="tooltip" title="{{ translate('dashboard', 'stop' , data['lang']) }}">
                       <i class="fas fa-stop"></i>
                     </a> &nbsp;
 
-                    <a data-id="{{server['server_data']['server_id']}}" class="restart_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'restart' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="restart_button" data-toggle="tooltip" title="{{ translate('dashboard', 'restart' , data['lang']) }}">
                       <i class="fas fa-sync"></i>
                     </a> &nbsp;
 
-                    <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip" title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                       <i class="fas fa-skull"></i>
                     </a> &nbsp;
                     {% else %}
-                    <a data-id="{{server['server_data']['server_id']}}" class="play_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'start' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="play_button" data-toggle="tooltip" title="{{ translate('dashboard', 'start' , data['lang']) }}">
                       <i class="fas fa-play"></i>
                     </a> &nbsp;
-                    <a data-id="{{server['server_data']['server_id']}}" class="clone_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'clone' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="clone_button" data-toggle="tooltip" title="{{ translate('dashboard', 'clone' , data['lang']) }}">
                       <i class="fas fa-clone"></i>
                     </a> &nbsp;
-                    <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip"
-                      title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                    <a data-id="{{server['server_data']['server_id']}}" class="kill_button" data-toggle="tooltip" title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                       <i class="fas fa-skull"></i>
                     </a> &nbsp;
                     {% end %}
@@ -258,8 +241,7 @@
                   </td>
 
                   <td draggable="false" id="server_cpu_{{server['server_data']['server_id']}}">
-                    <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                      title="{{server['stats']['cpu']}}">
+                    <div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats']['cpu']}}">
                       <div class="progress-bar
                       {% if server['stats']['cpu'] <= 33 %}
                       bg-success
@@ -268,15 +250,13 @@
                       {% else %}
                       bg-danger
                       {% end %}
-                      " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0"
-                        aria-valuemin="0" aria-valuemax="100"></div>
+                      " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
                     </div>
                     {{server['stats']['cpu']}}%
                   </td>
 
                   <td draggable="false" id="server_mem_{{server['server_data']['server_id']}}">
-                    <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                      title="{{server['stats']['mem']}}">
+                    <div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats']['mem']}}">
                       <div class="progress-bar
                       {% if server['stats']['mem_percent'] <= 33 %}
                       bg-success
@@ -285,8 +265,7 @@
                       {% else %}
                       bg-danger
                       {% end %}
-                      " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0"
-                        aria-valuemin="0" aria-valuemax="100"></div>
+                      " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
                     </div>
                     {{server['stats']['mem_percent']}}% -
 
@@ -305,8 +284,7 @@
                     data['lang']) }} <br />
 
                     {% if server['stats']['desc'] != 'False' %}
-                    <div id="desc_id"
-                      style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">{{
+                    <div id="desc_id" style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">{{
                       server['stats']['desc'] }}</div> <br />
                     {% end %}
 
@@ -334,16 +312,14 @@
                         <br />
                         <br />
                   </td>
-                  <span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}"
-                    data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
+                  <span class="server-player-totals" id="server_players_{{server['server_data']['server_id']}}" data-players="{{ server['stats']['online']}}" data-max="{{ server['stats']['max'] }}"></span>
                 </tr>
                 {% end %}
           </div>
           </span>
           {% for server in data['failed_servers'] %}
           <tr id="{{server['server_id']}}" draggable="false">
-            <td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning"
-                href="/panel/server_detail?id={{server['server_id']}}&subpage=config">{{server['server_name']}}</a>
+            <td class="text-warning"><i class="fas fa-server"></i>&nbsp;<a class="text-warning" href="/panel/server_detail?id={{server['server_id']}}&subpage=config">{{server['server_name']}}</a>
             </td>
             <td></td>
             <td></td>
@@ -368,28 +344,22 @@
                   <div class="row">
                     <div class="col-10 col-lg-3 mx-0 px-0">
                       {% if server['alert'] %}
-                      <a style="color: red !important" class="btn btn-link d-flex justify-content-start" type="button"
-                        href="/panel/server_detail?id={{server['server_data']['server_id']}}">
-                        <i class="fas fa-server"></i> {{ server['server_data']['server_name'] }}&nbsp; <i
-                          class="fas fa-exclamation-triangle"></i>
+                      <a style="color: red !important" class="btn btn-link d-flex justify-content-start" type="button" href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                        <i class="fas fa-server"></i> {{ server['server_data']['server_name'] }}&nbsp; <i class="fas fa-exclamation-triangle"></i>
                       </a>
                       {% else %}
-                      <a class="btn btn-link d-flex justify-content-start" type="button"
-                        href="/panel/server_detail?id={{server['server_data']['server_id']}}">
+                      <a class="btn btn-link d-flex justify-content-start" type="button" href="/panel/server_detail?id={{server['server_data']['server_id']}}">
                         <i class="fas fa-server"></i> {{ server['server_data']['server_name'] }}
                       </a>
                       {% end %}
                     </div>
                     <div class="col-2 col-lg-3 mx-0 px-0">
-                      <a class="btn btn-link d-flex justify-content-center" type="button" data-toggle="collapse"
-                        data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false"
-                        aria-controls="collapse-{{server['server_data']['server_id']}}">
+                      <a class="btn btn-link d-flex justify-content-center" type="button" data-toggle="collapse" data-target="#collapse-{{server['server_data']['server_id']}}" aria-expanded="false" aria-controls="collapse-{{server['server_data']['server_id']}}">
                         <i class="fas fa-chart-bar"></i>
                       </a>
                     </div>
                     <div class="col-4 col-lg-3 mx-0 px-0">
-                      <a id="m_server_running_status_{{server['server_data']['server_id']}}"
-                        class="btn btn-link d-flex justify-content-start" type="button">
+                      <a id="m_server_running_status_{{server['server_data']['server_id']}}" class="btn btn-link d-flex justify-content-start" type="button">
                         {% if server['stats']['running'] %}
                         <span class="text-success"><i class="fas fa-signal"></i> {{ translate('dashboard', 'online',
                           data['lang']) }}</span>
@@ -410,23 +380,17 @@
                         {% if server['stats']['running'] %}
                         <div class="row">
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn btn-link stop_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'stop' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link stop_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'stop' , data['lang']) }}">
                               <i class="fas fa-stop"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn btn-link restart_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'restart' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link restart_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'restart' , data['lang']) }}">
                               <i class="fas fa-sync"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn btn-link kill_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link kill_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                               <i class="fas fa-skull"></i>
                             </a>
                           </div>
@@ -452,31 +416,24 @@
                         {% elif server['stats']['importing']%}
                         <div class="row">
                           <div class="col-12 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link"><i
-                                class="fa fa-spinner fa-spin"></i>
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn btn-link"><i class="fa fa-spinner fa-spin"></i>
                               {{ translate('serverTerm', 'importing', data['lang']) }}</a>
                           </div>
                         </div>
                         {% else %}
                         <div class="row">
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn play_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'start' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn play_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'start' , data['lang']) }}">
                               <i class="fas fa-play"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn clone_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'clone' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn clone_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'clone' , data['lang']) }}">
                               <i class="fas fa-clone"></i>
                             </a>
                           </div>
                           <div class="col-4 px-0">
-                            <a data-id="{{server['server_data']['server_id']}}"
-                              class="btn kill_button actions_serveritem" data-toggle="tooltip"
-                              title="{{ translate('dashboard', 'kill' , data['lang']) }}">
+                            <a data-id="{{server['server_data']['server_id']}}" class="btn kill_button actions_serveritem" data-toggle="tooltip" title="{{ translate('dashboard', 'kill' , data['lang']) }}">
                               <i class="fas fa-skull"></i></a>
                           </div>
                         </div>
@@ -488,15 +445,13 @@
                 </h2>
               </div>
 
-              <div id="collapse-{{server['server_data']['server_id']}}" class="collapse"
-                aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
+              <div id="collapse-{{server['server_data']['server_id']}}" class="collapse" aria-labelledby="heading-{{server['server_data']['server_id']}}" data-parent="#accordionServers">
                 <div class="card-body">
                   <div class="row">
                     <div class="col-6">
                       <h6>{{ translate('dashboard', 'cpuUsage', data['lang']) }}</h6>
                       <div id="m_server_cpu_{{server['server_data']['server_id']}}">
-                        <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                          title="{{server['stats']['cpu']}}">
+                        <div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats']['cpu']}}">
                           <div class="progress-bar
                     {% if server['stats']['cpu'] <= 33 %}
                     bg-success
@@ -505,8 +460,7 @@
                     {% else %}
                     bg-danger
                     {% end %}
-                    " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" aria-valuemin="0"
-                            aria-valuemax="100"></div>
+                    " role="progressbar" style="width: {{server['stats']['cpu']}}%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
                         </div>
                         {{server['stats']['cpu']}}%
                       </div>
@@ -514,8 +468,7 @@
                     <div class="col-6">
                       <h6>{{ translate('dashboard', 'memUsage', data['lang']) }}</h6>
                       <div draggable="false" id="m_server_mem_{{server['server_data']['server_id']}}">
-                        <div class="progress mb-1" data-toggle="tooltip" data-placement="top"
-                          title="{{server['stats']['mem']}}">
+                        <div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats']['mem']}}">
                           <div class="progress-bar
                     {% if server['stats']['mem_percent'] <= 33 %}
                     bg-success
@@ -524,8 +477,7 @@
                     {% else %}
                     bg-danger
                     {% end %}
-                    " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0"
-                            aria-valuemin="0" aria-valuemax="100"></div>
+                    " role="progressbar" style="width: {{server['stats']['mem_percent']}}%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
                         </div>
                         {{server['stats']['mem_percent']}}% -
 
@@ -554,8 +506,7 @@
                         data['lang']) }} <br />
 
                         {% if server['stats']['desc'] != 'False' %}
-                        <div id="desc_id"
-                          style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">
+                        <div id="desc_id" style="overflow-wrap: break-word !important; max-width: 85px !important; overflow: scroll;">
                           {{ server['stats']['desc'] }}</div> <br />
                         {% end %}
 
@@ -796,6 +747,7 @@
       /* Update Motd */
       let motd = "";
       if (server.desc) {
+        m_motd = `<span id="m_input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span>`;
         motd = `<span id="input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span>`;
         m_server_infos = server_infos + '<div id="desc_id" style="word-wrap: break-word; overflow: auto;">' + motd + '</div>' + "<br />";
         server_infos = server_infos + '<div id="desc_id" style="word-wrap: break-word; max-width: 85px !important; overflow: auto;">' + motd + '</div>' + "<br />";
diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html
index b93c0479..4d99f7a6 100644
--- a/app/frontend/templates/public/status.html
+++ b/app/frontend/templates/public/status.html
@@ -44,9 +44,14 @@
             </td>
             <td id="server_motd_{{ server['stats']['server_id']['server_id'] }}">
               {% if server['stats']['desc'] != 'False' %}
-              <img src="/static/assets/images/pack.png" alt="icon" style="-webkit-filter:grayscale(100%); filter:grayscale(100%)" />
-              <span id="input_motd_{{ server['stats']['server_id']['server_id'] }}" class="input_motd">{{
-                server['stats']['desc'] }}</span> <br />
+              <div class="row">
+                <div class="col-auto">
+                  <img src="/static/assets/images/pack.png" alt="icon" style="-webkit-filter:grayscale(100%); filter:grayscale(100%)" />
+                </div>
+                <div class="col-auto">
+                  <span id="input_motd_{{ server['stats']['server_id']['server_id'] }}" class="input_motd">{{ server['stats']['desc'] }}</span>
+                </div>
+              </div>
               {% end %}
             </td>
             <td id="server_version_{{ server['stats']['server_id']['server_id'] }}">
@@ -183,7 +188,7 @@
     m_server_online_status = document.getElementById('m_server_online_status_' + server.id);
 
     /* TODO Update each element */
-    if (server.int_ping_results) {
+    if (server.running) {
       /* Update Players */
       if (server.players) {
         server_players.innerHTML = server.online + ` / ` + server.max + ` {{ translate('dashboard', 'max', data['lang']) }}<br />`
@@ -193,16 +198,18 @@
       var motd = "";
       if (server.desc) {
         if (server.icon) {
-          motd = `<img src="data:image/png;base64,` + server.icon + `" alt="icon" /> `;
+          img_motd = `<img src="data:image/png;base64,` + server.icon + `" alt="icon" /> `;
           m_motd = `<img src="data:image/png;base64,` + server.icon + `" alt="icon" /> `;
         }
         else {
-          motd = `<img src="/static/assets/images/pack.png" alt="icon" /> `;
+          img_motd = `<img src="/static/assets/images/pack.png" alt="icon" /> `;
           m_motd = `<img class="w-25 mr-3" src="/static/assets/images/pack.png" alt="icon" /> `;
         }
 
-        motd = motd + `<span id="input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span> <br />`;
+        desc_motd = `<span id="input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span> <br />`;
         m_motd = m_motd + `<div class="media-body"><span id="m_input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span></div>`;
+
+        motd = `<div class="row"><div class="col-auto">` + img_motd + `</div><div class="col-auto">` + desc_motd + `</div></div>`;
         server_motd.innerHTML = motd;
         m_server_motd.innerHTML = m_motd;
       }
@@ -235,17 +242,31 @@
   }
 
   function update_servers_status(data) {
-    console.log(data);
-    update_one_server_status(data[0]);
+    console.log("update servers");
+    data.forEach(server => {
+      console.log(server);
+      update_one_server_status(server);
+    });
     display_motd();
   }
 
+  function refreshStatus() {
+    let xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = function () {
+      if (this.readyState == 4 && this.status == 200) {
+        var myData = JSON.parse(this.responseText);
+        update_servers_status(myData.data);
+      }
+    };
+    xmlHttp.open('GET', '/api/v2/servers/status', true);
+    xmlHttp.send();
+
+    setTimeout(refreshStatus, 30000);
+  }
+
   $(document).ready(function () {
     console.log("ready!");
-
-    if (webSocket) {
-      webSocket.on('update_server_status', update_servers_status);
-    }
+    refreshStatus();
   }());
 </script>
 
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index 77632762..6513e4e9 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -55,120 +55,7 @@
   <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
   <script src="/static/assets/js/shared/misc.js"></script>
 
-  <script>
-    /* Script for WebSockets */
-    let usingWebSockets = false;
-    let webSocket = null;
-    let websocketTimeoutId = null;
-    // {% if request.protocol == 'https' %}
-    usingWebSockets = true;
 
-    let listenEvents = [];
-    let wsOpen = false;
-    /**
-      * @type {number | null} reconnectorId An interval ID for the reconnector.
-      */
-    let reconnectorId = null;
-    let failedConnectionCounter = 0; // https://stackoverflow.com/a/37038217/15388424
-
-    const wsPageQueryParams = 'page_query_params=' + encodeURIComponent(location.search)
-    const wsPage = 'page=' + encodeURIComponent(location.pathname)
-
-    const sendWssError = () => wsOpen || warn(
-      'WebSockets are required for Crafty to work. This websocket connection has been closed. Are you using a reverse proxy?',
-      'https://docs.craftycontrol.com/pages/getting-started/proxies/',
-      'wssError'
-    )
-
-    function startWebSocket() {
-      console.log('%c[Crafty Controller] %cConnecting the WebSocket', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
-      try {
-        var wsInternal = new WebSocket('wss://' + location.host + '/ws/public?' + wsPage + '&' + wsPageQueryParams);
-        wsInternal.onopen = function () {
-          console.log('opened WebSocket connection:', wsInternal)
-          wsOpen = true;
-          failedConnectionCounter = 0;
-          if (typeof reconnectorId === 'number') {
-            document.querySelectorAll('.wssError').forEach(el => el.remove())
-            clearInterval(reconnectorId);
-            reconnectorId = null;
-          }
-        };
-        wsInternal.onmessage = function (rawMessage) {
-          var message = JSON.parse(rawMessage.data);
-
-          console.log('got message: ', message)
-
-          listenEvents
-            .filter(listenedEvent => listenedEvent.event == message.event)
-            .forEach(listenedEvent => listenedEvent.callback(message.data))
-        };
-        wsInternal.onerror = function (errorEvent) {
-          console.error('WebSocket Error', errorEvent);
-        };
-        wsInternal.onclose = function (closeEvent) {
-          wsOpen = false;
-          console.log('Closed WebSocket', closeEvent);
-
-          if (!document.hidden) {
-            if (typeof reconnectorId !== 'number') {
-              setTimeout(sendWssError, 7000);
-            }
-            console.info("Reconnecting with a timeout of", (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000, "milliseconds");
-            // Discard old websocket and create a new one in 5 seconds
-            wsInternal = null
-            reconnectorId = setTimeout(startWebSocket, (getRandomArbitrary(0, 2 ** failedConnectionCounter - 1) + 5) * 1000)
-
-            failedConnectionCounter++;
-          }
-        };
-
-        webSocket = {
-          on: function (event, callback) {
-            console.log('registered ' + event + ' event');
-            listenEvents.push({ event: event, callback: callback })
-          },
-          emit: function (event, data) {
-            var message = {
-              event: event,
-              data: data
-            }
-
-            wsInternal.send(JSON.stringify(message));
-          },
-          close: function (code, reason) {
-            wsInternal.close(code, reason);
-          },
-          getStatus: function () {
-            return wsInternal.readyState;
-          }
-        }
-      } catch (error) {
-        console.error('Error while making websocket helpers', error);
-        usingWebSockets = false;
-      }
-    }
-
-    startWebSocket();
-    // {% else %}
-    warn('WebSockets are not supported in Crafty if not using the https protocol')
-    // {% end%}
-
-    // Managing Connexions for Multi Tab opened to reduce bandwith usage
-    document.addEventListener("visibilitychange", () => {
-      if (document.visibilityState == "hidden") {
-        websocketTimeoutId = setTimeout(() => {
-          webSocket.close(1000, "Closed due to Inactivity");
-          console.log('%c[Crafty Controller] %cClose Websocket due to Tab not active after 5s', 'font-weight: 900; color: #800080;', 'font-weight: 900; color: #eee;');
-        }, 10000);
-      } else {
-        clearTimeout(websocketTimeoutId)
-        if (webSocket.getStatus() == WebSocket.CLOSED) {
-          startWebSocket();
-        }
-      }
-    });
-  </script>
   <!-- endinject -->
   {% block js %}
   <!-- Custom js for this page -->
diff --git a/app/migrations/stats/20230827_add_icon.py b/app/migrations/stats/20230827_add_icon.py
new file mode 100644
index 00000000..2d7970e8
--- /dev/null
+++ b/app/migrations/stats/20230827_add_icon.py
@@ -0,0 +1,16 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns("server_stats", icon=peewee.CharField(null=True))
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns("server_stats", ["icon"])
+    """
+    Write your rollback migrations here.
+    """

From a63c2dcf003d0b60dd326fc0c991662f4b590f3f Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sat, 2 Sep 2023 22:19:17 +0200
Subject: [PATCH 080/210] Removing saving data realtime => from 5s to 30s

---
 app/classes/shared/server.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 45675de5..17773833 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -253,6 +253,23 @@ class ServerInstance:
                 seconds=5,
                 id="stats_" + str(self.server_id),
             )
+        logger.info(f"Saving server statistics {self.name} every {30} seconds")
+        Console.info(f"Saving server statistics {self.name} every {30} seconds")
+        try:
+            self.server_scheduler.add_job(
+                self.record_server_stats,
+                "interval",
+                seconds=30,
+                id="save_stats_" + str(self.server_id),
+            )
+        except:
+            self.server_scheduler.remove_job("save_" + str(self.server_id))
+            self.server_scheduler.add_job(
+                self.record_server_stats,
+                "interval",
+                seconds=30,
+                id="save_" + str(self.server_id),
+            )
 
     def setup_server_run_command(self):
         # configure the server
@@ -1526,7 +1543,7 @@ class ServerInstance:
             total_players += int(raw_ping_result.get("online"))
             max_players += int(raw_ping_result.get("max"))
 
-            self.record_server_stats()
+            # self.record_server_stats()
 
             if (len(servers_ping) > 0) & (len(WebSocketManager().auth_clients) > 0):
                 try:

From ff1ba23830c1c585bc23a9770bb6e5d389fcba2d Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 2 Sep 2023 19:35:16 -0400
Subject: [PATCH 081/210] Add updates to notifs

---
 app/classes/shared/helpers.py                       |  5 +++--
 app/classes/shared/tasks.py                         | 11 +++++++++++
 .../web/routes/api/crafty/announcements/index.py    | 13 +++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 9c74135d..0f36886a 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -579,8 +579,7 @@ class Helpers:
 
         return version_data
 
-    @staticmethod
-    def get_announcements():
+    def get_announcements(self):
         data = []
         try:
             response = requests.get("https://craftycontrol.com/notify.json", timeout=2)
@@ -588,6 +587,8 @@ class Helpers:
         except Exception as e:
             logger.error(f"Failed to fetch notifications with error: {e}")
 
+        if self.update_available:
+            data.append(self.update_available)
         return data
 
     def get_version_string(self):
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index acdc1cac..4d878066 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -726,12 +726,23 @@ class TasksManager:
     def check_for_updates(self):
         logger.info("Checking for Crafty updates...")
         self.helper.update_available = self.helper.check_remote_version()
+        remote = self.helper.update_available
         if self.helper.update_available:
             logger.info(f"Found new version {self.helper.update_available}")
         else:
             logger.info(
                 "No updates found! You are on the most up to date Crafty version."
             )
+        if self.helper.update_available:
+            self.helper.update_available = {
+                "id": str(remote),
+                "title": f"{remote} Update Available",
+                "date": "",
+                "desc": "Instructions for updating can be found"
+                " by clicking this notification.",
+                "link": "https://docs.craftycontrol.com/pages/"
+                "getting-started/installation/linux/?h=updating#updating-crafty",
+            }
         logger.info("Refreshing Gravatar PFPs...")
         for user in HelperUsers.get_all_users():
             if user.email:
diff --git a/app/classes/web/routes/api/crafty/announcements/index.py b/app/classes/web/routes/api/crafty/announcements/index.py
index 12430725..ff274256 100644
--- a/app/classes/web/routes/api/crafty/announcements/index.py
+++ b/app/classes/web/routes/api/crafty/announcements/index.py
@@ -40,6 +40,8 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
         for item in cleared[:]:
             if item not in res:
                 cleared.remove(item)
+        updata = {"cleared_notifs": ",".join(cleared)}
+        self.controller.users.update_user(auth_data[4]["user_id"], updata)
         if len(cleared) > 0:
             for item in data[:]:
                 if item["id"] in cleared:
@@ -93,7 +95,7 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
         for item in cleared_notifs[:]:
             if item not in res:
                 cleared_notifs.remove(item)
-        if is_valid_uuid(data["id"]):
+        if str(data["id"]) in str(res):
             cleared_notifs.append(data["id"])
         else:
             self.finish_json(200, {"status": "error", "error": "INVALID_DATA"})
@@ -107,12 +109,3 @@ class ApiAnnounceIndexHandler(BaseApiHandler):
                 "data": {},
             },
         )
-
-
-def is_valid_uuid(value):
-    try:
-        uuid.UUID(str(value))
-
-        return True
-    except ValueError:
-        return False

From 5e4560c4610a1b9f50bb2ae55aec59b908638fe2 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 2 Sep 2023 19:35:25 -0400
Subject: [PATCH 082/210] Remove from ajax handler

---
 app/classes/web/ajax_handler.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index efe8d2fa..1c703ecc 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -83,11 +83,6 @@ class AjaxHandler(BaseHandler):
                 except Exception as e:
                     logger.warning(f"Skipping Log Line due to error: {e}")
 
-        elif page == "announcements":
-            data = Helpers.get_announcements()
-            page_data["notify_data"] = data
-            self.render_page("ajax/notify.html", page_data)
-
         elif page == "get_zip_tree":
             path = self.get_argument("path", None)
 

From a983cc88687c566d63db056182951f2b20805266 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 13:20:02 -0400
Subject: [PATCH 083/210] Squash bugs in java imports/bedrock imports

---
 app/classes/shared/main_controller.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index eb067e7e..52e98138 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -354,7 +354,7 @@ class Controller:
                 server_file = create_data["jarfile"]
                 raise NotImplementedError("Not yet implemented")
                 self.import_helper.import_java_zip_server()
-            if create_data["minecraft_java"]:
+            if data["create_type"] == "minecraft_java":
                 _create_server_properties_if_needed(
                     create_data["server_properties_port"],
                 )
@@ -417,6 +417,7 @@ class Controller:
                 else:
                     server_command = f"./{create_data['executable']}"
                 logger.debug("command: " + server_command)
+                server_file = create_data["executable"]
             elif root_create_data["create_type"] == "import_zip":
                 # TODO: Copy files from the zip file to the new server directory
                 raise NotImplementedError("Not yet implemented")
@@ -520,7 +521,7 @@ class Controller:
                 ServersController.set_import(new_server_id)
                 self.import_helper.import_jar_server(
                     create_data["existing_server_path"],
-                    os.path.join(new_server_path, server_fs_uuid),
+                    new_server_path,
                     monitoring_port,
                     new_server_id,
                 )
@@ -534,6 +535,7 @@ class Controller:
                     new_server_path, new_server_id
                 )
             elif root_create_data["create_type"] == "import_server":
+                ServersController.set_import(new_server_id)
                 full_exe_path = os.path.join(new_server_path, create_data["executable"])
                 self.import_helper.import_bedrock_server(
                     create_data["existing_server_path"],
@@ -543,6 +545,7 @@ class Controller:
                     new_server_id,
                 )
             elif root_create_data["create_type"] == "import_zip":
+                ServersController.set_import(new_server_id)
                 full_exe_path = os.path.join(new_server_path, create_data["executable"])
                 self.import_helper.import_bedrock_zip_server(
                     create_data["zip_path"],

From 1898fd1945101e5cd6849affd1fc1c8158a0802c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 13:22:17 -0400
Subject: [PATCH 084/210] Squash upload bug created in commit 27f6c4c

---
 app/classes/web/upload_handler.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/classes/web/upload_handler.py b/app/classes/web/upload_handler.py
index adce3ab9..88510a80 100644
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@@ -25,11 +25,13 @@ class UploadHandler(BaseHandler):
         controller: Controller = None,
         tasks_manager=None,
         translator=None,
+        file_helper=None,
     ):
         self.helper = helper
         self.controller = controller
         self.tasks_manager = tasks_manager
         self.translator = translator
+        self.file_helper = file_helper
 
     def prepare(self):
         # Class & Function Defination

From 7ff77c598f15093dd693c8928b72257ce68fd1f6 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 13:22:48 -0400
Subject: [PATCH 085/210] Add upload support for apiv2

This should get changed once upload handler is gone.
---
 app/classes/web/routes/api/crafty/imports/index.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/classes/web/routes/api/crafty/imports/index.py b/app/classes/web/routes/api/crafty/imports/index.py
index 3bcae9af..0e88f484 100644
--- a/app/classes/web/routes/api/crafty/imports/index.py
+++ b/app/classes/web/routes/api/crafty/imports/index.py
@@ -14,6 +14,7 @@ files_get_schema = {
     "properties": {
         "page": {"type": "string", "minLength": 1},
         "folder": {"type": "string"},
+        "upload": {"type": "boolean", "default": "False"},
         "unzip": {"type": "boolean", "default": "True"},
     },
     "additionalProperties": False,
@@ -59,6 +60,11 @@ class ApiImportFilesIndexHandler(BaseApiHandler):
         user_id = auth_data[4]["user_id"]
         root_path = False
         if data["unzip"]:
+            # This is awful. Once uploads go to return
+            # JSON we need to remove this and just send
+            # the path.
+            if data["upload"]:
+                folder = os.path.join(self.controller.project_root, "imports", folder)
             if Helpers.check_file_exists(folder):
                 folder = self.file_helper.unzip_server(folder, user_id)
                 root_path = True

From 90905a70f5b9a2b2643461b62c603e9a2202df45 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 13:23:18 -0400
Subject: [PATCH 086/210] General bug fixes/upload support

---
 .../static/assets/js/shared/root-dir.js       | 141 ++++++++
 .../templates/server/bedrock_wizard.html      | 163 +--------
 app/frontend/templates/server/wizard.html     | 336 +++++-------------
 3 files changed, 234 insertions(+), 406 deletions(-)
 create mode 100644 app/frontend/static/assets/js/shared/root-dir.js

diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js
new file mode 100644
index 00000000..9f3f14ac
--- /dev/null
+++ b/app/frontend/static/assets/js/shared/root-dir.js
@@ -0,0 +1,141 @@
+
+function show_file_tree() {
+        $("#dir_select").modal();
+}
+function getDirView(event = false) {
+    if (event) {
+        try {
+            path = event.target.parentElement.getAttribute('data-path');
+            if (event.target.parentElement.classList.contains('clicked')) {
+
+                if ($(`#${path}span`).hasClass('files-tree-title')) {
+                    $(`#${path}ul`).toggleClass("d-block");
+                    $(`#${path}span`).toggleClass("tree-caret-down");
+                }
+                return;
+            } else {
+                getTreeView(path);
+            }
+        } catch {
+            console.log("Well that failed");
+        }
+    } else {
+        if ($("#root_files_button").hasClass("clicked")) {
+            path = $("#zip_server_path").val();
+            getTreeView(path, true);
+        } else {
+            path = $("#file-uploaded").val();
+            getTreeView(path, true, true);
+        }
+    }
+
+}
+
+async function getTreeView(path, unzip = false, upload = false) {
+    var token = getCookie("_xsrf");
+    console.log("IN TREE VIEW")
+    console.log({ "page": "import", "folder": path, "upload": upload, "unzip": unzip });
+    let res = await fetch(`/api/v2/import/file/unzip/`, {
+        method: 'POST',
+        headers: {
+            'X-XSRFToken': token
+        },
+        body: JSON.stringify({ "page": "import", "folder": path, "upload": upload, "unzip": unzip }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+        console.log(responseData);
+        process_tree_response(responseData);
+        var x = document.querySelector('.bootbox');
+        if (x) {
+            x.remove()
+        }
+        var x = document.querySelector('.modal-backdrop');
+        if (x) {
+            x.remove()
+        }
+        show_file_tree();
+
+    } else {
+
+        bootbox.alert({
+            title: responseData.status,
+            message: responseData.error
+        });
+    }
+}
+
+function process_tree_response(response) {
+    const styles = window.getComputedStyle(document.getElementById("lower_half"));
+    //If this value is still hidden we know the user is executing a zip import and not an upload
+    if (styles.visibility === "hidden") {
+        document.getElementById('zip_submit').disabled = false;
+    } else {
+        document.getElementById('upload_submit').disabled = false;
+    }
+    let path = response.data.root_path.path;
+    $(".root-input").val(response.data.root_path.path);
+    text = `<ul class="tree-nested d-block" id="${path}ul">`;
+    Object.entries(response.data).forEach(([key, value]) => {
+        if (key === "root_path" || key === "db_stats") {
+            //continue is not valid in for each. Return acts as a continue.
+            return;
+        }
+
+        let dpath = value.path;
+        let filename = key;
+        if (value.dir) {
+            text += `<li class="tree-item" id="${dpath}li"  data-path="${dpath}">
+                    <div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
+                    <input type="radio" name="root_path" value="${dpath}">
+                    <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
+                      <i style="color: var(--info);" class="far fa-folder"></i>
+                      <i style="color: var(--info);" class="far fa-folder-open"></i>
+                      ${filename}
+                      </span>
+                    </input></div><li>`
+        } else {
+            text += `<li
+          class="d-block tree-ctx-item tree-file"
+          data-path="${dpath}"
+          data-name="${filename}"
+          onclick="" id="${dpath}li"><input type='radio' class="checkBoxClass d-none file-check" name='root_path' value="${dpath}" disabled><span style="margin-right: 6px;">
+          <i class="far fa-file"></i></span></input>${filename}</li>
+      `
+        }
+    });
+    text += `</ul>`;
+
+    if (response.data.root_path.top) {
+        try {
+            document.getElementById('main-tree-div').innerHTML += text;
+            document.getElementById('main-tree').parentElement.classList.add("clicked");
+        } catch {
+            document.getElementById('files-tree').innerHTML = text;
+        }
+    } else {
+        try {
+            document.getElementById(path + "span").classList.add('tree-caret-down');
+            document.getElementById(path).innerHTML += text;
+            document.getElementById(path).classList.add("clicked");
+        } catch {
+            console.log("Bad")
+        }
+
+        var toggler = document.getElementById(path + "span");
+
+        if (toggler.classList.contains('files-tree-title')) {
+            document.getElementById(path + "span").addEventListener("click", function caretListener() {
+                document.getElementById(path + "ul").classList.toggle("d-block");
+                document.getElementById(path + "span").classList.toggle("tree-caret-down");
+            });
+        }
+    }
+}
+
+function getToggleMain(event) {
+    path = event.target.parentElement.getAttribute('data-path');
+    document.getElementById("files-tree").classList.toggle("d-block");
+    document.getElementById(path + "span").classList.toggle("tree-caret-down");
+    document.getElementById(path + "span").classList.toggle("tree-caret");
+}
\ No newline at end of file
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index c10285a1..d91a1eb5 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -184,7 +184,7 @@
 
           <h4>{{ translate('serverWizard', 'importZip', data['lang']) }}</h4>
           <br />
-          <form name="zip" id="import-zip" method="post" class="server-wizard">\
+          <form name="zip" id="import-zip" method="post" class="server-wizard">
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
@@ -265,7 +265,7 @@
                   <div class="modal-body">
                     <div class="tree-ctx-item" id="main-tree-div" data-path=""
                       style="overflow: scroll; max-height:75%;">
-                      <input type="radio" id="main-tree-input" name="root_path" value="" checked>
+                      <input type="radio" class="root-input" id="main-tree-input" name="root_path" value="" checked>
                       <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                         <i class="far fa-folder"></i>
                         <i class="far fa-folder-open"></i>
@@ -397,7 +397,7 @@
                     <div class="modal-body">
                       <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
                         style="overflow: scroll; max-height:75%;">
-                        <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
+                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked>
                         <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                           <i class="far fa-folder"></i>
                           <i class="far fa-folder-open"></i>
@@ -555,7 +555,7 @@
     xmlHttpRequest.addEventListener('load', (event) => {
       if (event.target.responseText == 'success') {
         console.log('Upload for file', file.name, 'was successful!')
-        document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
+        document.getElementById("upload_input").innerHTML =  `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
         document.getElementById("lower_half").style.visibility = "visible";
       }
       else {
@@ -581,7 +581,7 @@
     if (file) {
       upload = true;
       if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+        document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir"><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
       } else {
         document.getElementById('root_upload_button').classList.add('clicked')
       }
@@ -628,18 +628,15 @@
   document.getElementById("root_files_button").addEventListener("click", function (event) {
     if (document.forms["zip"]["server_path"].value != "") {
       if (document.getElementById('root_files_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate('serverFiles', 'files', data['lang']) }}</span></input>'
+        show_file_tree();
+        return;
       } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-      let path = document.forms["zip"]["server_path"].value;
-      console.log(document.forms["zip"]["server_path"].value)
-      var token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      console.log("TEST");
       getDirView();
     } else {
       bootbox.alert("You must input a path before selecting this button");
@@ -667,151 +664,6 @@
     });
   }
 
-  function show_file_tree() {
-    if (upload) {
-      $("#dir_upload_select").modal();
-    } else {
-      $("#dir_select").modal();
-    }
-  }
-  function getDirView(event=false) {
-    if(event){
-      try{
-      path = event.target.parentElement.getAttribute('data-path');
-    if (event.target.parentElement.classList.contains('clicked')) {
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        console.log("Toggling")
-        console.log(path + "ul")
-        console.log($(`#${path}ul`).attr("data-path"))
-        document.getElementById(path + "ul").classList.toggle("d-block");
-        document.getElementById(path + "span").classList.toggle("tree-caret-down");
-      }
-      return;
-    } else {
-      getTreeView(path);
-    }
-    } catch {
-      console.log("Well that failed");
-    }
-    }else{
-      path = $("#zip_server_path").val();
-      console.log("path")
-      getTreeView(path, true);
-    }
-
-  }
-
-  async function getTreeView(path, unzip=false) {
-    var token = getCookie("_xsrf");
-    console.log("IN TREE VIEW")
-    console.log({ "page": "import", "folder": path});
-    let res = await fetch(`/api/v2/import/file/unzip/`, {
-      method: 'POST',
-      headers: {
-        'X-XSRFToken': token
-      },
-      body: JSON.stringify({ "page": "import", "folder": path, "unzip": unzip }),
-    });
-    let responseData = await res.json();
-    if (responseData.status === "ok") {
-      console.log(responseData);
-      process_tree_response(responseData);
-      var x = document.querySelector('.bootbox');
-      if (x) {
-        x.remove()
-      }
-      var x = document.querySelector('.modal-backdrop');
-      if (x) {
-        x.remove()
-      }
-      show_file_tree();
-
-    } else {
-
-      bootbox.alert({
-        title: responseData.status,
-        message: responseData.error
-      });
-    }
-  }
-
-  function process_tree_response(response) {
-    const styles = window.getComputedStyle(document.getElementById("lower_half"));
-      //If this value is still hidden we know the user is executing a zip import and not an upload
-      if (styles.visibility === "hidden") {
-        document.getElementById('zip_submit').disabled = false;
-      } else {
-        document.getElementById('upload_submit').disabled = false;
-      }
-    let path = response.data.root_path.path;
-    text = `<ul class="tree-nested d-block" id="${path}ul">`;
-    Object.entries(response.data).forEach(([key, value]) => {
-      if (key === "root_path" || key === "db_stats") {
-        //continue is not valid in for each. Return acts as a continue.
-        return;
-      }
-      let checked = ""
-      let dpath = value.path;
-      let filename = key;
-      if (value.dir) {
-        text += `<li class="tree-item" id="${dpath}li"  data-path="${dpath}">
-                    <div id="${dpath}" data-path="${dpath}" data-name="${filename}" class="tree-caret tree-ctx-item tree-folder">
-                    <input type="radio" name="root_path" value="${dpath}">
-                    <span id="${dpath}span" class="files-tree-title" data-path="${dpath}" data-name="${filename}" onclick="getDirView(event)">
-                      <i style="color: var(--info);" class="far fa-folder"></i>
-                      <i style="color: var(--info);" class="far fa-folder-open"></i>
-                      ${filename}
-                      </span>
-                    </input></div><li>`
-      } else {
-        text += `<li
-          class="d-block tree-ctx-item tree-file"
-          data-path="${dpath}"
-          data-name="${filename}"
-          onclick="" id="${dpath}li"><input type='radio' class="checkBoxClass d-none file-check" name='root_path' value="${dpath}" disabled><span style="margin-right: 6px;">
-          <i class="far fa-file"></i></span></input>${filename}</li>
-      `
-      }
-    });
-      text += `</ul>`;
-
-    if(response.data.root_path.top){
-      try {
-          document.getElementById('main-tree-div').innerHTML += text;
-          document.getElementById('main-tree').parentElement.classList.add("clicked");
-        } catch {
-          document.getElementById('files-tree').innerHTML = text;
-        }
-    }else{
-      try {
-            document.getElementById(path + "span").classList.add('tree-caret-down');
-            document.getElementById(path).innerHTML += text;
-            document.getElementById(path).classList.add("clicked");
-          } catch {
-            console.log("Bad")
-          }
-
-          var toggler = document.getElementById(path + "span");
-
-          if (toggler.classList.contains('files-tree-title')) {
-            document.getElementById(path + "span").addEventListener("click", function caretListener() {
-              document.getElementById(path + "ul").classList.toggle("d-block");
-              document.getElementById(path + "span").classList.toggle("tree-caret-down");
-            });
-          }
-    }
-  }
-
-  function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    document.getElementById("files-tree").classList.toggle("d-block");
-    document.getElementById(path + "span").classList.toggle("tree-caret-down");
-    document.getElementById(path + "span").classList.toggle("tree-caret");
-  }
-
   $('#file').change(function () {
     console.log("File changed");
     if ($('#file').val()) {
@@ -1002,4 +854,5 @@
 
   });
 </script>
+<script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
 {% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index f5847e15..3acecd45 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -197,7 +197,7 @@
           <br />
           <p class="card-description">
 
-          <form class="server-wizard" id="jar-import">
+          <form class="server-wizard" id="import-jar">
             {% raw xsrf_form_html() %}
             <input type="hidden" value="import_jar" name="create_type">
             <div class="row">
@@ -319,7 +319,7 @@
                   <div class="form-group">
                     <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{
                         translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
-                    <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server.zip" required>
+                    <input type="text" class="form-control" id="zip_server_path" name="server_path" placeholder="/var/opt/server.zip" required>
                   </div>
                 </div>
 
@@ -416,7 +416,7 @@
                       </div>
                       <div class="modal-body">
                         <div class="tree-ctx-item" id="main-tree-div" data-path="" style="overflow: scroll; max-height:75%;">
-                          <input type="radio" id="main-tree-input" name="root_path" value="" checked>
+                          <input type="radio" class="root-input" id="main-tree-input" name="root_path" value="" checked>
                           <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                             <i class="far fa-folder"></i>
                             <i class="far fa-folder-open"></i>
@@ -513,71 +513,73 @@
                 <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1" max="65535" required>
               </div>
 
-              <div class="form-group">
-                <div id="accordion-3">
-                  <div class="card">
-                    <div class="card-header p-2" id="Role-3">
-                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
-                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
-                        data['lang'])
-                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                          data['lang']) }}</small>
-                      </p>
-                    </div>
-                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
-                      <div class="card-body scroll">
-                        <div class="form-group">
-                          {% for r in data['roles'] %}
-                          <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
-                              {{ r['role_name'].capitalize() }}</label></span>
-                          {% end %}
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div style="visibility: hidden;">
                 <div class="form-group">
-                  <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
-                </div>
-              </div>
-                <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
-                  <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard',
-                          'selectZipDir', data['lang']) }}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                          <span aria-hidden="true">&times;</span>
-                        </button>
+                  <div id="accordion-3">
+                    <div class="card">
+                      <div class="card-header p-2" id="Role-3">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
+                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                          data['lang'])
+                          }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                            data['lang']) }}</small>
+                        </p>
                       </div>
-                      <div class="modal-body">
-                        <div class="tree-ctx-item" id="main-tree-div-upload" data-path="" style="overflow: scroll; max-height:75%;">
-                          <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
-                          <span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir" data-path="">
-                            <i class="far fa-folder"></i>
-                            <i class="far fa-folder-open"></i>
-                            {{ translate('serverFiles', 'files', data['lang']) }}
-                          </span>
-                          </input>
+                      <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                        <div class="card-body scroll">
+                          <div class="form-group">
+                            {% for r in data['roles'] %}
+                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                                {{ r['role_name'].capitalize() }}</label></span>
+                            {% end %}
+                          </div>
                         </div>
                       </div>
-                      <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{
-                          translate('serverWizard', 'close', data['lang']) }}</button>
-                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
-                          translate('serverWizard', 'save', data['lang']) }}</button>
-                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div style="visibility: hidden;">
+                  <div class="form-group">
+                    <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
+                  </div>
+                </div>
+                <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                aria-hidden="true">
+                <div class="modal-dialog" role="document">
+                  <div class="modal-content">
+                    <div class="modal-header">
+                      <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard',
+                        'selectZipDir', data['lang']) }}</h5>
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                      </button>
+                    </div>
+                    <div class="modal-body">
+                      <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
+                        style="overflow: scroll; max-height:75%;">
+                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked>
+                        <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                          <i class="far fa-folder"></i>
+                          <i class="far fa-folder-open"></i>
+                          {{ translate('serverFiles', 'files', data['lang']) }}
+                        </span>
+                        </input>
+                      </div>
+                    </div>
+                    <div class="modal-footer">
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">{{
+                        translate('serverWizard', 'close', data['lang']) }}</button>
+                      <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
+                        translate('serverWizard', 'save', data['lang']) }}</button>
                     </div>
                   </div>
                 </div>
               </div>
-              <button id="upload_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
-                }}</button>
-              <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
-                data['lang'])
-                }}</button>
+            </div>
+            <button id="upload_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+              }}</button>
+            <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
+              data['lang'])
+              }}</button>
             </div>
           </form>
           </p>
@@ -760,35 +762,41 @@
 {% end %}
 
 {% block js %}
-
 <script>
-  document.getElementById("root_files_button").addEventListener("click", function () {
+    document.getElementById("root_files_button").addEventListener("click", function (event) {
     if (document.forms["zip"]["server_path"].value != "") {
       if (document.getElementById('root_files_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+        show_file_tree();
+        return;
       } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-      path = document.forms["zip"]["server_path"].value;
-      console.log(document.forms["zip"]["server_path"].value)
       var token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/unzip_server?id=-1&path=' + encodeURIComponent(path),
-      });
+      console.log("CALLING DIR")
+      getDirView();
     } else {
       bootbox.alert("You must input a path before selecting this button");
     }
-</script>
-{% end %}
-
-{% block js %}
-<script>
+  });
+  document.getElementById("root_upload_button").addEventListener("click", function (event) {
+      if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+        show_file_tree();
+        return;
+      } else {
+        document.getElementById('root_upload_button').classList.add('clicked')
+      }
+      var token = getCookie("_xsrf");
+      var dialog = bootbox.dialog({
+        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+        closeButton: false
+      });
+      console.log("CALLING DIR")
+      getDirView();
+  });
     var upload = false;
     var file;
     function sendFile() {
@@ -821,7 +829,7 @@
       xmlHttpRequest.addEventListener('load', (event) => {
         if (event.target.responseText == 'success') {
           console.log('Upload for file', file.name, 'was successful!')
-          document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
+          document.getElementById("upload_input").innerHTML = `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
           document.getElementById("lower_half").style.visibility = "visible";
           document.getElementById("lower_half").hidden = false;
         }
@@ -843,55 +851,8 @@
       }, false);
       xmlHttpRequest.send(file);
     }
-
-
-    document.getElementById("root_files_button").addEventListener("click", function () {
-      if (document.forms["zip"]["server_path"].value != "") {
-        if (document.getElementById('root_files_button').classList.contains('clicked')) {
-          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-        } else {
-          document.getElementById('root_files_button').classList.add('clicked')
-        }
-        path = document.forms["zip"]["server_path"].value;
-        console.log(document.forms["zip"]["server_path"].value)
-        var token = getCookie("_xsrf");
-        var dialog = bootbox.dialog({
-          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-          closeButton: false
-        });
-        $.ajax({
-          type: "POST",
-          headers: { 'X-XSRFToken': token },
-          url: '/ajax/unzip_server?id=-1&path=' + encodeURIComponent(path),
-        });
-      } else {
-        bootbox.alert("You must input a path before selecting this button");
-      }
-    });
-
-    document.getElementById("root_upload_button").addEventListener("click", function () {
-      if (file) {
-        upload = true;
-        if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-          document.getElementById('main-tree-div-upload').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree-upload" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-        } else {
-          document.getElementById('root_upload_button').classList.add('clicked')
-        }
-        var token = getCookie("_xsrf");
-        var dialog = bootbox.dialog({
-          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-          closeButton: false
-        });
-        $.ajax({
-          type: "POST",
-          headers: { 'X-XSRFToken': token },
-          url: '/ajax/unzip_server?id=-1&file=' + encodeURIComponent(file.name),
-        });
-      } else {
-        bootbox.alert("You must input a path before selecting this button");
-      }
-    });
 </script>
+<script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
 
 <script>
       function replacer(key, value) {
@@ -1131,14 +1092,6 @@
       });
     }
 
-    function show_file_tree() {
-      if (upload) {
-        console.log("upload true")
-        $("#dir_upload_select").modal();
-      } else {
-        $("#dir_select").modal();
-      }
-    }
 
     function check_sizes(a, b, changed) {
       max_mem = parseFloat(a.val());
@@ -1151,125 +1104,6 @@
       }
     }
 
-    function getTreeView(path) {
-      const styles = window.getComputedStyle(document.getElementById("lower_half"));
-      //If this value is still hidden we know the user is executing a zip import and not an upload
-      if (styles.visibility === "hidden") {
-        document.getElementById('zip_submit').disabled = false;
-      } else {
-        document.getElementById('upload_submit').disabled = false;
-      }
-      path = path
-
-      $.ajax({
-        type: "GET",
-        url: '/ajax/get_zip_tree?id=-1&path=' + path,
-        dataType: 'text',
-        success: function (data) {
-          console.log("got response:");
-          console.log(data);
-
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
-          if (styles.visibility === "hidden") {
-            try {
-              document.getElementById('main-tree-div').innerHTML += text;
-              document.getElementById('main-tree').parentElement.classList.add("clicked");
-            } catch {
-              document.getElementById('files-tree').innerHTML = text;
-            }
-          } else {
-            try {
-              document.getElementById('main-tree-div-upload').innerHTML += text;
-              document.getElementById('main-tree-upload').parentElement.classList.add("clicked");
-            } catch {
-              document.getElementById('files-tree').innerHTML = text;
-            }
-          }
-
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-        },
-      });
-    }
-
-    function getToggleMain(event) {
-      path = event.target.parentElement.getAttribute('data-path');
-      document.getElementById("files-tree").classList.toggle("d-block");
-      document.getElementById(path + "span").classList.toggle("tree-caret-down");
-      document.getElementById(path + "span").classList.toggle("tree-caret");
-    }
-
-
-    function getDirView(event) {
-      path = event.target.parentElement.getAttribute('data-path');
-
-      if (document.getElementById(path).classList.contains('clicked')) {
-
-        var toggler = document.getElementById(path + "span");
-
-        if (toggler.classList.contains('files-tree-title')) {
-          document.getElementById(path + "ul").classList.toggle("d-block");
-          document.getElementById(path + "span").classList.toggle("tree-caret-down");
-        }
-        return;
-      } else {
-        $.ajax({
-          type: "GET",
-          url: '/ajax/get_zip_dir?id=-1&path=' + path,
-          dataType: 'text',
-          success: function (data) {
-            console.log("got response:");
-
-            dataArr = data.split('\n');
-            serverDir = dataArr.shift(); // Remove & return first element (server directory)
-            text = dataArr.join('\n');
-
-            try {
-              document.getElementById(path + "span").classList.add('tree-caret-down');
-              document.getElementById(path).innerHTML += text;
-              document.getElementById(path).classList.add("clicked");
-            } catch {
-              console.log("Bad")
-            }
-
-            var toggler = document.getElementById(path);
-
-            if (toggler.classList.contains('files-tree-title')) {
-              document.getElementById(path + "span").addEventListener("click", function caretListener() {
-                document.getElementById(path + "ul").classList.toggle("d-block");
-                document.getElementById(path + "span").classList.toggle("tree-caret-down");
-              });
-            }
-          },
-        });
-      }
-    }
-    if (webSocket) {
-      webSocket.on('send_temp_path', function (data) {
-        setTimeout(function () {
-          var x = document.querySelector('.bootbox');
-          if (x) {
-            x.remove()
-          }
-          var x = document.querySelector('.modal-backdrop');
-          if (x) {
-            x.remove()
-          }
-          document.getElementById('main-tree-input').setAttribute('value', data.path)
-          document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
-          getTreeView(data.path);
-          show_file_tree();
-
-          $("#root_files_button").attr("disabled", "disabled");
-          $("#root_upload_button").attr("disabled", "disabled");
-
-        }, 5000);
-      });
-    }
-
     function refreshCache() {
       let token = getCookie("_xsrf")
       document.getElementById("refresh-cache").classList.add("fa-spin")

From 859a1737f350566db8d730f46828c7d2397f8161 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 15:26:04 -0400
Subject: [PATCH 087/210] Change link to json

---
 app/classes/shared/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 0f36886a..5955548e 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -582,7 +582,7 @@ class Helpers:
     def get_announcements(self):
         data = []
         try:
-            response = requests.get("https://craftycontrol.com/notify.json", timeout=2)
+            response = requests.get("https://craftycontrol.com/notify", timeout=2)
             data = json.loads(response.content)
         except Exception as e:
             logger.error(f"Failed to fetch notifications with error: {e}")

From 92a9fffafcd43dda9a97d44dcd5533aa996978cc Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 15:26:13 -0400
Subject: [PATCH 088/210] Make update notif point to release notes

---
 app/classes/shared/tasks.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 4d878066..a117452f 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -738,10 +738,8 @@ class TasksManager:
                 "id": str(remote),
                 "title": f"{remote} Update Available",
                 "date": "",
-                "desc": "Instructions for updating can be found"
-                " by clicking this notification.",
-                "link": "https://docs.craftycontrol.com/pages/"
-                "getting-started/installation/linux/?h=updating#updating-crafty",
+                "desc": "Release notes are available by clicking this notification.",
+                "link": "https://gitlab.com/crafty-controller/crafty-4/-/releases",
             }
         logger.info("Refreshing Gravatar PFPs...")
         for user in HelperUsers.get_all_users():

From afb7b91b7af2d97eb62be4bd71a328a702387ae5 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 16:15:38 -0400
Subject: [PATCH 089/210] Add files functions to API v2

---
 app/classes/web/routes/api/api_handlers.py    |  12 +
 .../web/routes/api/servers/server/files.py    | 465 ++++++++++++++++--
 .../templates/panel/server_files.html         | 204 ++++----
 3 files changed, 544 insertions(+), 137 deletions(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 102161ab..1b4cb487 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -34,6 +34,8 @@ from app.classes.web.routes.api.servers.server.backups.backup.index import (
 )
 from app.classes.web.routes.api.servers.server.files import (
     ApiServersServerFilesIndexHandler,
+    ApiServersServerFilesCreateHandler,
+    ApiServersServerFilesZipHandler,
 )
 from app.classes.web.routes.api.servers.server.tasks.task.children import (
     ApiServersServerTasksTaskChildrenHandler,
@@ -154,6 +156,16 @@ def api_handlers(handler_args):
             ApiServersServerFilesIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/servers/([0-9]+)/files/create/?",
+            ApiServersServerFilesCreateHandler,
+            handler_args,
+        ),
+        (
+            r"/api/v2/servers/([0-9]+)/files/zip/?",
+            ApiServersServerFilesZipHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/tasks/?",
             ApiServersServerTasksIndexHandler,
diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index becd3681..a81d29f6 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -15,12 +15,52 @@ files_get_schema = {
     "type": "object",
     "properties": {
         "page": {"type": "string", "minLength": 1},
+        "path": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+files_patch_schema = {
+    "type": "object",
+    "properties": {
+        "path": {"type": "string"},
+        "contents": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+files_unzip_schema = {
+    "type": "object",
+    "properties": {
         "folder": {"type": "string"},
     },
     "additionalProperties": False,
     "minProperties": 1,
 }
 
+files_create_schema = {
+    "type": "object",
+    "properties": {
+        "parent": {"type": "string"},
+        "name": {"type": "string"},
+        "directory": {"type": "boolean"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+files_rename_schema = {
+    "type": "object",
+    "properties": {
+        "path": {"type": "string"},
+        "new_name": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
 file_delete_schema = {
     "type": "object",
     "properties": {
@@ -73,7 +113,7 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             )
         if not Helpers.validate_traversal(
             self.controller.servers.get_server_data_by_id(server_id)["path"],
-            data["folder"],
+            data["path"],
         ):
             return self.finish_json(
                 400,
@@ -83,60 +123,71 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
                     "error_data": str(e),
                 },
             )
-        # TODO: limit some columns for specific permissions?
-        folder = data["folder"]
-        return_json = {
-            "root_path": {
-                "path": folder,
-                "top": data["folder"]
-                == self.controller.servers.get_server_data_by_id(server_id)["path"],
+        if os.path.isdir(data["path"]):
+            # TODO: limit some columns for specific permissions?
+            folder = data["path"]
+            return_json = {
+                "root_path": {
+                    "path": folder,
+                    "top": data["path"]
+                    == self.controller.servers.get_server_data_by_id(server_id)["path"],
+                }
             }
-        }
 
-        dir_list = []
-        unsorted_files = []
-        file_list = os.listdir(folder)
-        for item in file_list:
-            if os.path.isdir(os.path.join(folder, item)):
-                dir_list.append(item)
-            else:
-                unsorted_files.append(item)
-        file_list = sorted(dir_list, key=str.casefold) + sorted(
-            unsorted_files, key=str.casefold
-        )
-        for raw_filename in file_list:
-            filename = html.escape(raw_filename)
-            rel = os.path.join(folder, raw_filename)
-            dpath = os.path.join(folder, filename)
-            if str(dpath) in self.controller.management.get_excluded_backup_dirs(
-                server_id
-            ):
-                if os.path.isdir(rel):
-                    return_json[filename] = {
-                        "path": dpath,
-                        "dir": True,
-                        "excluded": True,
-                    }
+            dir_list = []
+            unsorted_files = []
+            file_list = os.listdir(folder)
+            for item in file_list:
+                if os.path.isdir(os.path.join(folder, item)):
+                    dir_list.append(item)
                 else:
-                    return_json[filename] = {
-                        "path": dpath,
-                        "dir": False,
-                        "excluded": True,
-                    }
-            else:
-                if os.path.isdir(rel):
-                    return_json[filename] = {
-                        "path": dpath,
-                        "dir": True,
-                        "excluded": False,
-                    }
+                    unsorted_files.append(item)
+            file_list = sorted(dir_list, key=str.casefold) + sorted(
+                unsorted_files, key=str.casefold
+            )
+            for raw_filename in file_list:
+                filename = html.escape(raw_filename)
+                rel = os.path.join(folder, raw_filename)
+                dpath = os.path.join(folder, filename)
+                if str(dpath) in self.controller.management.get_excluded_backup_dirs(
+                    server_id
+                ):
+                    if os.path.isdir(rel):
+                        return_json[filename] = {
+                            "path": dpath,
+                            "dir": True,
+                            "excluded": True,
+                        }
+                    else:
+                        return_json[filename] = {
+                            "path": dpath,
+                            "dir": False,
+                            "excluded": True,
+                        }
                 else:
-                    return_json[filename] = {
-                        "path": dpath,
-                        "dir": False,
-                        "excluded": False,
-                    }
-        self.finish_json(200, {"status": "ok", "data": return_json})
+                    if os.path.isdir(rel):
+                        return_json[filename] = {
+                            "path": dpath,
+                            "dir": True,
+                            "excluded": False,
+                        }
+                    else:
+                        return_json[filename] = {
+                            "path": dpath,
+                            "dir": False,
+                            "excluded": False,
+                        }
+            self.finish_json(200, {"status": "ok", "data": return_json})
+        else:
+            try:
+                with open(data["path"], encoding="utf-8") as file:
+                    file_contents = file.read()
+            except UnicodeDecodeError as ex:
+                self.finish_json(
+                    400,
+                    {"status": "error", "error": "DECODE_ERROR", "error_data": str(ex)},
+                )
+            self.finish_json(200, {"status": "ok", "data": file_contents})
 
     def delete(self, server_id: str):
         auth_data = self.authenticate_user()
@@ -190,3 +241,315 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
         else:
             FileHelpers.del_file(data["filename"])
         return self.finish_json(200, {"status": "ok"})
+
+    def patch(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_patch_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            data["path"],
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        file_path = Helpers.get_os_understandable_path(data["path"])
+        file_contents = data["contents"]
+        # Open the file in write mode and store the content in file_object
+        with open(file_path, "w", encoding="utf-8") as file_object:
+            file_object.write(file_contents)
+        return self.finish_json(200, {"status": "ok"})
+
+    def put(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_create_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        path = os.path.join(data["parent"], data["name"])
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            path,
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        if Helpers.check_path_exists(os.path.abspath(path)):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "FILE EXISTS",
+                    "error_data": str(e),
+                },
+            )
+        if data["directory"]:
+            os.mkdir(path)
+        else:
+            # Create the file by opening it
+            with open(path, "w", encoding="utf-8") as file_object:
+                file_object.close()
+        return self.finish_json(200, {"status": "ok"})
+
+
+class ApiServersServerFilesCreateHandler(BaseApiHandler):
+    def patch(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_rename_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        path = data["path"]
+        new_item_name = data["new_name"]
+        new_item_path = os.path.join(os.path.split(path)[0], new_item_name)
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            path,
+        ) and not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            new_item_path,
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        if Helpers.check_path_exists(os.path.abspath(new_item_path)):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "FILE EXISTS",
+                    "error_data": {},
+                },
+            )
+
+        os.rename(path, new_item_path)
+        return self.finish_json(200, {"status": "ok"})
+
+    def put(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_create_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        path = os.path.join(data["parent"], data["name"])
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            path,
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        if Helpers.check_path_exists(os.path.abspath(path)):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "FILE EXISTS",
+                    "error_data": str(e),
+                },
+            )
+        if data["directory"]:
+            os.mkdir(path)
+        else:
+            # Create the file by opening it
+            with open(path, "w", encoding="utf-8") as file_object:
+                file_object.close()
+        return self.finish_json(200, {"status": "ok"})
+
+
+class ApiServersServerFilesZipHandler(BaseApiHandler):
+    def post(self, server_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if server_id not in [str(x["server_id"]) for x in auth_data[0]]:
+            # if the user doesn't have access to the server, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if (
+            EnumPermissionsServer.FILES
+            not in self.controller.server_perms.get_user_id_permissions_list(
+                auth_data[4]["user_id"], server_id
+            )
+        ):
+            # if the user doesn't have Files permission, return an error
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, files_unzip_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        folder = data["folder"]
+        user_id = auth_data[4]["user_id"]
+        if not Helpers.validate_traversal(
+            self.controller.servers.get_server_data_by_id(server_id)["path"],
+            folder,
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": str(e),
+                },
+            )
+        if Helpers.check_file_exists(folder):
+            folder = self.file_helper.unzip_file(folder, user_id)
+        else:
+            if user_id:
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "FILE_DOES_NOT_EXIST",
+                        "error_data": str(e),
+                    },
+                )
+        return self.finish_json(200, {"status": "ok"})
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index dcc315a4..4ded6483 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -398,32 +398,36 @@
     },
   ];
 
-  let filePath = '', serverFileContent = '';
+  let path = '', serverFileContent = '';
 
-  function clickOnFile(event) {
-    filePath = event.target.getAttribute('data-path');
-    $.ajax({
-      type: 'GET',
-      url: "/files/get_file?id=" + serverId + "&file_path=" + encodeURIComponent(filePath),
-      dataType: 'text',
-      success: function (data) {
+  async function clickOnFile(event) {
+    var token = getCookie("_xsrf");
+    path = event.target.getAttribute('data-path');
+    let res = await fetch(`/api/v2/servers/${serverId}/files`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"page": "files", "path": path}),
+      });
+      let responseData = await res.json();
+      console.log(responseData)
+      if (responseData.status === "ok") {
         console.log('Got File Contents From Server');
-        json = JSON.parse(data)
-        if (json.error) {
-          $('#editorParent').toggle(false) // hide
-          $('#fileError').toggle(true)     // show
-          $('#fileError').text("{{ translate('serverFiles', 'fileReadError', data['lang']) }}: " + json.error) // show error
-          editor.blur()
-        } else {
           $('#editorParent').toggle(true) // show
           $('#fileError').toggle(false)   // hide
           setFileName(event.target.innerText);
-          editor.session.setValue(json.content);
-          serverFileContent = json.content;
+          editor.session.setValue(responseData.data);
+          serverFileContent = responseData.data;
           setSaveStatus(true);
         }
-      },
-    });
+      else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
   function setFileName(name) {
@@ -578,74 +582,96 @@
 
 
 
-  function save() {
+  async function save() {
     let text = editor.session.getValue();
 
     var token = getCookie("_xsrf")
-    $.ajax({
-      type: "PUT",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/save_file?id=" + serverId,
-      data: {
-        file_contents: text,
-        file_path: filePath
-      },
-      success: (data) => {
+    let res = await fetch(`/api/v2/servers/${serverId}/files`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"path": path, "contents": text}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
         serverFileContent = text;
         setSaveStatus(true)
+
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
       }
-    });
   }
 
-  function createFile(parent, name, callback) {
+  async function createFile(parent, name, callback) {
     var token = getCookie("_xsrf")
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/create_file?id=" + serverId,
-      data: {
-        file_parent: parent,
-        file_name: name
-      },
-      success: function (data) {
-        console.log("got response:");
-        callback();
-      },
-    });
+    let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
+        method: 'PUT',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"parent": parent, "name": name, "directory": false}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        getTreeView($('#root_dir').data('path'));
+        setTreeViewContext();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
-  function createDir(parent, name, callback) {
+
+  async function createDir(parent, name, callback) {
     var token = getCookie("_xsrf")
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/create_dir?id=" + serverId,
-      data: {
-        dir_parent: parent,
-        dir_name: name
-      },
-      success: function (data) {
-        console.log("got response:");
-        callback();
-      },
-    });
+    let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
+        method: 'PUT',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"parent": parent, "name": name, "directory": true}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        getTreeView($('#root_dir').data('path'));
+        setTreeViewContext();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
-  function renameItem(path, name, callback) {
+  async function renameItem(path, name, callback) {
     var token = getCookie("_xsrf")
-    $.ajax({
-      type: "PATCH",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/rename_file?id=" + serverId,
-      data: {
-        item_path: path,
-        new_item_name: name
-      },
-      success: function (data) {
-        console.log("got response:");
-        callback();
-      },
-    });
+    let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"path": path, "new_name": name}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        getTreeView($('#root_dir').data('path'));
+        setTreeViewContext();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
   async function deleteItem(path, el, callback) {
@@ -671,20 +697,26 @@
       }
   }
 
-  function unZip(path, callback) {
-    console.log('path: ', path)
+  async function unZip(path, callback) {
     var token = getCookie("_xsrf")
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: "/files/unzip_file?id=" + serverId,
-      data: {
-        path: path
-      },
-      success: function (data) {
-        window.location.href = "/panel/server_detail?id=" + serverId + "&subpage=files";
-      },
-    });
+    let res = await fetch(`/api/v2/servers/${serverId}/files/zip/`, {
+        method: 'POST',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"folder": path}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        getTreeView($('#root_dir').data('path'));
+        setTreeViewContext();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
   async function sendFile(file, path, serverId, left, i, onProgress) {
@@ -888,7 +920,7 @@
         headers: {
           'X-XSRFToken': token
         },
-        body: JSON.stringify({"page": "files", "folder": path}),
+        body: JSON.stringify({"page": "files", "path": path}),
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {

From 0a99261f5ae932b597fa1d3b621240d429fbe6c1 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 16:16:07 -0400
Subject: [PATCH 090/210] Remove antiquated file_handler

---
 app/classes/web/file_handler.py    | 464 -----------------------------
 app/classes/web/tornado_handler.py |   2 -
 2 files changed, 466 deletions(-)
 delete mode 100644 app/classes/web/file_handler.py

diff --git a/app/classes/web/file_handler.py b/app/classes/web/file_handler.py
deleted file mode 100644
index e2d07476..00000000
--- a/app/classes/web/file_handler.py
+++ /dev/null
@@ -1,464 +0,0 @@
-import os
-import logging
-import bleach
-import tornado.web
-import tornado.escape
-
-from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
-from app.classes.web.base_handler import BaseHandler
-
-logger = logging.getLogger(__name__)
-
-
-class FileHandler(BaseHandler):
-    def render_page(self, template, page_data):
-        self.render(
-            template,
-            data=page_data,
-            translate=self.translator.translate,
-        )
-
-    @tornado.web.authenticated
-    def get(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-
-        if page == "get_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            file_path = Helpers.get_os_understandable_path(
-                self.get_argument("file_path", None)
-            )
-
-            if not self.check_server_id(server_id, "get_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if not self.helper.is_subdir(
-                file_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or not Helpers.check_file_exists(os.path.abspath(file_path)):
-                logger.warning(
-                    f"Invalid path in get_file file file ajax call ({file_path})"
-                )
-                Console.warning(
-                    f"Invalid path in get_file file file ajax call ({file_path})"
-                )
-                return
-
-            error = None
-
-            try:
-                with open(file_path, encoding="utf-8") as file:
-                    file_contents = file.read()
-            except UnicodeDecodeError:
-                file_contents = ""
-                error = "UnicodeDecodeError"
-
-            self.write({"content": file_contents, "error": error})
-            self.finish()
-
-        elif page == "get_tree":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            path = self.get_argument("path", None)
-
-            if not self.check_server_id(server_id, "get_tree"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if Helpers.validate_traversal(
-                self.controller.servers.get_server_data_by_id(server_id)["path"], path
-            ):
-                self.write(
-                    Helpers.get_os_understandable_path(path)
-                    + "\n"
-                    + self.helper.generate_tree(path)
-                )
-            self.finish()
-
-        elif page == "get_dir":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            path = self.get_argument("path", None)
-
-            if not self.check_server_id(server_id, "get_tree"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if Helpers.validate_traversal(
-                self.controller.servers.get_server_data_by_id(server_id)["path"], path
-            ):
-                self.write(
-                    Helpers.get_os_understandable_path(path)
-                    + "\n"
-                    + self.helper.generate_dir(path)
-                )
-            self.finish()
-
-    @tornado.web.authenticated
-    def post(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-
-        if page == "create_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            file_parent = Helpers.get_os_understandable_path(
-                self.get_body_argument("file_parent", default=None, strip=True)
-            )
-            file_name = self.get_body_argument("file_name", default=None, strip=True)
-            file_path = os.path.join(file_parent, file_name)
-
-            if not self.check_server_id(server_id, "create_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if not self.helper.is_subdir(
-                file_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or Helpers.check_file_exists(os.path.abspath(file_path)):
-                logger.warning(
-                    f"Invalid path in create_file file ajax call ({file_path})"
-                )
-                Console.warning(
-                    f"Invalid path in create_file file ajax call ({file_path})"
-                )
-                return
-
-            # Create the file by opening it
-            with open(file_path, "w", encoding="utf-8") as file_object:
-                file_object.close()
-
-        elif page == "create_dir":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            dir_parent = Helpers.get_os_understandable_path(
-                self.get_body_argument("dir_parent", default=None, strip=True)
-            )
-            dir_name = self.get_body_argument("dir_name", default=None, strip=True)
-            dir_path = os.path.join(dir_parent, dir_name)
-
-            if not self.check_server_id(server_id, "create_dir"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if not self.helper.is_subdir(
-                dir_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or Helpers.check_path_exists(os.path.abspath(dir_path)):
-                logger.warning(
-                    f"Invalid path in create_dir file ajax call ({dir_path})"
-                )
-                Console.warning(
-                    f"Invalid path in create_dir file ajax call ({dir_path})"
-                )
-                return
-            # Create the directory
-            os.mkdir(dir_path)
-
-        elif page == "unzip_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            path = Helpers.get_os_understandable_path(self.get_argument("path", None))
-            if Helpers.is_os_windows():
-                path = Helpers.wtol_path(path)
-            FileHelpers.unzip_file(path)
-            self.redirect(f"/panel/server_detail?id={server_id}&subpage=files")
-            return
-
-    @tornado.web.authenticated
-    def delete(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-        if page == "del_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            file_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("file_path", default=None, strip=True)
-            )
-
-            Console.warning(f"Delete {file_path} for server {server_id}")
-
-            if not self.check_server_id(server_id, "del_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            server_info = self.controller.servers.get_server_data_by_id(server_id)
-            if not (
-                self.helper.is_subdir(
-                    file_path, Helpers.get_os_understandable_path(server_info["path"])
-                )
-                or self.helper.is_subdir(
-                    file_path,
-                    Helpers.get_os_understandable_path(server_info["backup_path"]),
-                )
-            ) or not Helpers.check_file_exists(os.path.abspath(file_path)):
-                logger.warning(f"Invalid path in del_file file ajax call ({file_path})")
-                Console.warning(
-                    f"Invalid path in del_file file ajax call ({file_path})"
-                )
-                return
-
-            # Delete the file
-            FileHelpers.del_file(file_path)
-
-        elif page == "del_dir":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            dir_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("dir_path", default=None, strip=True)
-            )
-
-            Console.warning(f"Delete {dir_path} for server {server_id}")
-
-            if not self.check_server_id(server_id, "del_dir"):
-                return
-            server_id = bleach.clean(server_id)
-
-            server_info = self.controller.servers.get_server_data_by_id(server_id)
-            if not self.helper.is_subdir(
-                dir_path, Helpers.get_os_understandable_path(server_info["path"])
-            ) or not Helpers.check_path_exists(os.path.abspath(dir_path)):
-                logger.warning(f"Invalid path in del_file file ajax call ({dir_path})")
-                Console.warning(f"Invalid path in del_file file ajax call ({dir_path})")
-                return
-
-            # Delete the directory
-            # os.rmdir(dir_path)     # Would only remove empty directories
-            if Helpers.validate_traversal(
-                Helpers.get_os_understandable_path(server_info["path"]), dir_path
-            ):
-                # Removes also when there are contents
-                FileHelpers.del_dirs(dir_path)
-
-    @tornado.web.authenticated
-    def put(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-        if page == "save_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            file_contents = self.get_body_argument(
-                "file_contents", default=None, strip=True
-            )
-            file_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("file_path", default=None, strip=True)
-            )
-
-            if not self.check_server_id(server_id, "save_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if not self.helper.is_subdir(
-                file_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or not Helpers.check_file_exists(os.path.abspath(file_path)):
-                logger.warning(
-                    f"Invalid path in save_file file ajax call ({file_path})"
-                )
-                Console.warning(
-                    f"Invalid path in save_file file ajax call ({file_path})"
-                )
-                return
-
-            # Open the file in write mode and store the content in file_object
-            with open(file_path, "w", encoding="utf-8") as file_object:
-                file_object.write(file_contents)
-
-    @tornado.web.authenticated
-    def patch(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        server_id = self.get_argument("id", None)
-        permissions = {
-            "Commands": EnumPermissionsServer.COMMANDS,
-            "Terminal": EnumPermissionsServer.TERMINAL,
-            "Logs": EnumPermissionsServer.LOGS,
-            "Schedule": EnumPermissionsServer.SCHEDULE,
-            "Backup": EnumPermissionsServer.BACKUP,
-            "Files": EnumPermissionsServer.FILES,
-            "Config": EnumPermissionsServer.CONFIG,
-            "Players": EnumPermissionsServer.PLAYERS,
-        }
-        user_perms = self.controller.server_perms.get_user_id_permissions_list(
-            exec_user["user_id"], server_id
-        )
-        if page == "rename_file":
-            if not permissions["Files"] in user_perms:
-                if not superuser:
-                    self.redirect("/panel/error?error=Unauthorized access to Files")
-                    return
-            item_path = Helpers.get_os_understandable_path(
-                self.get_body_argument("item_path", default=None, strip=True)
-            )
-            new_item_name = self.get_body_argument(
-                "new_item_name", default=None, strip=True
-            )
-
-            if not self.check_server_id(server_id, "rename_file"):
-                return
-            server_id = bleach.clean(server_id)
-
-            if item_path is None or new_item_name is None:
-                logger.warning("Invalid path(s) in rename_file file ajax call")
-                Console.warning("Invalid path(s) in rename_file file ajax call")
-                return
-
-            if not self.helper.is_subdir(
-                item_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or not Helpers.check_path_exists(os.path.abspath(item_path)):
-                logger.warning(
-                    f"Invalid old name path in rename_file file ajax call ({server_id})"
-                )
-                Console.warning(
-                    f"Invalid old name path in rename_file file ajax call ({server_id})"
-                )
-                return
-
-            new_item_path = os.path.join(os.path.split(item_path)[0], new_item_name)
-
-            if not self.helper.is_subdir(
-                new_item_path,
-                Helpers.get_os_understandable_path(
-                    self.controller.servers.get_server_data_by_id(server_id)["path"]
-                ),
-            ) or Helpers.check_path_exists(os.path.abspath(new_item_path)):
-                logger.warning(
-                    f"Invalid new name path in rename_file file ajax call ({server_id})"
-                )
-                Console.warning(
-                    f"Invalid new name path in rename_file file ajax call ({server_id})"
-                )
-                return
-
-            # RENAME
-            os.rename(item_path, new_item_path)
-
-    def check_server_id(self, server_id, page_name):
-        if server_id is None:
-            logger.warning(
-                f"Server ID not defined in {page_name} file ajax call ({server_id})"
-            )
-            Console.warning(
-                f"Server ID not defined in {page_name} file ajax call ({server_id})"
-            )
-            return
-        server_id = bleach.clean(server_id)
-
-        # does this server id exist?
-        if not self.controller.servers.server_id_exists(server_id):
-            logger.warning(
-                f"Server ID not found in {page_name} file ajax call ({server_id})"
-            )
-            Console.warning(
-                f"Server ID not found in {page_name} file ajax call ({server_id})"
-            )
-            return
-        return True
diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index 7b56220b..a8407345 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -15,7 +15,6 @@ from app.classes.models.management import HelpersManagement
 from app.classes.shared.console import Console
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_controller import Controller
-from app.classes.web.file_handler import FileHandler
 from app.classes.web.public_handler import PublicHandler
 from app.classes.web.panel_handler import PanelHandler
 from app.classes.web.default_handler import DefaultHandler
@@ -154,7 +153,6 @@ class Webserver:
             (r"/panel/(.*)", PanelHandler, handler_args),
             (r"/server/(.*)", ServerHandler, handler_args),
             (r"/ajax/(.*)", AjaxHandler, handler_args),
-            (r"/files/(.*)", FileHandler, handler_args),
             (r"/ws", SocketHandler, handler_args),
             (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),

From cd4bd681d9c6a82c5a81751d219620c3f26f28bc Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 16:17:26 -0400
Subject: [PATCH 091/210] Remove antiquaed functions from ajax_handler

---
 app/classes/web/ajax_handler.py | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 0fa17dcf..aa54505c 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -87,26 +87,6 @@ class AjaxHandler(BaseHandler):
             page_data["notify_data"] = data
             self.render_page("ajax/notify.html", page_data)
 
-        elif page == "get_zip_tree":
-            path = self.get_argument("path", None)
-
-            self.write(
-                Helpers.get_os_understandable_path(path)
-                + "\n"
-                + Helpers.generate_zip_tree(path)
-            )
-            self.finish()
-
-        elif page == "get_zip_dir":
-            path = self.get_argument("path", None)
-
-            self.write(
-                Helpers.get_os_understandable_path(path)
-                + "\n"
-                + Helpers.generate_zip_dir(path)
-            )
-            self.finish()
-
     @tornado.web.authenticated
     def post(self, page):
         api_key, _, exec_user = self.current_user

From 13539d83a9bcb03fc89d41bf27cc08af6994bd2f Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 17:27:09 -0400
Subject: [PATCH 092/210] add style

---
 app/frontend/templates/notify.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 9848e98a..4348fad5 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -89,7 +89,7 @@
     console.log(data)
     let text = "";
     for (i = 0; i < data.length; i++) {
-      text += `<li id="${data[i].id}"><p style="float: right;"><i data-id="${data[i].id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${data[i].link} target="_blank"><h6>${data[i].title}</h6><small><p>${data[i].date}</p></small><p>${data[i].desc}</p></li></a>`
+      text += `<li class="card-header header-sm justify-content-between align-items-center" id="${data[i].id}"><p style="float: right;"><i data-id="${data[i].id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${data[i].link} target="_blank"><h6>${data[i].title}</h6><small><p>${data[i].date}</p></small><p>${data[i].desc}</p></li></a>`
     }
     if (data.length > 0) {
       localStorage.setItem("notif-count", data.length);

From 6a4a9f77d912dc80cb8c05fce633069c10db2f08 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 3 Sep 2023 23:30:26 -0400
Subject: [PATCH 093/210] Add create new API key from api v2

---
 app/classes/web/panel_handler.py              | 228 +-----------------
 app/classes/web/routes/api/api_handlers.py    |   6 +
 app/classes/web/routes/api/users/user/api.py  | 146 +++++++++++
 .../panel/panel_edit_user_apikeys.html        |  77 +++++-
 4 files changed, 223 insertions(+), 234 deletions(-)
 create mode 100644 app/classes/web/routes/api/users/user/api.py

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 9d1404ef..d7160919 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1525,139 +1525,7 @@ class PanelHandler(BaseHandler):
                 role = self.controller.roles.get_role(r)
                 exec_user_role.add(role["role_name"])
 
-        if page == "edit_user":
-            if bleach.clean(self.get_argument("username", None)).lower() == "system":
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: "
-                    "system user is not editable"
-                )
-            user_id = bleach.clean(self.get_argument("id", None))
-            user = self.controller.users.get_user_by_id(user_id)
-            username = bleach.clean(self.get_argument("username", None).lower())
-            theme = bleach.clean(self.get_argument("theme", "default"))
-            if (
-                username != self.controller.users.get_user_by_id(user_id)["username"]
-                and username in self.controller.users.get_all_usernames()
-            ):
-                self.redirect(
-                    "/panel/error?error=Duplicate User: Useranme already exists."
-                )
-            password0 = bleach.clean(self.get_argument("password0", None))
-            password1 = bleach.clean(self.get_argument("password1", None))
-            email = bleach.clean(self.get_argument("email", "default@example.com"))
-            enabled = int(float(self.get_argument("enabled", "0")))
-            try:
-                hints = int(bleach.clean(self.get_argument("hints")))
-                hints = True
-            except:
-                hints = False
-            lang = bleach.clean(
-                self.get_argument("language"), self.helper.get_setting("language")
-            )
-
-            if superuser:
-                # Checks if user is trying to change super user status of self.
-                # We don't want that. Automatically make them stay super user
-                # since we know they are.
-                if str(exec_user["user_id"]) != str(user_id):
-                    superuser = int(bleach.clean(self.get_argument("superuser", "0")))
-                else:
-                    superuser = 1
-            else:
-                superuser = 0
-
-            if exec_user["superuser"]:
-                manager = self.get_argument("manager")
-                if manager == "":
-                    manager = None
-                else:
-                    manager = int(manager)
-            else:
-                manager = user["manager"]
-
-            if (
-                not exec_user["superuser"]
-                and int(exec_user["user_id"]) != user["manager"]
-            ):
-                if username is None or username == "":
-                    self.redirect("/panel/error?error=Invalid username")
-                    return
-                if user_id is None:
-                    self.redirect("/panel/error?error=Invalid User ID")
-                    return
-                if (
-                    EnumPermissionsCrafty.USER_CONFIG
-                    not in exec_user_crafty_permissions
-                ):
-                    if str(user_id) != str(exec_user["user_id"]):
-                        self.redirect(
-                            "/panel/error?error=Unauthorized access: not a user editor"
-                        )
-                        return
-
-                    user_data = {
-                        "username": username,
-                        "password": password0,
-                        "email": email,
-                        "lang": lang,
-                        "hints": hints,
-                        "theme": theme,
-                    }
-                    self.controller.users.update_user(user_id, user_data=user_data)
-
-                    self.controller.management.add_to_audit_log(
-                        exec_user["user_id"],
-                        f"Edited user {username} (UID:{user_id}) password",
-                        server_id=0,
-                        source_ip=self.get_remote_ip(),
-                    )
-                    self.redirect("/panel/panel_config")
-                    return
-                # does this user id exist?
-                if not self.controller.users.user_id_exists(user_id):
-                    self.redirect("/panel/error?error=Invalid User ID")
-                    return
-            else:
-                if password0 != password1:
-                    self.redirect("/panel/error?error=Passwords must match")
-                    return
-
-                roles = self.get_user_role_memberships()
-                permissions_mask, server_quantity = self.get_perms_quantity()
-
-                # if email is None or "":
-                #     email = "default@example.com"
-
-                user_data = {
-                    "username": username,
-                    "manager": manager,
-                    "password": password0,
-                    "email": email,
-                    "enabled": enabled,
-                    "roles": roles,
-                    "lang": lang,
-                    "superuser": superuser,
-                    "hints": hints,
-                    "theme": theme,
-                }
-                user_crafty_data = {
-                    "permissions_mask": permissions_mask,
-                    "server_quantity": server_quantity,
-                }
-                self.controller.users.update_user(
-                    user_id, user_data=user_data, user_crafty_data=user_crafty_data
-                )
-
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f"Edited user {username} (UID:{user_id}) with roles {roles} "
-                    f"and permissions {permissions_mask}",
-                    server_id=0,
-                    source_ip=self.get_remote_ip(),
-                )
-            self.redirect("/panel/panel_config")
-
-        elif page == "edit_user_apikeys":
+        if page == "edit_user_apikeys":
             user_id = self.get_argument("id", None)
             name = self.get_argument("name", None)
             superuser = self.get_argument("superuser", None) == "1"
@@ -1737,100 +1605,6 @@ class PanelHandler(BaseHandler):
             )
             self.finish()
 
-        elif page == "add_user":
-            username = bleach.clean(self.get_argument("username", None).lower())
-            if username.lower() == "system":
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: "
-                    "username system is reserved for the Crafty system."
-                    " Please choose a different username."
-                )
-                return
-            password0 = bleach.clean(self.get_argument("password0", None))
-            password1 = bleach.clean(self.get_argument("password1", None))
-            email = bleach.clean(self.get_argument("email", "default@example.com"))
-            enabled = int(float(self.get_argument("enabled", "0")))
-            theme = bleach.clean(self.get_argument("theme"), "default")
-            hints = True
-            lang = bleach.clean(
-                self.get_argument("lang", self.helper.get_setting("language"))
-            )
-            # We don't want a non-super user to be able to create a super user.
-            if superuser:
-                new_superuser = int(bleach.clean(self.get_argument("superuser", "0")))
-            else:
-                new_superuser = 0
-
-            if EnumPermissionsCrafty.USER_CONFIG not in exec_user_crafty_permissions:
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: not a user editor"
-                )
-                return
-
-            if (
-                not self.controller.crafty_perms.can_add_user(exec_user["user_id"])
-                and not exec_user["superuser"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: quantity limit reached"
-                )
-                return
-            if username is None or username == "":
-                self.redirect("/panel/error?error=Invalid username")
-                return
-
-            if exec_user["superuser"]:
-                manager = self.get_argument("manager")
-                if manager == "":
-                    manager = None
-                else:
-                    manager = int(manager)
-            else:
-                manager = int(exec_user["user_id"])
-            # does this user id exist?
-            if self.controller.users.get_id_by_name(username) is not None:
-                self.redirect("/panel/error?error=User exists")
-                return
-
-            if password0 != password1:
-                self.redirect("/panel/error?error=Passwords must match")
-                return
-
-            roles = self.get_user_role_memberships()
-            permissions_mask, server_quantity = self.get_perms_quantity()
-
-            user_id = self.controller.users.add_user(
-                username,
-                manager=manager,
-                password=password0,
-                email=email,
-                enabled=enabled,
-                superuser=new_superuser,
-                theme=theme,
-            )
-            user_data = {"roles": roles, "lang": lang, "hints": True}
-            user_crafty_data = {
-                "permissions_mask": permissions_mask,
-                "server_quantity": server_quantity,
-            }
-            self.controller.users.update_user(
-                user_id, user_data=user_data, user_crafty_data=user_crafty_data
-            )
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Added user {username} (UID:{user_id})",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Edited user {username} (UID:{user_id}) with roles {roles}",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.redirect("/panel/panel_config")
-
         else:
             self.set_status(404)
             page_data = {
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 1b4cb487..89c35fc0 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -49,6 +49,7 @@ from app.classes.web.routes.api.users.user.index import ApiUsersUserIndexHandler
 from app.classes.web.routes.api.users.user.permissions import (
     ApiUsersUserPermissionsHandler,
 )
+from app.classes.web.routes.api.users.user.api import ApiUsersUserKeyHandler
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
 from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
@@ -90,6 +91,11 @@ def api_handlers(handler_args):
             ApiUsersIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/users/([0-9]+)/key/?",
+            ApiUsersUserKeyHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/users/([0-9]+)/?",
             ApiUsersUserIndexHandler,
diff --git a/app/classes/web/routes/api/users/user/api.py b/app/classes/web/routes/api/users/user/api.py
new file mode 100644
index 00000000..a53235b4
--- /dev/null
+++ b/app/classes/web/routes/api/users/user/api.py
@@ -0,0 +1,146 @@
+import json
+import logging
+
+from jsonschema import ValidationError, validate
+from app.classes.web.base_api_handler import BaseApiHandler
+
+
+logger = logging.getLogger(__name__)
+
+
+class ApiUsersUserKeyHandler(BaseApiHandler):
+    def get(self, _user_id: str, key_id: int):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _exec_user_crafty_permissions,
+            _,
+            _,
+            _user,
+        ) = auth_data
+
+        key = self.controller.users.get_user_api_key(key_id)
+        # does this user id exist?
+        if key is None:
+            self.redirect("/panel/error?error=Invalid Key ID")
+            return
+
+        if (
+            str(key.user_id) != str(auth_data[4]["user_id"])
+            and not auth_data[4]["superuser"]
+        ):
+            self.redirect(
+                "/panel/error?error=You are not authorized to access this key."
+            )
+            return
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Generated a new API token for the key {key.name} "
+            f"from user with UID: {key.user_id}",
+            server_id=0,
+            source_ip=self.get_remote_ip(),
+        )
+
+        self.finish_json(
+            {
+                "status": "ok",
+                "data": self.controller.authentication.generate(
+                    key.user_id_id, {"token_id": key.token_id}
+                ),
+            }
+        )
+
+    def patch(self, user_id: str):
+        user_key_schema = {
+            "type": "object",
+            "properties": {
+                "name": {"type": "string", "minLength": 3},
+                "server_permissions_mask": {
+                    "type": "string",
+                    "pattern": "^[01]{8}$",  # 8 bits, see EnumPermissionsServer
+                },
+                "crafty_permissions_mask": {
+                    "type": "string",
+                    "pattern": "^[01]{3}$",  # 8 bits, see EnumPermissionsCrafty
+                },
+                "superuser": {"type": "boolean"},
+            },
+            "additionalProperties": False,
+            "minProperties": 1,
+        }
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _exec_user_crafty_permissions,
+            _,
+            _superuser,
+            user,
+        ) = auth_data
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, user_key_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+
+        if user_id == "@me":
+            user_id = user["user_id"]
+        # does this user id exist?
+        if not self.controller.users.user_id_exists(user_id):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "USER NOT FOUND",
+                    "error_data": "USER_NOT_FOUND",
+                },
+            )
+
+        if (
+            str(user_id) != str(auth_data[4]["user_id"])
+            and not auth_data[4]["superuser"]
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "NOT AUTHORIZED",
+                    "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
+                },
+            )
+
+        key_id = self.controller.users.add_user_api_key(
+            data["name"],
+            user_id,
+            data["superuser"],
+            data["server_permissions_mask"],
+            data["crafty_permissions_mask"],
+        )
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"Added API key {data['name']} with crafty permissions "
+            f"{data['crafty_permissions_mask']}"
+            f" and {data['server_permissions_mask']} for user with UID: {user_id}",
+            server_id=0,
+            source_ip=self.get_remote_ip(),
+        )
+        self.finish_json(200, {"status": "ok", "data": {"id": key_id}})
diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index 062cf8d9..83294e84 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -115,10 +115,7 @@
                                         'createNew', data['lang']) }}</h4>
                                 </div>
                                 <div class="card-body">
-                                    <form id="user_form" class="forms-sample" method="post"
-                                        action="/panel/edit_user_apikeys">
-                                        {% raw xsrf_form_html() %}
-                                        <input type="hidden" name="id" value="{{ data['user']['user_id'] }}">
+                                    <form id="user_api_form" class="forms-sample">
 
                                         <div class="form-group">
                                             <label class="form-label" for="username">{{ translate('apiKeys', 'name',
@@ -142,7 +139,7 @@
                                                             }}</label>
                                                     </td>
                                                     <td>
-                                                        <input type="checkbox" class=""
+                                                        <input type="checkbox" class="server_perm"
                                                             id="permission_{{ permission.name }}"
                                                             name="permission_{{ permission.name }}" value="1">
                                                     </td>
@@ -154,7 +151,7 @@
                                                             }}</label>
                                                     </td>
                                                     <td>
-                                                        <input type="checkbox" class=""
+                                                        <input type="checkbox" class="crafty_perm"
                                                             id="permission_{{ permission.name }}"
                                                             name="permission_{{ permission.name }}" value="1">
                                                     </td>
@@ -201,8 +198,74 @@
         var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
         return r ? r[1] : undefined;
     }
-
+    const userId = new URLSearchParams(document.location.search).get('id')
     $(document).ready(function () {
+        $("#user_api_form").on("submit", async function (e) {
+            e.preventDefault();
+            var token = getCookie("_xsrf")
+            let apiForm = document.getElementById("user_api_form");
+
+            let formData = new FormData(apiForm);
+
+            //Create an object from the form data entries
+            let formDataObject = Object.fromEntries(formData.entries());
+            //We need to make sure these are sent regardless of whether or not they're checked
+            formDataObject.disabled_language_files = $('#lang_select').val();
+            $('#user_api_form input[type="checkbox"]:checked').each(function () {
+                if ($(this).val() == 'True') {
+                    formDataObject[this.name] = true;
+                } else {
+                    formDataObject[this.name] = false;
+                }
+            });
+            let server_permissions = $('.server_perm').map(function () {
+                if (this.checked) {
+                    return "1";
+                } else {
+                    return "0"
+                }
+            }).get();
+            server_permissions = server_permissions.join("");
+
+            let crafty_permissions = $('.crafty_perm').map(function () {
+                if (this.checked) {
+                    return "1";
+                } else {
+                    return "0"
+                }
+            }).get();
+            crafty_permissions = crafty_permissions.join("");
+            console.log(server_permissions);
+            console.log(crafty_permissions);
+            console.log(formDataObject);
+            // Format the plain form data as JSON
+            let formDataJsonString = JSON.stringify({
+                "name": formDataObject.name,
+                "server_permissions_mask": server_permissions,
+                "crafty_permissions_mask": crafty_permissions,
+                "superuser": $("#superuser").prop('checked'),
+            });
+            console.log(formDataJsonString);
+
+            let res = await fetch(`/api/v2/users/${userId}/key/`, {
+                method: 'PATCH',
+                headers: {
+                    'X-XSRFToken': token
+                },
+                body: formDataJsonString,
+            });
+            let responseData = await res.json();
+            if (responseData.status === "ok") {
+                location.reload();
+            } else {
+
+                bootbox.alert({
+                    title: responseData.error,
+                    message: responseData.error_data
+                });
+            }
+        });
+
         console.log("ready!");
         $('.delete-api-key').click(function () {
             var keyId = $(this).data("key-id");

From 2f69464e7a1580561a503ca2e91c72f8adccb323 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 11:41:45 -0400
Subject: [PATCH 094/210] Remove remaining get/delete calls in panelhandler

---
 app/classes/web/panel_handler.py | 179 -------------------------------
 1 file changed, 179 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index d7160919..696da799 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1498,182 +1498,3 @@ class PanelHandler(BaseHandler):
             utc_offset=(time.timezone * -1 / 60 / 60),
             translate=self.translator.translate,
         )
-
-    @tornado.web.authenticated
-    def post(self, page):
-        api_key, _token_data, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        if superuser:
-            # defined_servers = self.controller.servers.list_defined_servers()
-            exec_user_role = {"Super User"}
-            exec_user_crafty_permissions = (
-                self.controller.crafty_perms.list_defined_crafty_permissions()
-            )
-        else:
-            exec_user_crafty_permissions = (
-                self.controller.crafty_perms.get_crafty_permissions_list(
-                    exec_user["user_id"]
-                )
-            )
-            # defined_servers =
-            # self.controller.servers.get_authorized_servers(exec_user["user_id"])
-            exec_user_role = set()
-            for r in exec_user["roles"]:
-                role = self.controller.roles.get_role(r)
-                exec_user_role.add(role["role_name"])
-
-        if page == "edit_user_apikeys":
-            user_id = self.get_argument("id", None)
-            name = self.get_argument("name", None)
-            superuser = self.get_argument("superuser", None) == "1"
-
-            if name is None or name == "":
-                self.redirect("/panel/error?error=Invalid API key name")
-                return
-            if user_id is None:
-                self.redirect("/panel/error?error=Invalid User ID")
-                return
-            # does this user id exist?
-            if not self.controller.users.user_id_exists(user_id):
-                self.redirect("/panel/error?error=Invalid User ID")
-                return
-
-            if str(user_id) != str(exec_user["user_id"]) and not exec_user["superuser"]:
-                self.redirect(
-                    "/panel/error?error=You do not have access to change"
-                    + "this user's api key."
-                )
-                return
-
-            crafty_permissions_mask = self.get_perms()
-            server_permissions_mask = self.get_perms_server()
-
-            self.controller.users.add_user_api_key(
-                name,
-                user_id,
-                superuser,
-                server_permissions_mask,
-                crafty_permissions_mask,
-            )
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Added API key {name} with crafty permissions "
-                f"{crafty_permissions_mask}"
-                f" and {server_permissions_mask} for user with UID: {user_id}",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.redirect(f"/panel/edit_user_apikeys?id={user_id}")
-
-        elif page == "get_token":
-            key_id = self.get_argument("id", None)
-
-            if key_id is None:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
-            key = self.controller.users.get_user_api_key(key_id)
-            # does this user id exist?
-            if key is None:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
-
-            if (
-                str(key.user_id) != str(exec_user["user_id"])
-                and not exec_user["superuser"]
-            ):
-                self.redirect(
-                    "/panel/error?error=You are not authorized to access this key."
-                )
-                return
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Generated a new API token for the key {key.name} "
-                f"from user with UID: {key.user_id}",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-
-            self.write(
-                self.controller.authentication.generate(
-                    key.user_id_id, {"token_id": key.token_id}
-                )
-            )
-            self.finish()
-
-        else:
-            self.set_status(404)
-            page_data = {
-                "lang": self.helper.get_setting("language"),
-                "lang_page": Helpers.get_lang_page(self.helper.get_setting("language")),
-            }
-            self.render(
-                "public/404.html", translate=self.translator.translate, data=page_data
-            )
-
-    @tornado.web.authenticated
-    def delete(self, page):
-        api_key, _token_data, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        page_data = {
-            # todo: make this actually pull and compare version data
-            "update_available": False,
-            "version_data": self.helper.get_version_string(),
-            "user_data": exec_user,
-            "hosts_data": self.controller.management.get_latest_hosts_stats(),
-            "show_contribute": self.helper.get_setting("show_contribute_link", True),
-            "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
-            "lang_page": Helpers.get_lang_page(
-                self.controller.users.get_user_lang_by_id(exec_user["user_id"])
-            ),
-        }
-
-        if page == "remove_apikey":
-            key_id = bleach.clean(self.get_argument("id", None))
-
-            if not superuser:
-                self.redirect("/panel/error?error=Unauthorized access: not superuser")
-                return
-            if key_id is None or self.controller.users.get_user_api_key(key_id) is None:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
-            # does this user id exist?
-            target_key = self.controller.users.get_user_api_key(key_id)
-            if not target_key:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
-
-            key_obj = self.controller.users.get_user_api_key(key_id)
-
-            if key_obj.user_id != exec_user["user_id"] and not exec_user["superuser"]:
-                self.redirect(
-                    "/panel/error?error=You do not have access to change"
-                    + "this user's api key."
-                )
-                return
-
-            self.controller.users.delete_user_api_key(key_id)
-
-            self.controller.management.add_to_audit_log(
-                exec_user["user_id"],
-                f"Removed API key {target_key} "
-                f"(ID: {key_id}) from user {exec_user['user_id']}",
-                server_id=0,
-                source_ip=self.get_remote_ip(),
-            )
-            self.finish()
-            self.redirect(f"/panel/edit_user_apikeys?id={key_obj.user_id}")
-        else:
-            self.set_status(404)
-            self.render(
-                "public/404.html",
-                data=page_data,
-                translate=self.translator.translate,
-            )

From a6b7b84b3b919bfc0901cabc5216c1f060e3d4c7 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 11:42:07 -0400
Subject: [PATCH 095/210] Add get/delete functions for api keys

---
 app/classes/web/routes/api/api_handlers.py    |   5 +
 app/classes/web/routes/api/users/user/api.py  | 150 ++++++++++++++----
 .../panel/panel_edit_user_apikeys.html        | 108 +++++++------
 3 files changed, 179 insertions(+), 84 deletions(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 89c35fc0..4f34cfbc 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -96,6 +96,11 @@ def api_handlers(handler_args):
             ApiUsersUserKeyHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/users/([0-9]+)/key/([0-9]+)/?",
+            ApiUsersUserKeyHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/users/([0-9]+)/?",
             ApiUsersUserIndexHandler,
diff --git a/app/classes/web/routes/api/users/user/api.py b/app/classes/web/routes/api/users/user/api.py
index a53235b4..2d8fd764 100644
--- a/app/classes/web/routes/api/users/user/api.py
+++ b/app/classes/web/routes/api/users/user/api.py
@@ -9,7 +9,7 @@ logger = logging.getLogger(__name__)
 
 
 class ApiUsersUserKeyHandler(BaseApiHandler):
-    def get(self, _user_id: str, key_id: int):
+    def get(self, user_id: str, key_id=None):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
@@ -20,38 +20,72 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             _,
             _user,
         ) = auth_data
+        if key_id:
+            key = self.controller.users.get_user_api_key(key_id)
+            # does this user id exist?
+            if key is None:
+                self.redirect("/panel/error?error=Invalid Key ID")
+                return
 
-        key = self.controller.users.get_user_api_key(key_id)
-        # does this user id exist?
-        if key is None:
-            self.redirect("/panel/error?error=Invalid Key ID")
-            return
+            if (
+                str(key.user_id) != str(auth_data[4]["user_id"])
+                and not auth_data[4]["superuser"]
+            ):
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "NOT AUTHORIZED",
+                        "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
+                    },
+                )
 
-        if (
-            str(key.user_id) != str(auth_data[4]["user_id"])
-            and not auth_data[4]["superuser"]
-        ):
-            self.redirect(
-                "/panel/error?error=You are not authorized to access this key."
+            self.controller.management.add_to_audit_log(
+                auth_data[4]["user_id"],
+                f"Generated a new API token for the key {key.name} "
+                f"from user with UID: {key.user_id}",
+                server_id=0,
+                source_ip=self.get_remote_ip(),
+            )
+            data_key = self.controller.authentication.generate(
+                key.user_id_id, {"token_id": key.token_id}
             )
-            return
 
-        self.controller.management.add_to_audit_log(
-            auth_data[4]["user_id"],
-            f"Generated a new API token for the key {key.name} "
-            f"from user with UID: {key.user_id}",
-            server_id=0,
-            source_ip=self.get_remote_ip(),
-        )
-
-        self.finish_json(
-            {
-                "status": "ok",
-                "data": self.controller.authentication.generate(
-                    key.user_id_id, {"token_id": key.token_id}
-                ),
-            }
-        )
+            return self.finish_json(
+                200,
+                {"status": "ok", "data": data_key},
+            )
+        else:
+            if (
+                str(user_id) != str(auth_data[4]["user_id"])
+                and not auth_data[4]["superuser"]
+            ):
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "NOT AUTHORIZED",
+                        "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
+                    },
+                )
+            keys = []
+            for key in self.controller.users.get_user_api_keys(str(user_id)):
+                keys.append(
+                    {
+                        "id": key.token_id,
+                        "name": key.name,
+                        "server_permissions": key.server_permissions,
+                        "crafty_permissions": key.crafty_permissions,
+                        "superuser": key.superuser,
+                    }
+                )
+            self.finish_json(
+                200,
+                {
+                    "status": "ok",
+                    "data": keys,
+                },
+            )
 
     def patch(self, user_id: str):
         user_key_schema = {
@@ -144,3 +178,61 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             source_ip=self.get_remote_ip(),
         )
         self.finish_json(200, {"status": "ok", "data": {"id": key_id}})
+
+    def delete(self, _user_id: str, key_id: str):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _exec_user_crafty_permissions,
+            _,
+            _,
+            _user,
+        ) = auth_data
+        if key_id:
+            key = self.controller.users.get_user_api_key(key_id)
+            # does this user id exist?
+            if key is None:
+                self.redirect("/panel/error?error=Invalid Key ID")
+                return
+
+            # does this user id exist?
+            target_key = self.controller.users.get_user_api_key(key_id)
+            if not target_key:
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "INVALID KEY",
+                        "error_data": "INVALID KEY ID",
+                    },
+                )
+
+            if (
+                target_key.user_id != auth_data[4]["user_id"]
+                and not auth_data[4]["superuser"]
+            ):
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "NOT AUTHORIZED",
+                        "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
+                    },
+                )
+
+            self.controller.users.delete_user_api_key(key_id)
+
+            self.controller.management.add_to_audit_log(
+                auth_data[4]["user_id"],
+                f"Removed API key {target_key} "
+                f"(ID: {key_id}) from user {auth_data[4]['user_id']}",
+                server_id=0,
+                source_ip=self.get_remote_ip(),
+            )
+
+            return self.finish_json(
+                200,
+                {"status": "ok", "data": {"id": key_id}},
+            )
diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index 83294e84..34e0d23b 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -86,17 +86,14 @@
                                                             apikey.server_permissions }}
                                                             {{ translate('apiKeys', 'crafty', data['lang']) }} {{
                                                             apikey.crafty_permissions }}</td>
-                                                        <td>
-                                                            <button class="btn btn-danger delete-api-key"
+                                                        <td><button class="btn btn-danger delete-api-key"
                                                                 data-key-id="{{ apikey.token_id }}"
-                                                                data-key-name="{{ apikey.name }}">{{
-                                                                translate('panelConfig', 'delete', data['lang'])
-                                                                }}</button>
+                                                                data-key-name="{{ apikey.name }}">{{translate('panelConfig',
+                                                                'delete', data['lang'])}}</button>
                                                             <button class="btn btn-outline-primary get-a-token"
                                                                 data-key-id="{{ apikey.token_id }}"
-                                                                data-key-name="{{ apikey.name }}">{{
-                                                                translate('apiKeys', 'getToken', data['lang']) }}
-                                                            </button>
+                                                                data-key-name="{{ apikey.name }}">{{translate('apiKeys',
+                                                                'getToken', data['lang'])}}</button>
                                                         </td>
                                                     </tr>
                                                     {% end %}
@@ -265,55 +262,56 @@
                 });
             }
         });
-
-        console.log("ready!");
-        $('.delete-api-key').click(function () {
-            var keyId = $(this).data("key-id");
-            var keyName = $(this).data("key-name");
-            bootbox.confirm({
-                title: `Remove API key ${keyName}?`,
-                message: "Do you want to delete this API key? This cannot be undone.",
-                buttons: {
-                    cancel: {
-                        label: '<i class="fas fa-times"></i> {{ translate("panelConfig", "cancel", data['lang']) }}'
-                    },
-                    confirm: {
-                        label: '<i class="fas fa-check"></i> {{ translate("serverBackups", "confirm", data['lang']) }}'
-                    }
-                },
-                callback: function (result) {
-                    if (result) {
-                        var token = getCookie("_xsrf")
-                        $.ajax({
-                            type: "DELETE",
-                            headers: { 'X-XSRFToken': token },
-                            url: '/panel/remove_apikey?id=' + keyId,
-                            success: function (data) {
-                                location.reload();
-                            },
-                        });
-                    }
-                }
-            });
-        })
-        $('.get-a-token').click(function () {
-            var keyId = $(this).data("key-id");
-            var keyName = $(this).data("key-name");
-            var token = getCookie("_xsrf")
-            $.ajax({
-                type: "POST",
-                headers: { 'X-XSRFToken': token },
-                url: '/panel/get_token?id=' + keyId,
-                success: function (data) {
-                    bootbox.alert({
-                        title: `API token for ${keyName}`,
-                        message: `Here is an API token for ${keyName}:\n<pre style="white-space: pre-wrap;color:white;word-break:break-all;background: grey;border-radius: 5px;">${data}</pre>`
-                    });
-                },
-            });
-        })
     });
 
+    $(document).ready(function () {
+        console.log("ready!");
+        $('.delete-api-key').click(async function () {
+            let keyId = $(this).data("key-id");
+            let keyName = $(this).data("key-name");
+            let token = getCookie("_xsrf");
+            let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
+                method: 'DELETE',
+                headers: {
+                    'X-XSRFToken': token
+                },
+            });
+            let responseData = await res.json();
+            if (responseData.status === "ok") {
+                location.reload()
+            } else {
+
+                bootbox.alert({
+                    title: responseData.error,
+                    message: responseData.error_data
+                });
+            }
+        })
+        $('.get-a-token').click(async function () {
+            let keyId = $(this).data("key-id");
+            let keyName = $(this).data("key-name");
+            let token = getCookie("_xsrf");
+            let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
+                method: 'GET',
+                headers: {
+                    'X-XSRFToken': token
+                },
+            });
+            let responseData = await res.json();
+            if (responseData.status === "ok") {
+                bootbox.alert({
+                    title: `API token for ${keyName}`,
+                    message: `Here is an API token for ${keyName}:\n<pre style="white-space: pre-wrap;color:white;word-break:break-all;background: grey;border-radius: 5px;">${responseData.data}</pre>`
+                });
+            } else {
+
+                bootbox.alert({
+                    title: responseData.error,
+                    message: responseData.error_data
+                });
+            }
+        });
+    });
 
 </script>
 

From db20d5ea7fc2022ae33665a1e7c5c2e9848f8a6d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 11:45:11 -0400
Subject: [PATCH 096/210] Remove post handlers server handler

---
 app/classes/web/server_handler.py | 270 ------------------------------
 1 file changed, 270 deletions(-)

diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 210d7848..6c2fc7c6 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -174,273 +174,3 @@ class ServerHandler(BaseHandler):
             data=page_data,
             translate=self.translator.translate,
         )
-
-    @tornado.web.authenticated
-    def post(self, page):
-        api_key, _token_data, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        template = "public/404.html"
-        page_data = {
-            "version_data": "version_data_here",  # TODO
-            "user_data": exec_user,
-            "show_contribute": self.helper.get_setting("show_contribute_link", True),
-            "background": self.controller.cached_login,
-            "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
-            "lang_page": Helpers.get_lang_page(
-                self.controller.users.get_user_lang_by_id(exec_user["user_id"])
-            ),
-        }
-
-        if page == "command":
-            server_id = bleach.clean(self.get_argument("id", None))
-            command = bleach.clean(self.get_argument("command", None))
-
-            if server_id is not None:
-                if command == "clone_server":
-                    if (
-                        not superuser
-                        and not self.controller.crafty_perms.can_create_server(
-                            exec_user["user_id"]
-                        )
-                    ):
-                        time.sleep(3)
-                        self.helper.websocket_helper.broadcast_user(
-                            exec_user["user_id"],
-                            "send_start_error",
-                            {
-                                "error": "<i class='fas fa-exclamation-triangle'"
-                                " style='font-size:48px;color:red'>"
-                                "</i> Not a server creator or server limit reached."
-                            },
-                        )
-                        return
-
-                    def is_name_used(name):
-                        for server in self.controller.servers.get_all_defined_servers():
-                            if server["server_name"] == name:
-                                return True
-                        return
-
-                    template = "/panel/dashboard"
-                    server_data = self.controller.servers.get_server_data_by_id(
-                        server_id
-                    )
-                    new_server_name = server_data.get("server_name") + " (Copy)"
-
-                    name_counter = 1
-                    while is_name_used(new_server_name):
-                        name_counter += 1
-                        new_server_name = (
-                            server_data.get("server_name") + f" (Copy {name_counter})"
-                        )
-
-                    new_server_uuid = Helpers.create_uuid()
-                    while os.path.exists(
-                        os.path.join(self.helper.servers_dir, new_server_uuid)
-                    ):
-                        new_server_uuid = Helpers.create_uuid()
-                    new_server_path = os.path.join(
-                        self.helper.servers_dir, new_server_uuid
-                    )
-
-                    # copy the old server
-                    FileHelpers.copy_dir(server_data.get("path"), new_server_path)
-
-                    # TODO get old server DB data to individual variables
-                    stop_command = server_data.get("stop_command")
-                    new_server_command = str(server_data.get("execution_command"))
-                    new_executable = server_data.get("executable")
-                    new_server_log_file = str(
-                        Helpers.get_os_understandable_path(server_data.get("log_path"))
-                    )
-                    backup_path = os.path.join(self.helper.backup_path, new_server_uuid)
-                    server_port = server_data.get("server_port")
-                    server_type = server_data.get("type")
-                    created_by = exec_user["user_id"]
-
-                    new_server_id = self.controller.servers.create_server(
-                        new_server_name,
-                        new_server_uuid,
-                        new_server_path,
-                        backup_path,
-                        new_server_command,
-                        new_executable,
-                        new_server_log_file,
-                        stop_command,
-                        server_type,
-                        created_by,
-                        server_port,
-                    )
-                    if not exec_user["superuser"]:
-                        new_server_uuid = self.controller.servers.get_server_data_by_id(
-                            new_server_id
-                        ).get("server_uuid")
-                        role_id = self.controller.roles.add_role(
-                            f"Creator of Server with uuid={new_server_uuid}",
-                            exec_user["user_id"],
-                        )
-                        self.controller.server_perms.add_role_server(
-                            new_server_id, role_id, "11111111"
-                        )
-                        self.controller.users.add_role_to_user(
-                            exec_user["user_id"], role_id
-                        )
-
-                    self.controller.servers.init_all_servers()
-
-                    return
-
-                self.controller.management.send_command(
-                    exec_user["user_id"], server_id, self.get_remote_ip(), command
-                )
-
-        if page == "bedrock_step1":
-            if not superuser and not self.controller.crafty_perms.can_create_server(
-                exec_user["user_id"]
-            ):
-                self.redirect(
-                    "/panel/error?error=Unauthorized access: "
-                    "not a server creator or server limit reached"
-                )
-                return
-            if not superuser:
-                user_roles = self.controller.roles.get_all_roles()
-            else:
-                user_roles = self.controller.roles.get_all_roles()
-            server_name = bleach.clean(self.get_argument("server_name", ""))
-            port = bleach.clean(self.get_argument("port", ""))
-
-            if not port:
-                port = 19132
-            if int(port) < 1 or int(port) > 65535:
-                self.redirect(
-                    "/panel/error?error=Constraint Error: "
-                    "Port must be greater than 0 and less than 65535"
-                )
-                return
-            import_type = bleach.clean(self.get_argument("create_type", ""))
-            import_server_path = bleach.clean(self.get_argument("server_path", ""))
-            import_server_exe = bleach.clean(self.get_argument("server_jar", ""))
-            captured_roles = []
-            for role in user_roles:
-                if bleach.clean(self.get_argument(str(role), "")) == "on":
-                    captured_roles.append(role)
-
-            if not server_name:
-                self.redirect("/panel/error?error=Server name cannot be empty!")
-                return
-
-            if import_type == "import_jar":
-                if self.helper.is_subdir(
-                    self.controller.project_root, import_server_path
-                ):
-                    self.redirect(
-                        "/panel/error?error=Loop Error: The selected path will cause"
-                        " an infinite copy loop. Make sure Crafty's directory is not"
-                        " in your server path."
-                    )
-                    return
-                good_path = self.controller.verify_jar_server(
-                    import_server_path, import_server_exe
-                )
-
-                if not good_path:
-                    self.redirect(
-                        "/panel/error?error=Server path or Server Jar not found!"
-                    )
-                    return
-
-                new_server_id = self.controller.import_bedrock_server(
-                    server_name,
-                    import_server_path,
-                    import_server_exe,
-                    port,
-                    exec_user["user_id"],
-                )
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f'imported a jar server named "{server_name}"',
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-            elif import_type == "import_zip":
-                # here import_server_path means the zip path
-                zip_path = bleach.clean(self.get_argument("root_path"))
-                good_path = Helpers.check_path_exists(zip_path)
-                if not good_path:
-                    self.redirect("/panel/error?error=Temp path not found!")
-                    return
-
-                new_server_id = self.controller.import_bedrock_zip_server(
-                    server_name,
-                    zip_path,
-                    import_server_exe,
-                    port,
-                    exec_user["user_id"],
-                )
-                if new_server_id == "false":
-                    self.redirect(
-                        f"/panel/error?error=Zip file not accessible! "
-                        f"You can fix this permissions issue with"
-                        f"sudo chown -R crafty:crafty {import_server_path} "
-                        f"And sudo chmod 2775 -R {import_server_path}"
-                    )
-                    return
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    f'imported a zip server named "{server_name}"',
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-            else:
-                new_server_id = self.controller.create_bedrock_server(
-                    server_name,
-                    exec_user["user_id"],
-                )
-                self.controller.management.add_to_audit_log(
-                    exec_user["user_id"],
-                    "created a Bedrock " f'server named "{server_name}"',
-                    # Example: Admin created a 1.16.5 Bukkit server named "survival"
-                    new_server_id,
-                    self.get_remote_ip(),
-                )
-
-            # These lines create a new Role for the Server with full permissions
-            # and add the user to it if he's not a superuser
-            if len(captured_roles) == 0:
-                if not superuser:
-                    new_server_uuid = self.controller.servers.get_server_data_by_id(
-                        new_server_id
-                    ).get("server_uuid")
-                    role_id = self.controller.roles.add_role(
-                        f"Creator of Server with uuid={new_server_uuid}",
-                        exec_user["user_id"],
-                    )
-                    self.controller.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
-                    self.controller.users.add_role_to_user(
-                        exec_user["user_id"], role_id
-                    )
-
-            else:
-                for role in captured_roles:
-                    role_id = role
-                    self.controller.server_perms.add_role_server(
-                        new_server_id, role_id, "11111111"
-                    )
-
-            self.controller.servers.stats.record_stats()
-            self.redirect("/panel/dashboard")
-
-        try:
-            self.render(
-                template,
-                data=page_data,
-                translate=self.translator.translate,
-            )
-        except RuntimeError:
-            self.redirect("/panel/dashboard")

From 153781c78e9048348972a12e9843592b3800d30d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 12:12:02 -0400
Subject: [PATCH 097/210] Add cache refresh to api v2

---
 app/classes/web/ajax_handler.py               |  8 -----
 app/classes/web/routes/api/api_handlers.py    |  6 ++++
 .../web/routes/api/crafty/exe_cache.py        | 27 ++++++++++++++++
 app/frontend/templates/server/wizard.html     | 31 ++++++++++++-------
 4 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 app/classes/web/routes/api/crafty/exe_cache.py

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index aa54505c..8cd81b50 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -128,14 +128,6 @@ class AjaxHandler(BaseHandler):
                         self.controller.cached_login = "login_1.jpg"
             return
 
-        elif page == "jar_cache":
-            if not superuser:
-                self.redirect("/panel/error?error=Not a super user")
-                return
-
-            self.controller.server_jars.manual_refresh_cache()
-            return
-
         elif page == "update_server_dir":
             if self.helper.dir_migration:
                 return
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 4f34cfbc..7294b931 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -55,6 +55,7 @@ from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandl
 from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
 from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
 from app.classes.web.routes.api.crafty.imports.index import ApiImportFilesIndexHandler
+from app.classes.web.routes.api.crafty.exe_cache import ApiCraftyExeCacheIndexHandler
 
 
 def api_handlers(handler_args):
@@ -147,6 +148,11 @@ def api_handlers(handler_args):
             ApiServersIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/exeCache/?",
+            ApiCraftyExeCacheIndexHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/servers/([0-9]+)/?",
             ApiServersServerIndexHandler,
diff --git a/app/classes/web/routes/api/crafty/exe_cache.py b/app/classes/web/routes/api/crafty/exe_cache.py
new file mode 100644
index 00000000..a779195d
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/exe_cache.py
@@ -0,0 +1,27 @@
+from app.classes.web.base_api_handler import BaseApiHandler
+
+
+class ApiCraftyExeCacheIndexHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            _,
+            _,
+        ) = auth_data
+
+        if not auth_data[4]["superuser"]:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        self.controller.server_jars.manual_refresh_cache()
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.server_jars.get_serverjar_data(),
+            },
+        )
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 3acecd45..83205160 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -1104,24 +1104,31 @@
       }
     }
 
-    function refreshCache() {
-      let token = getCookie("_xsrf")
+    async function refreshCache() {
       document.getElementById("refresh-cache").classList.add("fa-spin")
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/jar_cache',
-        success: function () {
+      let token = getCookie("_xsrf")
+        let res = await fetch(`/api/v2/crafty/exeCache`, {
+          method: 'GET',
+          headers: {
+            'X-XSRFToken': token
+          },
+        });
+        let responseData = await res.json();
+        if (responseData.status === "ok") {
           document.getElementById("refresh-cache").classList.remove("fa-sync");
           document.getElementById("refresh-cache").classList.remove("fa-spin");
           document.getElementById("refresh-cache").classList.add("fa-check");
-
-          setTimeout(function () {
+          setTimeout(() => {
             location.reload();
           }, 2000);
-        },
-      });
-    }
+        } else {
+
+          bootbox.alert({
+            title: responseData.error,
+            message: responseData.error
+          });
+        }
+      }
 
     $('#file').change(function () {
       console.log("File changed");

From adaaff3d23355700ea0eb840290e5529468d1112 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 12:34:39 -0400
Subject: [PATCH 098/210] Add master server dir to API v2

---
 app/classes/shared/main_controller.py         |   2 +
 app/classes/web/ajax_handler.py               |  27 ----
 app/classes/web/routes/api/api_handlers.py    |   8 ++
 .../routes/api/crafty/config/server_dir.py    | 115 ++++++++++++++++++
 .../templates/panel/panel_config.html         |  33 +++--
 5 files changed, 147 insertions(+), 38 deletions(-)
 create mode 100644 app/classes/web/routes/api/crafty/config/server_dir.py

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 52e98138..bc8daf1c 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -951,6 +951,8 @@ class Controller:
                     "the new directory."
                 },
             )
+            self.helper.dir_migration = False
+
             return
         # set the cached serve dir
         self.helper.servers_dir = new_server_path
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 8cd81b50..9a018539 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -127,30 +127,3 @@ class AjaxHandler(BaseHandler):
                         self.controller.management.set_login_image("login_1.jpg")
                         self.controller.cached_login = "login_1.jpg"
             return
-
-        elif page == "update_server_dir":
-            if self.helper.dir_migration:
-                return
-            for server in self.controller.servers.get_all_servers_stats():
-                if server["stats"]["running"]:
-                    self.helper.websocket_helper.broadcast_user(
-                        exec_user["user_id"],
-                        "send_start_error",
-                        {
-                            "error": "You must stop all servers before "
-                            "starting a storage migration."
-                        },
-                    )
-                    return
-            if not superuser:
-                self.redirect("/panel/error?error=Not a super user")
-                return
-            if self.helper.is_env_docker():
-                self.redirect(
-                    "/panel/error?error=This feature is not"
-                    " supported on docker environments"
-                )
-                return
-            new_dir = urllib.parse.unquote(self.get_argument("server_dir"))
-            self.controller.update_master_server_dir(new_dir, exec_user["user_id"])
-            return
diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 7294b931..2dc8c920 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -53,6 +53,9 @@ from app.classes.web.routes.api.users.user.api import ApiUsersUserKeyHandler
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
 from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
+from app.classes.web.routes.api.crafty.config.server_dir import (
+    ApiCraftyConfigServerDirHandler,
+)
 from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
 from app.classes.web.routes.api.crafty.imports.index import ApiImportFilesIndexHandler
 from app.classes.web.routes.api.crafty.exe_cache import ApiCraftyExeCacheIndexHandler
@@ -76,6 +79,11 @@ def api_handlers(handler_args):
             ApiCraftyConfigIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/config/servers_dir/?",
+            ApiCraftyConfigServerDirHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/crafty/logs/([a-z0-9_]+)/?",
             ApiCraftyLogIndexHandler,
diff --git a/app/classes/web/routes/api/crafty/config/server_dir.py b/app/classes/web/routes/api/crafty/config/server_dir.py
new file mode 100644
index 00000000..4e41be14
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/config/server_dir.py
@@ -0,0 +1,115 @@
+from jsonschema import ValidationError, validate
+import orjson
+from playhouse.shortcuts import model_to_dict
+from app.classes.web.base_api_handler import BaseApiHandler
+
+server_dir_schema = {
+    "type": "object",
+    "properties": {
+        "new_dir": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+
+class ApiCraftyConfigServerDirHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            _,
+        ) = auth_data
+
+        # GET /api/v2/roles?ids=true
+        get_only_ids = self.get_query_argument("ids", None) == "true"
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.roles.get_all_role_ids()
+                if get_only_ids
+                else [model_to_dict(r) for r in self.controller.roles.get_all_roles()],
+            },
+        )
+
+    def patch(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            _,
+            _,
+        ) = auth_data
+
+        if not auth_data:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        if not auth_data[4]["superuser"]:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+        if self.helper.is_env_docker():
+            raise NotImplementedError
+
+        try:
+            data = orjson.loads(self.request.body)
+        except orjson.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, server_dir_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if self.helper.dir_migration:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "IN PROGRESS",
+                    "error_data": "Migration already in progress. Please be patient",
+                },
+            )
+        for server in self.controller.servers.get_all_servers_stats():
+            if server["stats"]["running"]:
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "SERVER RUNNING",
+                    },
+                )
+
+        new_dir = data["new_dir"]
+        self.controller.update_master_server_dir(new_dir, auth_data[4]["user_id"])
+
+        self.controller.management.add_to_audit_log(
+            auth_data[4]["user_id"],
+            f"updated master servers dir to {new_dir}/servers",
+            server_id=0,
+            source_ip=self.get_remote_ip(),
+        )
+
+        self.finish_json(
+            200,
+            {"status": "ok"},
+        )
diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 5dc8c253..898eb96f 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -326,24 +326,35 @@
     });
   }
 
-  $("#server-path").submit(function (e) {
+  $("#server-path").submit(async function (e) {
     var token = getCookie("_xsrf")
     e.preventDefault();
 
     $("#submit-status").html('<i class="fa fa-spinner fa-spin"></i>');
 
     let path = $("#global_server_path").val();
-    let encoded = encodeURIComponent(path);
+    path;
     console.log(path)
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      dataType: "text",
-      url: '/ajax/update_server_dir',
-      data: {
-        "server_dir": encoded,
-      },
-    });
+    var token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/crafty/config/servers_dir`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"new_dir": path}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        serverFileContent = text;
+        setSaveStatus(true)
+
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   });
 
   $(document).ready(function () {

From 78b689b7ec3698f2b8bda832bdc69ec5e4c28ec3 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 12:53:06 -0400
Subject: [PATCH 099/210] Fix security issue in logical expression

---
 app/classes/web/routes/api/servers/server/files.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index a81d29f6..3fb99796 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -401,7 +401,7 @@ class ApiServersServerFilesCreateHandler(BaseApiHandler):
         if not Helpers.validate_traversal(
             self.controller.servers.get_server_data_by_id(server_id)["path"],
             path,
-        ) and not Helpers.validate_traversal(
+        ) or not Helpers.validate_traversal(
             self.controller.servers.get_server_data_by_id(server_id)["path"],
             new_item_path,
         ):

From 61699d6a270d5349d588935d6f3b81b1d76feb2a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:30:31 -0400
Subject: [PATCH 100/210] Remove remaining post from AJAX

---
 app/classes/web/ajax_handler.py | 41 ---------------------------------
 1 file changed, 41 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 9a018539..8c4657ed 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -86,44 +86,3 @@ class AjaxHandler(BaseHandler):
             data = Helpers.get_announcements()
             page_data["notify_data"] = data
             self.render_page("ajax/notify.html", page_data)
-
-    @tornado.web.authenticated
-    def post(self, page):
-        api_key, _, exec_user = self.current_user
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-
-        if page == "select_photo":
-            if exec_user["superuser"]:
-                photo = urllib.parse.unquote(self.get_argument("photo", ""))
-                opacity = self.get_argument("opacity", 100)
-                self.controller.management.set_login_opacity(int(opacity))
-                if photo == "login_1.jpg":
-                    self.controller.management.set_login_image("login_1.jpg")
-                    self.controller.cached_login = f"{photo}"
-                else:
-                    self.controller.management.set_login_image(f"custom/{photo}")
-                    self.controller.cached_login = f"custom/{photo}"
-                return
-
-        elif page == "delete_photo":
-            if exec_user["superuser"]:
-                photo = urllib.parse.unquote(self.get_argument("photo", None))
-                if photo and photo != "login_1.jpg":
-                    os.remove(
-                        os.path.join(
-                            self.controller.project_root,
-                            f"app/frontend/static/assets/images/auth/custom/{photo}",
-                        )
-                    )
-                    current = self.controller.cached_login
-                    split = current.split("/")
-                    if len(split) == 1:
-                        current_photo = current
-                    else:
-                        current_photo = split[1]
-                    if current_photo == photo:
-                        self.controller.management.set_login_image("login_1.jpg")
-                        self.controller.cached_login = "login_1.jpg"
-            return

From e79f33fcc4e12bbf15e604d1f4ce5eafeea0268e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:30:48 -0400
Subject: [PATCH 101/210] Add login photo to API v2

---
 .../web/routes/api/crafty/config/index.py     | 199 ++++++++++++++++++
 .../templates/panel/custom_login.html         |  59 ++++--
 2 files changed, 237 insertions(+), 21 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
index 94c1847d..1da29b0d 100644
--- a/app/classes/web/routes/api/crafty/config/index.py
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -1,6 +1,9 @@
+import os
+import json
 from jsonschema import ValidationError, validate
 import orjson
 from playhouse.shortcuts import model_to_dict
+from app.classes.shared.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 config_json_schema = {
@@ -33,6 +36,24 @@ config_json_schema = {
     "additionalProperties": False,
     "minProperties": 1,
 }
+customize_json_schema = {
+    "type": "object",
+    "properties": {
+        "photo": {"type": "string"},
+        "opacity": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
+
+photo_delete_schema = {
+    "type": "object",
+    "properties": {
+        "photo": {"type": "string"},
+    },
+    "additionalProperties": False,
+    "minProperties": 1,
+}
 
 
 class ApiCraftyConfigIndexHandler(BaseApiHandler):
@@ -111,3 +132,181 @@ class ApiCraftyConfigIndexHandler(BaseApiHandler):
             200,
             {"status": "ok"},
         )
+
+
+class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            _,
+        ) = auth_data
+
+        # GET /api/v2/roles?ids=true
+        get_only_ids = self.get_query_argument("ids", None) == "true"
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": self.controller.roles.get_all_role_ids()
+                if get_only_ids
+                else [model_to_dict(r) for r in self.controller.roles.get_all_roles()],
+            },
+        )
+
+    def patch(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+        (
+            _,
+            _,
+            _,
+            superuser,
+            user,
+        ) = auth_data
+
+        if not superuser:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = orjson.loads(self.request.body)
+        except orjson.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+
+        try:
+            validate(data, customize_json_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if not self.helper.validate_traversal(
+            os.path.join(
+                self.controller.project_root,
+                "app/frontend/static/assets/images/auth/",
+            ),
+            os.path.join(
+                self.controller.project_root,
+                f"app/frontend/static/assets/images/auth/{data['photo']}",
+            ),
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": "TRIED TO REACH FILES THAT ARE"
+                    " NOT SUPPOSED TO BE ACCESSIBLE",
+                },
+            )
+        self.controller.management.add_to_audit_log(
+            user["user_id"],
+            f"customized login photo: {data['photo']}/{data['opacity']}",
+            server_id=0,
+            source_ip=self.get_remote_ip(),
+        )
+        self.controller.management.set_login_opacity(int(data["opacity"]))
+        if data["photo"] == "login_1.jpg":
+            self.controller.management.set_login_image("login_1.jpg")
+            self.controller.cached_login = f"{data['photo']}"
+        else:
+            self.controller.management.set_login_image(f"custom/{data['photo']}")
+            self.controller.cached_login = f"custom/{data['photo']}"
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": {"photo": data["photo"], "opacity": data["opacity"]},
+            },
+        )
+
+    def delete(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        if not auth_data[4]["superuser"]:
+            return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
+
+        try:
+            data = json.loads(self.request.body)
+        except json.decoder.JSONDecodeError as e:
+            return self.finish_json(
+                400, {"status": "error", "error": "INVALID_JSON", "error_data": str(e)}
+            )
+        try:
+            validate(data, photo_delete_schema)
+        except ValidationError as e:
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID_JSON_SCHEMA",
+                    "error_data": str(e),
+                },
+            )
+        if not self.helper.validate_traversal(
+            os.path.join(
+                self.controller.project_root,
+                "app",
+                "frontend",
+                "/static/assets/images/auth/",
+            ),
+            os.path.join(
+                self.controller.project_root,
+                "app",
+                "frontend",
+                "/static/assets/images/auth/",
+                data["photo"],
+            ),
+        ):
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "TRAVERSAL DETECTED",
+                    "error_data": "TRIED TO REACH FILES THAT ARE"
+                    " NOT SUPPOSED TO BE ACCESSIBLE",
+                },
+            )
+        if data["photo"] == "login_1.jpg":
+            return self.finish_json(
+                400,
+                {
+                    "status": "error",
+                    "error": "INVALID FILE",
+                    "error_data": "CANNOT DELETE DEFAULT",
+                },
+            )
+        FileHelpers.del_file(
+            os.path.join(
+                self.controller.project_root,
+                f"app/frontend/static/assets/images/auth/custom/{data['photo']}",
+            )
+        )
+        current = self.controller.cached_login
+        split = current.split("/")
+        if len(split) == 1:
+            current_photo = current
+        else:
+            current_photo = split[1]
+        if current_photo == data["photo"]:
+            self.controller.management.set_login_image("login_1.jpg")
+            self.controller.cached_login = "login_1.jpg"
+        return self.finish_json(200, {"status": "ok"})
diff --git a/app/frontend/templates/panel/custom_login.html b/app/frontend/templates/panel/custom_login.html
index 22a0c48c..87e6d081 100644
--- a/app/frontend/templates/panel/custom_login.html
+++ b/app/frontend/templates/panel/custom_login.html
@@ -297,33 +297,50 @@
     });
   });
 
-  $('.delete-photo').click(function () {
-    var token = getCookie("_xsrf")
+  $('.delete-photo').click(async function () {
     let photo = $('#photo').find(":selected").val();
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: '/ajax/delete_photo?photo=' + encodeURIComponent(photo),
-      success: function (data) {
-        location.reload();
-      },
-    });
+    var token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/crafty/config/customize`, {
+        method: 'DELETE',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"photo": photo}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
+        window.location.reload();
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   })
 
-  $('.select-photo').click(function () {
-    var token = getCookie("_xsrf")
+  $('.select-photo').click(async function () {
     let photo = $('#photo').find(":selected").val();
     let opacity = $('#modal_opacity').val();
-    let enc_photo = encodeURIComponent(photo);
-
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: '/ajax/select_photo?photo=' + enc_photo + '&opacity=' + opacity,
-      success: function (data) {
+    console.log(JSON.stringify({"photo": photo, "opacity": opacity}))
+    var token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/crafty/config/customize`, {
+        method: 'PATCH',
+        headers: {
+          'X-XSRFToken': token
+        },
+        body: JSON.stringify({"photo": photo, "opacity": opacity}),
+      });
+      let responseData = await res.json();
+      if (responseData.status === "ok") {
         window.location.reload();
-      },
-    });
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   })
 
   $(document).ready(function () {

From a73063f279ffcdff9c576963d1111da1683a741d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:30:56 -0400
Subject: [PATCH 102/210] Fix bug on master server dir

---
 app/frontend/templates/panel/panel_config.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 898eb96f..d8822eb3 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -345,9 +345,7 @@
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
-        serverFileContent = text;
-        setSaveStatus(true)
-
+        return
       } else {
 
         bootbox.alert({

From 76526916eb3e54c0b01a81a7ae8f88b58376fc03 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:31:05 -0400
Subject: [PATCH 103/210] Add customize to handlers

---
 app/classes/web/routes/api/api_handlers.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 2dc8c920..1a4d99f5 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -52,7 +52,10 @@ from app.classes.web.routes.api.users.user.permissions import (
 from app.classes.web.routes.api.users.user.api import ApiUsersUserKeyHandler
 from app.classes.web.routes.api.users.user.pfp import ApiUsersUserPfpHandler
 from app.classes.web.routes.api.users.user.public import ApiUsersUserPublicHandler
-from app.classes.web.routes.api.crafty.config.index import ApiCraftyConfigIndexHandler
+from app.classes.web.routes.api.crafty.config.index import (
+    ApiCraftyConfigIndexHandler,
+    ApiCraftyCustomizeIndexHandler,
+)
 from app.classes.web.routes.api.crafty.config.server_dir import (
     ApiCraftyConfigServerDirHandler,
 )
@@ -79,6 +82,11 @@ def api_handlers(handler_args):
             ApiCraftyConfigIndexHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/config/customize/?",
+            ApiCraftyCustomizeIndexHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/crafty/config/servers_dir/?",
             ApiCraftyConfigServerDirHandler,

From 16e01aed858dd5825cf5c3e3c986b427646d5934 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:31:15 -0400
Subject: [PATCH 104/210] Remove ajax notif

---
 app/frontend/templates/ajax/notify.html | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 app/frontend/templates/ajax/notify.html

diff --git a/app/frontend/templates/ajax/notify.html b/app/frontend/templates/ajax/notify.html
deleted file mode 100644
index 90683da6..00000000
--- a/app/frontend/templates/ajax/notify.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% for item in data['notify_data'] %}
-<!--    <div class="hidden">{{ item['id'] }}</div>-->
-    <div class="event">
-      <p class="font-weight-medium">{{ item['title'] }}</p>
-      <a class="d-flex align-items-center">
-        <div class="badge badge-primary">{{ item['date'] }}</div>
-        <span class="text-muted ml-2">{{ item['desc'] }}</span>
-      </a>
-    </div>
-
-
-
-{% end %}
-

From 10f696edcc1fffe24cf32023962e0d8cb364d49d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:54:24 -0400
Subject: [PATCH 105/210] Make server logs call API

---
 .../web/routes/api/servers/server/logs.py     |  6 +--
 app/frontend/templates/panel/server_logs.html | 39 ++++++++++++-------
 app/frontend/templates/panel/server_term.html | 32 ++++++++++-----
 3 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/logs.py b/app/classes/web/routes/api/servers/server/logs.py
index 641a1163..94a8a71b 100644
--- a/app/classes/web/routes/api/servers/server/logs.py
+++ b/app/classes/web/routes/api/servers/server/logs.py
@@ -74,6 +74,6 @@ class ApiServersServerLogsHandler(BaseApiHandler):
 
         if use_html:
             for line in lines:
-                self.write(f"{line}<br />")
-        else:
-            self.finish_json(200, {"status": "ok", "data": lines})
+                line = f"{line}<br />"
+
+        self.finish_json(200, {"status": "ok", "data": lines})
diff --git a/app/frontend/templates/panel/server_logs.html b/app/frontend/templates/panel/server_logs.html
index ccf40937..9388c2d8 100644
--- a/app/frontend/templates/panel/server_logs.html
+++ b/app/frontend/templates/panel/server_logs.html
@@ -188,23 +188,36 @@
 
   // Populate logs and filter if present
   const serverId = new URLSearchParams(document.location.search).get('id')
-  function get_server_log() {
+  async function get_server_log() {
+    var token = getCookie("_xsrf")
+    let colors=true;
     if (!$("#stop_scroll").is(':checked')) {
-      $.ajax({
-        type: 'GET',
-        url: '/ajax/server_log?id=' + serverId + '&full=1',
-        dataType: 'text',
-        success: function (data) {
-          console.log('Got Log From Server')
-          $('#virt_console').html(data);
-          scroll();
-          lines = document.querySelectorAll('.box');
-          hideFilteredWords();
+    let res = await fetch(`/api/v2/servers/${serverId}/logs?colors=${colors}`, {
+        method: 'GET',
+        headers: {
+          'X-XSRFToken': token
         },
       });
-    }
-  }
+      let responseData = await res.json();
+      html = ``
+      if (responseData.status === "ok") {
+        for(i=0; i < responseData.data.length; i++) {
+          html += `<span class='box'>${responseData.data[i]}<br /></span>`
+        }
+        console.log('Got Log From Server')
+        $('#virt_console').html(html);
+        scroll();
+        lines = document.querySelectorAll('.box');
+        hideFilteredWords();
+      } else {
 
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
+  }
+  }
   $(document).ready(function () {
     console.log("ready!");
     get_server_log();
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 8e16462a..41d974d2 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -229,17 +229,31 @@
   }
   //{% end %}
 
-  function get_server_log() {
-    $.ajax({
-      type: 'GET',
-      url: '/ajax/server_log?id=' + serverId,
-      dataType: 'text',
-      success: function (data) {
+  async function get_server_log() {
+    var token = getCookie("_xsrf")
+    let colors=true;
+    let res = await fetch(`/api/v2/servers/${serverId}/logs?colors=${colors}`, {
+        method: 'GET',
+        headers: {
+          'X-XSRFToken': token
+        },
+      });
+      let responseData = await res.json();
+      html = ``
+      if (responseData.status === "ok") {
+        for(i=0; i < responseData.data.length; i++) {
+          html += `<span class='box'>${responseData.data[i]}<br /></span>`
+        }
         console.log('Got Log From Server')
-        $('#virt_console').html(data);
+        $('#virt_console').html(html);
         scrollConsole();
-      },
-    });
+      } else {
+
+        bootbox.alert({
+          title: responseData.status,
+          message: responseData.error
+        });
+      }
   }
 
 

From 52d0d5fc09bc6eb99bf1ee79c6fa69a598b8c516 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 13:54:59 -0400
Subject: [PATCH 106/210] Remove ajax handler

---
 app/classes/web/ajax_handler.py | 88 ---------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 app/classes/web/ajax_handler.py

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
deleted file mode 100644
index 8c4657ed..00000000
--- a/app/classes/web/ajax_handler.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import os
-import html
-import pathlib
-import re
-import logging
-import time
-import urllib.parse
-import bleach
-import tornado.web
-import tornado.escape
-
-from app.classes.shared.file_helpers import FileHelpers
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.server import ServerOutBuf
-from app.classes.web.base_handler import BaseHandler
-
-logger = logging.getLogger(__name__)
-
-
-class AjaxHandler(BaseHandler):
-    def render_page(self, template, page_data):
-        self.render(
-            template,
-            data=page_data,
-            translate=self.translator.translate,
-        )
-
-    @tornado.web.authenticated
-    def get(self, page):
-        _, _, exec_user = self.current_user
-        error = bleach.clean(self.get_argument("error", "WTF Error!"))
-
-        template = "panel/denied.html"
-
-        page_data = {"user_data": exec_user, "error": error}
-
-        if page == "error":
-            template = "public/error.html"
-            self.render_page(template, page_data)
-
-        elif page == "server_log":
-            server_id = self.get_argument("id", None)
-            full_log = self.get_argument("full", False)
-
-            if server_id is None:
-                logger.warning("Server ID not found in server_log ajax call")
-                self.redirect("/panel/error?error=Server ID Not Found")
-                return
-
-            server_id = bleach.clean(server_id)
-
-            server_data = self.controller.servers.get_server_data_by_id(server_id)
-            if not server_data:
-                logger.warning("Server Data not found in server_log ajax call")
-                self.redirect("/panel/error?error=Server ID Not Found")
-                return
-
-            if not server_data["log_path"]:
-                logger.warning(
-                    f"Log path not found in server_log ajax call ({server_id})"
-                )
-
-            if full_log:
-                log_lines = self.helper.get_setting("max_log_lines")
-                data = Helpers.tail_file(
-                    # If the log path is absolute it returns it as is
-                    # If it is relative it joins the paths below like normal
-                    pathlib.Path(server_data["path"], server_data["log_path"]),
-                    log_lines,
-                )
-            else:
-                data = ServerOutBuf.lines.get(server_id, [])
-
-            for line in data:
-                try:
-                    line = re.sub("(\033\\[(0;)?[0-9]*[A-z]?(;[0-9])?m?)", "", line)
-                    line = re.sub("[A-z]{2}\b\b", "", line)
-                    line = self.helper.log_colors(html.escape(line))
-                    self.write(f"<span class='box'>{line}<br /></span>")
-                    # self.write(d.encode("utf-8"))
-
-                except Exception as e:
-                    logger.warning(f"Skipping Log Line due to error: {e}")
-
-        elif page == "announcements":
-            data = Helpers.get_announcements()
-            page_data["notify_data"] = data
-            self.render_page("ajax/notify.html", page_data)

From 977da1049d089786138a84b12ed33b25a58c97aa Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 14:00:34 -0400
Subject: [PATCH 107/210] Had to remove a line somewhere

---
 app/frontend/templates/panel/server_files.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 4ded6483..46ca0a86 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -581,7 +581,6 @@
   }
 
 
-
   async function save() {
     let text = editor.session.getValue();
 

From 6574a557ff72388e860f7f64fb766732253fd4f7 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 14:12:27 -0400
Subject: [PATCH 108/210] Remove ajax handler references

---
 app/classes/web/tornado_handler.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index a8407345..c10184dc 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -20,7 +20,6 @@ from app.classes.web.panel_handler import PanelHandler
 from app.classes.web.default_handler import DefaultHandler
 from app.classes.web.routes.api.api_handlers import api_handlers
 from app.classes.web.server_handler import ServerHandler
-from app.classes.web.ajax_handler import AjaxHandler
 from app.classes.web.api_handler import (
     ServersStats,
     NodeStats,
@@ -152,7 +151,6 @@ class Webserver:
             (r"/", DefaultHandler, handler_args),
             (r"/panel/(.*)", PanelHandler, handler_args),
             (r"/server/(.*)", ServerHandler, handler_args),
-            (r"/ajax/(.*)", AjaxHandler, handler_args),
             (r"/ws", SocketHandler, handler_args),
             (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),

From bc71e4e5fd144af930470eec72592c0bec504748 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 14:19:21 -0400
Subject: [PATCH 109/210] Force cache refresh on reload

---
 app/frontend/templates/panel/server_config.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index 913a2000..dec4fec6 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -576,7 +576,7 @@
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {
-        window.location.reload();
+        location.reload(true);
       } else {
 
         bootbox.alert({

From 98720aa072181d202508caba9ab96f1c2ca4af4c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 17:30:47 -0400
Subject: [PATCH 110/210] Poll notifications on an hourly schedule

---
 app/classes/shared/helpers.py      |  7 ++++++-
 app/classes/shared/tasks.py        |  8 ++++++++
 app/frontend/templates/notify.html | 20 +++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 5955548e..7cc87b68 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -82,6 +82,7 @@ class Helpers:
         self.translation = Translation(self)
         self.update_available = False
         self.ignored_names = ["crafty_managed.txt", "db_stats"]
+        self.announcements = []
 
     @staticmethod
     def auto_installer_fix(ex):
@@ -579,7 +580,7 @@ class Helpers:
 
         return version_data
 
-    def get_announcements(self):
+    def refresh_announcements(self):
         data = []
         try:
             response = requests.get("https://craftycontrol.com/notify", timeout=2)
@@ -587,6 +588,10 @@ class Helpers:
         except Exception as e:
             logger.error(f"Failed to fetch notifications with error: {e}")
 
+        self.announcements = data
+
+    def get_announcements(self):
+        data = self.announcements
         if self.update_available:
             data.append(self.update_available)
         return data
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index a117452f..8d27ddb2 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -200,6 +200,14 @@ class TasksManager:
             id="update_watcher",
             start_date=datetime.datetime.now(),
         )
+        self.helper.refresh_announcements()
+        self.scheduler.add_job(
+            self.helper.refresh_announcements,
+            "interval",
+            hours=1,
+            id="annoucement_watcher",
+            start_date=datetime.datetime.now(),
+        )
         # self.scheduler.add_job(
         #    self.scheduler.print_jobs, "interval", seconds=10, id="-1"
         # )
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 4348fad5..f8c3ad9e 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -7,7 +7,8 @@
             text-danger
         {% end %}
         "></i><span id="notif-count" class="badge badge-notify"></span> </a>
-    <div class="dropdown-menu dropdown-menu-right navbar-dropdown" style="width: 40vw;" aria-labelledby="notifDropdown">
+    <div class="dropdown-menu dropdown-menu-right navbar-dropdown notif-drop"
+      style="width: 40vw; max-height: 80vh; overflow-y: scroll;" aria-labelledby="notifDropdown">
       <ul style="padding-top: 10px;" id="announcements">
       </ul>
     </div>
@@ -78,6 +79,19 @@
   .clear-button:hover {
     cursor: pointer;
   }
+
+  /* Hide scrollbar for Chrome, Safari and Opera */
+  .notif-drop::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* Hide scrollbar for IE, Edge and Firefox */
+  .notif-drop {
+    -ms-overflow-style: none;
+    /* IE and Edge */
+    scrollbar-width: none;
+    /* Firefox */
+  }
 </style>
 <script>
   function pfpError(image) {
@@ -117,6 +131,10 @@
     });
   }
   async function getAnnouncements() {
+    setTimeout(() => {
+      getAnnouncements();
+      console.log("Notifications Refreshed")
+    }, 5 * 60 * 1000);
     var token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/crafty/announcements/`, {
       method: 'GET',

From 4cd8e540f7ccef7cd0d0f72be61d01321caa6643 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 17:46:22 -0400
Subject: [PATCH 111/210] Revert "Poll notifications on an hourly schedule"

This reverts commit 98720aa072181d202508caba9ab96f1c2ca4af4c.
---
 app/classes/shared/helpers.py      |  7 +------
 app/classes/shared/tasks.py        |  8 --------
 app/frontend/templates/notify.html | 20 +-------------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 7cc87b68..5955548e 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -82,7 +82,6 @@ class Helpers:
         self.translation = Translation(self)
         self.update_available = False
         self.ignored_names = ["crafty_managed.txt", "db_stats"]
-        self.announcements = []
 
     @staticmethod
     def auto_installer_fix(ex):
@@ -580,7 +579,7 @@ class Helpers:
 
         return version_data
 
-    def refresh_announcements(self):
+    def get_announcements(self):
         data = []
         try:
             response = requests.get("https://craftycontrol.com/notify", timeout=2)
@@ -588,10 +587,6 @@ class Helpers:
         except Exception as e:
             logger.error(f"Failed to fetch notifications with error: {e}")
 
-        self.announcements = data
-
-    def get_announcements(self):
-        data = self.announcements
         if self.update_available:
             data.append(self.update_available)
         return data
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 8d27ddb2..a117452f 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -200,14 +200,6 @@ class TasksManager:
             id="update_watcher",
             start_date=datetime.datetime.now(),
         )
-        self.helper.refresh_announcements()
-        self.scheduler.add_job(
-            self.helper.refresh_announcements,
-            "interval",
-            hours=1,
-            id="annoucement_watcher",
-            start_date=datetime.datetime.now(),
-        )
         # self.scheduler.add_job(
         #    self.scheduler.print_jobs, "interval", seconds=10, id="-1"
         # )
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index f8c3ad9e..4348fad5 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -7,8 +7,7 @@
             text-danger
         {% end %}
         "></i><span id="notif-count" class="badge badge-notify"></span> </a>
-    <div class="dropdown-menu dropdown-menu-right navbar-dropdown notif-drop"
-      style="width: 40vw; max-height: 80vh; overflow-y: scroll;" aria-labelledby="notifDropdown">
+    <div class="dropdown-menu dropdown-menu-right navbar-dropdown" style="width: 40vw;" aria-labelledby="notifDropdown">
       <ul style="padding-top: 10px;" id="announcements">
       </ul>
     </div>
@@ -79,19 +78,6 @@
   .clear-button:hover {
     cursor: pointer;
   }
-
-  /* Hide scrollbar for Chrome, Safari and Opera */
-  .notif-drop::-webkit-scrollbar {
-    display: none;
-  }
-
-  /* Hide scrollbar for IE, Edge and Firefox */
-  .notif-drop {
-    -ms-overflow-style: none;
-    /* IE and Edge */
-    scrollbar-width: none;
-    /* Firefox */
-  }
 </style>
 <script>
   function pfpError(image) {
@@ -131,10 +117,6 @@
     });
   }
   async function getAnnouncements() {
-    setTimeout(() => {
-      getAnnouncements();
-      console.log("Notifications Refreshed")
-    }, 5 * 60 * 1000);
     var token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/crafty/announcements/`, {
       method: 'GET',

From e716198af467cf60c4fe97e59218030d8e7606d7 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:19:29 -0400
Subject: [PATCH 112/210] Appease the linter

---
 app/classes/shared/main_controller.py        | 2 +-
 app/classes/web/routes/api/users/user/api.py | 7 -------
 app/classes/web/server_handler.py            | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index bc8daf1c..ccea5dac 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -353,7 +353,7 @@ class Controller:
                 # TODO: Copy files from the zip file to the new server directory
                 server_file = create_data["jarfile"]
                 raise NotImplementedError("Not yet implemented")
-                self.import_helper.import_java_zip_server()
+                # self.import_helper.import_java_zip_server()
             if data["create_type"] == "minecraft_java":
                 _create_server_properties_if_needed(
                     create_data["server_properties_port"],
diff --git a/app/classes/web/routes/api/users/user/api.py b/app/classes/web/routes/api/users/user/api.py
index 2d8fd764..814ce296 100644
--- a/app/classes/web/routes/api/users/user/api.py
+++ b/app/classes/web/routes/api/users/user/api.py
@@ -13,13 +13,6 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
         auth_data = self.authenticate_user()
         if not auth_data:
             return
-        (
-            _,
-            _exec_user_crafty_permissions,
-            _,
-            _,
-            _user,
-        ) = auth_data
         if key_id:
             key = self.controller.users.get_user_api_key(key_id)
             # does this user id exist?
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 6c2fc7c6..69864049 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -1,14 +1,10 @@
 import json
 import logging
-import os
-import time
 import tornado.web
 import tornado.escape
-import bleach
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
 

From 73c4adbdbf0fe69b10c9385c7007844f0364b0fe Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:24:10 -0400
Subject: [PATCH 113/210] Appease the linter

---
 app/classes/web/routes/api/servers/server/action.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/web/routes/api/servers/server/action.py b/app/classes/web/routes/api/servers/server/action.py
index 3b000d1b..153b889d 100644
--- a/app/classes/web/routes/api/servers/server/action.py
+++ b/app/classes/web/routes/api/servers/server/action.py
@@ -31,7 +31,7 @@ class ApiServersServerActionHandler(BaseApiHandler):
 
         if action == "clone_server":
             return self._clone_server(server_id, auth_data[4]["user_id"])
-        elif action == "eula":
+        if action == "eula":
             return self._agree_eula(server_id, auth_data[4]["user_id"])
 
         self.controller.management.send_command(

From b8210b1a07f79dfa78296a2a95ce76841ce697ca Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:26:04 -0400
Subject: [PATCH 114/210] Remove sonar "bugs"

---
 app/frontend/templates/panel/panel_config.html    | 2 --
 app/frontend/templates/panel/panel_edit_user.html | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index d8822eb3..22cf7998 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -333,8 +333,6 @@
     $("#submit-status").html('<i class="fa fa-spinner fa-spin"></i>');
 
     let path = $("#global_server_path").val();
-    path;
-    console.log(path)
     var token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/crafty/config/servers_dir`, {
         method: 'PATCH',
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index b61c6619..959987a9 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -217,7 +217,7 @@ data['lang']) }}{% end %}
                     <div class="card-body">
                       <div class="form-group">
                         <div class="table-responsive">
-                          <table id="permissions" class="table table-hover">
+                          <table id="permissions" aria-describedby="User Crafty Permissions" class="table table-hover">
                             <thead>
                               <tr class="rounded">
                                 <th>{{ translate('userConfig', 'permName', data['lang']) }}</th>

From 157b06651843eadc99cbaf8565458ec35a6a66b9 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:31:46 -0400
Subject: [PATCH 115/210] Appease sonar security

---
 app/frontend/templates/server/bedrock_wizard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index d91a1eb5..6c9a3289 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -97,7 +97,7 @@
                 <p style="color: white !important;"><i class="fas fa-exclamation-triangle"
                     style="color: red;"></i>&nbsp;{{ translate('error', 'bedrockError', data['lang']) }}<a
                     style="color: red;" ; href="https://status.craftycontrol.com/status/craftycontrol"
-                    target="_blank">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
+                    target="_blank" rel="noopener noreferrer">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
                   &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
               </div>
               {% end %}

From 24f9b64d591d5a34848f0e391abc3fe371012246 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:42:29 -0400
Subject: [PATCH 116/210] Add default photo variable to appease sonar

---
 app/classes/web/routes/api/crafty/config/index.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
index 1da29b0d..9183d96b 100644
--- a/app/classes/web/routes/api/crafty/config/index.py
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -54,6 +54,7 @@ photo_delete_schema = {
     "additionalProperties": False,
     "minProperties": 1,
 }
+default_photo = "login_1.jpg"
 
 
 class ApiCraftyConfigIndexHandler(BaseApiHandler):
@@ -174,7 +175,6 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
             superuser,
             user,
         ) = auth_data
-
         if not superuser:
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
 
@@ -222,8 +222,8 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
             source_ip=self.get_remote_ip(),
         )
         self.controller.management.set_login_opacity(int(data["opacity"]))
-        if data["photo"] == "login_1.jpg":
-            self.controller.management.set_login_image("login_1.jpg")
+        if data["photo"] == default_photo:
+            self.controller.management.set_login_image(default_photo)
             self.controller.cached_login = f"{data['photo']}"
         else:
             self.controller.management.set_login_image(f"custom/{data['photo']}")
@@ -285,7 +285,7 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
                     " NOT SUPPOSED TO BE ACCESSIBLE",
                 },
             )
-        if data["photo"] == "login_1.jpg":
+        if data["photo"] == default_photo:
             return self.finish_json(
                 400,
                 {
@@ -307,6 +307,6 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
         else:
             current_photo = split[1]
         if current_photo == data["photo"]:
-            self.controller.management.set_login_image("login_1.jpg")
-            self.controller.cached_login = "login_1.jpg"
+            self.controller.management.set_login_image(default_photo)
+            self.controller.cached_login = default_photo
         return self.finish_json(200, {"status": "ok"})

From 3cb18f2da42857bb0e790e12b84012a1227545c3 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 18:44:17 -0400
Subject: [PATCH 117/210] Make if more comprehensive

---
 .../web/routes/api/crafty/imports/index.py    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/imports/index.py b/app/classes/web/routes/api/crafty/imports/index.py
index 0e88f484..643a0aa4 100644
--- a/app/classes/web/routes/api/crafty/imports/index.py
+++ b/app/classes/web/routes/api/crafty/imports/index.py
@@ -81,18 +81,17 @@ class ApiImportFilesIndexHandler(BaseApiHandler):
                         },
                     )
         else:
-            if not self.helper.check_path_exists(folder):
-                if user_id:
-                    user_lang = self.controller.users.get_user_lang_by_id(user_id)
-                    self.helper.websocket_helper.broadcast_user(
-                        user_id,
-                        "send_start_error",
-                        {
-                            "error": self.helper.translation.translate(
-                                "error", "no-file", user_lang
-                            )
-                        },
-                    )
+            if not self.helper.check_path_exists(folder) and user_id:
+                user_lang = self.controller.users.get_user_lang_by_id(user_id)
+                self.helper.websocket_helper.broadcast_user(
+                    user_id,
+                    "send_start_error",
+                    {
+                        "error": self.helper.translation.translate(
+                            "error", "no-file", user_lang
+                        )
+                    },
+                )
         return_json = {
             "root_path": {
                 "path": folder,

From 81d63575962b231235071c3e55dc64b8701a9f09 Mon Sep 17 00:00:00 2001
From: Iain Powrie <zedifus@zediverse.gg>
Date: Mon, 4 Sep 2023 23:13:13 +0000
Subject: [PATCH 118/210] Revert "Merge branch 'refractor/remove-bleach' into
 'dev'"

This reverts merge request !616
---
 app/classes/web/ajax_handler.py   | 18 +++++-----
 app/classes/web/base_handler.py   |  4 +--
 app/classes/web/file_handler.py   | 22 ++++++------
 app/classes/web/panel_handler.py  | 60 ++++++++++++++++---------------
 app/classes/web/public_handler.py | 14 ++++----
 app/classes/web/server_handler.py | 42 +++++++++++-----------
 requirements.txt                  |  2 +-
 7 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index df2d701d..efe8d2fa 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -5,7 +5,7 @@ import re
 import logging
 import time
 import urllib.parse
-import nh3
+import bleach
 import tornado.web
 import tornado.escape
 
@@ -29,7 +29,7 @@ class AjaxHandler(BaseHandler):
     @tornado.web.authenticated
     def get(self, page):
         _, _, exec_user = self.current_user
-        error = nh3.clean(self.get_argument("error", "WTF Error!"))
+        error = bleach.clean(self.get_argument("error", "WTF Error!"))
 
         template = "panel/denied.html"
 
@@ -48,7 +48,7 @@ class AjaxHandler(BaseHandler):
                 self.redirect("/panel/error?error=Server ID Not Found")
                 return
 
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             server_data = self.controller.servers.get_server_data_by_id(server_id)
             if not server_data:
@@ -246,7 +246,7 @@ class AjaxHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "get_tree"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if Helpers.validate_traversal(
                 self.controller.servers.get_server_data_by_id(server_id)["path"], path
@@ -327,7 +327,7 @@ class AjaxHandler(BaseHandler):
 
         elif page == "send_order":
             self.controller.users.update_server_order(
-                exec_user["user_id"], nh3.clean(self.get_argument("order"))
+                exec_user["user_id"], bleach.clean(self.get_argument("order"))
             )
             return
 
@@ -392,8 +392,8 @@ class AjaxHandler(BaseHandler):
                 if not superuser:
                     self.redirect("/panel/error?error=Unauthorized access to Backups")
                     return
-            server_id = nh3.clean(self.get_argument("id", None))
-            zip_name = nh3.clean(self.get_argument("zip_file", None))
+            server_id = bleach.clean(self.get_argument("id", None))
+            zip_name = bleach.clean(self.get_argument("zip_file", None))
             svr_obj = self.controller.servers.get_server_obj(server_id)
             server_data = self.controller.servers.get_server_data_by_id(server_id)
 
@@ -652,7 +652,7 @@ class AjaxHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "del_backup"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
             if not (
@@ -684,7 +684,7 @@ class AjaxHandler(BaseHandler):
                 f"Server ID not defined in {page_name} ajax call ({server_id})"
             )
             return
-        server_id = nh3.clean(server_id)
+        server_id = bleach.clean(server_id)
 
         # does this server id exist?
         if not self.controller.servers.server_id_exists(server_id):
diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index 11a62ff8..e772d633 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -2,7 +2,7 @@ import logging
 import re
 import typing as t
 import orjson
-import nh3
+import bleach
 import tornado.web
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
@@ -93,7 +93,7 @@ class BaseHandler(tornado.web.RequestHandler):
         if type(text) in self.nobleach:
             logger.debug("Auto-bleaching - bypass type")
             return text
-        return nh3.clean(text)
+        return bleach.clean(text)
 
     def get_argument(
         self,
diff --git a/app/classes/web/file_handler.py b/app/classes/web/file_handler.py
index f3c05151..e2d07476 100644
--- a/app/classes/web/file_handler.py
+++ b/app/classes/web/file_handler.py
@@ -1,6 +1,6 @@
 import os
 import logging
-import nh3
+import bleach
 import tornado.web
 import tornado.escape
 
@@ -55,7 +55,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "get_file"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if not self.helper.is_subdir(
                 file_path,
@@ -92,7 +92,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "get_tree"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if Helpers.validate_traversal(
                 self.controller.servers.get_server_data_by_id(server_id)["path"], path
@@ -113,7 +113,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "get_tree"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if Helpers.validate_traversal(
                 self.controller.servers.get_server_data_by_id(server_id)["path"], path
@@ -161,7 +161,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "create_file"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if not self.helper.is_subdir(
                 file_path,
@@ -194,7 +194,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "create_dir"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if not self.helper.is_subdir(
                 dir_path,
@@ -259,7 +259,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "del_file"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
             if not (
@@ -293,7 +293,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "del_dir"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             server_info = self.controller.servers.get_server_data_by_id(server_id)
             if not self.helper.is_subdir(
@@ -346,7 +346,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "save_file"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if not self.helper.is_subdir(
                 file_path,
@@ -401,7 +401,7 @@ class FileHandler(BaseHandler):
 
             if not self.check_server_id(server_id, "rename_file"):
                 return
-            server_id = nh3.clean(server_id)
+            server_id = bleach.clean(server_id)
 
             if item_path is None or new_item_name is None:
                 logger.warning("Invalid path(s) in rename_file file ajax call")
@@ -450,7 +450,7 @@ class FileHandler(BaseHandler):
                 f"Server ID not defined in {page_name} file ajax call ({server_id})"
             )
             return
-        server_id = nh3.clean(server_id)
+        server_id = bleach.clean(server_id)
 
         # does this server id exist?
         if not self.controller.servers.server_id_exists(server_id):
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 0dc3c586..20c76c1a 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -7,7 +7,7 @@ import json
 import logging
 import threading
 import urllib.parse
-import nh3
+import bleach
 import requests
 import tornado.web
 import tornado.escape
@@ -67,7 +67,9 @@ class PanelHandler(BaseHandler):
         ) in self.controller.crafty_perms.list_defined_crafty_permissions():
             argument = int(
                 float(
-                    nh3.clean(self.get_argument(f"permission_{permission.name}", "0"))
+                    bleach.clean(
+                        self.get_argument(f"permission_{permission.name}", "0")
+                    )
                 )
             )
             if argument:
@@ -76,7 +78,9 @@ class PanelHandler(BaseHandler):
                 )
 
             q_argument = int(
-                float(nh3.clean(self.get_argument(f"quantity_{permission.name}", "0")))
+                float(
+                    bleach.clean(self.get_argument(f"quantity_{permission.name}", "0"))
+                )
             )
             if q_argument:
                 server_quantity[permission.name] = q_argument
@@ -475,7 +479,7 @@ class PanelHandler(BaseHandler):
             template = "panel/dashboard.html"
 
         elif page == "server_detail":
-            subpage = nh3.clean(self.get_argument("subpage", ""))
+            subpage = bleach.clean(self.get_argument("subpage", ""))
 
             server_id = self.check_server_id()
             if server_id is None:
@@ -1280,7 +1284,7 @@ class PanelHandler(BaseHandler):
             template = "panel/panel_edit_user_apikeys.html"
 
         elif page == "remove_user":
-            user_id = nh3.clean(self.get_argument("id", None))
+            user_id = bleach.clean(self.get_argument("id", None))
 
             if (
                 not superuser
@@ -1412,7 +1416,7 @@ class PanelHandler(BaseHandler):
             template = "panel/panel_edit_role.html"
 
         elif page == "remove_role":
-            role_id = nh3.clean(self.get_argument("id", None))
+            role_id = bleach.clean(self.get_argument("id", None))
 
             if (
                 not superuser
@@ -1600,7 +1604,7 @@ class PanelHandler(BaseHandler):
                     backup_path = Helpers.wtol_path(backup_path)
             else:
                 backup_path = server_obj.backup_path
-            max_backups = nh3.clean(self.get_argument("max_backups", None))
+            max_backups = bleach.clean(self.get_argument("max_backups", None))
 
             server_obj = self.controller.servers.get_server_obj(server_id)
 
@@ -1661,15 +1665,15 @@ class PanelHandler(BaseHandler):
             self.redirect("/panel/config_json")
 
         elif page == "edit_user":
-            if nh3.clean(self.get_argument("username", None)).lower() == "system":
+            if bleach.clean(self.get_argument("username", None)).lower() == "system":
                 self.redirect(
                     "/panel/error?error=Unauthorized access: "
                     "system user is not editable"
                 )
-            user_id = nh3.clean(self.get_argument("id", None))
+            user_id = bleach.clean(self.get_argument("id", None))
             user = self.controller.users.get_user_by_id(user_id)
-            username = nh3.clean(self.get_argument("username", None).lower())
-            theme = nh3.clean(self.get_argument("theme", "default"))
+            username = bleach.clean(self.get_argument("username", None).lower())
+            theme = bleach.clean(self.get_argument("theme", "default"))
             if (
                 username != self.controller.users.get_user_by_id(user_id)["username"]
                 and username in self.controller.users.get_all_usernames()
@@ -1677,16 +1681,16 @@ class PanelHandler(BaseHandler):
                 self.redirect(
                     "/panel/error?error=Duplicate User: Useranme already exists."
                 )
-            password0 = nh3.clean(self.get_argument("password0", None))
-            password1 = nh3.clean(self.get_argument("password1", None))
-            email = nh3.clean(self.get_argument("email", "default@example.com"))
+            password0 = bleach.clean(self.get_argument("password0", None))
+            password1 = bleach.clean(self.get_argument("password1", None))
+            email = bleach.clean(self.get_argument("email", "default@example.com"))
             enabled = int(float(self.get_argument("enabled", "0")))
             try:
-                hints = int(nh3.clean(self.get_argument("hints")))
+                hints = int(bleach.clean(self.get_argument("hints")))
                 hints = True
             except:
                 hints = False
-            lang = nh3.clean(
+            lang = bleach.clean(
                 self.get_argument("language"), self.helper.get_setting("language")
             )
 
@@ -1695,7 +1699,7 @@ class PanelHandler(BaseHandler):
                 # We don't want that. Automatically make them stay super user
                 # since we know they are.
                 if str(exec_user["user_id"]) != str(user_id):
-                    superuser = int(nh3.clean(self.get_argument("superuser", "0")))
+                    superuser = int(bleach.clean(self.get_argument("superuser", "0")))
                 else:
                     superuser = 1
             else:
@@ -1873,7 +1877,7 @@ class PanelHandler(BaseHandler):
             self.finish()
 
         elif page == "add_user":
-            username = nh3.clean(self.get_argument("username", None).lower())
+            username = bleach.clean(self.get_argument("username", None).lower())
             if username.lower() == "system":
                 self.redirect(
                     "/panel/error?error=Unauthorized access: "
@@ -1881,18 +1885,18 @@ class PanelHandler(BaseHandler):
                     " Please choose a different username."
                 )
                 return
-            password0 = nh3.clean(self.get_argument("password0", None))
-            password1 = nh3.clean(self.get_argument("password1", None))
-            email = nh3.clean(self.get_argument("email", "default@example.com"))
+            password0 = bleach.clean(self.get_argument("password0", None))
+            password1 = bleach.clean(self.get_argument("password1", None))
+            email = bleach.clean(self.get_argument("email", "default@example.com"))
             enabled = int(float(self.get_argument("enabled", "0")))
-            theme = nh3.clean(self.get_argument("theme"), "default")
+            theme = bleach.clean(self.get_argument("theme"), "default")
             hints = True
-            lang = nh3.clean(
+            lang = bleach.clean(
                 self.get_argument("lang", self.helper.get_setting("language"))
             )
             # We don't want a non-super user to be able to create a super user.
             if superuser:
-                new_superuser = int(nh3.clean(self.get_argument("superuser", "0")))
+                new_superuser = int(bleach.clean(self.get_argument("superuser", "0")))
             else:
                 new_superuser = 0
 
@@ -1967,8 +1971,8 @@ class PanelHandler(BaseHandler):
             self.redirect("/panel/panel_config")
 
         elif page == "edit_role":
-            role_id = nh3.clean(self.get_argument("id", None))
-            role_name = nh3.clean(self.get_argument("role_name", None))
+            role_id = bleach.clean(self.get_argument("id", None))
+            role_name = bleach.clean(self.get_argument("role_name", None))
 
             role = self.controller.roles.get_role(role_id)
 
@@ -2014,7 +2018,7 @@ class PanelHandler(BaseHandler):
             self.redirect("/panel/panel_config")
 
         elif page == "add_role":
-            role_name = nh3.clean(self.get_argument("role_name", None))
+            role_name = bleach.clean(self.get_argument("role_name", None))
             if exec_user["superuser"]:
                 manager = self.get_argument("manager", None)
                 if manager == "":
@@ -2088,7 +2092,7 @@ class PanelHandler(BaseHandler):
         }
 
         if page == "remove_apikey":
-            key_id = nh3.clean(self.get_argument("id", None))
+            key_id = bleach.clean(self.get_argument("id", None))
 
             if not superuser:
                 self.redirect("/panel/error?error=Unauthorized access: not superuser")
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index b7d1be9b..76c6a8be 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -1,5 +1,5 @@
 import logging
-import nh3
+import bleach
 
 from app.classes.shared.helpers import Helpers
 from app.classes.models.users import HelperUsers
@@ -28,8 +28,8 @@ class PublicHandler(BaseHandler):
             # self.clear_cookie("user_data")
 
     def get(self, page=None):
-        error = nh3.clean(self.get_argument("error", "Invalid Login!"))
-        error_msg = nh3.clean(self.get_argument("error_msg", ""))
+        error = bleach.clean(self.get_argument("error", "Invalid Login!"))
+        error_msg = bleach.clean(self.get_argument("error_msg", ""))
 
         page_data = {
             "version": self.helper.get_version_string(),
@@ -82,8 +82,8 @@ class PublicHandler(BaseHandler):
         )
 
     def post(self, page=None):
-        error = nh3.clean(self.get_argument("error", "Invalid Login!"))
-        error_msg = nh3.clean(self.get_argument("error_msg", ""))
+        error = bleach.clean(self.get_argument("error", "Invalid Login!"))
+        error_msg = bleach.clean(self.get_argument("error_msg", ""))
 
         page_data = {
             "version": self.helper.get_version_string(),
@@ -100,8 +100,8 @@ class PublicHandler(BaseHandler):
             if self.request.query:
                 next_page = "/login?" + self.request.query
 
-            entered_username = nh3.clean(self.get_argument("username"))
-            entered_password = nh3.clean(self.get_argument("password"))
+            entered_username = bleach.clean(self.get_argument("username"))
+            entered_password = bleach.clean(self.get_argument("password"))
 
             # pylint: disable=no-member
             try:
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 42cb8ce5..eae3ce0c 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -4,7 +4,7 @@ import os
 import time
 import tornado.web
 import tornado.escape
-import nh3
+import bleach
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.shared.helpers import Helpers
@@ -195,8 +195,8 @@ class ServerHandler(BaseHandler):
         }
 
         if page == "command":
-            server_id = nh3.clean(self.get_argument("id", None))
-            command = nh3.clean(self.get_argument("command", None))
+            server_id = bleach.clean(self.get_argument("id", None))
+            command = bleach.clean(self.get_argument("command", None))
 
             if server_id is not None:
                 if command == "clone_server":
@@ -311,24 +311,24 @@ class ServerHandler(BaseHandler):
                 user_roles = self.controller.roles.get_all_roles()
             else:
                 user_roles = self.get_user_roles()
-            server = nh3.clean(self.get_argument("server", ""))
-            server_name = nh3.clean(self.get_argument("server_name", ""))
-            min_mem = nh3.clean(self.get_argument("min_memory", ""))
-            max_mem = nh3.clean(self.get_argument("max_memory", ""))
-            port = nh3.clean(self.get_argument("port", ""))
+            server = bleach.clean(self.get_argument("server", ""))
+            server_name = bleach.clean(self.get_argument("server_name", ""))
+            min_mem = bleach.clean(self.get_argument("min_memory", ""))
+            max_mem = bleach.clean(self.get_argument("max_memory", ""))
+            port = bleach.clean(self.get_argument("port", ""))
             if int(port) < 1 or int(port) > 65535:
                 self.redirect(
                     "/panel/error?error=Constraint Error: "
                     "Port must be greater than 0 and less than 65535"
                 )
                 return
-            import_type = nh3.clean(self.get_argument("create_type", ""))
-            import_server_path = nh3.clean(self.get_argument("server_path", ""))
-            import_server_jar = nh3.clean(self.get_argument("server_jar", ""))
+            import_type = bleach.clean(self.get_argument("create_type", ""))
+            import_server_path = bleach.clean(self.get_argument("server_path", ""))
+            import_server_jar = bleach.clean(self.get_argument("server_jar", ""))
             server_parts = server.split("|")
             captured_roles = []
             for role in user_roles:
-                if nh3.clean(self.get_argument(str(role), "")) == "on":
+                if bleach.clean(self.get_argument(str(role), "")) == "on":
                     captured_roles.append(role)
 
             if not server_name:
@@ -372,7 +372,7 @@ class ServerHandler(BaseHandler):
                 )
             elif import_type == "import_zip":
                 # here import_server_path means the zip path
-                zip_path = nh3.clean(self.get_argument("root_path"))
+                zip_path = bleach.clean(self.get_argument("root_path"))
                 good_path = Helpers.check_path_exists(zip_path)
                 if not good_path:
                     self.redirect("/panel/error?error=Temp path not found!")
@@ -476,9 +476,9 @@ class ServerHandler(BaseHandler):
                 user_roles = self.controller.roles.get_all_roles()
             else:
                 user_roles = self.controller.roles.get_all_roles()
-            server = nh3.clean(self.get_argument("server", ""))
-            server_name = nh3.clean(self.get_argument("server_name", ""))
-            port = nh3.clean(self.get_argument("port", ""))
+            server = bleach.clean(self.get_argument("server", ""))
+            server_name = bleach.clean(self.get_argument("server_name", ""))
+            port = bleach.clean(self.get_argument("port", ""))
 
             if not port:
                 port = 19132
@@ -488,13 +488,13 @@ class ServerHandler(BaseHandler):
                     "Port must be greater than 0 and less than 65535"
                 )
                 return
-            import_type = nh3.clean(self.get_argument("create_type", ""))
-            import_server_path = nh3.clean(self.get_argument("server_path", ""))
-            import_server_exe = nh3.clean(self.get_argument("server_jar", ""))
+            import_type = bleach.clean(self.get_argument("create_type", ""))
+            import_server_path = bleach.clean(self.get_argument("server_path", ""))
+            import_server_exe = bleach.clean(self.get_argument("server_jar", ""))
             server_parts = server.split("|")
             captured_roles = []
             for role in user_roles:
-                if nh3.clean(self.get_argument(str(role), "")) == "on":
+                if bleach.clean(self.get_argument(str(role), "")) == "on":
                     captured_roles.append(role)
 
             if not server_name:
@@ -536,7 +536,7 @@ class ServerHandler(BaseHandler):
                 )
             elif import_type == "import_zip":
                 # here import_server_path means the zip path
-                zip_path = nh3.clean(self.get_argument("root_path"))
+                zip_path = bleach.clean(self.get_argument("root_path"))
                 good_path = Helpers.check_path_exists(zip_path)
                 if not good_path:
                     self.redirect("/panel/error?error=Temp path not found!")
diff --git a/requirements.txt b/requirements.txt
index df3360a0..98e095f1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 
 apscheduler==3.8.1
 argon2-cffi==21.3
-nh3==0.2.14
+bleach==4.1
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5

From 9d26a8ff8d695bbc46e4456ff6d68be0c128628e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:22:11 -0400
Subject: [PATCH 119/210] Make sonar changes

---
 .../web/routes/api/servers/server/files.py    |   4 +-
 .../web/routes/api/users/user/index.py        |  11 +-
 .../static/assets/js/shared/root-dir.js       |  20 +-
 app/frontend/templates/base.html              |   6 +-
 app/frontend/templates/panel/config_json.html |  54 +-
 .../templates/panel/custom_login.html         | 102 ++-
 .../templates/panel/panel_config.html         |  33 +-
 .../templates/panel/panel_edit_role.html      |   4 +-
 .../templates/panel/panel_edit_user.html      |   4 +-
 .../panel/panel_edit_user_apikeys.html        |   6 +-
 .../panel/server_admin_controls.html          |   2 +-
 .../templates/panel/server_config.html        |  10 +-
 .../templates/panel/server_files.html         | 360 ++++----
 app/frontend/templates/panel/server_logs.html |  12 +-
 .../templates/panel/server_schedule_edit.html |   4 +-
 .../templates/panel/server_schedules.html     |  39 +-
 app/frontend/templates/panel/server_term.html | 109 +--
 .../templates/server/bedrock_wizard.html      |  15 +-
 app/frontend/templates/server/wizard.html     | 831 ++++++++++--------
 19 files changed, 859 insertions(+), 767 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index 3fb99796..9ed720ac 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -86,8 +86,8 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler):
             not in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )
-            or not EnumPermissionsServer.BACKUP
-            in self.controller.server_perms.get_user_id_permissions_list(
+            or EnumPermissionsServer.BACKUP
+            not in self.controller.server_perms.get_user_id_permissions_list(
                 auth_data[4]["user_id"], server_id
             )
         ):
diff --git a/app/classes/web/routes/api/users/user/index.py b/app/classes/web/routes/api/users/user/index.py
index 898a9fda..73f17f9f 100644
--- a/app/classes/web/routes/api/users/user/index.py
+++ b/app/classes/web/routes/api/users/user/index.py
@@ -242,12 +242,11 @@ class ApiUsersUserIndexHandler(BaseApiHandler):
                     user_id, removed_roles
                 )
 
-        if "manager" in data:
-            if (
-                data["manager"] == self.controller.users.get_id_by_name("SYSTEM")
-                or data["manager"] == 0
-            ):
-                data["manager"] = None
+        if "manager" in data and (
+            data["manager"] == self.controller.users.get_id_by_name("SYSTEM")
+            or data["manager"] == 0
+        ):
+            data["manager"] = None
 
         if "permissions" in data:
             permissions: t.List[UsersController.ApiPermissionDict] = data.pop(
diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js
index 9f3f14ac..2a6f58fd 100644
--- a/app/frontend/static/assets/js/shared/root-dir.js
+++ b/app/frontend/static/assets/js/shared/root-dir.js
@@ -1,11 +1,11 @@
 
 function show_file_tree() {
-        $("#dir_select").modal();
+    $("#dir_select").modal();
 }
 function getDirView(event = false) {
     if (event) {
         try {
-            path = event.target.parentElement.getAttribute('data-path');
+            let path = event.target.parentElement.getAttribute('data-path');
             if (event.target.parentElement.classList.contains('clicked')) {
 
                 if ($(`#${path}span`).hasClass('files-tree-title')) {
@@ -19,20 +19,18 @@ function getDirView(event = false) {
         } catch {
             console.log("Well that failed");
         }
+    } else if ($("#root_files_button").hasClass("clicked")) {
+        path = $("#zip_server_path").val();
+        getTreeView(path, true);
     } else {
-        if ($("#root_files_button").hasClass("clicked")) {
-            path = $("#zip_server_path").val();
-            getTreeView(path, true);
-        } else {
-            path = $("#file-uploaded").val();
-            getTreeView(path, true, true);
-        }
+        path = $("#file-uploaded").val();
+        getTreeView(path, true, true);
     }
-
 }
 
+
 async function getTreeView(path, unzip = false, upload = false) {
-    var token = getCookie("_xsrf");
+    const token = getCookie("_xsrf");
     console.log("IN TREE VIEW")
     console.log({ "page": "import", "folder": path, "upload": upload, "unzip": unzip });
     let res = await fetch(`/api/v2/import/file/unzip/`, {
diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index fc56d45b..eca34e75 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -18,7 +18,7 @@
     href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
   <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
   <link rel="stylesheet" href="/static/assets/css/crafty.css">
-  
+
   <link rel="manifest" href="/static/assets/crafty.webmanifest">
   <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -414,7 +414,7 @@
 
     async function eulaAgree(server_id, command) {
       //< !--this getCookie function is in base.html-- >
-      var token = getCookie("_xsrf");
+      const token = getCookie("_xsrf");
 
       let res = await fetch(`/api/v2/servers/${server_id}/action/eula/`, {
         method: 'POST',
@@ -544,7 +544,7 @@
     });
     $(document).ready(() => {
       if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
+        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', { scope: '/' })
           .then(function (registration) {
             console.log('Service Worker Registered');
           });
diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html
index a8d5e040..aabac37d 100644
--- a/app/frontend/templates/panel/config_json.html
+++ b/app/frontend/templates/panel/config_json.html
@@ -6,7 +6,8 @@
 {% block title %}Crafty Controller - {{ translate('panelConfig', 'pageTitle', data['lang']) }}{% end %}
 
 {% block content %}
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/css/bootstrap-select.min.css">
+<link rel="stylesheet"
+  href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/css/bootstrap-select.min.css">
 
 
 <div class="content-wrapper">
@@ -72,8 +73,11 @@
                 </select>
                 {% elif item[0] == 'disabled_language_files' %}
                 <div class="input-group">
-                  <button type="button" class="btn btn-outline-default custom-picker" onclick="$('option', $('#lang_select')).each(function(element) {$(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')});">{{ translate('panelConfig', 'enableLang', data['lang']) }}</button>
-                  <select id="lang_select" class="form-control selectpicker show-tick custom-picker" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
+                  <button type="button" class="btn btn-outline-default custom-picker"
+                    onclick="$('option', $('#lang_select')).each(function(element) {$(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')});">{{
+                    translate('panelConfig', 'enableLang', data['lang']) }}</button>
+                  <select id="lang_select" class="form-control selectpicker show-tick custom-picker"
+                    data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
                     {% for lang in data['all_languages'] %}
                     {% if lang in item[1] %}
                     <option selected>{{lang}}</option>
@@ -82,12 +86,17 @@
                     {% end %}
                     {% end %}
                   </select>
-                  <textarea id="disabled_lang" name="{{item[0]}}" class="form-control list hidden" rows="{{ len(data['all_languages']) }}" value="{{','.join(item[1])}}" hidden>{{','.join(item[1])}}</textarea>
+                  <textarea id="disabled_lang" name="{{item[0]}}" class="form-control list hidden"
+                    rows="{{ len(data['all_languages']) }}" value="{{','.join(item[1])}}"
+                    hidden>{{','.join(item[1])}}</textarea>
                 </div>
                 {% elif item[0] == 'monitored_mounts'%}
                 <div class="input-group">
-                  <button type="button" class="btn btn-outline-default custom-picker" onclick="$('option', $('#mount_select')).each(function(element) {$(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')});">{{ translate('panelConfig', 'noMounts', data['lang']) }}</button>
-                  <select id="mount_select" class="form-control selectpicker show-tick" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
+                  <button type="button" class="btn btn-outline-default custom-picker"
+                    onclick="$('option', $('#mount_select')).each(function(element) {$(this).removeAttr('selected').prop('selected', false); $('.selectpicker').selectpicker('refresh')});">{{
+                    translate('panelConfig', 'noMounts', data['lang']) }}</button>
+                  <select id="mount_select" class="form-control selectpicker show-tick" data-icon-base="fas"
+                    data-tick-icon="fa-check" multiple data-style="custom-picker">
                     {% for mount in data['all_partitions'] %}
                     {% if mount in item[1] %}
                     <option selected>{{mount}}</option>
@@ -96,10 +105,13 @@
                     {% end %}
                     {% end %}
                   </select>
-                  <textarea id="monitored_mounts" name="{{item[0]}}" class="form-control list hidden" rows="{{ len(data['all_partitions']) }}" value="{{','.join(item[1])}}" hidden>{{','.join(item[1])}}</textarea>
+                  <textarea id="monitored_mounts" name="{{item[0]}}" class="form-control list hidden"
+                    rows="{{ len(data['all_partitions']) }}" value="{{','.join(item[1])}}"
+                    hidden>{{','.join(item[1])}}</textarea>
                 </div>
                 {% elif isinstance(item[1], list) %}
-                <textarea id="{{item[0]}}" value="{{','.join(item[1])}}" type="text" name="{{item[0]}}" class="form-control list">{{','.join(item[1])}}</textarea>
+                <textarea id="{{item[0]}}" value="{{','.join(item[1])}}" type="text" name="{{item[0]}}"
+                  class="form-control list">{{','.join(item[1])}}</textarea>
                 {% elif isinstance(item[1], bool) %}
                 <div style="margin-left: 30px;">
                   {% if item[1] == True %}
@@ -115,9 +127,11 @@
                   {% end %}
                 </div>
                 {% elif isinstance(item[1], int) %}
-                <input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}" step="1" min="0" required>
+                <input type="number" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}"
+                  step="1" min="0" required>
                 {% else %}
-                <input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}" step="2" min="0" required>
+                <input type="text" class="form-control" name="{{item[0]}}" id="{{item[0]}}" value="{{ item[1]  }}"
+                  step="2" min="0" required>
                 {% end %}
               </div>
               {% end %}
@@ -155,9 +169,9 @@
 
 {% block js %}
 <script>
-    function replacer(key, value) {
+  function replacer(key, value) {
     if (key == "disabled_language_files") {
-      if (value == 0){
+      if (value == 0) {
         return []
       } else {
         return value
@@ -172,7 +186,7 @@
   $("#config-form").on("submit", async function (e) {
     e.preventDefault();
     $("#submit-status").html('<i class="fa fa-spinner fa-spin"></i>');
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let configForm = document.getElementById("config-form");
 
     let formData = new FormData(configForm);
@@ -185,10 +199,10 @@
     formDataObject.disabled_language_files = $('#lang_select').val();
     formDataObject.monitored_mounts = $('#mount_select').val();
     formDataObject.keywords = $('#keywords').val().split(",");
-    $('#config-form input[type="radio"]:checked').each(function() {
-      if ($(this).val() == 'True'){
+    $('#config-form input[type="radio"]:checked').each(function () {
+      if ($(this).val() == 'True') {
         formDataObject[this.name] = true;
-      }else{
+      } else {
         formDataObject[this.name] = false;
       }
     });
@@ -215,7 +229,7 @@
         message: responseData.error_data
       });
     }
-});
+  });
 
   function uuidv4() {
     return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
@@ -286,7 +300,7 @@
   });
 
   $('.clear-comm').click(function () {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     $.ajax({
       type: "POST",
       headers: { 'X-XSRFToken': token },
@@ -297,7 +311,7 @@
   })
 
   $('.delete-photo').click(function () {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let photo = $('#photo').find(":selected").val();
     $.ajax({
       type: "POST",
@@ -310,7 +324,7 @@
   })
 
   $('.select-photo').click(function () {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let photo = $('#photo').find(":selected").val();
     $.ajax({
       type: "POST",
diff --git a/app/frontend/templates/panel/custom_login.html b/app/frontend/templates/panel/custom_login.html
index 87e6d081..0f2f6c10 100644
--- a/app/frontend/templates/panel/custom_login.html
+++ b/app/frontend/templates/panel/custom_login.html
@@ -62,11 +62,14 @@
                         <div class="form-group">
                           <div id="upload_input" class="input-group">
                             <div class="custom-file">
-                              <input type="file" class="custom-file-input" id="file" name="file" multiple="false" required>
-                              <label id="fileLabel" class="custom-file-label" for="file">{{ translate('customLogin', 'labelLoginImage', data['lang']) }}</label>
+                              <input type="file" class="custom-file-input" id="file" name="file" multiple="false"
+                                required>
+                              <label id="fileLabel" class="custom-file-label" for="file">{{ translate('customLogin',
+                                'labelLoginImage', data['lang']) }}</label>
                             </div>
                             <div class="input-group-append">
-                              <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()" disabled>UPLOAD</button>
+                              <button type="button" class="btn btn-info upload-button" id="upload-button"
+                                onclick="sendFile()" disabled>UPLOAD</button>
                             </div>
                           </div>
                         </div>
@@ -81,7 +84,8 @@
                           <div class="form-group row">
                             <label for="photo" class="col-sm-6 col-form-label">Selected Background Image</label>
                             <div class="col-sm-6">
-                              <select class="form-select form-control form-control-lg select-css form-control-plaintext" id="photo" name="photo" form="photo_form" onchange="updateBackgroundPreview()">
+                              <select class="form-select form-control form-control-lg select-css form-control-plaintext"
+                                id="photo" name="photo" form="photo_form" onchange="updateBackgroundPreview()">
                                 {% for image in data["backgrounds"] %}
                                 <option value="{{image}}">{{image}}</option>
                                 {% end %}
@@ -90,7 +94,9 @@
                           </div>
                           <div id="photo_loading" class="form-group" hidden>
                             <div class="progress">
-                              <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div>
+                              <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
+                                aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i
+                                  class="fa-solid fa-spinner"></i></div>
                             </div>
                           </div>
                           <div class="form-group row">
@@ -98,11 +104,13 @@
                               data['lang']) }}</label>
                             <label class="col-sm-1" id="opacityValue">{{ data['login_opacity'] }}%</label>
                             <div class="range col-sm-8">
-                              <input type="range" class="form-control-range" id="modal_opacity" name="modal_opacity" onchange="previewOpacity()" min="0" max="100" value="{{ data['login_opacity'] }}">
+                              <input type="range" class="form-control-range" id="modal_opacity" name="modal_opacity"
+                                onchange="previewOpacity()" min="0" max="100" value="{{ data['login_opacity'] }}">
                             </div>
                           </div>
                           <div id="login_preview" style="position: relative;">
-                            <img id="bg-preview" src="../../static/assets/images/auth/{{ data['background'] }}" class="img-fluid" alt="Responsive image">
+                            <img id="bg-preview" src="../../static/assets/images/auth/{{ data['background'] }}"
+                              class="img-fluid" alt="Responsive image">
                             <div id="login-form-preview">
                               <div id="login-form-background" class="auto-form-wrapper login-modal">
                                 <div class="text-center auto-form-logo">
@@ -166,17 +174,20 @@
                                 </style>
 
                                 <div id="login_form_data">
-                                  <input type="hidden" name="_xsrf" value="2|1d603267|809fb6bd82f677d440e484dde7c3a310|1671726040" disabled>
+                                  <input type="hidden" name="_xsrf"
+                                    value="2|1d603267|809fb6bd82f677d440e484dde7c3a310|1671726040" disabled>
                                   <div class="form-group">
                                     <label class="label">Username</label>
                                     <div class="input-group">
-                                      <input type="text" class="form-control login-text-input login-input" placeholder="Username" name="username" id="username" required="true" disabled>
+                                      <input type="text" class="form-control login-text-input login-input"
+                                        placeholder="Username" name="username" id="username" required="true" disabled>
                                     </div>
                                   </div>
                                   <div class="form-group">
                                     <label class="label">Password</label>
                                     <div class="input-group">
-                                      <input type="password" class="form-control login-text-input login-input" placeholder="Password" name="password" id="password" required="true" disabled>
+                                      <input type="password" class="form-control login-text-input login-input"
+                                        placeholder="Password" name="password" id="password" required="true" disabled>
                                     </div>
                                   </div>
                                   <div class="form-group">
@@ -195,7 +206,8 @@
                                     <a href="#" class="text-small forgot-password" disabled>Forgot Password</a>
                                   </div>
                                   <div class="text-block text-center my-3">
-                                    <span class="text-small font-weight-semibold"><a href="https://craftycontrol.com/">Crafty Control
+                                    <span class="text-small font-weight-semibold"><a
+                                        href="https://craftycontrol.com/">Crafty Control
                                         4.0.20</a> </span>
                                   </div>
                                 </div>
@@ -299,48 +311,48 @@
 
   $('.delete-photo').click(async function () {
     let photo = $('#photo').find(":selected").val();
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/crafty/config/customize`, {
-        method: 'DELETE',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"photo": photo}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        window.location.reload();
-      } else {
+      method: 'DELETE',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "photo": photo }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.reload();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   })
 
   $('.select-photo').click(async function () {
     let photo = $('#photo').find(":selected").val();
     let opacity = $('#modal_opacity').val();
-    console.log(JSON.stringify({"photo": photo, "opacity": opacity}))
-    var token = getCookie("_xsrf")
+    console.log(JSON.stringify({ "photo": photo, "opacity": opacity }))
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/crafty/config/customize`, {
-        method: 'PATCH',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"photo": photo, "opacity": opacity}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        window.location.reload();
-      } else {
+      method: 'PATCH',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "photo": photo, "opacity": opacity }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.reload();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   })
 
   $(document).ready(function () {
@@ -375,7 +387,7 @@
     file = $("#file")[0].files[0]
     document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
     let xmlHttpRequest = new XMLHttpRequest();
-    let token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let fileName = file.name
     let target = '/upload'
     let mimeType = file.type
diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 22cf7998..eded1165 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -327,30 +327,29 @@
   }
 
   $("#server-path").submit(async function (e) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     e.preventDefault();
 
     $("#submit-status").html('<i class="fa fa-spinner fa-spin"></i>');
 
     let path = $("#global_server_path").val();
-    var token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/crafty/config/servers_dir`, {
-        method: 'PATCH',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"new_dir": path}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        return
-      } else {
+      method: 'PATCH',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "new_dir": path }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      return
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   });
 
   $(document).ready(function () {
diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index f614b7a3..3abb12a3 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -355,7 +355,7 @@
   }
 
   async function del_role(){
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/roles/${roleId}`, {
         method: "DELETE",
         headers: {
@@ -376,7 +376,7 @@
 
     $("#role_form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let roleForm = document.getElementById("role_form");
 
       let server_ids = $('.access').map(function() {
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index 959987a9..39979b6d 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -395,7 +395,7 @@ data['lang']) }}{% end %}
       if (!password){
         return;
       }
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let userForm = document.getElementById("user_form");
 
       let disabled_flag = false;
@@ -494,7 +494,7 @@ data['lang']) }}{% end %}
       callback: async function (result) {
         console.log(result);
         if (result === true) {
-            var token = getCookie("_xsrf")
+            const token = getCookie("_xsrf")
             let res = await fetch(`/api/v2/users/${userId}`, {
               method: "DELETE",
               headers: {
diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index 34e0d23b..c08b5518 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -199,7 +199,7 @@
     $(document).ready(function () {
         $("#user_api_form").on("submit", async function (e) {
             e.preventDefault();
-            var token = getCookie("_xsrf")
+            const token = getCookie("_xsrf")
             let apiForm = document.getElementById("user_api_form");
 
             let formData = new FormData(apiForm);
@@ -269,7 +269,7 @@
         $('.delete-api-key').click(async function () {
             let keyId = $(this).data("key-id");
             let keyName = $(this).data("key-name");
-            let token = getCookie("_xsrf");
+            const token = getCookie("_xsrf");
             let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
                 method: 'DELETE',
                 headers: {
@@ -290,7 +290,7 @@
         $('.get-a-token').click(async function () {
             let keyId = $(this).data("key-id");
             let keyName = $(this).data("key-name");
-            let token = getCookie("_xsrf");
+            const token = getCookie("_xsrf");
             let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
                 method: 'GET',
                 headers: {
diff --git a/app/frontend/templates/panel/server_admin_controls.html b/app/frontend/templates/panel/server_admin_controls.html
index b7b8d5a2..c021f310 100644
--- a/app/frontend/templates/panel/server_admin_controls.html
+++ b/app/frontend/templates/panel/server_admin_controls.html
@@ -87,7 +87,7 @@
 
   async function send_command_to_server(command) {
     console.log(command)
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     console.log('sending command: ' + command)
 
     let res = await fetch(`/api/v2/servers/${serverId}/stdin`, {
diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index dec4fec6..08c426e8 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -304,7 +304,7 @@
   });
 
   function deleteServerE(callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     $.ajax({
       type: "DELETE",
       headers: { 'X-XSRFToken': token },
@@ -318,7 +318,7 @@
     });
   }
   function deleteServerFilesE(path, callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     $.ajax({
       type: "DELETE",
       headers: { 'X-XSRFToken': token },
@@ -334,7 +334,7 @@
 
   function send_command(serverId, command) {
     //<!--  this getCookie function is in base.html-->
-    var token = getCookie("_xsrf");
+    const token = getCookie("_xsrf");
     if (command == "update_executable") {
       document.getElementById("update-spinner").style.visibility = "visible";
     }
@@ -460,7 +460,7 @@
           return;
         }
         else {
-          var token = getCookie("_xsrf")
+          const token = getCookie("_xsrf")
           setTimeout(function () { window.location = '/panel/dashboard'; }, 5000);
           bootbox.dialog({
             backdrop: true,
@@ -549,7 +549,7 @@
     });
     $("#config_form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let configForm = document.getElementById("config_form");
 
       let formData = new FormData(configForm);
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 46ca0a86..77cc2353 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -401,33 +401,33 @@
   let path = '', serverFileContent = '';
 
   async function clickOnFile(event) {
-    var token = getCookie("_xsrf");
+    const token = getCookie("_xsrf");
     path = event.target.getAttribute('data-path');
     let res = await fetch(`/api/v2/servers/${serverId}/files`, {
-        method: 'POST',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"page": "files", "path": path}),
-      });
-      let responseData = await res.json();
-      console.log(responseData)
-      if (responseData.status === "ok") {
-        console.log('Got File Contents From Server');
-          $('#editorParent').toggle(true) // show
-          $('#fileError').toggle(false)   // hide
-          setFileName(event.target.innerText);
-          editor.session.setValue(responseData.data);
-          serverFileContent = responseData.data;
-          setSaveStatus(true);
-        }
-      else {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "page": "files", "path": path }),
+    });
+    let responseData = await res.json();
+    console.log(responseData)
+    if (responseData.status === "ok") {
+      console.log('Got File Contents From Server');
+      $('#editorParent').toggle(true) // show
+      $('#fileError').toggle(false)   // hide
+      setFileName(event.target.innerText);
+      editor.session.setValue(responseData.data);
+      serverFileContent = responseData.data;
+      setSaveStatus(true);
+    }
+    else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
   function setFileName(name) {
@@ -584,143 +584,143 @@
   async function save() {
     let text = editor.session.getValue();
 
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/${serverId}/files`, {
-        method: 'PATCH',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"path": path, "contents": text}),
+      method: 'PATCH',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "path": path, "contents": text }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      serverFileContent = text;
+      setSaveStatus(true)
+
+    } else {
+
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
       });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        serverFileContent = text;
-        setSaveStatus(true)
-
-      } else {
-
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+    }
   }
 
   async function createFile(parent, name, callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
-        method: 'PUT',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"parent": parent, "name": name, "directory": false}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        getTreeView($('#root_dir').data('path'));
-        setTreeViewContext();
-      } else {
+      method: 'PUT',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "parent": parent, "name": name, "directory": false }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      getTreeView($('#root_dir').data('path'));
+      setTreeViewContext();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
 
   async function createDir(parent, name, callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
-        method: 'PUT',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"parent": parent, "name": name, "directory": true}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        getTreeView($('#root_dir').data('path'));
-        setTreeViewContext();
-      } else {
+      method: 'PUT',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "parent": parent, "name": name, "directory": true }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      getTreeView($('#root_dir').data('path'));
+      setTreeViewContext();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
   async function renameItem(path, name, callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/${serverId}/files/create/`, {
-        method: 'PATCH',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"path": path, "new_name": name}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        getTreeView($('#root_dir').data('path'));
-        setTreeViewContext();
-      } else {
+      method: 'PATCH',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "path": path, "new_name": name }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      getTreeView($('#root_dir').data('path'));
+      setTreeViewContext();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
   async function deleteItem(path, el, callback) {
-    var token = getCookie("_xsrf");
+    const token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/servers/${serverId}/files`, {
-        method: 'DELETE',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"filename": path}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        el = document.getElementById(path + "li");
-        $(el).remove();
-        document.getElementById('files-tree-nav').style.display = 'none';
-      } else {
+      method: 'DELETE',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "filename": path }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      el = document.getElementById(path + "li");
+      $(el).remove();
+      document.getElementById('files-tree-nav').style.display = 'none';
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
   async function unZip(path, callback) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/${serverId}/files/zip/`, {
-        method: 'POST',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"folder": path}),
-      });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        getTreeView($('#root_dir').data('path'));
-        setTreeViewContext();
-      } else {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "folder": path }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      getTreeView($('#root_dir').data('path'));
+      setTreeViewContext();
+    } else {
 
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
   async function sendFile(file, path, serverId, left, i, onProgress) {
     let xmlHttpRequest = new XMLHttpRequest();
-    let token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let fileName = file.name
     let target = '/upload?server_id=' + serverId
     let mimeType = file.type
@@ -903,54 +903,54 @@
     });
   }
 
-  function getDirView(event){
+  function getDirView(event) {
     let path = event.target.parentElement.getAttribute("data-path");
     if (document.getElementById(path).classList.contains('clicked')) {
       return;
-    }else{
+    } else {
       getTreeView(path);
     }
 
   }
-  async function getTreeView(path){
-    var token = getCookie("_xsrf");
+  async function getTreeView(path) {
+    const token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/servers/${serverId}/files`, {
-        method: 'POST',
-        headers: {
-          'X-XSRFToken': token
-        },
-        body: JSON.stringify({"page": "files", "path": path}),
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: JSON.stringify({ "page": "files", "path": path }),
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      console.log(responseData);
+      process_tree_response(responseData);
+
+    } else {
+
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
       });
-      let responseData = await res.json();
-      if (responseData.status === "ok") {
-        console.log(responseData);
-        process_tree_response(responseData);
-
-      } else {
-
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
-      }
+    }
   }
 
   function process_tree_response(response) {
     let path = response.data.root_path.path;
     let text = ``;
-    if (!response.data.root_path.top){
+    if (!response.data.root_path.top) {
       text = `<ul class="tree-nested d-block" id="${path}ul">`;
     }
-      Object.entries(response.data).forEach(([key, value]) => {
-        if (key === "root_path" || key === "db_stats"){
-          //continue is not valid in for each. Return acts as a continue.
-          return;
-        }
+    Object.entries(response.data).forEach(([key, value]) => {
+      if (key === "root_path" || key === "db_stats") {
+        //continue is not valid in for each. Return acts as a continue.
+        return;
+      }
       let checked = ""
       let dpath = value.path;
       let filename = key;
-      if (value.dir){
-        if (value.excluded){
+      if (value.dir) {
+        if (value.excluded) {
           checked = "checked"
         }
         text += `<li class="tree-item" id="${dpath}li" data-path="${dpath}">
@@ -962,7 +962,7 @@
                             ${filename}
                             </span>
                             </input></div></li>`
-      }else{
+      } else {
         text += `<li
                         class="d-block tree-ctx-item tree-file"
                         data-path="${dpath}"
@@ -971,33 +971,33 @@
                         <i class="far fa-file"></i></span></input>${filename}</li>`
       }
     });
-    if (! response.data.root_path.top){
+    if (!response.data.root_path.top) {
       text += `</ul>`;
     }
-    if(response.data.root_path.top){
+    if (response.data.root_path.top) {
       try {
-          document.getElementById('main-tree-div').innerHTML += text;
-          document.getElementById('main-tree').parentElement.classList.add("clicked");
-        } catch {
-          document.getElementById('files-tree').innerHTML = text;
-        }
-    }else{
+        document.getElementById('main-tree-div').innerHTML += text;
+        document.getElementById('main-tree').parentElement.classList.add("clicked");
+      } catch {
+        document.getElementById('files-tree').innerHTML = text;
+      }
+    } else {
       try {
-            document.getElementById(path + "span").classList.add('tree-caret-down');
-            document.getElementById(path).innerHTML += text;
-            document.getElementById(path).classList.add("clicked");
-          } catch {
-            console.log("Bad")
-          }
+        document.getElementById(path + "span").classList.add('tree-caret-down');
+        document.getElementById(path).innerHTML += text;
+        document.getElementById(path).classList.add("clicked");
+      } catch {
+        console.log("Bad")
+      }
 
-          var toggler = document.getElementById(path + "span");
+      var toggler = document.getElementById(path + "span");
 
-          if (toggler.classList.contains('files-tree-title')) {
-            document.getElementById(path + "span").addEventListener("click", function caretListener() {
-              document.getElementById(path + "ul").classList.toggle("d-block");
-              document.getElementById(path + "span").classList.toggle("tree-caret-down");
-            });
-          }
+      if (toggler.classList.contains('files-tree-title')) {
+        document.getElementById(path + "span").addEventListener("click", function caretListener() {
+          document.getElementById(path + "ul").classList.toggle("d-block");
+          document.getElementById(path + "span").classList.toggle("tree-caret-down");
+        });
+      }
     }
     setTimeout(function () { setTreeViewContext() }, 1000);
   }
diff --git a/app/frontend/templates/panel/server_logs.html b/app/frontend/templates/panel/server_logs.html
index 9388c2d8..df654ce1 100644
--- a/app/frontend/templates/panel/server_logs.html
+++ b/app/frontend/templates/panel/server_logs.html
@@ -189,10 +189,10 @@
   // Populate logs and filter if present
   const serverId = new URLSearchParams(document.location.search).get('id')
   async function get_server_log() {
-    var token = getCookie("_xsrf")
-    let colors=true;
+    const token = getCookie("_xsrf")
+    let colors = true;
     if (!$("#stop_scroll").is(':checked')) {
-    let res = await fetch(`/api/v2/servers/${serverId}/logs?colors=${colors}`, {
+      let res = await fetch(`/api/v2/servers/${serverId}/logs?colors=${colors}`, {
         method: 'GET',
         headers: {
           'X-XSRFToken': token
@@ -201,7 +201,7 @@
       let responseData = await res.json();
       html = ``
       if (responseData.status === "ok") {
-        for(i=0; i < responseData.data.length; i++) {
+        for (i = 0; i < responseData.data.length; i++) {
           html += `<span class='box'>${responseData.data[i]}<br /></span>`
         }
         console.log('Got Log From Server')
@@ -216,7 +216,7 @@
           message: responseData.error
         });
       }
-  }
+    }
   }
   $(document).ready(function () {
     console.log("ready!");
@@ -224,4 +224,4 @@
     populateWords();
   });
 </script>
-{% end %}
+{% end %}
\ No newline at end of file
diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html
index ebded95e..b1260770 100644
--- a/app/frontend/templates/panel/server_schedule_edit.html
+++ b/app/frontend/templates/panel/server_schedule_edit.html
@@ -260,7 +260,7 @@
       console.log("ready!");
       $("#new_schedule_form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let schForm = document.getElementById("new_schedule_form");
 
       let formData = new FormData(schForm);
@@ -305,7 +305,7 @@
 
     $("#schedule_form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let schForm = document.getElementById("schedule_form");
 
       let formData = new FormData(schForm);
diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html
index 78e43bb2..586c6ae4 100644
--- a/app/frontend/templates/panel/server_schedules.html
+++ b/app/frontend/templates/panel/server_schedules.html
@@ -47,14 +47,20 @@
                   <h4 class="card-title"><i class="fas fa-calendar"></i> {{ translate('serverSchedules',
                     'scheduledTasks', data['lang']) }} </h4>
                   {% if data['user_data']['hints'] %}
-                  <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" , data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" , data-placement="bottom"></span>
+                  <span class="too_small" title="{{ translate('serverSchedules', 'cannotSee', data['lang']) }}" ,
+                    data-content="{{ translate('serverSchedules', 'cannotSeeOnMobile', data['lang']) }}" ,
+                    data-placement="bottom"></span>
                   {% end %}
                   <div>
-                    <button onclick="location.href=`/panel/add_schedule?id={{ data['server_stats']['server_id']['server_id'] }}`" class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}<i class="fas fa-pencil-alt"></i></button>
+                    <button
+                      onclick="location.href=`/panel/add_schedule?id={{ data['server_stats']['server_id']['server_id'] }}`"
+                      class="btn btn-info">{{ translate('serverSchedules', 'create', data['lang']) }}<i
+                        class="fas fa-pencil-alt"></i></button>
                   </div>
                 </div>
                 <div class="card-body">
-                  <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%" style="table-layout:fixed;">
+                  <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%"
+                    style="table-layout:fixed;">
                     <thead>
                       <tr class="rounded">
                         <th style="width: 2%; min-width: 10px;">{{ translate('serverSchedules', 'name', data['lang']) }}
@@ -101,10 +107,14 @@
                           <p>{{schedule.next_run}}</p>
                         </td>
                         <td id="{{schedule.enabled}}" class="action">
-                          <input style="width: 10px !important;" type="checkbox" class="schedule-enabled-toggle" data-schedule-id="{{schedule.schedule_id}}" data-schedule-enabled="{{ 'true' if schedule.enabled else 'false' }}">
+                          <input style="width: 10px !important;" type="checkbox" class="schedule-enabled-toggle"
+                            data-schedule-id="{{schedule.schedule_id}}"
+                            data-schedule-enabled="{{ 'true' if schedule.enabled else 'false' }}">
                         </td>
                         <td id="{{schedule.action}}" class="action">
-                          <button onclick="window.location.href='/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{schedule.schedule_id}}'" class="btn btn-info">
+                          <button
+                            onclick="window.location.href='/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{schedule.schedule_id}}'"
+                            class="btn btn-info">
                             <i class="fas fa-pencil-alt"></i>
                           </button>
                           <br>
@@ -118,7 +128,8 @@
                     </tbody>
                   </table>
                   <hr />
-                  <table class="table table-hover d-block d-lg-none" id="mini_schedule_table" width="100%" style="table-layout:fixed;">
+                  <table class="table table-hover d-block d-lg-none" id="mini_schedule_table" width="100%"
+                    style="table-layout:fixed;">
                     <thead>
                       <tr class="rounded">
                         <th style="width: 25%; min-width: 50px;">{{ translate('serverSchedules', 'action', data['lang'])
@@ -151,7 +162,8 @@
                         </td>
                       </tr>
                       <!-- Modal -->
-                      <div class="modal fade" id="task_details_{{schedule.schedule_id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+                      <div class="modal fade" id="task_details_{{schedule.schedule_id}}" tabindex="-1" role="dialog"
+                        aria-labelledby="exampleModalLabel" aria-hidden="true">
                         <div class="modal-dialog" role="document">
                           <div class="modal-content">
                             <div class="modal-header">
@@ -198,14 +210,19 @@
                                   <p>zzzzzzz</p>
                                   {% end %}
                                 </li>
-                                <li id="{{schedule.enabled}}" class="action" style="border-top: .1em solid gray; border-bottom: .1em solid gray">
+                                <li id="{{schedule.enabled}}" class="action"
+                                  style="border-top: .1em solid gray; border-bottom: .1em solid gray">
                                   <h4>{{ translate('serverSchedules', 'enabled', data['lang']) }}</h4>
-                                  <input type="checkbox" class="schedule-enabled-toggle" data-schedule-id="{{schedule.schedule_id}}" data-schedule-enabled="{{ 'true' if schedule.enabled else 'false' }}">
+                                  <input type="checkbox" class="schedule-enabled-toggle"
+                                    data-schedule-id="{{schedule.schedule_id}}"
+                                    data-schedule-enabled="{{ 'true' if schedule.enabled else 'false' }}">
                                 </li>
                               </ul>
                             </div>
                             <div class="modal-footer">
-                              <button onclick="window.location.href='/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{schedule.schedule_id}}'" class="btn btn-info">
+                              <button
+                                onclick="window.location.href='/panel/edit_schedule?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{schedule.schedule_id}}'"
+                                class="btn btn-info">
                                 <i class="fas fa-pencil-alt"></i> {{ translate('serverSchedules', 'edit', data['lang'])
                                 }}
                               </button>
@@ -393,7 +410,7 @@
   });
 
   async function del_task(sch_id, id) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
 
     let res = await fetch(`/api/v2/servers/${id}/tasks/${sch_id}`, {
       method: 'DELETE',
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 41d974d2..37f923c1 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -46,15 +46,15 @@
 
             <div class="input-group">
               <div id="virt_console" class=""
-                   style="width: 100%; font-size: .8em; padding: 5px 10px; border: 1px solid var(--outline); background-color:var(--card-banner-bg);height:500px; overflow: scroll;">
+                style="width: 100%; font-size: .8em; padding: 5px 10px; border: 1px solid var(--outline); background-color:var(--card-banner-bg);height:500px; overflow: scroll;">
               </div>
             </div>
             <br />
 
             <div style="gap: 0.5rem;" class="input-group flex-wrap">
               <input style="min-width: 10rem;" type="text" class="form-control" id="server_command"
-                     name="server_command" placeholder="{{ translate('serverTerm', 'commandInput', data['lang']) }}"
-                     autofocus="">
+                name="server_command" placeholder="{{ translate('serverTerm', 'commandInput', data['lang']) }}"
+                autofocus="">
               <span class="input-group-btn ml-5">
                 <button id="submit" class="btn btn-sm btn-info" type="button">{{ translate('serverTerm', 'sendCommand',
                   data['lang']) }}</button>
@@ -63,73 +63,74 @@
             {% if data['permissions']['Commands'] in data['user_permissions'] %}
             {% if data['importing'] and data['server_stats']['running']%}
             <div id="update_control_buttons"
-                 class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
-                 style="visibility: visible">
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
               <button onclick="" id="start-btn" style="max-width: 7rem;"
-                      class="btn btn-warning m-1 flex-grow-1 disabled"><i
-                   class="fa fa-spinner fa-spin"></i>&nbsp;{{translate('serverTerm', 'installing', data['lang']) }}</button>
+                class="btn btn-warning m-1 flex-grow-1 disabled"><i
+                  class="fa fa-spinner fa-spin"></i>&nbsp;{{translate('serverTerm', 'installing', data['lang'])
+                }}</button>
               <button onclick="" id="restart-btn" style="max-width: 7rem;"
-                      class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
+                class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
                 data['lang']) %}</button>
               <button onclick="" id="stop-btn" style="max-width: 7rem;"
-                      class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
+                class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
                 }}</button>
             </div>
             {% elif data['server_stats']['updating']%}
             <div id="update_control_buttons"
-                 class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
-                 style="visibility: visible">
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
               <button onclick="" id="start-btn" style="max-width: 7rem;"
-                      class="btn btn-warning m-1 flex-grow-1 disabled"><i class="fa fa-spinner fa-spin"></i>&nbsp;{{
+                class="btn btn-warning m-1 flex-grow-1 disabled"><i class="fa fa-spinner fa-spin"></i>&nbsp;{{
                 translate('serverTerm', 'updating', data['lang']) }}</button>
               <button onclick="" id="restart-btn" style="max-width: 7rem;"
-                      class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
+                class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
                 data['lang']) %}</button>
               <button onclick="" id="stop-btn" style="max-width: 7rem;"
-                      class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
+                class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
                 }}</button>
             </div>
             {% elif data['waiting_start'] %}
             <div id="control_buttons"
-                 class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
-                 style="visibility: visible">
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
               <button onclick="" id="start-btn" style="max-width: 7rem; white-space: nowrap;"
-                      class="btn btn-secondary m-1 flex-grow-1 disabled" data-toggle="tooltip"
-                      title="{{ translate('serverTerm', 'delay-explained', data['lang'])}}">{{ translate('serverTerm',
+                class="btn btn-secondary m-1 flex-grow-1 disabled" data-toggle="tooltip"
+                title="{{ translate('serverTerm', 'delay-explained', data['lang'])}}">{{ translate('serverTerm',
                 'starting', data['lang']) }}</button>
               <button onclick="" id="restart-btn" style="max-width: 7rem;"
-                      class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
+                class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
                 data['lang']) %}</button>
               <button onclick="" id="stop-btn" style="max-width: 7rem;"
-                      class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
+                class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
                 }}</button>
             </div>
             {% elif data['importing'] %}
             <div id="control_buttons"
-                 class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
-                 style="visibility: visible">
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
               <button onclick="" id="start-btn" style="max-width: 12rem; white-space: nowrap;"
-                      class="btn btn-secondary m-1 flex-grow-1 disabled"><i class="fa fa-spinner fa-spin"></i> {{
+                class="btn btn-secondary m-1 flex-grow-1 disabled"><i class="fa fa-spinner fa-spin"></i> {{
                 translate('serverTerm', 'importing',
                 data['lang']) }}</button>
               <button onclick="" id="restart-btn" style="max-width: 7rem;"
-                      class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
+                class="btn btn-outline-primary m-1 flex-grow-1 disabled">{% raw translate('serverTerm', 'restart',
                 data['lang']) %}</button>
               <button onclick="" id="stop-btn" style="max-width: 7rem;"
-                      class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
+                class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate('serverTerm', 'stop', data['lang'])
                 }}</button>
             </div>
             {% else %}
             <div id="control_buttons"
-                 class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
-                 style="visibility: visible">
+              class="mt-4 flex-wrap d-flex justify-content-between justify-content-md-center align-items-center px-5 px-md-0"
+              style="visibility: visible">
               <button onclick="send_command(serverId, 'start_server');" id="start-btn" style="max-width: 7rem;"
-                      class="btn btn-primary m-1 flex-grow-1">{{ translate('serverTerm', 'start', data['lang']) }}</button>
+                class="btn btn-primary m-1 flex-grow-1">{{ translate('serverTerm', 'start', data['lang']) }}</button>
               <button onclick="send_command(serverId, 'restart_server');" id="restart-btn" style="max-width: 7rem;"
-                      class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate('serverTerm', 'restart', data['lang'])
+                class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate('serverTerm', 'restart', data['lang'])
                 %}</button>
               <button onclick="send_command(serverId, 'stop_server');" id="stop-btn" style="max-width: 7rem;"
-                      class="btn btn-danger m-1 flex-grow-1">{{ translate('serverTerm', 'stop', data['lang']) }}</button>
+                class="btn btn-danger m-1 flex-grow-1">{{ translate('serverTerm', 'stop', data['lang']) }}</button>
             </div>
             {% end %}
             {% end %}
@@ -150,7 +151,7 @@
     /* IE and Edge */
     scrollbar-width: none;
     /* Firefox */
-    font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
+    font-family: Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace;
     white-space: pre-wrap;
   }
 </style>
@@ -175,7 +176,7 @@
       stopBtn.setAttribute('disabled', 'disabled');
     }
     //<!--  this getCookie function is in base.html-->
-    var token = getCookie("_xsrf");
+    const token = getCookie("_xsrf");
 
     $.ajax({
       type: "POST",
@@ -230,30 +231,30 @@
   //{% end %}
 
   async function get_server_log() {
-    var token = getCookie("_xsrf")
-    let colors=true;
+    const token = getCookie("_xsrf")
+    let colors = true;
     let res = await fetch(`/api/v2/servers/${serverId}/logs?colors=${colors}`, {
-        method: 'GET',
-        headers: {
-          'X-XSRFToken': token
-        },
-      });
-      let responseData = await res.json();
-      html = ``
-      if (responseData.status === "ok") {
-        for(i=0; i < responseData.data.length; i++) {
-          html += `<span class='box'>${responseData.data[i]}<br /></span>`
-        }
-        console.log('Got Log From Server')
-        $('#virt_console').html(html);
-        scrollConsole();
-      } else {
-
-        bootbox.alert({
-          title: responseData.status,
-          message: responseData.error
-        });
+      method: 'GET',
+      headers: {
+        'X-XSRFToken': token
+      },
+    });
+    let responseData = await res.json();
+    html = ``
+    if (responseData.status === "ok") {
+      for (i = 0; i < responseData.data.length; i++) {
+        html += `<span class='box'>${responseData.data[i]}<br /></span>`
       }
+      console.log('Got Log From Server')
+      $('#virt_console').html(html);
+      scrollConsole();
+    } else {
+
+      bootbox.alert({
+        title: responseData.status,
+        message: responseData.error
+      });
+    }
   }
 
 
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 6c9a3289..8eefcf68 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -96,8 +96,8 @@
               <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
                 <p style="color: white !important;"><i class="fas fa-exclamation-triangle"
                     style="color: red;"></i>&nbsp;{{ translate('error', 'bedrockError', data['lang']) }}<a
-                    style="color: red;" ; href="https://status.craftycontrol.com/status/craftycontrol"
-                    target="_blank" rel="noopener noreferrer">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
+                    style="color: red;" ; href="https://status.craftycontrol.com/status/craftycontrol" target="_blank"
+                    rel="noopener noreferrer">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
                   &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
               </div>
               {% end %}
@@ -397,7 +397,8 @@
                     <div class="modal-body">
                       <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
                         style="overflow: scroll; max-height:75%;">
-                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked>
+                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value=""
+                          checked>
                         <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                           <i class="far fa-folder"></i>
                           <i class="far fa-folder-open"></i>
@@ -529,7 +530,7 @@
     file = $("#file")[0].files[0]
     document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
     let xmlHttpRequest = new XMLHttpRequest();
-    let token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let fileName = encodeURIComponent(file.name)
     let target = '/upload'
     let mimeType = file.type
@@ -555,7 +556,7 @@
     xmlHttpRequest.addEventListener('load', (event) => {
       if (event.target.responseText == 'success') {
         console.log('Upload for file', file.name, 'was successful!')
-        document.getElementById("upload_input").innerHTML =  `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
+        document.getElementById("upload_input").innerHTML = `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
         document.getElementById("lower_half").style.visibility = "visible";
       }
       else {
@@ -585,7 +586,7 @@
       } else {
         document.getElementById('root_upload_button').classList.add('clicked')
       }
-      var token = getCookie("_xsrf");
+      const token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
@@ -696,7 +697,7 @@
     return role_ids
   }
   async function send_server(data) {
-    let token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     console.log(token)
     let res = await fetch(`/api/v2/servers/`, {
       method: 'POST',
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 83205160..080fcb49 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -21,8 +21,9 @@
       <div class="card" id="creation_wizard">
         <div class="card-body">
           {% if data["server_api"] and data["online"] %}
-          <a href="https://serverjars.com/" target="_blank" alt="serverjars icon"><img src="../../static/assets/images/serverjars/ICON.svg"
-             style="float: right; width: 40px; position: relative;"></a>
+          <a href="https://serverjars.com/" target="_blank" alt="serverjars icon"><img
+              src="../../static/assets/images/serverjars/ICON.svg"
+              style="float: right; width: 40px; position: relative;"></a>
           {% end %}
 
           <h4>{{ translate('serverWizard', 'newServer', data['lang']) }}</h4>
@@ -71,7 +72,8 @@
                       <label for="server_jar">{{ translate('serverWizard', 'serverType', data['lang'])
                         }}</label>
                       <div class="input-group">
-                        <select required class="form-control form-control-lg select-css" id="server_jar" name="server_jar" onchange="serverJarChange(this)">
+                        <select required class="form-control form-control-lg select-css" id="server_jar"
+                          name="server_jar" onchange="serverJarChange(this)">
                           <option value="None">{{ translate('serverWizard', 'selectType', data['lang']) }}</option>
                           {% for s in data['server_types'] %}
                           <option value="{{ s }}">{{ s.capitalize() }}</option>
@@ -79,7 +81,8 @@
                         </select>
                         {% if data['super_user'] %}
                         <div class="input-group-append">
-                          <button class="btn custom-picker" type="button" onclick="refreshCache()"><i id="refresh-cache" class="refresh-class fas fa-sync"></i></button>
+                          <button class="btn custom-picker" type="button" onclick="refreshCache()"><i id="refresh-cache"
+                              class="refresh-class fas fa-sync"></i></button>
                         </div>
                         {% end %}
                       </div>
@@ -89,7 +92,8 @@
                   <div class="col-sm-12">
                     <div class="form-group">
                       <label for="server_type">{{ translate('serverWizard', 'serverSelect', data['lang']) }}</label>
-                      <select required class="form-control form-control-lg select-css" id="server_type" name="type" onchange="serverTypeChange(this)">
+                      <select required class="form-control form-control-lg select-css" id="server_type" name="type"
+                        onchange="serverTypeChange(this)">
                         <option value="">{{ translate('serverWizard', 'selectServer', data['lang']) }}</option>
                       </select>
                     </div>
@@ -107,13 +111,15 @@
                   <div class="col-sm-12">
                     <div class="form-group">
                       <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                      <input type="text" class="form-control" id="server_name" name="name" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                      <input type="text" class="form-control" id="server_name" name="name"
+                        placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                     </div>
                   </div>
 
                 </div>
                 <br />
-                <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+                <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                    style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                     data['lang']) }}</small></h4>
                 <hr>
                 <div class="row">
@@ -122,7 +128,8 @@
                     <div class="form-group">
                       <label for="min_memory1">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                           translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="min_memory1" name="mem_min" value="1" step="0.5" min="0.5" required>
+                      <input type="number" class="form-control" id="min_memory1" name="mem_min" value="1" step="0.5"
+                        min="0.5" required>
                     </div>
                   </div>
 
@@ -130,7 +137,8 @@
                     <div class="form-group">
                       <label for="max_memory1">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                           translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="max_memory1" name="mem_max" value="2" step="0.5" min="0.5" required>
+                      <input type="number" class="form-control" id="max_memory1" name="mem_max" value="2" step="0.5"
+                        min="0.5" required>
                     </div>
                   </div>
 
@@ -138,7 +146,8 @@
                     <div class="form-group">
                       <label for="port1">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                           translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                      <input type="number" class="form-control" id="port1" name="port" value="25565" step="1" min="1" max="65535 " required>
+                      <input type="number" class="form-control" id="port1" name="port" value="25565" step="1" min="1"
+                        max="65535 " required>
                     </div>
                   </div>
                   <div class="col-sm-12">
@@ -146,8 +155,10 @@
                       <div id="accordion-1">
                         <div class="card">
                           <div class="card-header p-2" id="Role-1">
-                            <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1" aria-expanded="true" aria-controls="collapseRole-1">
-                              <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
+                            <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-1"
+                              aria-expanded="true" aria-controls="collapseRole-1">
+                              <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
+                              }}
                               <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                                 data['lang']) }}</small>
                             </p>
@@ -156,7 +167,9 @@
                             <div class="card-body scroll">
                               <div class="form-group">
                                 {% for r in data['roles'] %}
-                                <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp; {{ r['role_name'].capitalize() }}</label></span>
+                                <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                      type="checkbox" value="{{ r['role_id'] }}">&nbsp; {{ r['role_name'].capitalize()
+                                    }}</label></span>
                                 {% end %}
                               </div>
                             </div>
@@ -172,19 +185,24 @@
                 <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
                   }}</button>
               </fieldset>
-            </div>
-          </fieldset>
-          {% if not data["server_api"] and data["online"] %}
-          <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
-            <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{ translate('error', 'serverJars1', data['lang']) }}<a style="color: red;"; href="https://status.craftycontrol.com/status/craftycontrol" 
-              target="_blank">&nbsp;{{ translate('error', 'craftyStatus', data['lang']) }}</a>
-              &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p></div>
-          {% end %}
-          {% if not data["online"] %}
-          <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
-            <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{ translate('error', 'noInternet', data['lang']) }}</p></div>
-          {% end %}
         </div>
+        </fieldset>
+        {% if not data["server_api"] and data["online"] %}
+        <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
+          <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{
+            translate('error', 'serverJars1', data['lang']) }}<a style="color: red;" ;
+              href="https://status.craftycontrol.com/status/craftycontrol" target="_blank">&nbsp;{{ translate('error',
+              'craftyStatus', data['lang']) }}</a>
+            &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
+        </div>
+        {% end %}
+        {% if not data["online"] %}
+        <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
+          <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{
+            translate('error', 'noInternet', data['lang']) }}</p>
+        </div>
+        {% end %}
+      </div>
       </form>
     </div>
 
@@ -205,7 +223,8 @@
               <div class="col-sm-12">
                 <div class="form-group">
                   <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                  <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                  <input type="text" class="form-control" id="server_name" name="name" value=""
+                    placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                 </div>
               </div>
 
@@ -213,14 +232,16 @@
                 <div class="form-group">
                   <label for="server">{{ translate('serverWizard', 'serverPath', data['lang']) }} <small>{{
                       translate('serverWizard', 'absoluteServerPath', data['lang']) }}</small></label>
-                  <input type="text" class="form-control" id="server_path" name="server_path" placeholder="/var/opt/server" required>
+                  <input type="text" class="form-control" id="server_path" name="server_path"
+                    placeholder="/var/opt/server" required>
                 </div>
               </div>
 
               <div class="col-sm-12">
                 <div class="form-group">
                   <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                  <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
+                  <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                    placeholder="paper.jar" required>
                 </div>
               </div>
 
@@ -228,7 +249,8 @@
 
             </div>
             <br />
-            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+            <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                 data['lang']) }}</small></h4>
             <hr>
             <div class="row">
@@ -237,7 +259,8 @@
                 <div class="form-group">
                   <label for="min_memory2">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                       translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                  <input type="number" class="form-control" id="min_memory2" name="mem_min" value="1" step="0.5" min="0.5" required>
+                  <input type="number" class="form-control" id="min_memory2" name="mem_min" value="1" step="0.5"
+                    min="0.5" required>
                 </div>
               </div>
 
@@ -245,7 +268,8 @@
                 <div class="form-group">
                   <label for="max_memory2">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                       translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                  <input type="number" class="form-control" id="max_memory2" name="mem_max" value="2" step="0.5" min="0.5" required>
+                  <input type="number" class="form-control" id="max_memory2" name="mem_max" value="2" step="0.5"
+                    min="0.5" required>
                 </div>
               </div>
 
@@ -253,7 +277,8 @@
                 <div class="form-group">
                   <label for="port2">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                       translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                  <input type="number" class="form-control" id="port2" name="port" value="25565" step="1" min="1" max="65535" required>
+                  <input type="number" class="form-control" id="port2" name="port" value="25565" step="1" min="1"
+                    max="65535" required>
                 </div>
               </div>
               <div class="col-sm-12">
@@ -261,7 +286,8 @@
                   <div id="accordion-2">
                     <div class="card">
                       <div class="card-header p-2" id="Role-2">
-                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true" aria-controls="collapseRole-2">
+                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-2" aria-expanded="true"
+                          aria-controls="collapseRole-2">
                           <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang']) }}
                           <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                             data['lang']) }}</small>
@@ -271,7 +297,8 @@
                         <div class="card-body scroll">
                           <div class="form-group">
                             {% for r in data['roles'] %}
-                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                  type="checkbox" value="{{ r['role_id'] }}">&nbsp;
                                 {{ r['role_name'].capitalize() }}</label></span>
                             {% end %}
                           </div>
@@ -311,7 +338,8 @@
                 <div class="col-sm-12">
                   <div class="form-group">
                     <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-                    <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                    <input type="text" class="form-control" id="server_name" name="name" value=""
+                      placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
                   </div>
                 </div>
 
@@ -319,7 +347,8 @@
                   <div class="form-group">
                     <label for="server">{{ translate('serverWizard', 'zipPath', data['lang']) }} <small>{{
                         translate('serverWizard', 'absoluteZipPath', data['lang']) }}</small></label>
-                    <input type="text" class="form-control" id="zip_server_path" name="server_path" placeholder="/var/opt/server.zip" required>
+                    <input type="text" class="form-control" id="zip_server_path" name="server_path"
+                      placeholder="/var/opt/server.zip" required>
                   </div>
                 </div>
 
@@ -337,7 +366,8 @@
                 <div class="col-sm-12">
                   <div class="form-group">
                     <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                    <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
+                    <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                      placeholder="paper.jar" required>
                   </div>
                 </div>
               </div>
@@ -346,7 +376,8 @@
 
 
             <div class="col-sm-12">
-              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                  style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                   data['lang']) }}</small></h4>
               <hr>
               <div class="row">
@@ -354,7 +385,8 @@
                   <div class="form-group">
                     <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                         translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                    <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5" min="0.5" required>
+                    <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5"
+                      min="0.5" required>
                   </div>
                 </div>
 
@@ -362,7 +394,8 @@
                   <div class="form-group">
                     <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                         translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                    <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5" min="0.5" required>
+                    <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5"
+                      min="0.5" required>
                   </div>
                 </div>
 
@@ -370,7 +403,8 @@
                   <div class="form-group">
                     <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                         translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                    <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1" max="65535" required>
+                    <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1"
+                      max="65535" required>
                   </div>
                 </div>
 
@@ -379,7 +413,8 @@
                     <div id="accordion-3">
                       <div class="card">
                         <div class="card-header p-2" id="Role-3">
-                          <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
+                          <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                            aria-controls="collapseRole-3">
                             <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole', data['lang'])
                             }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
                               data['lang']) }}</small>
@@ -389,7 +424,8 @@
                           <div class="card-body scroll">
                             <div class="form-group">
                               {% for r in data['roles'] %}
-                              <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                              <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                    type="checkbox" value="{{ r['role_id'] }}">&nbsp;
                                   {{ r['role_name'].capitalize() }}</label></span>
                               {% end %}
                             </div>
@@ -404,7 +440,8 @@
                     <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                   </div>
                 </div>
-                <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
+                <div class="modal fade" id="dir_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                  aria-hidden="true">
                   <div class="modal-dialog" role="document">
                     <div class="modal-content">
                       <div class="modal-header">
@@ -415,7 +452,8 @@
                         </button>
                       </div>
                       <div class="modal-body">
-                        <div class="tree-ctx-item" id="main-tree-div" data-path="" style="overflow: scroll; max-height:75%;">
+                        <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                          style="overflow: scroll; max-height:75%;">
                           <input type="radio" class="root-input" id="main-tree-input" name="root_path" value="" checked>
                           <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                             <i class="far fa-folder"></i>
@@ -435,7 +473,8 @@
                   </div>
                 </div>
               </div>
-              <button id="zip_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+              <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
+                class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                 }}</button>
               <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
                 data['lang'])
@@ -461,17 +500,20 @@
 
             <div class="form-group">
               <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
-              <input type="text" class="form-control" id="server_name" name="name" value="" placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+              <input type="text" class="form-control" id="server_name" name="name" value=""
+                placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
             </div>
             <div class="form-group">
               <label for="server">{{ translate('serverWizard', 'serverUpload', data['lang']) }}</label>
               <div id="upload_input" class="input-group">
                 <div class="custom-file">
                   <input type="file" multiple="false" class="custom-file-input" id="file" name="file" required>
-                  <label id="fileLabel" class="custom-file-label" for="file">{{ translate('serverWizard', 'labelZipFile', data['lang']) }}</label>
+                  <label id="fileLabel" class="custom-file-label" for="file">{{ translate('serverWizard',
+                    'labelZipFile', data['lang']) }}</label>
                 </div>
                 <div class="input-group-append">
-                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()" disabled>{{ translate('serverWizard',
+                  <button type="button" class="btn btn-info upload-button" id="upload-button" onclick="sendFile()"
+                    disabled>{{ translate('serverWizard',
                     'uploadButton', data['lang']) }}</button>
                 </div>
               </div>
@@ -488,61 +530,68 @@
 
               <div class="form-group">
                 <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
-                <input type="text" class="form-control" id="server_jar" name="server_jar" value="" placeholder="paper.jar" required>
+                <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                  placeholder="paper.jar" required>
               </div>
 
-              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+              <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                  style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
                   data['lang']) }}</small></h4>
               <hr>
 
               <div class="form-group">
                 <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
                     translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5" min="0.5" required>
+                <input type="number" class="form-control" id="min_memory3" name="mem_min" value="1" step="0.5" min="0.5"
+                  required>
               </div>
 
               <div class="form-group">
                 <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
                     translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5" min="0.5" required>
+                <input type="number" class="form-control" id="max_memory3" name="mem_max" value="2" step="0.5" min="0.5"
+                  required>
               </div>
 
               <div class="form-group">
                 <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                     translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1" max="65535" required>
+                <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1"
+                  max="65535" required>
               </div>
 
-                <div class="form-group">
-                  <div id="accordion-3">
-                    <div class="card">
-                      <div class="card-header p-2" id="Role-3">
-                        <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true" aria-controls="collapseRole-3">
-                          <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
-                          data['lang'])
-                          }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
-                            data['lang']) }}</small>
-                        </p>
-                      </div>
-                      <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
-                        <div class="card-body scroll">
-                          <div class="form-group">
-                            {% for r in data['roles'] %}
-                            <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}" type="checkbox" value="{{ r['role_id'] }}">&nbsp;
-                                {{ r['role_name'].capitalize() }}</label></span>
-                            {% end %}
-                          </div>
+              <div class="form-group">
+                <div id="accordion-3">
+                  <div class="card">
+                    <div class="card-header p-2" id="Role-3">
+                      <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3" aria-expanded="true"
+                        aria-controls="collapseRole-3">
+                        <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                        data['lang'])
+                        }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                          data['lang']) }}</small>
+                      </p>
+                    </div>
+                    <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                      <div class="card-body scroll">
+                        <div class="form-group">
+                          {% for r in data['roles'] %}
+                          <span class="d-block menu-option"><label><input class="roles" name="{{ r['role_id'] }}"
+                                type="checkbox" value="{{ r['role_id'] }}">&nbsp;
+                              {{ r['role_name'].capitalize() }}</label></span>
+                          {% end %}
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-                <div style="visibility: hidden;">
-                  <div class="form-group">
-                    <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
-                  </div>
+              </div>
+              <div style="visibility: hidden;">
+                <div class="form-group">
+                  <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                 </div>
-                <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+              </div>
+              <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
                 aria-hidden="true">
                 <div class="modal-dialog" role="document">
                   <div class="modal-content">
@@ -556,7 +605,8 @@
                     <div class="modal-body">
                       <div class="tree-ctx-item" id="main-tree-div-upload" data-path=""
                         style="overflow: scroll; max-height:75%;">
-                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value="" checked>
+                        <input type="radio" class="root-input" id="main-tree-input-upload" name="root_path" value=""
+                          checked>
                         <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
                           <i class="far fa-folder"></i>
                           <i class="far fa-folder-open"></i>
@@ -575,18 +625,19 @@
                 </div>
               </div>
             </div>
-            <button id="upload_submit" type="submit" title="You must select server root dir first" disabled class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+            <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
+              class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
               }}</button>
             <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
               data['lang'])
               }}</button>
-            </div>
-          </form>
-          </p>
         </div>
+        </form>
+        </p>
       </div>
     </div>
   </div>
+</div>
 <style>
   button>i.refresh-class {
     margin: 0px;
@@ -763,7 +814,7 @@
 
 {% block js %}
 <script>
-    document.getElementById("root_files_button").addEventListener("click", function (event) {
+  document.getElementById("root_files_button").addEventListener("click", function (event) {
     if (document.forms["zip"]["server_path"].value != "") {
       if (document.getElementById('root_files_button').classList.contains('clicked')) {
         show_file_tree();
@@ -771,7 +822,7 @@
       } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-      var token = getCookie("_xsrf");
+      const token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
@@ -783,125 +834,125 @@
     }
   });
   document.getElementById("root_upload_button").addEventListener("click", function (event) {
-      if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-        show_file_tree();
-        return;
-      } else {
-        document.getElementById('root_upload_button').classList.add('clicked')
-      }
-      var token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
-        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-        closeButton: false
-      });
-      console.log("CALLING DIR")
-      getDirView();
-  });
-    var upload = false;
-    var file;
-    function sendFile() {
-      file = $("#file")[0].files[0]
-      document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
-      let xmlHttpRequest = new XMLHttpRequest();
-      let token = getCookie("_xsrf")
-      let fileName = file.name
-      let target = '/upload'
-      let mimeType = file.type
-      let size = file.size
-      let type = 'server_import'
-
-      xmlHttpRequest.upload.addEventListener('progress', function (e) {
-
-        if (e.loaded <= size) {
-          var percent = Math.round(e.loaded / size * 100);
-          $(`#upload-progress-bar`).css('width', percent + '%');
-          $(`#upload-progress-bar`).html(percent + '%');
-        }
-      });
-
-      xmlHttpRequest.open('POST', target, true);
-      xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
-      xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
-      xmlHttpRequest.setRequestHeader('X-Content-Length', size);
-      xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
-      xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
-      xmlHttpRequest.setRequestHeader('X-FileName', fileName);
-      xmlHttpRequest.addEventListener('load', (event) => {
-        if (event.target.responseText == 'success') {
-          console.log('Upload for file', file.name, 'was successful!')
-          document.getElementById("upload_input").innerHTML = `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
-          document.getElementById("lower_half").style.visibility = "visible";
-          document.getElementById("lower_half").hidden = false;
-        }
-        else {
-          let response_text = JSON.parse(event.target.responseText);
-          var x = document.querySelector('.bootbox');
-          console.log(JSON.parse(event.target.responseText).info)
-          bootbox.alert({
-            message: JSON.parse(event.target.responseText).info,
-            callback: function () {
-              window.location.reload();
-            }
-          });
-          doUpload = false;
-        }
-      }, false);
-      xmlHttpRequest.addEventListener('error', (e) => {
-        console.error('Error while uploading file', file.name + '.', 'Event:', e)
-      }, false);
-      xmlHttpRequest.send(file);
+    if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+      show_file_tree();
+      return;
+    } else {
+      document.getElementById('root_upload_button').classList.add('clicked')
     }
+    const token = getCookie("_xsrf");
+    var dialog = bootbox.dialog({
+      message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
+    });
+    console.log("CALLING DIR")
+    getDirView();
+  });
+  var upload = false;
+  var file;
+  function sendFile() {
+    file = $("#file")[0].files[0]
+    document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+    let xmlHttpRequest = new XMLHttpRequest();
+    const token = getCookie("_xsrf")
+    let fileName = file.name
+    let target = '/upload'
+    let mimeType = file.type
+    let size = file.size
+    let type = 'server_import'
+
+    xmlHttpRequest.upload.addEventListener('progress', function (e) {
+
+      if (e.loaded <= size) {
+        var percent = Math.round(e.loaded / size * 100);
+        $(`#upload-progress-bar`).css('width', percent + '%');
+        $(`#upload-progress-bar`).html(percent + '%');
+      }
+    });
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!')
+        document.getElementById("upload_input").innerHTML = `<div class="card-header header-sm d-flex justify-content-between align-items-center" style="width: 100%;"><input value=${fileName} type="text" id="file-uploaded" disabled></input> 🔒</div>`;
+        document.getElementById("lower_half").style.visibility = "visible";
+        document.getElementById("lower_half").hidden = false;
+      }
+      else {
+        let response_text = JSON.parse(event.target.responseText);
+        var x = document.querySelector('.bootbox');
+        console.log(JSON.parse(event.target.responseText).info)
+        bootbox.alert({
+          message: JSON.parse(event.target.responseText).info,
+          callback: function () {
+            window.location.reload();
+          }
+        });
+        doUpload = false;
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
 </script>
 <script type="text/javascript" src="../../static/assets/js/shared/root-dir.js"></script>
 
 <script>
-      function replacer(key, value) {
-        if (key === "roles"){
-          return value
-        }
-        if (key != "ignored_exits") {
-          if (typeof value == "boolean" || key === "host" || key === "version") {
-            return value
-          } else {
-            return (isNaN(value) ? value : +value);
-          }
-        } else {
-          return value;
-        }
+  function replacer(key, value) {
+    if (key === "roles") {
+      return value
+    }
+    if (key != "ignored_exits") {
+      if (typeof value == "boolean" || key === "host" || key === "version") {
+        return value
+      } else {
+        return (isNaN(value) ? value : +value);
       }
-      function calcRoles() {
-        let role_ids = $('.roles').map(function() {
-        if ($(this).is(':checked')){
-          return $(this).val();
-        }
-        }).get();
-        console.log(role_ids)
-        return role_ids
+    } else {
+      return value;
+    }
+  }
+  function calcRoles() {
+    let role_ids = $('.roles').map(function () {
+      if ($(this).is(':checked')) {
+        return $(this).val();
       }
-      async function send_server(data){
-        let token = getCookie("_xsrf")
-        let res = await fetch(`/api/v2/servers/`, {
-          method: 'POST',
-          headers: {
-            'X-XSRFToken': token
-          },
-          body: data,
-        });
-        let responseData = await res.json();
-        if (responseData.status === "ok") {
-          window.location.href = '/panel/dashboard';
-        } else {
+    }).get();
+    console.log(role_ids)
+    return role_ids
+  }
+  async function send_server(data) {
+    const token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/servers/`, {
+      method: 'POST',
+      headers: {
+        'X-XSRFToken': token
+      },
+      body: data,
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      window.location.href = '/panel/dashboard';
+    } else {
 
-          bootbox.alert({
-            title: responseData.error,
-            message: responseData.error_data
-          });
-        }
-      }
-    $(document).ready(function () {
+      bootbox.alert({
+        title: responseData.error,
+        message: responseData.error_data
+      });
+    }
+  }
+  $(document).ready(function () {
 
-      $("#download_jar").on("submit", async function (e) {
-        wait_msg();
+    $("#download_jar").on("submit", async function (e) {
+      wait_msg();
       e.preventDefault();
       let jarForm = document.getElementById("download_jar");
 
@@ -911,23 +962,23 @@
       console.log(formDataObject);
       let send_data = {
         "name": formDataObject.name,
-        "roles": calcRoles(), 
-        "monitoring_type": "minecraft_java", 
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_java",
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
           "port": formDataObject.port
         },
         "create_type": "minecraft_java",
         "minecraft_java_create_data": {
-        "create_type": "download_jar",
-        "download_jar_create_data": {
-          "category": formDataObject.version.split("|")[0],
-          "type": formDataObject.version.split("|")[1],
-          "version": formDataObject.version.split("|")[2],
-          "mem_min": formDataObject.mem_min,
-          "mem_max": formDataObject.mem_max,
-          "server_properties_port": formDataObject.port
-        }
+          "create_type": "download_jar",
+          "download_jar_create_data": {
+            "category": formDataObject.version.split("|")[0],
+            "type": formDataObject.version.split("|")[1],
+            "version": formDataObject.version.split("|")[2],
+            "mem_min": formDataObject.mem_min,
+            "mem_max": formDataObject.mem_max,
+            "server_properties_port": formDataObject.port
+          }
         }
       }
       console.log(send_data);
@@ -940,8 +991,8 @@
       send_server(formDataJsonString);
     });
 
-  $("#import-jar").on("submit", async function (e) {
-        wait_msg(true);
+    $("#import-jar").on("submit", async function (e) {
+      wait_msg(true);
       e.preventDefault();
       let jarForm = document.getElementById("import-jar");
 
@@ -952,21 +1003,21 @@
       let send_data = {
         "name": formDataObject.name,
         "roles": calcRoles(),
-        "monitoring_type": "minecraft_java", 
+        "monitoring_type": "minecraft_java",
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
           "port": formDataObject.port
         },
         "create_type": "minecraft_java",
         "minecraft_java_create_data": {
-        "create_type": "import_server",
-        "import_server_create_data": {
-          "existing_server_path": formDataObject.server_path,
-          "jarfile": formDataObject.server_jar,
-          "mem_min": formDataObject.mem_min,
-          "mem_max": formDataObject.mem_max,
-          "server_properties_port": formDataObject.port
-        }
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.server_path,
+            "jarfile": formDataObject.server_jar,
+            "mem_min": formDataObject.mem_min,
+            "mem_max": formDataObject.mem_max,
+            "server_properties_port": formDataObject.port
+          }
         }
       }
       console.log(send_data);
@@ -976,8 +1027,8 @@
       send_server(formDataJsonString);
     });
 
-      $("#import-zip").on("submit", async function (e) {
-        wait_msg(true);
+    $("#import-zip").on("submit", async function (e) {
+      wait_msg(true);
       e.preventDefault();
       let jarForm = document.getElementById("import-zip");
 
@@ -987,22 +1038,22 @@
       console.log(formDataObject);
       let send_data = {
         "name": formDataObject.name,
-        "roles": calcRoles(), 
-        "monitoring_type": "minecraft_java", 
+        "roles": calcRoles(),
+        "monitoring_type": "minecraft_java",
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
           "port": formDataObject.port
         },
         "create_type": "minecraft_java",
         "minecraft_java_create_data": {
-        "create_type": "import_server",
-        "import_server_create_data": {
-          "existing_server_path": formDataObject.root_path,
-          "jarfile": formDataObject.server_jar,
-          "mem_min": formDataObject.mem_min,
-          "mem_max": formDataObject.mem_max,
-          "server_properties_port": formDataObject.port
-        }
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.root_path,
+            "jarfile": formDataObject.server_jar,
+            "mem_min": formDataObject.mem_min,
+            "mem_max": formDataObject.mem_max,
+            "server_properties_port": formDataObject.port
+          }
         }
       }
       console.log(send_data);
@@ -1013,7 +1064,7 @@
     });
 
     $("#import-upload").on("submit", async function (e) {
-        wait_msg(true);
+      wait_msg(true);
       e.preventDefault();
       let jarForm = document.getElementById("import-upload");
 
@@ -1024,21 +1075,21 @@
       let send_data = {
         "name": formDataObject.name,
         "roles": calcRoles(),
-        "monitoring_type": "minecraft_java", 
+        "monitoring_type": "minecraft_java",
         "minecraft_java_monitoring_data": {
           "host": "127.0.0.1",
           "port": formDataObject.port
         },
         "create_type": "minecraft_java",
         "minecraft_java_create_data": {
-        "create_type": "import_server",
-        "import_server_create_data": {
-          "existing_server_path": formDataObject.root_path,
-          "jarfile": formDataObject.server_jar,
-          "mem_min": formDataObject.mem_min,
-          "mem_max": formDataObject.mem_max,
-          "server_properties_port": formDataObject.port
-        }
+          "create_type": "import_server",
+          "import_server_create_data": {
+            "existing_server_path": formDataObject.root_path,
+            "jarfile": formDataObject.server_jar,
+            "mem_min": formDataObject.mem_min,
+            "mem_max": formDataObject.mem_max,
+            "server_properties_port": formDataObject.port
+          }
         }
       }
       console.log(send_data);
@@ -1051,181 +1102,181 @@
 </script>
 
 <script>
-    $(".tree-reset").on("click", function () {
-      location.href = "/server/step1";
-    });
-    function dropDown(event) {
-      event.target.parentElement.children[1].classList.remove("d-none");
-      document.getElementById("overlay").classList.remove("d-none");
-    }
+  $(".tree-reset").on("click", function () {
+    location.href = "/server/step1";
+  });
+  function dropDown(event) {
+    event.target.parentElement.children[1].classList.remove("d-none");
+    document.getElementById("overlay").classList.remove("d-none");
+  }
 
-    function hide(event) {
-      var items = document.getElementsByClassName('menu');
-      items.forEach(item => {
-        item.classList.add("d-none");
-      })
+  function hide(event) {
+    var items = document.getElementsByClassName('menu');
+    items.forEach(item => {
+      item.classList.add("d-none");
+    })
 
-      document.getElementById("overlay").classList.add("d-none");
-    }
+    document.getElementById("overlay").classList.add("d-none");
+  }
 
-    $(document).ready(function () {
-      console.log('ready');
-      var forms = $('form.server-wizard');
-      forms.each(function (i, formEl) {
-        var form = $(formEl);
-        var min = form.find('[name=min_memory]');
-        var max = form.find('[name=max_memory]');
-        console.log(form, min, max)
-        min.change(function () {
-          check_sizes(max, min, 'min');
-        });
-        max.change(function () {
-          check_sizes(max, min, 'max');
-        });
+  $(document).ready(function () {
+    console.log('ready');
+    var forms = $('form.server-wizard');
+    forms.each(function (i, formEl) {
+      var form = $(formEl);
+      var min = form.find('[name=min_memory]');
+      var max = form.find('[name=max_memory]');
+      console.log(form, min, max)
+      min.change(function () {
+        check_sizes(max, min, 'min');
+      });
+      max.change(function () {
+        check_sizes(max, min, 'max');
       });
     });
+  });
+
+  function wait_msg(importing) {
+    bootbox.alert({
+      title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
+      message: importing ? '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}' : '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}<br><br><a href="https://serverjars.com" target="_blank" style="text-align: center;"><img src="../../static/assets/images/serverjars/FULL-WHITE.svg" alt="Powered by serverjars.com" width="40%"></a>',
+    });
+  }
+
+
+  function check_sizes(a, b, changed) {
+    max_mem = parseFloat(a.val());
+    min_mem = parseFloat(b.val());
+    if (max_mem < min_mem && changed === 'min') {
+      a.val(min_mem)
+    }
+    if (max_mem < min_mem && changed === 'max') {
+      b.val(max_mem)
+    }
+  }
+
+  async function refreshCache() {
+    document.getElementById("refresh-cache").classList.add("fa-spin")
+    const token = getCookie("_xsrf")
+    let res = await fetch(`/api/v2/crafty/exeCache`, {
+      method: 'GET',
+      headers: {
+        'X-XSRFToken': token
+      },
+    });
+    let responseData = await res.json();
+    if (responseData.status === "ok") {
+      document.getElementById("refresh-cache").classList.remove("fa-sync");
+      document.getElementById("refresh-cache").classList.remove("fa-spin");
+      document.getElementById("refresh-cache").classList.add("fa-check");
+      setTimeout(() => {
+        location.reload();
+      }, 2000);
+    } else {
 
-    function wait_msg(importing) {
       bootbox.alert({
-        title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
-        message: importing ? '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}': '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}<br><br><a href="https://serverjars.com" target="_blank" style="text-align: center;"><img src="../../static/assets/images/serverjars/FULL-WHITE.svg" alt="Powered by serverjars.com" width="40%"></a>',
+        title: responseData.error,
+        message: responseData.error
       });
     }
+  }
 
-
-    function check_sizes(a, b, changed) {
-      max_mem = parseFloat(a.val());
-      min_mem = parseFloat(b.val());
-      if (max_mem < min_mem && changed === 'min') {
-        a.val(min_mem)
-      }
-      if (max_mem < min_mem && changed === 'max') {
-        b.val(max_mem)
-      }
+  $('#file').change(function () {
+    console.log("File changed");
+    if ($('#file').val()) {
+      $('#upload-button').prop("disabled", false);
+      document.getElementById("fileLabel").innerHTML = $('#file').val().split('\\').pop().split('/').pop();
+      console.log("File changed good");
     }
-
-    async function refreshCache() {
-      document.getElementById("refresh-cache").classList.add("fa-spin")
-      let token = getCookie("_xsrf")
-        let res = await fetch(`/api/v2/crafty/exeCache`, {
-          method: 'GET',
-          headers: {
-            'X-XSRFToken': token
-          },
-        });
-        let responseData = await res.json();
-        if (responseData.status === "ok") {
-          document.getElementById("refresh-cache").classList.remove("fa-sync");
-          document.getElementById("refresh-cache").classList.remove("fa-spin");
-          document.getElementById("refresh-cache").classList.add("fa-check");
-          setTimeout(() => {
-            location.reload();
-          }, 2000);
-        } else {
-
-          bootbox.alert({
-            title: responseData.error,
-            message: responseData.error
-          });
-        }
-      }
-
-    $('#file').change(function () {
-      console.log("File changed");
-      if ($('#file').val()) {
-        $('#upload-button').prop("disabled", false);
-        document.getElementById("fileLabel").innerHTML = $('#file').val().split('\\').pop().split('/').pop();
-        console.log("File changed good");
-      }
-    });
+  });
 
 </script>
 <script type="text/javascript">
-    var text = '{% raw data["js_server_types"] %}';
-    var serverTypesLists = JSON.parse(text);
-    /* CountryChange() is called from the onchange event of a select element.
-    * param selectObj - the select object which fired the on change event.
-    */
-    function serverTypeChange(selectObj) {
-      // get the index of the selected option
-      var idx = document.getElementById('server_type').selectedIndex;
-      // get the value of the selected option
-      var cSelect = document.getElementById("server");
-      try {
-        var which = document.getElementById('server_type').options[idx].value;
-      } catch {
-        while (cSelect.options.length > 0) {
-          cSelect.remove(0);
-        }
-        return;
-      }
-      let server_type = which.split('|')[0];
-      let server = which.split('|')[1];
-      // use the selected option value to retrieve the list of items from the serverTypesLists array
-      let cList = serverTypesLists[server_type];
-      // get the country select element via its known id
-      var cSelect = document.getElementById("server");
-      // remove the current options from the country select
-      var len = cSelect.options.length;
+  var text = '{% raw data["js_server_types"] %}';
+  var serverTypesLists = JSON.parse(text);
+  /* CountryChange() is called from the onchange event of a select element.
+  * param selectObj - the select object which fired the on change event.
+  */
+  function serverTypeChange(selectObj) {
+    // get the index of the selected option
+    var idx = document.getElementById('server_type').selectedIndex;
+    // get the value of the selected option
+    var cSelect = document.getElementById("server");
+    try {
+      var which = document.getElementById('server_type').options[idx].value;
+    } catch {
       while (cSelect.options.length > 0) {
         cSelect.remove(0);
       }
-      var newOption;
-      // create new options ordered by ascending
-      cList[server].forEach(type => {
-        newOption = document.createElement("option");
-        newOption.value = which + "|" + type;  // assumes option string and value are the same
-        newOption.text = type;
-        // add the new option
-        try {
-          cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
-        }
-        catch (e) {
-          cSelect.appendChild(newOption);
-        }
-      })
+      return;
     }
-
-    function serverJarChange(selectObj) {
-      let type_select = document.getElementById('server_jar')
-      let tidx = type_select.selectedIndex;
-      let val = type_select.options[tidx].value;
-      if (val == 'None') {
-        var jcSelect = document.getElementById("server_type");
-        while (jcSelect.options.length > 0) {
-          jcSelect.remove(0);
-        }
-        serverTypeChange(selectObj);
-        return;
+    let server_type = which.split('|')[0];
+    let server = which.split('|')[1];
+    // use the selected option value to retrieve the list of items from the serverTypesLists array
+    let cList = serverTypesLists[server_type];
+    // get the country select element via its known id
+    var cSelect = document.getElementById("server");
+    // remove the current options from the country select
+    var len = cSelect.options.length;
+    while (cSelect.options.length > 0) {
+      cSelect.remove(0);
+    }
+    var newOption;
+    // create new options ordered by ascending
+    cList[server].forEach(type => {
+      newOption = document.createElement("option");
+      newOption.value = which + "|" + type;  // assumes option string and value are the same
+      newOption.text = type;
+      // add the new option
+      try {
+        cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
       }
-      // get the index of the selected option
-      var jidx = selectObj.selectedIndex;
-      // get the value of the selected option
-      var jwhich = selectObj.options[jidx].value;
-      // use the selected option value to retrieve the list of items from the serverTypesLists array
-      jcList = Object.keys(serverTypesLists[jwhich]);
-      // get the country select element via its known id
+      catch (e) {
+        cSelect.appendChild(newOption);
+      }
+    })
+  }
+
+  function serverJarChange(selectObj) {
+    let type_select = document.getElementById('server_jar')
+    let tidx = type_select.selectedIndex;
+    let val = type_select.options[tidx].value;
+    if (val == 'None') {
       var jcSelect = document.getElementById("server_type");
-      // remove the current options from the country select
-      var jlen = jcSelect.options.length;
       while (jcSelect.options.length > 0) {
         jcSelect.remove(0);
       }
-      var jnewOption;
-      // create new options ordered by ascending
-      jcList.forEach(type => {
-        jnewOption = document.createElement("option");
-        jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
-        jnewOption.text = type;
-        // add the new option
-        try {
-          jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
-        }
-        catch (e) {
-          jcSelect.appendChild(jnewOption);
-        }
-      })
       serverTypeChange(selectObj);
+      return;
     }
+    // get the index of the selected option
+    var jidx = selectObj.selectedIndex;
+    // get the value of the selected option
+    var jwhich = selectObj.options[jidx].value;
+    // use the selected option value to retrieve the list of items from the serverTypesLists array
+    jcList = Object.keys(serverTypesLists[jwhich]);
+    // get the country select element via its known id
+    var jcSelect = document.getElementById("server_type");
+    // remove the current options from the country select
+    var jlen = jcSelect.options.length;
+    while (jcSelect.options.length > 0) {
+      jcSelect.remove(0);
+    }
+    var jnewOption;
+    // create new options ordered by ascending
+    jcList.forEach(type => {
+      jnewOption = document.createElement("option");
+      jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
+      jnewOption.text = type;
+      // add the new option
+      try {
+        jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
+      }
+      catch (e) {
+        jcSelect.appendChild(jnewOption);
+      }
+    })
+    serverTypeChange(selectObj);
+  }
 </script>
 {% end %}
\ No newline at end of file

From fe5e7e88511c13a41185a6507d6d179e1021236b Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:22:32 -0400
Subject: [PATCH 120/210] Appease sonar

---
 app/frontend/templates/panel/custom_login.html            | 2 +-
 app/frontend/templates/panel/panel_edit_user_apikeys.html | 4 ++--
 app/frontend/templates/panel/server_files.html            | 2 +-
 app/frontend/templates/server/bedrock_wizard.html         | 4 ++--
 app/frontend/templates/server/wizard.html                 | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/frontend/templates/panel/custom_login.html b/app/frontend/templates/panel/custom_login.html
index 0f2f6c10..4eb22ca8 100644
--- a/app/frontend/templates/panel/custom_login.html
+++ b/app/frontend/templates/panel/custom_login.html
@@ -387,7 +387,7 @@
     file = $("#file")[0].files[0]
     document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>';
     let xmlHttpRequest = new XMLHttpRequest();
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let fileName = file.name
     let target = '/upload'
     let mimeType = file.type
diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index c08b5518..8aa63ea0 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -269,7 +269,7 @@
         $('.delete-api-key').click(async function () {
             let keyId = $(this).data("key-id");
             let keyName = $(this).data("key-name");
-            const token = getCookie("_xsrf");
+            let token = getCookie("_xsrf");
             let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
                 method: 'DELETE',
                 headers: {
@@ -290,7 +290,7 @@
         $('.get-a-token').click(async function () {
             let keyId = $(this).data("key-id");
             let keyName = $(this).data("key-name");
-            const token = getCookie("_xsrf");
+            let token = getCookie("_xsrf");
             let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
                 method: 'GET',
                 headers: {
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 77cc2353..a45a345b 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -720,7 +720,7 @@
 
   async function sendFile(file, path, serverId, left, i, onProgress) {
     let xmlHttpRequest = new XMLHttpRequest();
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let fileName = file.name
     let target = '/upload?server_id=' + serverId
     let mimeType = file.type
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 8eefcf68..e1ae727f 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -530,7 +530,7 @@
     file = $("#file")[0].files[0]
     document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
     let xmlHttpRequest = new XMLHttpRequest();
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let fileName = encodeURIComponent(file.name)
     let target = '/upload'
     let mimeType = file.type
@@ -697,7 +697,7 @@
     return role_ids
   }
   async function send_server(data) {
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     console.log(token)
     let res = await fetch(`/api/v2/servers/`, {
       method: 'POST',
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 080fcb49..879953c7 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -854,7 +854,7 @@
     file = $("#file")[0].files[0]
     document.getElementById("upload_input").innerHTML = '<div class="progress" style="width: 100%;"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
     let xmlHttpRequest = new XMLHttpRequest();
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let fileName = file.name
     let target = '/upload'
     let mimeType = file.type
@@ -930,7 +930,7 @@
     return role_ids
   }
   async function send_server(data) {
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/servers/`, {
       method: 'POST',
       headers: {
@@ -1157,7 +1157,7 @@
 
   async function refreshCache() {
     document.getElementById("refresh-cache").classList.add("fa-spin")
-    const token = getCookie("_xsrf")
+    let token = getCookie("_xsrf")
     let res = await fetch(`/api/v2/crafty/exeCache`, {
       method: 'GET',
       headers: {

From 6ea46277bbf69d83f60a65aa5eb670f6ce4e152e Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 00:22:49 +0100
Subject: [PATCH 121/210] Revert changelog !616

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1245e3ff..a82d64aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ TBD
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))
 - Correctly handle if a server returns a string instead of json data on socket ping ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/614))
 ### Refactor
-- Refractor/Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/616))
+TBD
 ### Tweaks
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))

From 88dada0b91ad0e701bb1f647a94f7d23516f155d Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 00:30:11 +0100
Subject: [PATCH 122/210] Reversion release 4.2.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a82d64aa..76e569e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Changelog
-## --- [4.1.4] - 2023/TBD
+## --- [4.2.0] - 2023/TBD
 ### New features
 TBD
 ### Bug fixes

From 9c9f9d3556e4130c182e01467a3a1bfe7d84e532 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:32:56 -0400
Subject: [PATCH 123/210] Fix file get naming

---
 app/frontend/templates/panel/server_backup.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 43e9d89f..284a392a 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -310,13 +310,12 @@
   }
 
   async function backup_started() {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     document.getElementById('backup_button').style.visibility = 'hidden';
     var dialog = bootbox.dialog({
       message: "{{ translate('serverBackups', 'backupTask', data['lang']) }}",
       closeButton: false
     });
-    var token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/servers/${server_id}/action/backup_server`, {
         method: 'POST',
         headers: {
@@ -338,7 +337,7 @@
     return;
   }
   async function del_backup(filename, id) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let contents = JSON.stringify({"filename": filename})
     let res = await fetch(`/api/v2/servers/${id}/backups/backup/`, {
       method: 'DELETE',
@@ -357,7 +356,7 @@
   }
 
   async function restore_backup(filename, id) {
-    var token = getCookie("_xsrf")
+    const token = getCookie("_xsrf")
     let contents = JSON.stringify({"filename": filename})
     var dialog = bootbox.dialog({
       message: "<i class='fa fa-spin fa-spinner'></i> {{ translate('serverBackups', 'restoring', data['lang']) }}",
@@ -411,7 +410,7 @@
   $(document).ready(function () {
     $("#backup-form").on("submit", async function (e) {
       e.preventDefault();
-      var token = getCookie("_xsrf")
+      const token = getCookie("_xsrf")
       let backupForm = document.getElementById("backup-form");
 
       let formData = new FormData(backupForm);
@@ -568,7 +567,7 @@
       }
       path = $("#root_files_button").data('server_path')
       console.log($("#root_files_button").data('server_path'))
-      var token = getCookie("_xsrf");
+      const token = getCookie("_xsrf");
       var dialog = bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
@@ -618,13 +617,14 @@
 
   }
   async function getTreeView(path){
-    var token = getCookie("_xsrf");
+    console.log(path)
+    const token = getCookie("_xsrf");
     let res = await fetch(`/api/v2/servers/${server_id}/files`, {
         method: 'POST',
         headers: {
           'X-XSRFToken': token
         },
-        body: JSON.stringify({"page": "backups", "folder": path}),
+        body: JSON.stringify({"page": "backups", "path": path}),
       });
       let responseData = await res.json();
       if (responseData.status === "ok") {

From d3df67ba7514006c2f5a992f5f8f525586da101a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:35:48 -0400
Subject: [PATCH 124/210] Appease Sonar

---
 app/frontend/templates/panel/server_schedules.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html
index 586c6ae4..121b40ff 100644
--- a/app/frontend/templates/panel/server_schedules.html
+++ b/app/frontend/templates/panel/server_schedules.html
@@ -60,7 +60,7 @@
                 </div>
                 <div class="card-body">
                   <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%"
-                    style="table-layout:fixed;">
+                    style="table-layout:fixed;" aria-describedby="Schedule List">
                     <thead>
                       <tr class="rounded">
                         <th style="width: 2%; min-width: 10px;">{{ translate('serverSchedules', 'name', data['lang']) }}
@@ -129,7 +129,7 @@
                   </table>
                   <hr />
                   <table class="table table-hover d-block d-lg-none" id="mini_schedule_table" width="100%"
-                    style="table-layout:fixed;">
+                    style="table-layout:fixed;" aria-describedby="Schedule List Mobile">
                     <thead>
                       <tr class="rounded">
                         <th style="width: 25%; min-width: 50px;">{{ translate('serverSchedules', 'action', data['lang'])

From 84a24687d027e6f8a2910c3fb7bcb4d00a7c7340 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:38:20 -0400
Subject: [PATCH 125/210] Appease the linter

---
 app/classes/web/routes/api/crafty/config/index.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
index 9183d96b..a2bff723 100644
--- a/app/classes/web/routes/api/crafty/config/index.py
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -54,7 +54,7 @@ photo_delete_schema = {
     "additionalProperties": False,
     "minProperties": 1,
 }
-default_photo = "login_1.jpg"
+DEFAULT_PHOTO = "login_1.jpg"
 
 
 class ApiCraftyConfigIndexHandler(BaseApiHandler):
@@ -222,8 +222,8 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
             source_ip=self.get_remote_ip(),
         )
         self.controller.management.set_login_opacity(int(data["opacity"]))
-        if data["photo"] == default_photo:
-            self.controller.management.set_login_image(default_photo)
+        if data["photo"] == DEFAULT_PHOTO:
+            self.controller.management.set_login_image(DEFAULT_PHOTO)
             self.controller.cached_login = f"{data['photo']}"
         else:
             self.controller.management.set_login_image(f"custom/{data['photo']}")
@@ -285,7 +285,7 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
                     " NOT SUPPOSED TO BE ACCESSIBLE",
                 },
             )
-        if data["photo"] == default_photo:
+        if data["photo"] == DEFAULT_PHOTO:
             return self.finish_json(
                 400,
                 {
@@ -307,6 +307,6 @@ class ApiCraftyCustomizeIndexHandler(BaseApiHandler):
         else:
             current_photo = split[1]
         if current_photo == data["photo"]:
-            self.controller.management.set_login_image(default_photo)
-            self.controller.cached_login = default_photo
+            self.controller.management.set_login_image(DEFAULT_PHOTO)
+            self.controller.cached_login = DEFAULT_PHOTO
         return self.finish_json(200, {"status": "ok"})

From 7134eb2eb8ae8f4f0dc1666ad70f5227c5e84d77 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:40:27 -0400
Subject: [PATCH 126/210] Appease sonar

---
 app/frontend/static/assets/js/shared/root-dir.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js
index 2a6f58fd..7513b9b8 100644
--- a/app/frontend/static/assets/js/shared/root-dir.js
+++ b/app/frontend/static/assets/js/shared/root-dir.js
@@ -44,11 +44,11 @@ async function getTreeView(path, unzip = false, upload = false) {
     if (responseData.status === "ok") {
         console.log(responseData);
         process_tree_response(responseData);
-        var x = document.querySelector('.bootbox');
+        let x = document.querySelector('.bootbox');
         if (x) {
             x.remove()
         }
-        var x = document.querySelector('.modal-backdrop');
+        x = document.querySelector('.modal-backdrop');
         if (x) {
             x.remove()
         }
@@ -73,7 +73,7 @@ function process_tree_response(response) {
     }
     let path = response.data.root_path.path;
     $(".root-input").val(response.data.root_path.path);
-    text = `<ul class="tree-nested d-block" id="${path}ul">`;
+    let text = `<ul class="tree-nested d-block" id="${path}ul">`;
     Object.entries(response.data).forEach(([key, value]) => {
         if (key === "root_path" || key === "db_stats") {
             //continue is not valid in for each. Return acts as a continue.
@@ -120,7 +120,7 @@ function process_tree_response(response) {
             console.log("Bad")
         }
 
-        var toggler = document.getElementById(path + "span");
+        let toggler = document.getElementById(path + "span");
 
         if (toggler.classList.contains('files-tree-title')) {
             document.getElementById(path + "span").addEventListener("click", function caretListener() {

From 46d7c3eb3c0ee169a384fe04ed245e57aca4e46c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:41:59 -0400
Subject: [PATCH 127/210] appease sonar

---
 app/frontend/templates/panel/panel_edit_role.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index 3abb12a3..df065bf9 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -387,7 +387,7 @@
 
       let servers = []
       for(i=0; i < server_ids.length; i++){
-        arrchecked = $(`.${server_ids[i]}_perms`).map(function() {
+        let arrchecked = $(`.${server_ids[i]}_perms`).map(function() {
         if(this.checked){
           return "1";
         }else{
@@ -410,12 +410,12 @@
       let formDataJsonString = JSON.stringify(formDataObject, replacer);
 
       console.log(formDataJsonString);
+
+      let url = `/api/v2/roles/`
+      let method = 'POST'
       if (roleId){
         url = `/api/v2/roles/${roleId}`
         method = 'PATCH'
-      }else{
-        url = `/api/v2/roles/`
-        method = 'POST'
       }
       let res = await fetch(url, {
         method: method,

From 8e1e7f8e1172671e2954353ef71c0ac2563dd641 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:43:15 -0400
Subject: [PATCH 128/210] Appease sonar

---
 app/frontend/templates/panel/panel_edit_user_apikeys.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/frontend/templates/panel/panel_edit_user_apikeys.html b/app/frontend/templates/panel/panel_edit_user_apikeys.html
index 8aa63ea0..084db0c3 100644
--- a/app/frontend/templates/panel/panel_edit_user_apikeys.html
+++ b/app/frontend/templates/panel/panel_edit_user_apikeys.html
@@ -268,7 +268,6 @@
         console.log("ready!");
         $('.delete-api-key').click(async function () {
             let keyId = $(this).data("key-id");
-            let keyName = $(this).data("key-name");
             let token = getCookie("_xsrf");
             let res = await fetch(`/api/v2/users/${userId}/key/${keyId}`, {
                 method: 'DELETE',

From 8664876c1bb377bc8754c5217a13a347a5852208 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 00:43:52 +0100
Subject: [PATCH 129/210] Update changelog !623

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76e569e5..431e5cb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ TBD
 - PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))
 - Correctly handle if a server returns a string instead of json data on socket ping ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/614))
+- Bump tornado to resolve #269 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/623))
 ### Refactor
 TBD
 ### Tweaks

From 097421b34f24d72738c0834179a476f21b3e50ce Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:45:39 -0400
Subject: [PATCH 130/210] Appease sonar

---
 .../templates/panel/server_files.html         | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index a45a345b..0ad7f935 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -67,7 +67,7 @@
                     translate('serverFiles', 'download', data['lang']) }}</a>
                   <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteFile" href="#"
                     style="color: red">{{ translate('serverFiles', 'delete', data['lang']) }}</a>
-                  <a onclick="deleteDirE(event)" href="javascript:void(0)" id="deleteDir" href="#" style="color: red">{{
+                  <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteDir" href="#" style="color: red">{{
                     translate('serverFiles', 'delete', data['lang']) }}</a>
                   <a href="javascript:void(0)" class="closebtn" style="color: var(--info);"
                     onclick="document.getElementById('files-tree-nav').style.display = 'none';">{{
@@ -1181,31 +1181,6 @@
     });
   }
 
-  function deleteDirE(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    name = event.target.parentElement.getAttribute('data-name');
-    bootbox.confirm({
-      size: "",
-      title: "{% raw translate('serverFiles', 'deleteItemQuestion', data['lang']) %}",
-      closeButton: false,
-      message: "{% raw translate('serverFiles', 'deleteItemQuestionMessage', data['lang']) %}",
-      buttons: {
-        confirm: {
-          label: "{{ translate('serverFiles', 'yesDelete', data['lang']) }}",
-          className: 'btn-danger'
-        },
-        cancel: {
-          label: "{{ translate('serverFiles', 'noDelete', data['lang']) }}",
-          className: 'btn-link'
-        }
-      },
-      callback: function (result) {
-        if (!result) return;
-        deleteItem(path);
-      }
-    });
-  }
-
   getTreeView($('#root_dir').data('path'));
   setTreeViewContext();
 

From 3467c1ccd649922515913936c5e760887c812304 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 19:48:03 -0400
Subject: [PATCH 131/210] Appease sonar

---
 app/frontend/templates/panel/server_schedule_edit.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html
index b1260770..fac8242a 100644
--- a/app/frontend/templates/panel/server_schedule_edit.html
+++ b/app/frontend/templates/panel/server_schedule_edit.html
@@ -245,14 +245,12 @@
       }else {
         return (isNaN(value) ? value : +value);
       }
-    } else {
-      if (value === "" && key == "start_time"){
+    } else if (value === "" && key == "start_time"){
         return "00:00";
       }else{
         return value;
       }
     }
-  }
 
     const serverId = new URLSearchParams(document.location.search).get('id');
     const schId = new URLSearchParams(document.location.search).get('sch_id');

From c2b3c98e394e338543cf4ddfb40cea221a38d4a1 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 00:52:24 +0100
Subject: [PATCH 132/210] Update changelog !622

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 431e5cb8..a4fcd66d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ TBD
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))
 - Correctly handle if a server returns a string instead of json data on socket ping ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/614))
 - Bump tornado to resolve #269 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/623))
+- Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
 ### Refactor
 TBD
 ### Tweaks

From c1d0902ea57cf2b40bf7e6e5e7eb0fdab8e56a94 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 20:05:25 -0400
Subject: [PATCH 133/210] Appease sonar

---
 app/frontend/templates/panel/server_logs.html |  8 +--
 .../templates/panel/server_schedules.html     |  4 +-
 app/frontend/templates/panel/server_term.html | 14 +++--
 app/frontend/templates/server/wizard.html     | 52 +++++++++----------
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/app/frontend/templates/panel/server_logs.html b/app/frontend/templates/panel/server_logs.html
index df654ce1..3918f1d6 100644
--- a/app/frontend/templates/panel/server_logs.html
+++ b/app/frontend/templates/panel/server_logs.html
@@ -77,8 +77,8 @@
 {% block js %}
 <script>
   // ##### Log Filter Block #####
-  var lines = [];
-  var words = [];
+  let lines = [];
+  let words = [];
   if (localStorage.getItem("words")) {
     try {
       words = JSON.parse(localStorage.getItem("words"));
@@ -199,9 +199,9 @@
         },
       });
       let responseData = await res.json();
-      html = ``
+      let html = ``
       if (responseData.status === "ok") {
-        for (i = 0; i < responseData.data.length; i++) {
+        for (let i = 0; i < responseData.data.length; i++) {
           html += `<span class='box'>${responseData.data[i]}<br /></span>`
         }
         console.log('Got Log From Server')
diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html
index 121b40ff..eb43396b 100644
--- a/app/frontend/templates/panel/server_schedules.html
+++ b/app/frontend/templates/panel/server_schedules.html
@@ -59,7 +59,7 @@
                   </div>
                 </div>
                 <div class="card-body">
-                  <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table" width="100%"
+                  <table class="table table-hover d-none d-lg-block responsive-table" id="schedule_table"
                     style="table-layout:fixed;" aria-describedby="Schedule List">
                     <thead>
                       <tr class="rounded">
@@ -128,7 +128,7 @@
                     </tbody>
                   </table>
                   <hr />
-                  <table class="table table-hover d-block d-lg-none" id="mini_schedule_table" width="100%"
+                  <table class="table table-hover d-block d-lg-none" id="mini_schedule_table"
                     style="table-layout:fixed;" aria-describedby="Schedule List Mobile">
                     <thead>
                       <tr class="rounded">
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 37f923c1..804c09dd 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -196,12 +196,10 @@
           document.getElementById('control_buttons').innerHTML = '<button onclick="" id="start-btn" style="max-width: 7rem;" class="btn btn-primary m-1 flex-grow-1">{{ translate("serverTerm", "updating", data["lang"]) }}</button><button onclick="" id="restart-btn" style="max-width: 7rem;" class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate("serverTerm", "restart", data["lang"]) %}</button><button onclick="" id="stop-btn" style="max-width: 7rem;" class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate("serverTerm", "stop", data["lang"]) }}</button>';
         }
       }
-      else {
-        if (updateButton.server_id == serverId) {
+      else if (updateButton.server_id == serverId) {
           window.location.reload()
           document.getElementById('update_control_buttons').innerHTML = '<button onclick="send_command(serverId, "start_server");" id="start-btn" style="max-width: 7rem;" class="btn btn-primary m-1 flex-grow-1">{{ translate("serverTerm", "start", data["lang"]) }}</button><button onclick="send_command(serverId, "restart_server");" id="restart-btn" style="max-width: 7rem;" class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate("serverTerm", "restart", data["lang"]) %}</button><button onclick="" id="stop-btn" style="max-width: 7rem;" class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate("serverTerm", "stop", data["lang"]) }}</button>';
         }
-      }
     });
   }
   // Convert running to lower case (example: 'True' converts to 'true') and
@@ -240,9 +238,9 @@
       },
     });
     let responseData = await res.json();
-    html = ``
+    let html = ``
     if (responseData.status === "ok") {
-      for (i = 0; i < responseData.data.length; i++) {
+      for (let i = 0; i < responseData.data.length; i++) {
         html += `<span class='box'>${responseData.data[i]}<br /></span>`
       }
       console.log('Got Log From Server')
@@ -273,7 +271,7 @@
 
   //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
   function getCookie(name) {
-    var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+    let r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
     return r ? r[1] : undefined;
   }
 
@@ -308,7 +306,7 @@
   });
 
   function scrollConsole() {
-    var logview = $('#virt_console');
+    let logview = $('#virt_console');
     if (logview.length)
       logview.scrollTop(logview[0].scrollHeight - logview.height());
   }
@@ -387,7 +385,7 @@
   }
 
   $(document).ready(() => {
-    var scrolled = false;
+    let scrolled = false;
     $('#virt_console').on('scroll', chkScroll);
     $('#to-bottom').on('click', scrollToBottom)
   });
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 879953c7..fa7c4fd0 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -822,8 +822,7 @@
       } else {
         document.getElementById('root_files_button').classList.add('clicked')
       }
-      const token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
+      bootbox.dialog({
         message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
         closeButton: false
       });
@@ -840,8 +839,7 @@
     } else {
       document.getElementById('root_upload_button').classList.add('clicked')
     }
-    const token = getCookie("_xsrf");
-    var dialog = bootbox.dialog({
+    bootbox.dialog({
       message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
       closeButton: false
     });
@@ -885,8 +883,6 @@
         document.getElementById("lower_half").hidden = false;
       }
       else {
-        let response_text = JSON.parse(event.target.responseText);
-        var x = document.querySelector('.bootbox');
         console.log(JSON.parse(event.target.responseText).info)
         bootbox.alert({
           message: JSON.parse(event.target.responseText).info,
@@ -894,7 +890,7 @@
             window.location.reload();
           }
         });
-        doUpload = false;
+        let doUpload = false;
       }
     }, false);
     xmlHttpRequest.addEventListener('error', (e) => {
@@ -1111,7 +1107,7 @@
   }
 
   function hide(event) {
-    var items = document.getElementsByClassName('menu');
+    let items = document.getElementsByClassName('menu');
     items.forEach(item => {
       item.classList.add("d-none");
     })
@@ -1121,11 +1117,11 @@
 
   $(document).ready(function () {
     console.log('ready');
-    var forms = $('form.server-wizard');
+    let forms = $('form.server-wizard');
     forms.each(function (i, formEl) {
-      var form = $(formEl);
-      var min = form.find('[name=min_memory]');
-      var max = form.find('[name=max_memory]');
+      let form = $(formEl);
+      let min = form.find('[name=min_memory]');
+      let max = form.find('[name=max_memory]');
       console.log(form, min, max)
       min.change(function () {
         check_sizes(max, min, 'min');
@@ -1145,8 +1141,8 @@
 
 
   function check_sizes(a, b, changed) {
-    max_mem = parseFloat(a.val());
-    min_mem = parseFloat(b.val());
+    let max_mem = parseFloat(a.val());
+    let min_mem = parseFloat(b.val());
     if (max_mem < min_mem && changed === 'min') {
       a.val(min_mem)
     }
@@ -1192,18 +1188,19 @@
 
 </script>
 <script type="text/javascript">
-  var text = '{% raw data["js_server_types"] %}';
-  var serverTypesLists = JSON.parse(text);
+  const text = '{% raw data["js_server_types"] %}';
+  const serverTypesLists = JSON.parse(text);
   /* CountryChange() is called from the onchange event of a select element.
   * param selectObj - the select object which fired the on change event.
   */
   function serverTypeChange(selectObj) {
     // get the index of the selected option
-    var idx = document.getElementById('server_type').selectedIndex;
+    let idx = document.getElementById('server_type').selectedIndex;
     // get the value of the selected option
-    var cSelect = document.getElementById("server");
+    let cSelect = document.getElementById("server");
+    let which;
     try {
-      var which = document.getElementById('server_type').options[idx].value;
+      which = document.getElementById('server_type').options[idx].value;
     } catch {
       while (cSelect.options.length > 0) {
         cSelect.remove(0);
@@ -1215,13 +1212,12 @@
     // use the selected option value to retrieve the list of items from the serverTypesLists array
     let cList = serverTypesLists[server_type];
     // get the country select element via its known id
-    var cSelect = document.getElementById("server");
+    cSelect = document.getElementById("server");
     // remove the current options from the country select
-    var len = cSelect.options.length;
     while (cSelect.options.length > 0) {
       cSelect.remove(0);
     }
-    var newOption;
+    let newOption;
     // create new options ordered by ascending
     cList[server].forEach(type => {
       newOption = document.createElement("option");
@@ -1241,8 +1237,9 @@
     let type_select = document.getElementById('server_jar')
     let tidx = type_select.selectedIndex;
     let val = type_select.options[tidx].value;
+    let jcSelect = "";
     if (val == 'None') {
-      var jcSelect = document.getElementById("server_type");
+      jcSelect = document.getElementById("server_type");
       while (jcSelect.options.length > 0) {
         jcSelect.remove(0);
       }
@@ -1250,19 +1247,18 @@
       return;
     }
     // get the index of the selected option
-    var jidx = selectObj.selectedIndex;
+    let jidx = selectObj.selectedIndex;
     // get the value of the selected option
-    var jwhich = selectObj.options[jidx].value;
+    let jwhich = selectObj.options[jidx].value;
     // use the selected option value to retrieve the list of items from the serverTypesLists array
     jcList = Object.keys(serverTypesLists[jwhich]);
     // get the country select element via its known id
-    var jcSelect = document.getElementById("server_type");
+    jcSelect = document.getElementById("server_type");
     // remove the current options from the country select
-    var jlen = jcSelect.options.length;
     while (jcSelect.options.length > 0) {
       jcSelect.remove(0);
     }
-    var jnewOption;
+    let jnewOption;
     // create new options ordered by ascending
     jcList.forEach(type => {
       jnewOption = document.createElement("option");

From cdba8c5c69fe92984cecb2c97b4ce1011b21c200 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 20:10:00 -0400
Subject: [PATCH 134/210] Appease sonar security

---
 app/frontend/templates/server/wizard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index fa7c4fd0..1c37a2fe 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -191,7 +191,7 @@
         <div class="api-alert" style="position: absolute; top: -5px; z-index: 100; opacity: .99;">
           <p style="color: white !important;"><i class="fas fa-exclamation-triangle" style="color: red;"></i>&nbsp;{{
             translate('error', 'serverJars1', data['lang']) }}<a style="color: red;" ;
-              href="https://status.craftycontrol.com/status/craftycontrol" target="_blank">&nbsp;{{ translate('error',
+              href="https://status.craftycontrol.com/status/craftycontrol" target="_blank" rel="noopener">&nbsp;{{ translate('error',
               'craftyStatus', data['lang']) }}</a>
             &nbsp;{{ translate('error', 'serverJars2', data['lang']) }}</p>
         </div>

From b34ecf58c2a2faebf9bfcdd24885b71024700e80 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 01:19:22 +0100
Subject: [PATCH 135/210] Update changelog !585

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4fcd66d..f2c1006f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ TBD
 - Bump tornado to resolve #269 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/623))
 - Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
 ### Refactor
-TBD
+- Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
 ### Tweaks
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))

From 4051d98f8fc2461131786054114efc32620c071e Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 20:28:55 -0400
Subject: [PATCH 136/210] Appease the linter

---
 app/classes/web/routes/api/users/user/api.py | 76 +++++++++++---------
 1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/app/classes/web/routes/api/users/user/api.py b/app/classes/web/routes/api/users/user/api.py
index 814ce296..1c7635f2 100644
--- a/app/classes/web/routes/api/users/user/api.py
+++ b/app/classes/web/routes/api/users/user/api.py
@@ -17,8 +17,14 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             key = self.controller.users.get_user_api_key(key_id)
             # does this user id exist?
             if key is None:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "INVALID DATA",
+                        "error_data": "INVALID KEY",
+                    },
+                )
 
             if (
                 str(key.user_id) != str(auth_data[4]["user_id"])
@@ -48,37 +54,37 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
                 200,
                 {"status": "ok", "data": data_key},
             )
-        else:
-            if (
-                str(user_id) != str(auth_data[4]["user_id"])
-                and not auth_data[4]["superuser"]
-            ):
-                return self.finish_json(
-                    400,
-                    {
-                        "status": "error",
-                        "error": "NOT AUTHORIZED",
-                        "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
-                    },
-                )
-            keys = []
-            for key in self.controller.users.get_user_api_keys(str(user_id)):
-                keys.append(
-                    {
-                        "id": key.token_id,
-                        "name": key.name,
-                        "server_permissions": key.server_permissions,
-                        "crafty_permissions": key.crafty_permissions,
-                        "superuser": key.superuser,
-                    }
-                )
-            self.finish_json(
-                200,
+
+        if (
+            str(user_id) != str(auth_data[4]["user_id"])
+            and not auth_data[4]["superuser"]
+        ):
+            return self.finish_json(
+                400,
                 {
-                    "status": "ok",
-                    "data": keys,
+                    "status": "error",
+                    "error": "NOT AUTHORIZED",
+                    "error_data": "TRIED TO EDIT KEY WIHTOUT AUTH",
                 },
             )
+        keys = []
+        for key in self.controller.users.get_user_api_keys(str(user_id)):
+            keys.append(
+                {
+                    "id": key.token_id,
+                    "name": key.name,
+                    "server_permissions": key.server_permissions,
+                    "crafty_permissions": key.crafty_permissions,
+                    "superuser": key.superuser,
+                }
+            )
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": keys,
+            },
+        )
 
     def patch(self, user_id: str):
         user_key_schema = {
@@ -187,8 +193,14 @@ class ApiUsersUserKeyHandler(BaseApiHandler):
             key = self.controller.users.get_user_api_key(key_id)
             # does this user id exist?
             if key is None:
-                self.redirect("/panel/error?error=Invalid Key ID")
-                return
+                return self.finish_json(
+                    400,
+                    {
+                        "status": "error",
+                        "error": "INVALID DATA",
+                        "error_data": "INVALID KEY",
+                    },
+                )
 
             # does this user id exist?
             target_key = self.controller.users.get_user_api_key(key_id)

From a8af1bcdf08931ffe8bf2809cdecdd75db9eef5d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 20:42:50 -0400
Subject: [PATCH 137/210] Adjust front end styling

---
 app/frontend/templates/notify.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 4348fad5..5f917e5e 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -7,7 +7,7 @@
             text-danger
         {% end %}
         "></i><span id="notif-count" class="badge badge-notify"></span> </a>
-    <div class="dropdown-menu dropdown-menu-right navbar-dropdown" style="width: 40vw;" aria-labelledby="notifDropdown">
+    <div class="dropdown-menu dropdown-menu-right navbar-dropdown notif-div" style="width: 40vw; max-height: 80vh;" aria-labelledby="notifDropdown">
       <ul style="padding-top: 10px;" id="announcements">
       </ul>
     </div>
@@ -78,6 +78,16 @@
   .clear-button:hover {
     cursor: pointer;
   }
+/* Hide scrollbar for Chrome, Safari and Opera */
+.notif-div::-webkit-scrollbar {
+  display: none;
+}
+
+/* Hide scrollbar for IE, Edge and Firefox */
+.notif-div {
+  -ms-overflow-style: none;  /* IE and Edge */
+  scrollbar-width: none;  /* Firefox */
+}
 </style>
 <script>
   function pfpError(image) {

From 6158ea85b55ff73e1a44e6589cca18cf831a08bf Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 20:49:55 -0400
Subject: [PATCH 138/210] Appease sonar

---
 app/frontend/templates/notify.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 5f917e5e..1f73f15b 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -98,7 +98,7 @@
   function updateAnnouncements(data) {
     console.log(data)
     let text = "";
-    for (i = 0; i < data.length; i++) {
+    for (let i = 0; i < data.length; i++) {
       text += `<li class="card-header header-sm justify-content-between align-items-center" id="${data[i].id}"><p style="float: right;"><i data-id="${data[i].id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${data[i].link} target="_blank"><h6>${data[i].title}</h6><small><p>${data[i].date}</p></small><p>${data[i].desc}</p></li></a>`
     }
     if (data.length > 0) {
@@ -114,7 +114,7 @@
       let uuid = event.target.getAttribute("data-id");
       $(`#${uuid}`).remove();
       send_clear(uuid);
-      notif_count = localStorage.getItem("notif-count") - 1;
+      let notif_count = localStorage.getItem("notif-count") - 1;
       if (notif_count > 0) {
         localStorage.setItem("notif-count", notif_count);
         $("#notif-count").html(notif_count);

From 9b7d0d83b5a8d9de57cf84764dfc4fa39516437c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 21:14:03 -0400
Subject: [PATCH 139/210] Appease sonar

---
 app/frontend/static/assets/js/shared/root-dir.js |  6 ++----
 app/frontend/templates/notify.html               |  4 ++--
 app/frontend/templates/panel/server_logs.html    |  4 ++--
 app/frontend/templates/panel/server_term.html    |  5 ++---
 app/frontend/templates/server/wizard.html        | 13 ++++++-------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js
index 7513b9b8..92ba6463 100644
--- a/app/frontend/static/assets/js/shared/root-dir.js
+++ b/app/frontend/static/assets/js/shared/root-dir.js
@@ -20,11 +20,9 @@ function getDirView(event = false) {
             console.log("Well that failed");
         }
     } else if ($("#root_files_button").hasClass("clicked")) {
-        path = $("#zip_server_path").val();
-        getTreeView(path, true);
+        getTreeView($("#zip_server_path").val(), true);
     } else {
-        path = $("#file-uploaded").val();
-        getTreeView(path, true, true);
+        getTreeView($("#file-uploaded").val(), true, true);
     }
 }
 
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 1f73f15b..98d366e7 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -98,8 +98,8 @@
   function updateAnnouncements(data) {
     console.log(data)
     let text = "";
-    for (let i = 0; i < data.length; i++) {
-      text += `<li class="card-header header-sm justify-content-between align-items-center" id="${data[i].id}"><p style="float: right;"><i data-id="${data[i].id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${data[i].link} target="_blank"><h6>${data[i].title}</h6><small><p>${data[i].date}</p></small><p>${data[i].desc}</p></li></a>`
+    for (let value of data) {
+      text += `<li class="card-header header-sm justify-content-between align-items-center" id="${value.id}"><p style="float: right;"><i data-id="${value.id}"class="clear-button fa-regular fa-x"></i></p><a style="color: var(--purple);" href=${value.link} target="_blank"><h6>${value.title}</h6><small><p>${value.date}</p></small><p>${value.desc}</p></li></a>`
     }
     if (data.length > 0) {
       localStorage.setItem("notif-count", data.length);
diff --git a/app/frontend/templates/panel/server_logs.html b/app/frontend/templates/panel/server_logs.html
index 3918f1d6..9a4033a1 100644
--- a/app/frontend/templates/panel/server_logs.html
+++ b/app/frontend/templates/panel/server_logs.html
@@ -201,8 +201,8 @@
       let responseData = await res.json();
       let html = ``
       if (responseData.status === "ok") {
-        for (let i = 0; i < responseData.data.length; i++) {
-          html += `<span class='box'>${responseData.data[i]}<br /></span>`
+        for (let value of responseData.data) {
+          html += `<span class='box'>${value}<br /></span>`
         }
         console.log('Got Log From Server')
         $('#virt_console').html(html);
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 804c09dd..bb63fbe7 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -240,8 +240,8 @@
     let responseData = await res.json();
     let html = ``
     if (responseData.status === "ok") {
-      for (let i = 0; i < responseData.data.length; i++) {
-        html += `<span class='box'>${responseData.data[i]}<br /></span>`
+      for (let value of responseData.data) {
+        html += `<span class='box'>${value}<br /></span>`
       }
       console.log('Got Log From Server')
       $('#virt_console').html(html);
@@ -385,7 +385,6 @@
   }
 
   $(document).ready(() => {
-    let scrolled = false;
     $('#virt_console').on('scroll', chkScroll);
     $('#to-bottom').on('click', scrollToBottom)
   });
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 1c37a2fe..663fbafc 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -890,7 +890,6 @@
             window.location.reload();
           }
         });
-        let doUpload = false;
       }
     }, false);
     xmlHttpRequest.addEventListener('error', (e) => {
@@ -1198,7 +1197,7 @@
     let idx = document.getElementById('server_type').selectedIndex;
     // get the value of the selected option
     let cSelect = document.getElementById("server");
-    let which;
+    let which = {};
     try {
       which = document.getElementById('server_type').options[idx].value;
     } catch {
@@ -1234,10 +1233,10 @@
   }
 
   function serverJarChange(selectObj) {
-    let type_select = document.getElementById('server_jar')
-    let tidx = type_select.selectedIndex;
-    let val = type_select.options[tidx].value;
-    let jcSelect = "";
+    const type_select = document.getElementById('server_jar')
+    const tidx = type_select.selectedIndex;
+    const val = type_select.options[tidx].value;
+    let jcSelect = {};
     if (val == 'None') {
       jcSelect = document.getElementById("server_type");
       while (jcSelect.options.length > 0) {
@@ -1251,7 +1250,7 @@
     // get the value of the selected option
     let jwhich = selectObj.options[jidx].value;
     // use the selected option value to retrieve the list of items from the serverTypesLists array
-    jcList = Object.keys(serverTypesLists[jwhich]);
+    let jcList = Object.keys(serverTypesLists[jwhich]);
     // get the country select element via its known id
     jcSelect = document.getElementById("server_type");
     // remove the current options from the country select

From 514bf8453f2800aecb0a0c3cc68b9db89d34712f Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 21:21:59 -0400
Subject: [PATCH 140/210] Appease sonar

---
 .../web/routes/api/servers/server/backups/backup/index.py    | 5 +++--
 app/frontend/static/assets/js/shared/root-dir.js             | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 56a42cbb..20a9ded0 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -1,6 +1,7 @@
 import logging
 import json
 import os
+from apscheduler.jobstores.base import JobLookupError
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
@@ -192,8 +193,8 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                     # remove old server's tasks
                     try:
                         self.tasks_manager.remove_all_server_tasks(server_id)
-                    except:
-                        logger.info("No active tasks found for server")
+                    except JobLookupError as e:
+                        logger.info("No active tasks found for server: {e}")
                     self.controller.remove_server(server_id, True)
         except Exception:
             return self.finish_json(
diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js
index 92ba6463..6882b577 100644
--- a/app/frontend/static/assets/js/shared/root-dir.js
+++ b/app/frontend/static/assets/js/shared/root-dir.js
@@ -130,7 +130,7 @@ function process_tree_response(response) {
 }
 
 function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
+    const path = event.target.parentElement.getAttribute('data-path');
     document.getElementById("files-tree").classList.toggle("d-block");
     document.getElementById(path + "span").classList.toggle("tree-caret-down");
     document.getElementById(path + "span").classList.toggle("tree-caret");

From 258256382164adc75e3d4557cbdc2110f14e723b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 02:25:24 +0100
Subject: [PATCH 141/210] Update changelog !621

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2c1006f..4af8ce1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 ## --- [4.2.0] - 2023/TBD
 ### New features
-TBD
+- Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621))
 ### Bug fixes
 - PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))

From 2c14a3fd2c47e44b72ab5f05b97c99d502b2fd0c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 21:39:40 -0400
Subject: [PATCH 142/210] Appease the linter

---
 app/classes/web/routes/api/crafty/announcements/index.py | 1 -
 app/frontend/templates/panel/server_backup.html          | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/classes/web/routes/api/crafty/announcements/index.py b/app/classes/web/routes/api/crafty/announcements/index.py
index ff274256..409aceed 100644
--- a/app/classes/web/routes/api/crafty/announcements/index.py
+++ b/app/classes/web/routes/api/crafty/announcements/index.py
@@ -1,6 +1,5 @@
 import logging
 import json
-import uuid
 from jsonschema import ValidationError, validate
 from app.classes.web.base_api_handler import BaseApiHandler
 
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index 284a392a..d8bdea51 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -168,10 +168,8 @@
                         </div>
                       </div>
                       <div class="modal-footer">
-                        <button type="button" id="modal-cancel" class="btn btn-secondary" data-dismiss="modal">{{
-                          translate('serverBackups', 'cancel', data['lang']) }}</button>
-                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
-                          translate('serverWizard', 'save', data['lang']) }}</button>
+                        <button type="button" id="modal-cancel" class="btn btn-secondary" data-dismiss="modal"><i class="fa-solid fa-xmark"></i></button>
+                        <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary"><i class="fa-solid fa-thumbs-up"></i></button>
                       </div>
                     </div>
                   </div>

From 751beaa7eb18cbcebc5798d766fdf547558b64eb Mon Sep 17 00:00:00 2001
From: Wout Bouckaert <woutbouckaert@gmail.com>
Date: Mon, 4 Sep 2023 20:44:44 -0600
Subject: [PATCH 143/210] Replace all instances of bleach with nh3. Using
 latest version of nh3.

---
 app/classes/web/base_handler.py   |  4 ++--
 app/classes/web/panel_handler.py  | 10 +++++-----
 app/classes/web/public_handler.py | 14 +++++++-------
 requirements.txt                  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index 33fe9936..b7a889b1 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -2,7 +2,7 @@ import logging
 import re
 import typing as t
 import orjson
-import bleach
+import nh3
 import tornado.web
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
@@ -101,7 +101,7 @@ class BaseHandler(tornado.web.RequestHandler):
         if type(text) in self.nobleach:
             logger.debug("Auto-bleaching - bypass type")
             return text
-        return bleach.clean(text)
+        return nh3.clean(text)
 
     def get_argument(
         self,
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 696da799..34d27fa2 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -7,7 +7,7 @@ import json
 import logging
 import threading
 import urllib.parse
-import bleach
+import nh3
 import requests
 import tornado.web
 import tornado.escape
@@ -67,7 +67,7 @@ class PanelHandler(BaseHandler):
         ) in self.controller.crafty_perms.list_defined_crafty_permissions():
             argument = int(
                 float(
-                    bleach.clean(
+                    nh3.clean(
                         self.get_argument(f"permission_{permission.name}", "0")
                     )
                 )
@@ -79,7 +79,7 @@ class PanelHandler(BaseHandler):
 
             q_argument = int(
                 float(
-                    bleach.clean(self.get_argument(f"quantity_{permission.name}", "0"))
+                    nh3.clean(self.get_argument(f"quantity_{permission.name}", "0"))
                 )
             )
             if q_argument:
@@ -479,7 +479,7 @@ class PanelHandler(BaseHandler):
             template = "panel/dashboard.html"
 
         elif page == "server_detail":
-            subpage = bleach.clean(self.get_argument("subpage", ""))
+            subpage = nh3.clean(self.get_argument("subpage", ""))
 
             server_id = self.check_server_id()
             if server_id is None:
@@ -1284,7 +1284,7 @@ class PanelHandler(BaseHandler):
             template = "panel/panel_edit_user_apikeys.html"
 
         elif page == "remove_user":
-            user_id = bleach.clean(self.get_argument("id", None))
+            user_id = nh3.clean(self.get_argument("id", None))
 
             if (
                 not superuser
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index 76c6a8be..b7d1be9b 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -1,5 +1,5 @@
 import logging
-import bleach
+import nh3
 
 from app.classes.shared.helpers import Helpers
 from app.classes.models.users import HelperUsers
@@ -28,8 +28,8 @@ class PublicHandler(BaseHandler):
             # self.clear_cookie("user_data")
 
     def get(self, page=None):
-        error = bleach.clean(self.get_argument("error", "Invalid Login!"))
-        error_msg = bleach.clean(self.get_argument("error_msg", ""))
+        error = nh3.clean(self.get_argument("error", "Invalid Login!"))
+        error_msg = nh3.clean(self.get_argument("error_msg", ""))
 
         page_data = {
             "version": self.helper.get_version_string(),
@@ -82,8 +82,8 @@ class PublicHandler(BaseHandler):
         )
 
     def post(self, page=None):
-        error = bleach.clean(self.get_argument("error", "Invalid Login!"))
-        error_msg = bleach.clean(self.get_argument("error_msg", ""))
+        error = nh3.clean(self.get_argument("error", "Invalid Login!"))
+        error_msg = nh3.clean(self.get_argument("error_msg", ""))
 
         page_data = {
             "version": self.helper.get_version_string(),
@@ -100,8 +100,8 @@ class PublicHandler(BaseHandler):
             if self.request.query:
                 next_page = "/login?" + self.request.query
 
-            entered_username = bleach.clean(self.get_argument("username"))
-            entered_password = bleach.clean(self.get_argument("password"))
+            entered_username = nh3.clean(self.get_argument("username"))
+            entered_password = nh3.clean(self.get_argument("password"))
 
             # pylint: disable=no-member
             try:
diff --git a/requirements.txt b/requirements.txt
index 4f76592f..18b41a41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 
 apscheduler==3.8.1
 argon2-cffi==21.3
-bleach==4.1
+nh3==0.2.14
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5

From 1901bdbecbf241976074ebc258e59c9c7dce7cc7 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 5 Sep 2023 03:54:13 +0100
Subject: [PATCH 144/210] Reversion release meta and docs tags

---
 README.md                | 2 +-
 app/config/version.json  | 4 ++--
 sonar-project.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index eb3cd642..5d2379c8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com)
-# Crafty Controller 4.1.4
+# Crafty Controller 4.2.0
 > Python based Control Panel for your Minecraft Server
 
 ## What is Crafty Controller?
diff --git a/app/config/version.json b/app/config/version.json
index 49cae729..6c1274e0 100644
--- a/app/config/version.json
+++ b/app/config/version.json
@@ -1,5 +1,5 @@
 {
   "major": 4,
-  "minor": 1,
-  "sub": 4
+  "minor": 2,
+  "sub": 0
 }
diff --git a/sonar-project.properties b/sonar-project.properties
index 3b0a2417..1a11b1fd 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.organization=crafty-controller
 
 # This is the name and version displayed in the SonarCloud UI.
 sonar.projectName=Crafty 4
-sonar.projectVersion=4.1.4
+sonar.projectVersion=4.2.0
 sonar.python.version=3.9, 3.10, 3.11
 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/**
 

From 4f7b2aaa9540b3849aef079b6080b3c11a29b569 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 23:20:49 -0400
Subject: [PATCH 145/210] Add contrast to number

---
 app/frontend/templates/notify.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 98d366e7..77b72780 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -65,6 +65,7 @@
 <style>
   .badge-notify {
     background: var(--purple);
+    color: var(--dark);
     position: absolute;
     -moz-transform: translate(-70%, -70%);
     /* For Firefox */

From 84cafe664eb823eaa17dca35e8a397f7211740e9 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 23:38:09 -0400
Subject: [PATCH 146/210] Make files hover cursor pointer

---
 app/frontend/templates/panel/server_files.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 0ad7f935..ce188d2a 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -156,6 +156,9 @@
                     right: 35px;
                   }
                 }
+                .tree-file:hover{
+                  cursor: pointer;
+                }
               </style>
               <ul class="tree-view">
                 <li>

From 23ff88e013250dffdf617858abe0e6118988934a Mon Sep 17 00:00:00 2001
From: Wout Bouckaert <woutbouckaert@gmail.com>
Date: Mon, 4 Sep 2023 21:59:24 -0600
Subject: [PATCH 147/210] =?UTF-8?q?=F0=9F=96=A4=20Format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/classes/web/panel_handler.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 34d27fa2..f55da4ba 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -67,9 +67,7 @@ class PanelHandler(BaseHandler):
         ) in self.controller.crafty_perms.list_defined_crafty_permissions():
             argument = int(
                 float(
-                    nh3.clean(
-                        self.get_argument(f"permission_{permission.name}", "0")
-                    )
+                    nh3.clean(self.get_argument(f"permission_{permission.name}", "0"))
                 )
             )
             if argument:
@@ -78,9 +76,7 @@ class PanelHandler(BaseHandler):
                 )
 
             q_argument = int(
-                float(
-                    nh3.clean(self.get_argument(f"quantity_{permission.name}", "0"))
-                )
+                float(nh3.clean(self.get_argument(f"quantity_{permission.name}", "0")))
             )
             if q_argument:
                 server_quantity[permission.name] = q_argument

From cfe502d2d389d1835a9ec948231a9429cc5ee982 Mon Sep 17 00:00:00 2001
From: Wout Bouckaert <woutb@cobar.org>
Date: Tue, 5 Sep 2023 10:56:52 -0600
Subject: [PATCH 148/210] Add Packaging 23.1 to requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 4f76592f..5c810f68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,3 +19,4 @@ tornado==6.3.3
 tzlocal==4.0
 jsonschema==4.5.1
 orjson==3.8.12
+packaging==23.1

From 645e11f4a8e134156cfef60c3f210c06a8959c3a Mon Sep 17 00:00:00 2001
From: Wout Bouckaert <woutb@cobar.org>
Date: Tue, 5 Sep 2023 11:10:36 -0600
Subject: [PATCH 149/210] Fix order to be alphabetical

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5c810f68..2a4262d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ colorama==0.4
 croniter==1.3.5
 cryptography==41.0.3
 libgravatar==1.0.0
+packaging==23.1
 peewee==3.13
 pexpect==4.8
 psutil==5.9
@@ -19,4 +20,3 @@ tornado==6.3.3
 tzlocal==4.0
 jsonschema==4.5.1
 orjson==3.8.12
-packaging==23.1

From f47e50eac123e6715ed7ea4f46736d73fc7c39d7 Mon Sep 17 00:00:00 2001
From: Wout Bouckaert <woutbouckaert@gmail.com>
Date: Tue, 5 Sep 2023 11:12:56 -0600
Subject: [PATCH 150/210] Fix order to be alphabetical

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 18b41a41..71ef0bf0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
 
 apscheduler==3.8.1
 argon2-cffi==21.3
-nh3==0.2.14
 cached_property==1.5.2
 colorama==0.4
 croniter==1.3.5
 cryptography==41.0.3
 libgravatar==1.0.0
+nh3==0.2.14
 peewee==3.13
 pexpect==4.8
 psutil==5.9

From 02b7cb82057d7656860829405fa58e2c93764044 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 5 Sep 2023 20:27:02 +0200
Subject: [PATCH 151/210] appease linter

---
 app/classes/web/tornado_handler.py   |  8 +++++++-
 app/classes/web/websocket_handler.py | 16 ----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index e2449f01..76a8161f 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -47,7 +47,13 @@ class Webserver:
     controller: Controller
     helper: Helpers
 
-    def __init__(self, helper: Helpers, controller: Controller, tasks_manager, file_helper: FileHelpers):
+    def __init__(
+            self,
+            helper: Helpers,
+            controller: Controller,
+            tasks_manager,
+            file_helper: FileHelpers
+        ):
         self.ioloop = None
         self.http_server = None
         self.https_server = None
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index 47e9c2e5..69d4a4fb 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -125,22 +125,6 @@ class SocketHandler(BaseSocketHandler):
         "remove_spinner",
         "close_upload_box",
     }  # Must be overridden at init
-    page = None
-    page_query_params = None
-    controller = None
-    tasks_manager = None
-    translator = None
-    io_loop = None
-
-    #Removed because exactly as the mother class
-    #def initialize(
-    #    self, helper=None, controller=None, tasks_manager=None, translator=None, file_helper=None
-    #):
-    #    self.helper = helper
-    #    self.controller = controller
-    #    self.tasks_manager = tasks_manager
-    #    self.translator = translator
-    #    self.io_loop = tornado.ioloop.IOLoop.current()
 
     def get_user_id(self):
         _, _, user = self.controller.authentication.check(self.get_cookie("token"))

From c7ea7fbc6be0111c5865dc412f8302e25d098dcb Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 5 Sep 2023 20:37:52 +0200
Subject: [PATCH 152/210] Appease Black

---
 app/classes/web/tornado_handler.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index 76a8161f..64c94e0c 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -48,12 +48,12 @@ class Webserver:
     helper: Helpers
 
     def __init__(
-            self,
-            helper: Helpers,
-            controller: Controller,
-            tasks_manager,
-            file_helper: FileHelpers
-        ):
+        self,
+        helper: Helpers,
+        controller: Controller,
+        tasks_manager,
+        file_helper: FileHelpers,
+    ):
         self.ioloop = None
         self.http_server = None
         self.https_server = None

From a0b069c9ef4af095d025b2e4611fc5d6dd635e77 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 5 Sep 2023 23:00:52 +0200
Subject: [PATCH 153/210] Reverting Public/Auth websocket

---
 app/classes/shared/server.py            | 72 ++++++++++++-------------
 app/classes/shared/tasks.py             |  2 +-
 app/classes/shared/websocket_manager.py | 36 ++++---------
 app/classes/web/websocket_handler.py    |  4 +-
 4 files changed, 48 insertions(+), 66 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 17773833..59465838 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -93,7 +93,7 @@ class ServerOutBuf:
 
         # TODO: Do not send data to clients who do not have permission to view
         # this server's console
-        if len(WebSocketManager().auth_clients) > 0:
+        if len(WebSocketManager().clients) > 0:
             WebSocketManager().broadcast_page_params(
                 "/panel/server_detail",
                 {"id": self.server_id},
@@ -1047,7 +1047,7 @@ class ServerInstance:
         logger.info(f"Backup Thread started for server {self.settings['server_name']}.")
 
     def a_backup_server(self):
-        if len(WebSocketManager().auth_clients) > 0:
+        if len(WebSocketManager().clients) > 0:
             WebSocketManager().broadcast_page_params(
                 "/panel/server_detail",
                 {"id": str(self.server_id)},
@@ -1133,7 +1133,7 @@ class ServerInstance:
             self.is_backingup = False
             logger.info(f"Backup of server: {self.name} completed")
             results = {"percent": 100, "total_files": 0, "current_file": 0}
-            if len(WebSocketManager().auth_clients) > 0:
+            if len(WebSocketManager().clients) > 0:
                 WebSocketManager().broadcast_page_params(
                     "/panel/server_detail",
                     {"id": str(self.server_id)},
@@ -1189,7 +1189,7 @@ class ServerInstance:
     def backup_status(self, source_path, dest_path):
         results = Helpers.calc_percent(source_path, dest_path)
         self.backup_stats = results
-        if len(WebSocketManager().auth_clients) > 0:
+        if len(WebSocketManager().clients) > 0:
             WebSocketManager().broadcast_page_params(
                 "/panel/server_detail",
                 {"id": str(self.server_id)},
@@ -1293,7 +1293,7 @@ class ServerInstance:
             self.stop_threaded_server()
         else:
             was_started = False
-        if len(WebSocketManager().auth_clients) > 0:
+        if len(WebSocketManager().clients) > 0:
             # There are clients
             self.check_update()
             message = (
@@ -1399,7 +1399,7 @@ class ServerInstance:
             logger.info("Executable updated successfully. Starting Server")
 
             self.stats_helper.set_update(False)
-            if len(WebSocketManager().auth_clients) > 0:
+            if len(WebSocketManager().clients) > 0:
                 # There are clients
                 self.check_update()
                 for user in server_users:
@@ -1480,7 +1480,7 @@ class ServerInstance:
     def realtime_stats(self):
         # only get stats if clients are connected.
         # no point in burning cpu
-        if len(WebSocketManager().public_clients | WebSocketManager().auth_clients) > 0:
+        if len(WebSocketManager().clients) > 0:
             total_players = 0
             max_players = 0
             servers_ping = []
@@ -1511,41 +1511,39 @@ class ServerInstance:
                     "crashed": self.is_crashed,
                 }
             )
-            if len(WebSocketManager().auth_clients) > 0:
-                WebSocketManager().broadcast_page_params(
-                    "/panel/server_detail",
-                    {"id": str(self.server_id)},
-                    "update_server_details",
-                    {
-                        "id": raw_ping_result.get("id"),
-                        "started": raw_ping_result.get("started"),
-                        "running": raw_ping_result.get("running"),
-                        "cpu": raw_ping_result.get("cpu"),
-                        "mem": raw_ping_result.get("mem"),
-                        "mem_percent": raw_ping_result.get("mem_percent"),
-                        "world_name": raw_ping_result.get("world_name"),
-                        "world_size": raw_ping_result.get("world_size"),
-                        "server_port": raw_ping_result.get("server_port"),
-                        "int_ping_results": raw_ping_result.get("int_ping_results"),
-                        "online": raw_ping_result.get("online"),
-                        "max": raw_ping_result.get("max"),
-                        "players": raw_ping_result.get("players"),
-                        "desc": raw_ping_result.get("desc"),
-                        "version": raw_ping_result.get("version"),
-                        "icon": raw_ping_result.get("icon"),
-                        "crashed": self.is_crashed,
-                        "created": datetime.datetime.now().strftime(
-                            "%Y/%m/%d, %H:%M:%S"
-                        ),
-                        "players_cache": self.player_cache,
-                    },
-                )
+
+            WebSocketManager().broadcast_page_params(
+                "/panel/server_detail",
+                {"id": str(self.server_id)},
+                "update_server_details",
+                {
+                    "id": raw_ping_result.get("id"),
+                    "started": raw_ping_result.get("started"),
+                    "running": raw_ping_result.get("running"),
+                    "cpu": raw_ping_result.get("cpu"),
+                    "mem": raw_ping_result.get("mem"),
+                    "mem_percent": raw_ping_result.get("mem_percent"),
+                    "world_name": raw_ping_result.get("world_name"),
+                    "world_size": raw_ping_result.get("world_size"),
+                    "server_port": raw_ping_result.get("server_port"),
+                    "int_ping_results": raw_ping_result.get("int_ping_results"),
+                    "online": raw_ping_result.get("online"),
+                    "max": raw_ping_result.get("max"),
+                    "players": raw_ping_result.get("players"),
+                    "desc": raw_ping_result.get("desc"),
+                    "version": raw_ping_result.get("version"),
+                    "icon": raw_ping_result.get("icon"),
+                    "crashed": self.is_crashed,
+                    "created": datetime.datetime.now().strftime("%Y/%m/%d, %H:%M:%S"),
+                    "players_cache": self.player_cache,
+                },
+            )
             total_players += int(raw_ping_result.get("online"))
             max_players += int(raw_ping_result.get("max"))
 
             # self.record_server_stats()
 
-            if (len(servers_ping) > 0) & (len(WebSocketManager().auth_clients) > 0):
+            if len(servers_ping) > 0:
                 try:
                     WebSocketManager().broadcast_page(
                         "/panel/dashboard", "update_server_status", servers_ping
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 3bb3336a..28e932be 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -689,7 +689,7 @@ class TasksManager:
                 # Stats are different
 
                 host_stats = HelpersManagement.get_latest_hosts_stats()
-                if len(WebSocketManager().auth_clients) > 0:
+                if len(WebSocketManager().clients) > 0:
                     # There are clients
                     try:
                         WebSocketManager().broadcast_page(
diff --git a/app/classes/shared/websocket_manager.py b/app/classes/shared/websocket_manager.py
index 9031f868..28a0b391 100644
--- a/app/classes/shared/websocket_manager.py
+++ b/app/classes/shared/websocket_manager.py
@@ -1,6 +1,5 @@
 import json
 import logging
-from enum import Enum
 
 from app.classes.shared.singleton import Singleton
 from app.classes.shared.console import Console
@@ -9,38 +8,25 @@ from app.classes.models.users import HelperUsers
 logger = logging.getLogger(__name__)
 
 
-class EnumWebSocketState(Enum):
-    WS_UNKNOWN = -1
-    WS_PUBLIC = 0
-    WS_USER_AUTH = 1
-
-
 class WebSocketManager(metaclass=Singleton):
     def __init__(self):
-        self.auth_clients = set()
-        self.public_clients = set()
+        self.clients = set()
 
     def add_client(self, client):
-        if client.ws_state == EnumWebSocketState.WS_PUBLIC:
-            self.public_clients.add(client)
-        elif client.ws_state == EnumWebSocketState.WS_USER_AUTH:
-            self.auth_clients.add(client)
-        else:
-            logging.debug("Unknown WebSocket")
-            client.close()
+        self.clients.add(client)
 
     def remove_client(self, client):
-        if client.ws_state == EnumWebSocketState.WS_PUBLIC:
-            self.public_clients.remove(client)
-        elif client.ws_state == EnumWebSocketState.WS_USER_AUTH:
-            self.auth_clients.remove(client)
+        if client in self.clients:
+            self.clients.remove(client)
+        else:
+            logger.exception("Error caught while removing unknown WebSocket client")
 
     def broadcast(self, event_type: str, data):
         logger.debug(
-            f"Sending to {len(self.public_clients | self.auth_clients)} clients: "
+            f"Sending to {len(self.clients)} clients: "
             f"{json.dumps({'event': event_type, 'data': data})}"
         )
-        for client in self.public_clients | self.auth_clients:
+        for client in self.clients:
             try:
                 client.send_message(event_type, data)
             except Exception as e:
@@ -108,11 +94,11 @@ class WebSocketManager(metaclass=Singleton):
     def broadcast_with_fn(self, filter_fn, event_type: str, data):
         # assign self.clients to a static variable here so hopefully
         # the set size won't change
-        static_clients = self.public_clients | self.auth_clients
+        static_clients = self.clients
         clients = list(filter(filter_fn, static_clients))
         logger.debug(
             f"Sending to {len(clients)}  \
-            out of {len(self.public_clients | self.auth_clients)} "
+            out of {len(self.clients)} "
             f"clients: {json.dumps({'event': event_type, 'data': data})}"
         )
 
@@ -127,6 +113,6 @@ class WebSocketManager(metaclass=Singleton):
 
     def disconnect_all(self):
         Console.info("Disconnecting WebSocket clients")
-        for client in self.public_clients | self.auth_clients:
+        for client in self.clients:
             client.close()
         Console.info("Disconnected WebSocket clients")
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index 69d4a4fb..c4ad5d26 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -6,13 +6,12 @@ import tornado.websocket
 
 from app.classes.shared.main_controller import Controller
 from app.classes.shared.helpers import Helpers
-from app.classes.shared.websocket_manager import WebSocketManager, EnumWebSocketState
+from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
 
 
 class BaseSocketHandler(tornado.websocket.WebSocketHandler):
-    ws_state = EnumWebSocketState.WS_UNKNOWN  # Must be overridden at init
     ws_authorized_pages = {}  # Must be overridden at init
     ws_authorized_events = {}  # Must be overridden at init
     page = None
@@ -104,7 +103,6 @@ class BaseSocketHandler(tornado.websocket.WebSocketHandler):
 
 
 class SocketHandler(BaseSocketHandler):
-    ws_state = EnumWebSocketState.WS_USER_AUTH
     ws_authorized_pages = {"panel", "server", "ajax", "files", "upload", "api"}
     ws_authorized_events = {
         "notification",

From 618094aa3e40b8ee172d46544cf25b19d4a59cfe Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 5 Sep 2023 23:08:40 +0200
Subject: [PATCH 154/210] Removing useless BaseWebSocketHandler

---
 app/classes/shared/websocket_manager.py |   2 +-
 app/classes/web/websocket_handler.py    | 120 ++++++------------------
 2 files changed, 31 insertions(+), 91 deletions(-)

diff --git a/app/classes/shared/websocket_manager.py b/app/classes/shared/websocket_manager.py
index 28a0b391..f48adef8 100644
--- a/app/classes/shared/websocket_manager.py
+++ b/app/classes/shared/websocket_manager.py
@@ -45,7 +45,7 @@ class WebSocketManager(metaclass=Singleton):
 
     def broadcast_page(self, page: str, event_type: str, data):
         def filter_fn(client):
-            return client.check_policy(event_type) and client.page == page
+            return client.page == page
 
         self.broadcast_with_fn(filter_fn, event_type, data)
 
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index c4ad5d26..cde97584 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -11,9 +11,7 @@ from app.classes.shared.websocket_manager import WebSocketManager
 logger = logging.getLogger(__name__)
 
 
-class BaseSocketHandler(tornado.websocket.WebSocketHandler):
-    ws_authorized_pages = {}  # Must be overridden at init
-    ws_authorized_events = {}  # Must be overridden at init
+class WebSocketHandler(tornado.websocket.WebSocketHandler):
     page = None
     page_query_params = None
     controller: Controller = None
@@ -44,93 +42,6 @@ class BaseSocketHandler(tornado.websocket.WebSocketHandler):
         )
         return remote_ip
 
-    # pylint: disable=arguments-differ
-    def open(self):
-        """
-        This method must be overridden
-        """
-        raise NotImplementedError
-
-    def handle(self):
-        """
-        This method must be overridden
-        """
-        raise NotImplementedError
-
-    def get_user_id(self):
-        """
-        This method must be overridden
-        """
-        raise NotImplementedError
-
-    def check_auth(self):
-        """
-        This method must be overridden
-        """
-        raise NotImplementedError
-
-    # pylint: disable=arguments-renamed
-    def on_message(self, raw_message):
-        logger.debug(f"Got message from WebSocket connection {raw_message}")
-        message = json.loads(raw_message)
-        logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")
-
-    def on_close(self):
-        WebSocketManager().remove_client(self)
-        logger.debug("Closed WebSocket connection")
-
-    async def write_message_int(self, message):
-        self.write_message(message)
-
-    def write_message_async(self, message):
-        asyncio.run_coroutine_threadsafe(
-            self.write_message_int(message), self.io_loop.asyncio_loop
-        )
-
-    def send_message(self, event_type: str, data):
-        message = str(json.dumps({"event": event_type, "data": data}))
-        self.write_message_async(message)
-
-    def check_policy(self, event_type: str):
-        # Looking if the client is the right one for the page
-        if self.page.split("/")[1] not in self.ws_authorized_pages:
-            return False
-        # Looking if the event is send to the right page
-        if event_type not in self.ws_authorized_events:
-            return False
-        # All seams good so we can agree
-        return True
-
-
-class SocketHandler(BaseSocketHandler):
-    ws_authorized_pages = {"panel", "server", "ajax", "files", "upload", "api"}
-    ws_authorized_events = {
-        "notification",
-        "update_host_stats",
-        "update_server_details",
-        "update_server_status",
-        "send_start_reload",
-        "send_start_error",
-        # TODO "send_temp_path",
-        "support_status_update",
-        "send_logs_bootbox",
-        "move_status",
-        "vterm_new_line",
-        "send_eula_bootbox",
-        "backup_reload",
-        "backup_status",
-        "update_button_status",
-        "remove_spinner",
-        "close_upload_box",
-    }  # Must be overridden at init
-
-    def get_user_id(self):
-        _, _, user = self.controller.authentication.check(self.get_cookie("token"))
-        return user["user_id"]
-
-    def check_auth(self):
-        return self.controller.authentication.check_bool(self.get_cookie("token"))
-
     # pylint: disable=arguments-differ
     def open(self):
         logger.debug("Checking WebSocket authentication")
@@ -165,3 +76,32 @@ class SocketHandler(BaseSocketHandler):
         )
         WebSocketManager().add_client(self)
         logger.debug("Opened WebSocket connection")
+
+    # pylint: disable=arguments-renamed
+    def on_message(self, raw_message):
+        logger.debug(f"Got message from WebSocket connection {raw_message}")
+        message = json.loads(raw_message)
+        logger.debug(f"Event Type: {message['event']}, Data: {message['data']}")
+
+    def on_close(self):
+        WebSocketManager().remove_client(self)
+        logger.debug("Closed WebSocket connection")
+
+    async def write_message_int(self, message):
+        self.write_message(message)
+
+    def write_message_async(self, message):
+        asyncio.run_coroutine_threadsafe(
+            self.write_message_int(message), self.io_loop.asyncio_loop
+        )
+
+    def send_message(self, event_type: str, data):
+        message = str(json.dumps({"event": event_type, "data": data}))
+        self.write_message_async(message)
+
+    def get_user_id(self):
+        _, _, user = self.controller.authentication.check(self.get_cookie("token"))
+        return user["user_id"]
+
+    def check_auth(self):
+        return self.controller.authentication.check_bool(self.get_cookie("token"))

From 083e7b2f3ff75fdbb92cf6b437af4f38df5a9957 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 5 Sep 2023 23:16:53 +0200
Subject: [PATCH 155/210] Fixing Little Rename Issue

---
 app/classes/web/tornado_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index 64c94e0c..69d1f0f5 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -33,7 +33,7 @@ from app.classes.web.api_handler import (
     ListServers,
     SendCommand,
 )
-from app.classes.web.websocket_handler import SocketHandler
+from app.classes.web.websocket_handler import WebSocketHandler
 from app.classes.web.static_handler import CustomStaticHandler
 from app.classes.web.upload_handler import UploadHandler
 from app.classes.web.http_handler import HTTPHandler, HTTPHandlerPage
@@ -158,7 +158,7 @@ class Webserver:
             (r"/", DefaultHandler, handler_args),
             (r"/panel/(.*)", PanelHandler, handler_args),
             (r"/server/(.*)", ServerHandler, handler_args),
-            (r"/ws", SocketHandler, handler_args),
+            (r"/ws", WebSocketHandler, handler_args),
             (r"/upload", UploadHandler, handler_args),
             (r"/status", StatusHandler, handler_args),
             # API Routes V1

From 99ef2db016b40bc8662b045306299e2f6efc0ea7 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Wed, 6 Sep 2023 23:28:46 +0200
Subject: [PATCH 156/210] Adding host stats to the API

---
 app/classes/web/routes/api/api_handlers.py    |  6 ++++++
 .../web/routes/api/crafty/stats/stats.py      | 21 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 app/classes/web/routes/api/crafty/stats/stats.py

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index d915a178..c917c195 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -69,6 +69,7 @@ from app.classes.web.routes.api.crafty.config.index import (
 from app.classes.web.routes.api.crafty.config.server_dir import (
     ApiCraftyConfigServerDirHandler,
 )
+from app.classes.web.routes.api.crafty.stats.stats import ApiCraftyHostStatsHandler
 from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
 from app.classes.web.routes.api.crafty.imports.index import ApiImportFilesIndexHandler
 from app.classes.web.routes.api.crafty.exe_cache import ApiCraftyExeCacheIndexHandler
@@ -107,6 +108,11 @@ def api_handlers(handler_args):
             ApiCraftyConfigServerDirHandler,
             handler_args,
         ),
+        (
+            r"/api/v2/crafty/stats/?",
+            ApiCraftyHostStatsHandler,
+            handler_args,
+        ),
         (
             r"/api/v2/crafty/logs/([a-z0-9_]+)/?",
             ApiCraftyLogIndexHandler,
diff --git a/app/classes/web/routes/api/crafty/stats/stats.py b/app/classes/web/routes/api/crafty/stats/stats.py
new file mode 100644
index 00000000..84569469
--- /dev/null
+++ b/app/classes/web/routes/api/crafty/stats/stats.py
@@ -0,0 +1,21 @@
+import logging
+from app.classes.web.base_api_handler import BaseApiHandler
+
+logger = logging.getLogger(__name__)
+
+
+class ApiCraftyHostStatsHandler(BaseApiHandler):
+    def get(self):
+        auth_data = self.authenticate_user()
+        if not auth_data:
+            return
+
+        latest = self.controller.management.get_latest_hosts_stats()
+
+        self.finish_json(
+            200,
+            {
+                "status": "ok",
+                "data": latest,
+            },
+        )

From 8c2cfacb4e592594453ca1ca64dacf8905a46539 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 8 Sep 2023 20:27:47 -0400
Subject: [PATCH 157/210] Use Jar naming schema for refresh

---
 app/classes/web/routes/api/api_handlers.py     | 6 +++---
 app/classes/web/routes/api/crafty/exe_cache.py | 2 +-
 app/frontend/templates/server/wizard.html      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 0c50614d..47977449 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -64,7 +64,7 @@ from app.classes.web.routes.api.crafty.config.server_dir import (
 )
 from app.classes.web.routes.api.crafty.clogs.index import ApiCraftyLogIndexHandler
 from app.classes.web.routes.api.crafty.imports.index import ApiImportFilesIndexHandler
-from app.classes.web.routes.api.crafty.exe_cache import ApiCraftyExeCacheIndexHandler
+from app.classes.web.routes.api.crafty.exe_cache import ApiCraftyJarCacheIndexHandler
 
 
 def api_handlers(handler_args):
@@ -173,8 +173,8 @@ def api_handlers(handler_args):
             handler_args,
         ),
         (
-            r"/api/v2/crafty/exeCache/?",
-            ApiCraftyExeCacheIndexHandler,
+            r"/api/v2/crafty/JarCache/?",
+            ApiCraftyJarCacheIndexHandler,
             handler_args,
         ),
         (
diff --git a/app/classes/web/routes/api/crafty/exe_cache.py b/app/classes/web/routes/api/crafty/exe_cache.py
index a779195d..8836aef8 100644
--- a/app/classes/web/routes/api/crafty/exe_cache.py
+++ b/app/classes/web/routes/api/crafty/exe_cache.py
@@ -1,7 +1,7 @@
 from app.classes.web.base_api_handler import BaseApiHandler
 
 
-class ApiCraftyExeCacheIndexHandler(BaseApiHandler):
+class ApiCraftyJarCacheIndexHandler(BaseApiHandler):
     def get(self):
         auth_data = self.authenticate_user()
         if not auth_data:
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 663fbafc..d7a49bee 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -1153,7 +1153,7 @@
   async function refreshCache() {
     document.getElementById("refresh-cache").classList.add("fa-spin")
     let token = getCookie("_xsrf")
-    let res = await fetch(`/api/v2/crafty/exeCache`, {
+    let res = await fetch(`/api/v2/crafty/JarCache`, {
       method: 'GET',
       headers: {
         'X-XSRFToken': token

From bd9e454f03c02eeeb8a078cc313b5a26434bfeed Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 19 Sep 2023 18:24:53 +0100
Subject: [PATCH 158/210] Update changelog !626

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4af8ce1f..7f4c0d54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 ## --- [4.2.0] - 2023/TBD
 ### New features
-- Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621))
+- Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/626))
 ### Bug fixes
 - PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))

From cfaac2077ed4537b3f1ba43105e395088dcca632 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 19 Sep 2023 18:36:38 +0100
Subject: [PATCH 159/210] Update changelog !627

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f4c0d54..fe9c3af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Tweaks
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))
+- Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627))
 ### Lang
 TBD
 <br><br>

From fe0746f40e6a776a5d6713afdab66663d1dfbe84 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 19 Sep 2023 18:48:01 +0100
Subject: [PATCH 160/210] Update changelog !628

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe9c3af4..62527138 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
 ### Refactor
 - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
+- Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/628))
 ### Tweaks
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))

From 2d1ecb447127ed57d44174c2b083dac3799cc45e Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 19 Sep 2023 19:15:01 +0100
Subject: [PATCH 161/210] Update changelog !629

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62527138..120bcc21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Correctly handle if a server returns a string instead of json data on socket ping ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/614))
 - Bump tornado to resolve #269 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/623))
 - Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
+- Fix select installs failing to start, returning missing python package `packaging` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/629))
 ### Refactor
 - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
 - Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/628))

From 9ead958d8941562b4f5ab9b5952102c6207f34d7 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Tue, 19 Sep 2023 19:25:21 +0100
Subject: [PATCH 162/210] Update changelog !630

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 120bcc21..e2697d8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))
 - Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627))
+- Use `Jar` class naming for jar refresh to make room for steamCMD naming in the future ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/630))
 ### Lang
 TBD
 <br><br>

From e9439ca154edcb264973ddd8cd7d68d30a4596f3 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Tue, 19 Sep 2023 21:46:31 +0200
Subject: [PATCH 163/210] Changing history units to hours

---
 app/classes/controllers/servers_controller.py | 4 ++--
 app/classes/models/server_stats.py            | 4 ++--
 app/classes/shared/server.py                  | 2 +-
 app/classes/web/panel_handler.py              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index ca6c8d22..c0bae7b0 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -105,9 +105,9 @@ class ServersController(metaclass=Singleton):
 
         return ret
 
-    def get_history_stats(self, server_id, days):
+    def get_history_stats(self, server_id, hours):
         srv = ServersController().get_server_instance_by_id(server_id)
-        return srv.stats_helper.get_history_stats(server_id, days)
+        return srv.stats_helper.get_history_stats(server_id, hours)
 
     @staticmethod
     def update_unloaded_server(server_obj):
diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index 5a38ac1e..f2bcec62 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -142,9 +142,9 @@ class HelperServerStats:
         self.database.close()
         return server_data
 
-    def get_history_stats(self, server_id, num_days):
+    def get_history_stats(self, server_id, num_hours):
         self.database.connect(reuse_if_open=True)
-        max_age = datetime.datetime.now() - timedelta(days=num_days)
+        max_age = datetime.datetime.now() - timedelta(hours=num_hours)
         query_stats = (
             ServerStats.select()
             .where(ServerStats.created > max_age)
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 59465838..8205bd8a 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1814,5 +1814,5 @@ class ServerInstance:
         self.stats_helper.remove_old_stats(minimum_to_exist)
 
     def get_server_history(self):
-        history = self.stats_helper.get_history_stats(self.server_id, 3)
+        history = self.stats_helper.get_history_stats(self.server_id, 1)
         return history
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 696da799..760e0298 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -747,7 +747,7 @@ class PanelHandler(BaseHandler):
                         0, page_data["options"].pop(page_data["options"].index(days))
                     )
                 page_data["history_stats"] = self.controller.servers.get_history_stats(
-                    server_id, days
+                    server_id, hours=(days * 24)
                 )
 
             def get_banned_players_html():

From 6c1508f061694b656027307832e086ea0b11f0ea Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 19 Sep 2023 18:35:41 -0400
Subject: [PATCH 164/210] Remove extra handler

---
 app/classes/web/routes/api/api_handlers.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index e12e2f7f..49dcb9de 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -118,11 +118,6 @@ def api_handlers(handler_args):
             ApiCraftyLogIndexHandler,
             handler_args,
         ),
-        (
-            r"/api/v2/crafty/exeCache/?",
-            ApiCraftyExeCacheIndexHandler,
-            handler_args,
-        ),
         (
             r"/api/v2/crafty/JarCache/?",
             ApiCraftyJarCacheIndexHandler,

From 0c02a1511da4fa3b4b9dc3d2a6a0391e1aefa781 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 19 Sep 2023 20:31:56 -0400
Subject: [PATCH 165/210] Fix players not showing up

---
 app/frontend/templates/public/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html
index 98d6a8c7..1190b9f8 100644
--- a/app/frontend/templates/public/status.html
+++ b/app/frontend/templates/public/status.html
@@ -192,7 +192,7 @@
     /* TODO Update each element */
     if (server.running) {
       /* Update Players */
-      if (server.players) {
+      if (server.max != 0) {
         server_players.innerHTML = server.online + ` / ` + server.max + ` {{ translate('dashboard', 'max', data['lang']) }}<br />`
       }
 

From 2a53c35df7205898e6c8beec7c460ef16b837bf9 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Wed, 20 Sep 2023 19:45:14 -0500
Subject: [PATCH 166/210] fix service worker security issue

---
 .../static/assets/js/shared/service-worker.js      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/service-worker.js b/app/frontend/static/assets/js/shared/service-worker.js
index 2fdbf708..8616d5d4 100644
--- a/app/frontend/static/assets/js/shared/service-worker.js
+++ b/app/frontend/static/assets/js/shared/service-worker.js
@@ -6,14 +6,18 @@ importScripts(
 
 const CACHE = "crafty-controller";
 
+//This service worker is basically just here to make browsers
+//accept the PWA. It's not doing much anymore
+
 // TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html";
 const offlineFallbackPage = "/offline";
 
-self.addEventListener("message", (event) => {
-	if (event.data && event.data.type === "SKIP_WAITING") {
-		self.skipWaiting();
-	}
-});
+// self.addEventListener("message", (event) => {
+// 	console.log(event.data);
+// 	if (event.data && event.data.type === "SKIP_WAITING") {
+// 		self.skipWaiting();
+// 	}
+// });
 
 if (workbox.navigationPreload.isSupported()) {
 	workbox.navigationPreload.enable();

From a02f42b0a6c272f21066977bf0547958bab63690 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Wed, 20 Sep 2023 19:50:30 -0500
Subject: [PATCH 167/210] remove unecesarry code from service worker

---
 .../static/assets/js/shared/service-worker.js | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/service-worker.js b/app/frontend/static/assets/js/shared/service-worker.js
index 8616d5d4..4d3eac9e 100644
--- a/app/frontend/static/assets/js/shared/service-worker.js
+++ b/app/frontend/static/assets/js/shared/service-worker.js
@@ -9,37 +9,6 @@ const CACHE = "crafty-controller";
 //This service worker is basically just here to make browsers
 //accept the PWA. It's not doing much anymore
 
-// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html";
-const offlineFallbackPage = "/offline";
-
-// self.addEventListener("message", (event) => {
-// 	console.log(event.data);
-// 	if (event.data && event.data.type === "SKIP_WAITING") {
-// 		self.skipWaiting();
-// 	}
-// });
-
 if (workbox.navigationPreload.isSupported()) {
 	workbox.navigationPreload.enable();
 }
-
-// self.addEventListener('fetch', (event) => {
-//   if (event.request.mode === 'navigate') {
-//     event.respondWith((async () => {
-//       try {
-//         const preloadResp = await event.preloadResponse;
-
-//         if (preloadResp) {
-//           return preloadResp;
-//         }
-//         const networkResp = await fetch(event.request);
-//         return networkResp;
-//       } catch (error) {
-
-//         const cache = await caches.open(CACHE);
-//         const cachedResp = await cache.match(offlineFallbackPage);
-//         return cachedResp;
-//       }
-//     })());
-//   }
-// });

From 12b44828631db582c1788ba5b25292abaa610908 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 21 Sep 2023 23:03:12 +0100
Subject: [PATCH 168/210] Update changelog !615

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2697d8b..031e2b9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,12 @@
 - Bump tornado to resolve #269 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/623))
 - Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
 - Fix select installs failing to start, returning missing python package `packaging` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/629))
+- Fix public status page not updating #255 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615))
 ### Refactor
 - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
 - Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/628))
+- Add API route for historical server stats ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615))
+- Add API route for host stats ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615))
 ### Tweaks
 - Polish/Enhance display for InApp Documentation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/613))
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))

From 828996eec647155851943366fd24c83a9f9ce7b3 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 21 Sep 2023 23:25:57 +0100
Subject: [PATCH 169/210] Update changelog !631

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 031e2b9b..ee86b2be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Bump crypto to resolve #267 & #268 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/622))
 - Fix select installs failing to start, returning missing python package `packaging` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/629))
 - Fix public status page not updating #255 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615))
+- Fix service worker vulrn and CQ raised by SonarQ ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/631))
 ### Refactor
 - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
 - Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/628))

From d0c8d7c27a3a8e323b57ace62e6cf99ec1a78c2a Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Sun, 24 Sep 2023 16:28:23 +0200
Subject: [PATCH 170/210] Fixing Dropdown menu closing while removing
 notifications

---
 app/frontend/templates/notify.html | 69 +++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 77b72780..4527d46b 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -1,7 +1,6 @@
 <ul class="navbar-nav ml-auto">
-  <li class="nav-item dropdown">
-    <a class="nav-link count-indicator dropdown-toggle" id="notifDropdown" href="#" data-toggle="dropdown"
-      aria-expanded="false">
+  <li class="nav-item dropdown notif-li">
+    <a class="nav-link count-indicator dropdown-toggle" id="notifDropdown" href="#" aria-expanded="false">
       <i class="fas fa-broadcast-tower
         {% if data.get('update_available') %}
             text-danger
@@ -21,12 +20,10 @@
 
   <li class="nav-item dropdown user-dropdown">
     <a class="nav-link dropdown-toggle" id="UserDropdown" href="#" data-toggle="dropdown" aria-expanded="false">
-      <img class="img-xs rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}"
-        alt="Profile image"> </a>
+      <img class="img-xs rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}" alt="Profile image"> </a>
     <div class="dropdown-menu dropdown-menu-right navbar-dropdown" aria-labelledby="UserDropdown">
       <div class="dropdown-header text-center">
-        <img class="img-md rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}"
-          alt="Profile image">
+        <img class="img-md rounded-circle profile-picture" onerror="pfpError(this)" src="{{ data['user_data']['pfp'] }}" alt="Profile image">
         <p class="mb-1 mt-3 font-weight-semibold">{{ data['user_data']['username'] }}</p>
         <p class="font-weight-light text-muted mb-0">Roles: </p>
         {% for r in data['user_role'] %}
@@ -38,23 +35,19 @@
         <p class="font-weight-light text-muted mb-0">Email: {{ data['user_data']['email'] }}</p>
       </div>
       {% if data['user_data']['preparing'] %}
-      <span class="dropdown-item" id="support_progress"><i
-          class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
+      <span class="dropdown-item" id="support_progress"><i class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
         data['lang']) }}<br><br></span>
       <span class="dropdown-item" id="support_progress">
         <div class="support_progress" style="height: 15px; width: 100%;">
-          <div class="progress-bar progress-bar-striped progress-bar-animated" id="logs_progress_bar" role="progressbar"
-            style="width:0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+          <div class="progress-bar progress-bar-striped progress-bar-animated" id="logs_progress_bar" role="progressbar" style="width:0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
         </div>
       </span>
       {% else %}
-      <a class="dropdown-item" id="support_logs"><i
-          class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
+      <a class="dropdown-item" id="support_logs"><i class="dropdown-item-icon mdi mdi-download-outline text-primary"></i>{{ translate('notify', 'supportLogs',
         data['lang']) }}</i></a>
       {% end %}
       {% if data['superuser'] %}
-      <a class="dropdown-item" href="/panel/activity_logs"><i
-          class="dropdown-item-icon mdi mdi-calendar-check-outline text-primary"></i>{{ translate('notify',
+      <a class="dropdown-item" href="/panel/activity_logs"><i class="dropdown-item-icon mdi mdi-calendar-check-outline text-primary"></i>{{ translate('notify',
         'activityLog', data['lang']) }}</a>
       {% end %}
       <a class="dropdown-item" href="/logout"><i class="dropdown-item-icon mdi mdi-power text-primary"></i>{{
@@ -79,16 +72,19 @@
   .clear-button:hover {
     cursor: pointer;
   }
-/* Hide scrollbar for Chrome, Safari and Opera */
-.notif-div::-webkit-scrollbar {
-  display: none;
-}
 
-/* Hide scrollbar for IE, Edge and Firefox */
-.notif-div {
-  -ms-overflow-style: none;  /* IE and Edge */
-  scrollbar-width: none;  /* Firefox */
-}
+  /* Hide scrollbar for Chrome, Safari and Opera */
+  .notif-div::-webkit-scrollbar {
+    display: none;
+  }
+
+  /* Hide scrollbar for IE, Edge and Firefox */
+  .notif-div {
+    -ms-overflow-style: none;
+    /* IE and Edge */
+    scrollbar-width: none;
+    /* Firefox */
+  }
 </style>
 <script>
   function pfpError(image) {
@@ -104,14 +100,17 @@
     }
     if (data.length > 0) {
       localStorage.setItem("notif-count", data.length);
+      $("#notif-count").show()
       $("#notif-count").html(data.length);
       $("#announcements").html(text);
     } else {
       $("#announcements").html(`<p style='margin-top: 15px;' class='text-center'><i class="fa fa-bell-slash" aria-hidden="true"></i>
 </p>`);
+      $("#notif-count").hide()
     }
     $(".clear-button").on("click", function (event) {
       console.log("CLEAR BUTTON")
+      event.stopPropagation();
       let uuid = event.target.getAttribute("data-id");
       $(`#${uuid}`).remove();
       send_clear(uuid);
@@ -162,6 +161,28 @@
       bootbox.alert(responseData.error)
     }
   }
+
+  /* Open / Close with Button */
+  $('li.dropdown.notif-li a').on('click', function (event) {
+    $(this).parent().toggleClass("show");
+    $('div.notif-div').toggleClass("show");
+    if ($('li.dropdown.notif-li a').attr('aria-expanded') === 'false') {
+      $('li.dropdown.notif-li a').attr('aria-expanded', "true");
+    }
+    else {
+      $('li.dropdown.notif-li a').attr('aria-expanded', "false");
+    }
+  });
+
+  /* Close when clicking ouside */
+  $('body').on('click', function (e) {
+    if (!$('li.dropdown.notif-li').is(e.target) && $('li.dropdown.notif-li').has(e.target).length === 0 && $('show').has(e.target).length === 0) {
+      $('li.notif-li').removeClass("show");
+      $('li.dropdown.notif-li a').attr('aria-expanded', "false");
+      $('div.notif-div').removeClass("show");
+    }
+  });
+
   $(document).ready(function () {
     getAnnouncements();
   })

From 0f0cd110587ebe5bbf0bd86652c1fe03eaa8e240 Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Mon, 25 Sep 2023 20:15:17 +0200
Subject: [PATCH 171/210] Use nav-pills instead of nav-tabs

---
 app/frontend/static/assets/css/dark/style.css | 28 ++++++++++++++++---
 .../static/assets/css/shared/style.css        | 23 ++++++++++++---
 .../templates/server/bedrock_wizard.html      |  2 +-
 app/frontend/templates/server/wizard.html     |  2 +-
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/frontend/static/assets/css/dark/style.css b/app/frontend/static/assets/css/dark/style.css
index c8ac5eb9..7da26c41 100755
--- a/app/frontend/static/assets/css/dark/style.css
+++ b/app/frontend/static/assets/css/dark/style.css
@@ -22979,27 +22979,47 @@ ul li {
   padding-left: 0;
 }
 
-.tab-simple-styled {
+.nav-tabs.tab-simple-styled {
   border-bottom: none;
   margin-top: 30px;
   margin-bottom: 30px;
 }
 
-.tab-simple-styled .nav-item {
+.nav-tabs.tab-simple-styled .nav-item {
   margin-right: 30px;
 }
 
-.tab-simple-styled .nav-item .nav-link {
+.nav-tabs.tab-simple-styled .nav-item .nav-link {
   border: none;
   padding: 0;
   color: var(--base-text);
 }
 
-.tab-simple-styled .nav-item .nav-link.active {
+.nav-tabs.tab-simple-styled .nav-item .nav-link.active {
   background: var(--dropdown-bg);
   color: var(--info);
 }
 
+.nav-pills.tab-simple-styled {
+  border-bottom: none;
+  /*margin-top: 1.5rem;*/
+  margin-bottom: 1.5rem;
+}
+
+/*.nav-pills.tab-simple-styled .nav-item {
+  margin-right: 1.5rem;
+}*/
+
+.nav-pills.tab-simple-styled .nav-item .nav-link.active {
+  background: var(--info);
+  color: #ffffff;
+}
+
+.nav-pills.tab-simple-styled .nav-link.active {
+  background: var(--info);
+  color: #ffffff;
+}
+
 .tab-tile-style {
   display: -webkit-box;
   display: -ms-flexbox;
diff --git a/app/frontend/static/assets/css/shared/style.css b/app/frontend/static/assets/css/shared/style.css
index 7352d637..a4b6df04 100755
--- a/app/frontend/static/assets/css/shared/style.css
+++ b/app/frontend/static/assets/css/shared/style.css
@@ -21494,27 +21494,42 @@ ul li {
   padding-left: 0;
 }
 
-.tab-simple-styled {
+.nav-tabs.tab-simple-styled {
   border-bottom: none;
   margin-top: 30px;
   margin-bottom: 30px;
 }
 
-.tab-simple-styled .nav-item {
+.nav-tabs.tab-simple-styled .nav-item {
   margin-right: 30px;
 }
 
-.tab-simple-styled .nav-item .nav-link {
+.nav-tabs.tab-simple-styled .nav-item .nav-link {
   border: none;
   padding: 0;
   color: var(--gray);
 }
 
-.tab-simple-styled .nav-item .nav-link.active {
+.nav-tabs.tab-simple-styled .nav-item .nav-link.active {
   background: #fff;
   color: var(--info);
 }
 
+.nav-pills.tab-simple-styled {
+  border-bottom: none;
+  /*margin-top: 1.5rem;*/
+  margin-bottom: 1.5rem;
+}
+
+/*.nav-pills.tab-simple-styled .nav-item {
+  margin-right: 1.5rem;
+}*/
+
+.nav-pills.tab-simple-styled .nav-item .nav-link.active {
+  background: var(--info);
+  color: #ffffff;
+}
+
 .tab-tile-style {
   display: -webkit-box;
   display: -ms-flexbox;
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index e1ae727f..4193c6d7 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -5,7 +5,7 @@
 {% block content %}
 
 <div class="content-wrapper">
-  <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
+  <ul class="nav nav-pills tab-simple-styled " role="tablist">
     <li class="nav-item term-nav-item">
       <a class="nav-link" href="/server/step1" role="tab" aria-selected="false">
         <i class="fas fa-file-signature"></i>Minecraft-Java</a>
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index d7a49bee..850bf505 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -5,7 +5,7 @@
 {% block content %}
 
 <div class="content-wrapper">
-  <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
+  <ul class="nav nav-pills tab-simple-styled">
     <li class="nav-item term-nav-item">
       <a class="nav-link active" href="/server/step1" role="tab" aria-selected="false">
         <i class="fas fa-file-signature"></i>Minecraft-Java</a>

From 4f37d5a7f410edf5ad1473f36d1beedecb44275b Mon Sep 17 00:00:00 2001
From: Silversthorn <nakor.silverton@gmail.com>
Date: Mon, 25 Sep 2023 20:15:49 +0200
Subject: [PATCH 172/210] Removed unused style

---
 app/frontend/static/assets/css/dark/style.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/frontend/static/assets/css/dark/style.css b/app/frontend/static/assets/css/dark/style.css
index 7da26c41..12320636 100755
--- a/app/frontend/static/assets/css/dark/style.css
+++ b/app/frontend/static/assets/css/dark/style.css
@@ -23015,11 +23015,6 @@ ul li {
   color: #ffffff;
 }
 
-.nav-pills.tab-simple-styled .nav-link.active {
-  background: var(--info);
-  color: #ffffff;
-}
-
 .tab-tile-style {
   display: -webkit-box;
   display: -ms-flexbox;

From f74194f0e523586d7d8e580b8a2dd5fe110bfcd7 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 26 Sep 2023 21:07:56 -0400
Subject: [PATCH 173/210] Fix backups status not showing up

---
 app/classes/shared/server.py                  |  8 ---
 .../templates/panel/server_backup.html        | 51 ++++++++++---------
 2 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 8205bd8a..2f62dc68 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1047,13 +1047,6 @@ class ServerInstance:
         logger.info(f"Backup Thread started for server {self.settings['server_name']}.")
 
     def a_backup_server(self):
-        if len(WebSocketManager().clients) > 0:
-            WebSocketManager().broadcast_page_params(
-                "/panel/server_detail",
-                {"id": str(self.server_id)},
-                "backup_reload",
-                {"percent": 0, "total_files": 0},
-            )
         was_server_running = None
         logger.info(f"Starting server {self.name} (ID {self.server_id}) backup")
         server_users = PermissionsServers.get_server_user_list(self.server_id)
@@ -1566,7 +1559,6 @@ class ServerInstance:
 
         # process stats
         p_stats = Stats._try_get_process_stats(self.process, self.check_running())
-
         internal_ip = server["server_ip"]
         server_port = server["server_port"]
         server_name = server.get("server_name", f"ID#{server_id}")
diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html
index d8bdea51..d79e710e 100644
--- a/app/frontend/templates/panel/server_backup.html
+++ b/app/frontend/templates/panel/server_backup.html
@@ -44,25 +44,25 @@
             <div class="col-md-6 col-sm-12">
               <br>
               <br>
-              <form id="backup-form" class="forms-sample">
-                {% if data['backing_up'] %}
-                <div class="progress" style="height: 15px;">
-                  <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
-                    role="progressbar" style="width:{{data['backup_stats']['percent']}}%;"
-                    aria-valuenow="{{data['backup_stats']['percent']}}" aria-valuemin="0" aria-valuemax="100">{{
-                    data['backup_stats']['percent'] }}%</div>
-                </div>
-                <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
-                    id="total_files">{{data['server_stats']['world_size']}}</span></p>
-                {% end %}
+              {% if data['backing_up'] %}
+              <div class="progress" style="height: 15px;">
+                <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
+                  role="progressbar" style="width:{{data['backup_stats']['percent']}}%;"
+                  aria-valuenow="{{data['backup_stats']['percent']}}" aria-valuemin="0" aria-valuemax="100">{{
+                  data['backup_stats']['percent'] }}%</div>
+              </div>
+              <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
+                  id="total_files">{{data['server_stats']['world_size']}}</span></p>
+              {% end %}
 
-                <br>
-                {% if not data['backing_up'] %}
-                <div id="backup_button" class="form-group">
-                  <button class="btn btn-primary" id="backup_now_button">{{ translate('serverBackups', 'backupNow',
-                    data['lang']) }}</button>
-                </div>
-                {% end %}
+              <br>
+              {% if not data['backing_up'] %}
+              <div id="backup_button" class="form-group">
+                <button class="btn btn-primary" id="backup_now_button">{{ translate('serverBackups', 'backupNow',
+                  data['lang']) }}</button>
+              </div>
+              {% end %}
+              <form id="backup-form" class="forms-sample">
                 <div class="form-group">
                   {% if data['super_user'] %}
                   <label for="server_name">{{ translate('serverBackups', 'storageLocation', data['lang']) }} <small
@@ -309,11 +309,6 @@
 
   async function backup_started() {
     const token = getCookie("_xsrf")
-    document.getElementById('backup_button').style.visibility = 'hidden';
-    var dialog = bootbox.dialog({
-      message: "{{ translate('serverBackups', 'backupTask', data['lang']) }}",
-      closeButton: false
-    });
     let res = await fetch(`/api/v2/servers/${server_id}/action/backup_server`, {
         method: 'POST',
         headers: {
@@ -323,8 +318,14 @@
       let responseData = await res.json();
       if (responseData.status === "ok") {
         console.log(responseData);
-        process_tree_response(responseData);
-
+        $("#backup_button").html(`<div class="progress" style="height: 15px;">
+                  <div class="progress-bar progress-bar-striped progress-bar-animated" id="backup_progress_bar"
+                    role="progressbar" style="width:{{data['backup_stats']['percent']}}%;"
+                    aria-valuenow="{{data['backup_stats']['percent']}}" aria-valuemin="0" aria-valuemax="100">{{
+                    data['backup_stats']['percent'] }}%</div>
+                </div>
+                <p>Backing up <i class="fas fa-spin fa-spinner"></i> <span
+                    id="total_files">{{data['server_stats']['world_size']}}</span></p>`);
       } else {
 
         bootbox.alert({

From 6c396fdf11ed5defb81741fd3dae8583bacbaa27 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 26 Sep 2023 21:08:11 -0400
Subject: [PATCH 174/210] Fix backup restore

---
 app/classes/shared/main_controller.py         |  63 +++++++-
 app/classes/shared/tasks.py                   |   2 +-
 .../servers/server/backups/backup/index.py    | 140 +++++++++---------
 3 files changed, 137 insertions(+), 68 deletions(-)

diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 4100b21e..541e45ad 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -594,6 +594,66 @@ class Controller:
             return False
         return True
 
+    def restore_java_zip_server(
+        self,
+        server_name: str,
+        zip_path: str,
+        server_jar: str,
+        min_mem: int,
+        max_mem: int,
+        port: int,
+        user_id: int,
+    ):
+        server_id = Helpers.create_uuid()
+        new_server_dir = os.path.join(self.helper.servers_dir, server_id)
+        backup_path = os.path.join(self.helper.backup_path, server_id)
+        if Helpers.is_os_windows():
+            new_server_dir = Helpers.wtol_path(new_server_dir)
+            backup_path = Helpers.wtol_path(backup_path)
+            new_server_dir.replace(" ", "^ ")
+            backup_path.replace(" ", "^ ")
+
+        temp_dir = Helpers.get_os_understandable_path(zip_path)
+        Helpers.ensure_dir_exists(new_server_dir)
+        Helpers.ensure_dir_exists(backup_path)
+
+        full_jar_path = os.path.join(new_server_dir, server_jar)
+
+        if Helpers.is_os_windows():
+            server_command = (
+                f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                f'-jar "{full_jar_path}" nogui'
+            )
+        else:
+            server_command = (
+                f"java -Xms{Helpers.float_to_string(min_mem)}M "
+                f"-Xmx{Helpers.float_to_string(max_mem)}M "
+                f"-jar {full_jar_path} nogui"
+            )
+        logger.debug("command: " + server_command)
+        server_log_file = "./logs/latest.log"
+        server_stop = "stop"
+
+        new_id = self.register_server(
+            server_name,
+            server_id,
+            new_server_dir,
+            backup_path,
+            server_command,
+            server_jar,
+            server_log_file,
+            server_stop,
+            port,
+            user_id,
+            server_type="minecraft-java",
+        )
+        ServersController.set_import(new_id)
+        self.import_helper.import_java_zip_server(
+            temp_dir, new_server_dir, port, new_id
+        )
+        return new_id
+
     # **********************************************************************************
     #                                   BEDROCK IMPORTS
     # **********************************************************************************
@@ -691,7 +751,7 @@ class Controller:
         self.import_helper.download_bedrock_server(new_server_dir, new_id)
         return new_id
 
-    def import_bedrock_zip_server(
+    def restore_bedrock_zip_server(
         self,
         server_name: str,
         zip_path: str,
@@ -836,6 +896,7 @@ class Controller:
 
                 srv_obj = server["server_obj"]
                 srv_obj.server_scheduler.shutdown()
+                srv_obj.dir_scheduler.shutdown()
                 running = srv_obj.check_running()
 
                 if running:
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 28e932be..c89be9d8 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -102,7 +102,7 @@ class TasksManager:
                     )
                 except:
                     logger.error(
-                        "Server value requested does not exist! "
+                        f"Server value {cmd['server_id']} requested does not exist! "
                         "Purging item from waiting commands."
                     )
                     continue
diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 20a9ded0..25329000 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -121,11 +121,11 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
             server_data = self.controller.servers.get_server_data_by_id(server_id)
             zip_name = data["filename"]
             # import the server again based on zipfile
-            if server_data["type"] == "minecraft-java":
-                backup_path = svr_obj.backup_path
-                if Helpers.validate_traversal(backup_path, zip_name):
-                    temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
-                    new_server = self.controller.import_zip_server(
+            backup_path = svr_obj.backup_path
+            if Helpers.validate_traversal(backup_path, zip_name):
+                temp_dir = Helpers.unzip_backup_archive(backup_path, zip_name)
+                if server_data["type"] == "minecraft-java":
+                    new_server = self.controller.restore_java_zip_server(
                         svr_obj.server_name,
                         temp_dir,
                         server_data["executable"],
@@ -134,71 +134,79 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                         server_data["server_port"],
                         server_data["created_by"],
                     )
-                    new_server_id = new_server
-                    new_server = self.controller.servers.get_server_data(new_server)
-                    self.controller.rename_backup_dir(
-                        server_id, new_server_id, new_server["server_uuid"]
+                elif server_data["type"] == "minecraft-bedrock":
+                    new_server = self.controller.restore_bedrock_zip_server(
+                        svr_obj.server_name,
+                        temp_dir,
+                        server_data["executable"],
+                        server_data["server_port"],
+                        server_data["created_by"],
                     )
-                    # preserve current schedules
-                    for schedule in self.controller.management.get_schedules_by_server(
-                        server_id
-                    ):
-                        self.tasks_manager.update_job(
-                            schedule.schedule_id, {"server_id": new_server_id}
-                        )
-                    # preserve execution command
-                    new_server_obj = self.controller.servers.get_server_obj(
-                        new_server_id
+                new_server_id = new_server
+                new_server = self.controller.servers.get_server_data(new_server)
+                self.controller.rename_backup_dir(
+                    server_id, new_server_id, new_server["server_uuid"]
+                )
+                # preserve current schedules
+                for schedule in self.controller.management.get_schedules_by_server(
+                    server_id
+                ):
+                    job_data = self.controller.management.get_scheduled_task(
+                        schedule.schedule_id
                     )
-                    new_server_obj.execution_command = server_data["execution_command"]
-                    # reset executable path
-                    if svr_obj.path in svr_obj.executable:
-                        new_server_obj.executable = str(svr_obj.executable).replace(
-                            svr_obj.path, new_server_obj.path
-                        )
-                    # reset run command path
-                    if svr_obj.path in svr_obj.execution_command:
-                        new_server_obj.execution_command = str(
-                            svr_obj.execution_command
-                        ).replace(svr_obj.path, new_server_obj.path)
-                    # reset log path
-                    if svr_obj.path in svr_obj.log_path:
-                        new_server_obj.log_path = str(svr_obj.log_path).replace(
-                            svr_obj.path, new_server_obj.path
-                        )
-                    self.controller.servers.update_server(new_server_obj)
+                    job_data["server_id"] = new_server_id
+                    del job_data["schedule_id"]
+                    print(job_data)
+                    self.tasks_manager.update_job(schedule.schedule_id, job_data)
+                # preserve execution command
+                new_server_obj = self.controller.servers.get_server_obj(new_server_id)
+                new_server_obj.execution_command = server_data["execution_command"]
+                # reset executable path
+                if svr_obj.path in svr_obj.executable:
+                    new_server_obj.executable = str(svr_obj.executable).replace(
+                        svr_obj.path, new_server_obj.path
+                    )
+                # reset run command path
+                if svr_obj.path in svr_obj.execution_command:
+                    new_server_obj.execution_command = str(
+                        svr_obj.execution_command
+                    ).replace(svr_obj.path, new_server_obj.path)
+                # reset log path
+                if svr_obj.path in svr_obj.log_path:
+                    new_server_obj.log_path = str(svr_obj.log_path).replace(
+                        svr_obj.path, new_server_obj.path
+                    )
+                self.controller.servers.update_server(new_server_obj)
 
-                    # preserve backup config
-                    backup_config = self.controller.management.get_backup_config(
-                        server_id
-                    )
-                    excluded_dirs = []
-                    server_obj = self.controller.servers.get_server_obj(server_id)
-                    loop_backup_path = self.helper.wtol_path(server_obj.path)
-                    for item in self.controller.management.get_excluded_backup_dirs(
-                        server_id
-                    ):
-                        item_path = self.helper.wtol_path(item)
-                        bu_path = os.path.relpath(item_path, loop_backup_path)
-                        bu_path = os.path.join(new_server_obj.path, bu_path)
-                        excluded_dirs.append(bu_path)
-                    self.controller.management.set_backup_config(
-                        new_server_id,
-                        new_server_obj.backup_path,
-                        backup_config["max_backups"],
-                        excluded_dirs,
-                        backup_config["compress"],
-                        backup_config["shutdown"],
-                    )
-                    # remove old server's tasks
-                    try:
-                        self.tasks_manager.remove_all_server_tasks(server_id)
-                    except JobLookupError as e:
-                        logger.info("No active tasks found for server: {e}")
-                    self.controller.remove_server(server_id, True)
-        except Exception:
+                # preserve backup config
+                backup_config = self.controller.management.get_backup_config(server_id)
+                excluded_dirs = []
+                server_obj = self.controller.servers.get_server_obj(server_id)
+                loop_backup_path = self.helper.wtol_path(server_obj.path)
+                for item in self.controller.management.get_excluded_backup_dirs(
+                    server_id
+                ):
+                    item_path = self.helper.wtol_path(item)
+                    bu_path = os.path.relpath(item_path, loop_backup_path)
+                    bu_path = os.path.join(new_server_obj.path, bu_path)
+                    excluded_dirs.append(bu_path)
+                self.controller.management.set_backup_config(
+                    new_server_id,
+                    new_server_obj.backup_path,
+                    backup_config["max_backups"],
+                    excluded_dirs,
+                    backup_config["compress"],
+                    backup_config["shutdown"],
+                )
+                # remove old server's tasks
+                try:
+                    self.tasks_manager.remove_all_server_tasks(server_id)
+                except JobLookupError as e:
+                    logger.info("No active tasks found for server: {e}")
+                self.controller.remove_server(server_id, True)
+        except Exception as e:
             return self.finish_json(
-                400, {"status": "error", "error": "NO BACKUP FOUND"}
+                400, {"status": "error", "error": f"NO BACKUP FOUND {e}"}
             )
         self.controller.management.add_to_audit_log(
             auth_data[4]["user_id"],

From feed08fb957c8a1ef8e7194af8d328566a722e99 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 27 Sep 2023 20:59:52 +0100
Subject: [PATCH 175/210] Update changelog !632

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee86b2be..9b256812 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 ## --- [4.2.0] - 2023/TBD
 ### New features
-- Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/626))
+- Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/626) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/632))
 ### Bug fixes
 - PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))

From 6af4f7b19659da1be0667bff8fcd7003f1023a95 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 27 Sep 2023 16:13:02 -0400
Subject: [PATCH 176/210] Remove print statement

---
 .../web/routes/api/servers/server/backups/backup/index.py        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 25329000..b92e1e9f 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -156,7 +156,6 @@ class ApiServersServerBackupsBackupIndexHandler(BaseApiHandler):
                     )
                     job_data["server_id"] = new_server_id
                     del job_data["schedule_id"]
-                    print(job_data)
                     self.tasks_manager.update_job(schedule.schedule_id, job_data)
                 # preserve execution command
                 new_server_obj = self.controller.servers.get_server_obj(new_server_id)

From f8683b81b02fc67608f22f1385ec2e50c72a5017 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 27 Sep 2023 21:26:43 +0100
Subject: [PATCH 177/210] Update changelog !633

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b256812..2ad5a697 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Add get_users command to Crafty's console ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/620))
 - Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627))
 - Use `Jar` class naming for jar refresh to make room for steamCMD naming in the future ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/630))
+- Improve ui visibility of Build Wizard selection tabs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/633))
 ### Lang
 TBD
 <br><br>

From 449523b3daadd26f4a6546973fba777095958339 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Wed, 27 Sep 2023 21:42:46 +0100
Subject: [PATCH 178/210] Update changelog !634

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ad5a697..266ec6bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Fix select installs failing to start, returning missing python package `packaging` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/629))
 - Fix public status page not updating #255 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/615))
 - Fix service worker vulrn and CQ raised by SonarQ ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/631))
+- Fix Backup Restore/Schedules, Backup button function on `remote-comms2` ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/634))
 ### Refactor
 - Consolidate remaining frontend functions into API V2, and remove ajax internal API ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/585))
 - Replace bleach with nh3 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/628))

From 628c23440081ead49566a5d1917ffc915414ec79 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 27 Sep 2023 17:35:44 -0400
Subject: [PATCH 179/210] Refactor management classname

---
 app/classes/web/routes/api/api_handlers.py                    | 4 ++--
 .../web/routes/api/servers/server/webhooks/webhook/index.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index 1e31a02e..a03be351 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -54,7 +54,7 @@ from app.classes.web.routes.api.servers.server.webhooks.index import (
     ApiServersServerWebhooksIndexHandler,
 )
 from app.classes.web.routes.api.servers.server.webhooks.webhook.index import (
-    ApiServersServerWebhooksWebhookIndexHandler,
+    ApiServersServerWebhooksManagementIndexHandler,
 )
 from app.classes.web.routes.api.servers.server.users import ApiServersServerUsersHandler
 from app.classes.web.routes.api.users.index import ApiUsersIndexHandler
@@ -258,7 +258,7 @@ def api_handlers(handler_args):
         ),
         (
             r"/api/v2/servers/([0-9]+)/webhook/([0-9]+)/?",
-            ApiServersServerWebhooksWebhookIndexHandler,
+            ApiServersServerWebhooksManagementIndexHandler,
             handler_args,
         ),
         (
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 9c0b705e..12aa0612 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -32,7 +32,7 @@ webhook_patch_schema = {
 }
 
 
-class ApiServersServerWebhooksWebhookIndexHandler(BaseApiHandler):
+class ApiServersServerWebhooksManagementIndexHandler(BaseApiHandler):
     def get(self, server_id: str, webhook_id: str):
         auth_data = self.authenticate_user()
         if not auth_data:

From a387c12769ef05d1e92448c47478a3710739a848 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 28 Sep 2023 02:08:11 +0100
Subject: [PATCH 180/210] Rework discord webhook dispatcher

---
 app/classes/web/webhook_handler.py | 64 ++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index 9564c437..83485a5d 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -1,9 +1,12 @@
 import json
 import logging
+from datetime import datetime
 import requests
 
-logger = logging.getLogger(__name__)
+from app.classes.shared.helpers import Helpers
 
+logger = logging.getLogger(__name__)
+helper = Helpers()
 
 class WebhookHandler:
     @staticmethod
@@ -27,20 +30,65 @@ class WebhookHandler:
         return ["server_start", "server_stop", "server_crash", "server_backup"]
 
     @staticmethod
-    def send_discord_webhook(title, url, message, color):
-        dataset = {
+    def send_discord_webhook(server_name, title, url, message, color):
+        """
+        Sends a message to a Discord channel via a webhook.
+
+        This method prepares a payload for the Discord webhook API using
+        the provided details, Crafty Controller version, and the current UTC datetime.
+        It dispatches this payload to the specified webhook URL.
+
+        Parameters:
+        - server_name (str): Name of the server, used as 'author' in the Discord embed.
+        - title (str): Title of the message in the Discord embed.
+        - url (str): URL of the Discord webhook.
+        - message (str): Main content of the message in the Discord embed.
+        - color (int): Color code for the side stripe in the Discord message.
+
+        Returns:
+        None. Sends the message to Discord without returning any value.
+
+        Note:
+        Uses 'requests' to send the webhook payload. Request times out after 10 seconds
+        to avoid indefinite hanging.
+        """
+        # Grab Crafty System version
+        version = helper.get_version_string()
+
+        # Get the current UTC datetime
+        current_datetime = datetime.utcnow()
+
+        # Format the datetime to discord's required UTC string format
+        # "YYYY-MM-DDTHH:MM:SS.MSSZ"
+        formatted_datetime = (current_datetime.strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3]
+                            + 'Z')
+
+        # Prepare webhook payload
+        payload = {
             "username": "Crafty Webhooks",
-            "avatar_url": "https://docs.craftycontrol.com/img/favicon.ico",
+            "avatar_url": (
+                "https://gitlab.com/crafty-controller/crafty-4/-",
+                "/raw/master/app/frontend/static/assets/images/Crafty_4-0.png"),
             "embeds": [
                 {
-                    "title": title,
-                    "description": message,
-                    "color": color,
+                "title": title,
+                "description": message,
+                "color": color,
+                "author": {
+                    "name": server_name
+                },
+                "footer": {
+                    "text": f"Crafty Controller v.{version}"
+                },
+                "timestamp": formatted_datetime
                 }
             ],
         }
+
+        # Dispatch webhook
         requests.post(
             url,
-            data=json.dumps(dataset),
+            data=json.dumps(payload),
             headers={"Content-type": "application/json"},
+            timeout=10, # 10 seconds, so we don't hang indefinitly
         )

From 2bb5fa4fa24896fb67e697a72740fd35a650abd6 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 28 Sep 2023 02:48:22 +0100
Subject: [PATCH 181/210] Refine discord webhook post

To better feedback dispatch outcome
---
 app/classes/web/webhook_handler.py | 34 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index 83485a5d..d9852b6c 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -13,9 +13,7 @@ class WebhookHandler:
     def get_providers():
         return [
             "Discord",
-            "Home Assistant",
             "Mattermost",
-            "Opsgenie",
             "Signal",
             "Slack",
             "SMTP",
@@ -35,7 +33,7 @@ class WebhookHandler:
         Sends a message to a Discord channel via a webhook.
 
         This method prepares a payload for the Discord webhook API using
-        the provided details, Crafty Controller version, and the current UTC datetime.
+        the message content, Crafty Controller version, and the current UTC datetime.
         It dispatches this payload to the specified webhook URL.
 
         Parameters:
@@ -46,11 +44,14 @@ class WebhookHandler:
         - color (int): Color code for the side stripe in the Discord message.
 
         Returns:
-        None. Sends the message to Discord without returning any value.
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
 
         Note:
-        Uses 'requests' to send the webhook payload. Request times out after 10 seconds
-        to avoid indefinite hanging.
+        Webhook request times out after 10 seconds to prevent indefinite hanging.
         """
         # Grab Crafty System version
         version = helper.get_version_string()
@@ -64,11 +65,13 @@ class WebhookHandler:
                             + 'Z')
 
         # Prepare webhook payload
+        headers={"Content-type": "application/json"}
         payload = {
             "username": "Crafty Webhooks",
-            "avatar_url": (
-                "https://gitlab.com/crafty-controller/crafty-4/-",
-                "/raw/master/app/frontend/static/assets/images/Crafty_4-0.png"),
+            "avatar_url": ("https://gitlab.com/crafty-controller/crafty-4/-"
+                        + "/raw/master/app/frontend/static/assets/images/"
+                        + "Crafty_4-0.png"),
+
             "embeds": [
                 {
                 "title": title,
@@ -86,9 +89,10 @@ class WebhookHandler:
         }
 
         # Dispatch webhook
-        requests.post(
-            url,
-            data=json.dumps(payload),
-            headers={"Content-type": "application/json"},
-            timeout=10, # 10 seconds, so we don't hang indefinitly
-        )
+        try:
+            response = requests.post(url, json=payload, headers=headers, timeout=10)
+            response.raise_for_status()
+            return "Dispatch successful"
+        except requests.RequestException as error:
+            logger.error(error)
+            raise RuntimeError(f"Failed to send notification: {error}") from error

From 1ea0d692d0896d05a7b126103924d89a2d0cc36c Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 28 Sep 2023 04:00:49 +0100
Subject: [PATCH 182/210] Add mattermost webhook dispatcher

Refactor common variables abit
---
 app/classes/web/webhook_handler.py | 99 +++++++++++++++++++++++-------
 1 file changed, 76 insertions(+), 23 deletions(-)

diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
index d9852b6c..b1fcc436 100644
--- a/app/classes/web/webhook_handler.py
+++ b/app/classes/web/webhook_handler.py
@@ -1,4 +1,3 @@
-import json
 import logging
 from datetime import datetime
 import requests
@@ -8,7 +7,16 @@ from app.classes.shared.helpers import Helpers
 logger = logging.getLogger(__name__)
 helper = Helpers()
 
+
 class WebhookHandler:
+    WEBHOOK_USERNAME = "Crafty Webhooks"
+    WEBHOOK_PFP_URL = (
+        "https://gitlab.com/crafty-controller/crafty-4/-"
+        + "/raw/master/app/frontend/static/assets/images/"
+        + "Crafty_4-0.png"
+    )
+    CRAFTY_VERSION = helper.get_version_string()
+
     @staticmethod
     def get_providers():
         return [
@@ -51,39 +59,34 @@ class WebhookHandler:
         Exception: If there's an error in dispatching the webhook.
 
         Note:
-        Webhook request times out after 10 seconds to prevent indefinite hanging.
+        - Docs: https://discord.com/developers/docs/resources/webhook#execute-webhook
+        - Webhook request times out after 10 seconds to prevent indefinite hanging.
         """
-        # Grab Crafty System version
-        version = helper.get_version_string()
 
         # Get the current UTC datetime
         current_datetime = datetime.utcnow()
 
         # Format the datetime to discord's required UTC string format
         # "YYYY-MM-DDTHH:MM:SS.MSSZ"
-        formatted_datetime = (current_datetime.strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3]
-                            + 'Z')
+        formatted_datetime = (
+            current_datetime.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+        )
 
         # Prepare webhook payload
-        headers={"Content-type": "application/json"}
+        headers = {"Content-type": "application/json"}
         payload = {
-            "username": "Crafty Webhooks",
-            "avatar_url": ("https://gitlab.com/crafty-controller/crafty-4/-"
-                        + "/raw/master/app/frontend/static/assets/images/"
-                        + "Crafty_4-0.png"),
-
+            "username": WebhookHandler.WEBHOOK_USERNAME,
+            "avatar_url": WebhookHandler.WEBHOOK_PFP_URL,
             "embeds": [
                 {
-                "title": title,
-                "description": message,
-                "color": color,
-                "author": {
-                    "name": server_name
-                },
-                "footer": {
-                    "text": f"Crafty Controller v.{version}"
-                },
-                "timestamp": formatted_datetime
+                    "title": title,
+                    "description": message,
+                    "color": color,
+                    "author": {"name": server_name},
+                    "footer": {
+                        "text": f"Crafty Controller v.{WebhookHandler.CRAFTY_VERSION}"
+                    },
+                    "timestamp": formatted_datetime,
                 }
             ],
         }
@@ -95,4 +98,54 @@ class WebhookHandler:
             return "Dispatch successful"
         except requests.RequestException as error:
             logger.error(error)
-            raise RuntimeError(f"Failed to send notification: {error}") from error
+            raise RuntimeError(f"Failed to dispatch notification: {error}") from error
+
+    @staticmethod
+    def send_mattermost_webhook(server_name, title, url, message):
+        """
+        Sends a message to a Mattermost channel via an incoming webhook.
+
+        Parameters:
+        - server_name (str): Name of the server, used as 'author' in the Discord embed.
+        - title (str): Title of the message in the Discord embed.
+        - url (str): URL of the Discord webhook.
+        - message (str): Main content of the message in the Discord embed.
+
+        Returns:
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
+
+        Note:
+        - Docs: https://developers.mattermost.com/integrate/webhooks/incoming
+        - Webhook request times out after 10 seconds to prevent indefinite hanging.
+        """
+        # Format the text for Mattermost
+        formatted_text = f"#### {title} \n *Server: {server_name}* \n\n {message}"
+
+        # Prepare webhook payload
+        headers = {"Content-Type": "application/json"}
+        payload = {
+            "text": formatted_text,
+            "username": WebhookHandler.WEBHOOK_USERNAME,
+            "icon_url": WebhookHandler.WEBHOOK_PFP_URL,
+            "props": {
+                "card": (
+                    f"[Crafty Controller "
+                    f"v.{WebhookHandler.CRAFTY_VERSION}](https://craftycontrol.com)"
+                )
+            },
+        }
+
+        # Dispatch webhook
+        try:
+            response = requests.post(url, json=payload, headers=headers, timeout=10)
+            response.raise_for_status()
+            return "Dispatch successful"
+        except requests.RequestException as error:
+            logger.error(error)
+            raise RuntimeError(
+                f"Failed to dispatch notification to Mattermost: {error}"
+            ) from error

From 409d7618dde15568d6b946eab8619eabef61d7b5 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 28 Sep 2023 19:17:47 +0100
Subject: [PATCH 183/210] Refactor Webhooks to WebhookFactory

To save having a massive class lets go modular
---
 app/classes/web/panel_handler.py              |  14 +-
 .../api/servers/server/webhooks/index.py      |   7 +-
 .../servers/server/webhooks/webhook/index.py  |  18 ++-
 app/classes/web/webhook_handler.py            | 151 ------------------
 app/classes/web/webhooks/base_webhook.py      |  39 +++++
 app/classes/web/webhooks/discord_webhook.py   |  71 ++++++++
 .../web/webhooks/mattermost_webhook.py        |  60 +++++++
 app/classes/web/webhooks/webhook_factory.py   |  79 +++++++++
 8 files changed, 274 insertions(+), 165 deletions(-)
 delete mode 100644 app/classes/web/webhook_handler.py
 create mode 100644 app/classes/web/webhooks/base_webhook.py
 create mode 100644 app/classes/web/webhooks/discord_webhook.py
 create mode 100644 app/classes/web/webhooks/mattermost_webhook.py
 create mode 100644 app/classes/web/webhooks/webhook_factory.py

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 0e997bd1..333bf02a 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -25,7 +25,7 @@ from app.classes.controllers.roles_controller import RolesController
 from app.classes.shared.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
-from app.classes.web.webhook_handler import WebhookHandler
+from app.classes.web.webhooks.webhook_factory import WebhookFactory
 
 logger = logging.getLogger(__name__)
 
@@ -345,7 +345,9 @@ class PanelHandler(BaseHandler):
             ) as credits_default_local:
                 try:
                     remote = requests.get(
-                        "https://craftycontrol.com/credits-v2", allow_redirects=True
+                        "https://craftycontrol.com/credits-v2",
+                        allow_redirects=True,
+                        timeout=10,
                     )
                     credits_dict: dict = remote.json()
                     if not credits_dict["staff"]:
@@ -1070,8 +1072,8 @@ class PanelHandler(BaseHandler):
             page_data["webhook"]["body"] = ""
             page_data["webhook"]["enabled"] = True
 
-            page_data["providers"] = WebhookHandler.get_providers()
-            page_data["triggers"] = WebhookHandler.get_monitored_actions()
+            page_data["providers"] = WebhookFactory.get_supported_providers()
+            page_data["triggers"] = WebhookFactory.get_monitored_events()
 
             if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
                 if not superuser:
@@ -1121,8 +1123,8 @@ class PanelHandler(BaseHandler):
                 page_data["webhook"]["trigger"]
             ).split(",")
 
-            page_data["providers"] = WebhookHandler.get_providers()
-            page_data["triggers"] = WebhookHandler.get_monitored_actions()
+            page_data["providers"] = WebhookFactory.get_supported_providers
+            page_data["triggers"] = WebhookFactory.get_monitored_events
 
             if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
                 if not superuser:
diff --git a/app/classes/web/routes/api/servers/server/webhooks/index.py b/app/classes/web/routes/api/servers/server/webhooks/index.py
index 328d4885..a96518af 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/index.py
@@ -6,14 +6,17 @@ import logging
 from jsonschema import ValidationError, validate
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.web.base_api_handler import BaseApiHandler
-from app.classes.web.webhook_handler import WebhookHandler
+from app.classes.web.webhooks.webhook_factory import WebhookFactory
 
 
 logger = logging.getLogger(__name__)
 new_webhook_schema = {
     "type": "object",
     "properties": {
-        "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
+        "webhook_type": {
+            "type": "string",
+            "enum": WebhookFactory.get_supported_providers(),
+        },
         "name": {"type": "string"},
         "url": {"type": "string"},
         "bot_name": {"type": "string"},
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 12aa0612..876b2e11 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -3,11 +3,9 @@
 import json
 import logging
 
-from croniter import croniter
 from jsonschema import ValidationError, validate
 from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.web.webhook_handler import WebhookHandler
-
+from app.classes.web.webhooks.webhook_factory import WebhookFactory
 from app.classes.web.base_api_handler import BaseApiHandler
 
 
@@ -16,7 +14,10 @@ logger = logging.getLogger(__name__)
 webhook_patch_schema = {
     "type": "object",
     "properties": {
-        "webhook_type": {"type": "string", "enum": WebhookHandler.get_providers()},
+        "webhook_type": {
+            "type": "string",
+            "enum": WebhookFactory.get_supported_providers(),
+        },
         "name": {"type": "string"},
         "url": {"type": "string"},
         "bot_name": {"type": "string"},
@@ -168,8 +169,13 @@ class ApiServersServerWebhooksManagementIndexHandler(BaseApiHandler):
             return self.finish_json(400, {"status": "error", "error": "NOT_AUTHORIZED"})
         webhook = self.controller.management.get_webhook_by_id(webhook_id)
         try:
-            WebhookHandler.send_discord_webhook(
-                webhook["bot_name"], webhook["url"], webhook["body"], 880808
+            webhook_provider = WebhookFactory.create_provider(webhook["webhook_type"])
+            webhook_provider.send(
+                server_name=server_id,  # TODO get actual server name
+                title="Tickle Test Webhook",
+                url=webhook["url"],
+                message=webhook["body"],
+                color=4915409,  # Prestigious purple!
             )
         except Exception as e:
             self.finish_json(500, {"status": "error", "error": str(e)})
diff --git a/app/classes/web/webhook_handler.py b/app/classes/web/webhook_handler.py
deleted file mode 100644
index b1fcc436..00000000
--- a/app/classes/web/webhook_handler.py
+++ /dev/null
@@ -1,151 +0,0 @@
-import logging
-from datetime import datetime
-import requests
-
-from app.classes.shared.helpers import Helpers
-
-logger = logging.getLogger(__name__)
-helper = Helpers()
-
-
-class WebhookHandler:
-    WEBHOOK_USERNAME = "Crafty Webhooks"
-    WEBHOOK_PFP_URL = (
-        "https://gitlab.com/crafty-controller/crafty-4/-"
-        + "/raw/master/app/frontend/static/assets/images/"
-        + "Crafty_4-0.png"
-    )
-    CRAFTY_VERSION = helper.get_version_string()
-
-    @staticmethod
-    def get_providers():
-        return [
-            "Discord",
-            "Mattermost",
-            "Signal",
-            "Slack",
-            "SMTP",
-            "Splunk",
-            "Teams",
-            "Telegram",
-            "Custom",
-        ]
-
-    @staticmethod
-    def get_monitored_actions():
-        return ["server_start", "server_stop", "server_crash", "server_backup"]
-
-    @staticmethod
-    def send_discord_webhook(server_name, title, url, message, color):
-        """
-        Sends a message to a Discord channel via a webhook.
-
-        This method prepares a payload for the Discord webhook API using
-        the message content, Crafty Controller version, and the current UTC datetime.
-        It dispatches this payload to the specified webhook URL.
-
-        Parameters:
-        - server_name (str): Name of the server, used as 'author' in the Discord embed.
-        - title (str): Title of the message in the Discord embed.
-        - url (str): URL of the Discord webhook.
-        - message (str): Main content of the message in the Discord embed.
-        - color (int): Color code for the side stripe in the Discord message.
-
-        Returns:
-        str: "Dispatch successful!" if the message is sent successfully, otherwise an
-        exception is raised.
-
-        Raises:
-        Exception: If there's an error in dispatching the webhook.
-
-        Note:
-        - Docs: https://discord.com/developers/docs/resources/webhook#execute-webhook
-        - Webhook request times out after 10 seconds to prevent indefinite hanging.
-        """
-
-        # Get the current UTC datetime
-        current_datetime = datetime.utcnow()
-
-        # Format the datetime to discord's required UTC string format
-        # "YYYY-MM-DDTHH:MM:SS.MSSZ"
-        formatted_datetime = (
-            current_datetime.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
-        )
-
-        # Prepare webhook payload
-        headers = {"Content-type": "application/json"}
-        payload = {
-            "username": WebhookHandler.WEBHOOK_USERNAME,
-            "avatar_url": WebhookHandler.WEBHOOK_PFP_URL,
-            "embeds": [
-                {
-                    "title": title,
-                    "description": message,
-                    "color": color,
-                    "author": {"name": server_name},
-                    "footer": {
-                        "text": f"Crafty Controller v.{WebhookHandler.CRAFTY_VERSION}"
-                    },
-                    "timestamp": formatted_datetime,
-                }
-            ],
-        }
-
-        # Dispatch webhook
-        try:
-            response = requests.post(url, json=payload, headers=headers, timeout=10)
-            response.raise_for_status()
-            return "Dispatch successful"
-        except requests.RequestException as error:
-            logger.error(error)
-            raise RuntimeError(f"Failed to dispatch notification: {error}") from error
-
-    @staticmethod
-    def send_mattermost_webhook(server_name, title, url, message):
-        """
-        Sends a message to a Mattermost channel via an incoming webhook.
-
-        Parameters:
-        - server_name (str): Name of the server, used as 'author' in the Discord embed.
-        - title (str): Title of the message in the Discord embed.
-        - url (str): URL of the Discord webhook.
-        - message (str): Main content of the message in the Discord embed.
-
-        Returns:
-        str: "Dispatch successful!" if the message is sent successfully, otherwise an
-        exception is raised.
-
-        Raises:
-        Exception: If there's an error in dispatching the webhook.
-
-        Note:
-        - Docs: https://developers.mattermost.com/integrate/webhooks/incoming
-        - Webhook request times out after 10 seconds to prevent indefinite hanging.
-        """
-        # Format the text for Mattermost
-        formatted_text = f"#### {title} \n *Server: {server_name}* \n\n {message}"
-
-        # Prepare webhook payload
-        headers = {"Content-Type": "application/json"}
-        payload = {
-            "text": formatted_text,
-            "username": WebhookHandler.WEBHOOK_USERNAME,
-            "icon_url": WebhookHandler.WEBHOOK_PFP_URL,
-            "props": {
-                "card": (
-                    f"[Crafty Controller "
-                    f"v.{WebhookHandler.CRAFTY_VERSION}](https://craftycontrol.com)"
-                )
-            },
-        }
-
-        # Dispatch webhook
-        try:
-            response = requests.post(url, json=payload, headers=headers, timeout=10)
-            response.raise_for_status()
-            return "Dispatch successful"
-        except requests.RequestException as error:
-            logger.error(error)
-            raise RuntimeError(
-                f"Failed to dispatch notification to Mattermost: {error}"
-            ) from error
diff --git a/app/classes/web/webhooks/base_webhook.py b/app/classes/web/webhooks/base_webhook.py
new file mode 100644
index 00000000..75e485fc
--- /dev/null
+++ b/app/classes/web/webhooks/base_webhook.py
@@ -0,0 +1,39 @@
+from abc import ABC, abstractmethod
+import logging
+import requests
+
+from app.classes.shared.helpers import Helpers
+
+logger = logging.getLogger(__name__)
+helper = Helpers()
+
+
+class WebhookProvider(ABC):
+    """
+    Base class for all webhook providers.
+
+    Provides a common interface for all webhook provider implementations,
+    ensuring that each provider will have a send method.
+    """
+
+    WEBHOOK_USERNAME = "Crafty Webhooks"
+    WEBHOOK_PFP_URL = (
+        "https://gitlab.com/crafty-controller/crafty-4/-"
+        + "/raw/master/app/frontend/static/assets/images/"
+        + "Crafty_4-0.png"
+    )
+    CRAFTY_VERSION = helper.get_version_string()
+
+    def _send_request(self, url, payload, headers=None):
+        """Send a POST request to the given URL with the provided payload."""
+        try:
+            response = requests.post(url, json=payload, headers=headers, timeout=10)
+            response.raise_for_status()
+            return "Dispatch successful"
+        except requests.RequestException as error:
+            logger.error(error)
+            raise RuntimeError(f"Failed to dispatch notification: {error}") from error
+
+    @abstractmethod
+    def send(self, server_name, title, url, message, **kwargs):
+        """Abstract method that derived classes will implement for sending webhooks."""
diff --git a/app/classes/web/webhooks/discord_webhook.py b/app/classes/web/webhooks/discord_webhook.py
new file mode 100644
index 00000000..2b5f4504
--- /dev/null
+++ b/app/classes/web/webhooks/discord_webhook.py
@@ -0,0 +1,71 @@
+from datetime import datetime
+from app.classes.web.webhooks.base_webhook import WebhookProvider
+
+
+class DiscordWebhook(WebhookProvider):
+    def _construct_discord_payload(self, server_name, title, message, color):
+        """
+        Constructs the payload required for sending a Discord webhook notification.
+
+        This method prepares a payload for the Discord webhook API using the provided
+        message content, the Crafty Controller version, and the current UTC datetime.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        message (str): The main content of the notification message.
+        color (int): The color code for the side stripe in the Discord embed message.
+
+        Returns:
+        tuple: A tuple containing the constructed payload (dict) incl headers (dict).
+        """
+        current_datetime = datetime.utcnow()
+        formatted_datetime = (
+            current_datetime.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+        )
+
+        headers = {"Content-type": "application/json"}
+        payload = {
+            "username": self.WEBHOOK_USERNAME,
+            "avatar_url": self.WEBHOOK_PFP_URL,
+            "embeds": [
+                {
+                    "title": title,
+                    "description": message,
+                    "color": color,
+                    "author": {"name": server_name},
+                    "footer": {"text": f"Crafty Controller v.{self.CRAFTY_VERSION}"},
+                    "timestamp": formatted_datetime,
+                }
+            ],
+        }
+
+        return payload, headers
+
+    def send(self, server_name, title, url, message, **kwargs):
+        """
+        Sends a Discord webhook notification using the given details.
+
+        The method constructs and dispatches a payload suitable for
+        Discords's webhook system.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        url (str): The webhook URL to send the notification to.
+        message (str): The main content or body of the notification message.
+        color (int, optional): The color code for the embed's side stripe.
+        Defaults to a pretty blue if not provided.
+
+        Returns:
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
+        """
+        color = kwargs.get("color", 23761)  # Default to a color if not provided.
+        payload, headers = self._construct_discord_payload(
+            server_name, title, message, color
+        )
+        return self._send_request(url, payload, headers)
diff --git a/app/classes/web/webhooks/mattermost_webhook.py b/app/classes/web/webhooks/mattermost_webhook.py
new file mode 100644
index 00000000..7598d6e7
--- /dev/null
+++ b/app/classes/web/webhooks/mattermost_webhook.py
@@ -0,0 +1,60 @@
+from app.classes.web.webhooks.base_webhook import WebhookProvider
+
+
+class MattermostWebhook(WebhookProvider):
+    def _construct_mattermost_payload(self, server_name, title, message):
+        """
+        Constructs the payload required for sending a Mattermost webhook notification.
+
+        The method formats the given information into a Markdown-styled message for MM,
+        including an information card containing the Crafty version.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        message (str): The main content of the notification message.
+
+        Returns:
+        tuple: A tuple containing the constructed payload (dict) incl headers (dict).
+        """
+        formatted_text = f"#### {title} \n *Server: {server_name}* \n\n {message}"
+
+        headers = {"Content-Type": "application/json"}
+        payload = {
+            "text": formatted_text,
+            "username": self.WEBHOOK_USERNAME,
+            "icon_url": self.WEBHOOK_PFP_URL,
+            "props": {
+                "card": (
+                    f"[Crafty Controller "
+                    f"v.{self.CRAFTY_VERSION}](https://craftycontrol.com)"
+                )
+            },
+        }
+
+        return payload, headers
+
+    def send(self, server_name, title, url, message, **kwargs):
+        """
+        Sends a Mattermost webhook notification using the given details.
+
+        The method constructs and dispatches a payload suitable for
+        Mattermost's webhook system.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        url (str): The webhook URL to send the notification to.
+        message (str): The main content or body of the notification message.
+
+        Returns:
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
+        """
+        payload, headers = self._construct_mattermost_payload(
+            server_name, title, message
+        )
+        return self._send_request(url, payload, headers)
diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
new file mode 100644
index 00000000..79cf2810
--- /dev/null
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -0,0 +1,79 @@
+from app.classes.web.webhooks.discord_webhook import DiscordWebhook
+from app.classes.web.webhooks.mattermost_webhook import MattermostWebhook
+
+
+class WebhookFactory:
+    """
+    A factory class responsible for the creation and management of webhook providers.
+
+    This class provides methods to instantiate specific webhook providers based on
+    their name and to retrieve a list of supported providers. It uses a registry pattern
+    to manage the available providers.
+
+    Attributes:
+    - _registry (dict): A dictionary mapping provider names to their classes.
+    """
+
+    _registry = {
+        "Discord": DiscordWebhook,
+        "Mattermost": MattermostWebhook,
+        # "Signal",
+        # "Slack",
+        # "SMTP",
+        # "Splunk",
+        # "Teams",
+        # "Telegram",
+        # "Custom",
+    }
+
+    @classmethod
+    def create_provider(cls, provider_name, *args, **kwargs):
+        """
+        Creates and returns an instance of the specified webhook provider.
+
+        This method looks up the provider in the registry, then instantiates it w/ the
+        provided arguments. If the provider is not recognized, a ValueError is raised.
+
+        Arguments:
+        - provider_name (str): The name of the desired webhook provider.
+
+        Additional arguments supported that we may use for if a provider
+        requires initialization:
+        - *args: Positional arguments to pass to the provider's constructor.
+        - **kwargs: Keyword arguments to pass to the provider's constructor.
+
+        Returns:
+        WebhookProvider: An instance of the desired webhook provider.
+
+        Raises:
+        ValueError: If the specified provider name is not recognized.
+        """
+        if provider_name not in cls._registry:
+            raise ValueError(f"Provider {provider_name} is not supported.")
+        return cls._registry[provider_name](*args, **kwargs)
+
+    @classmethod
+    def get_supported_providers(cls):
+        """
+        Retrieves the names of all supported webhook providers.
+
+        This method returns a list containing the names of all providers
+        currently registered in the factory's registry.
+
+        Returns:
+        List[str]: A list of supported provider names.
+        """
+        return list(cls._registry.keys())
+
+    @staticmethod
+    def get_monitored_events():
+        """
+        Retrieves the list of supported events for monitoring.
+
+        This method provides a list of common server events that the webhook system can
+        monitor and notify about.
+
+        Returns:
+        List[str]: A list of supported monitored actions.
+        """
+        return ["server_start", "server_stop", "server_crash", "server_backup"]

From 13214e9e86a8ac52c2d8143b1502448e0c426c12 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 14:57:18 -0400
Subject: [PATCH 184/210] Fix authentication issues on webhook get/post

---
 app/classes/web/routes/api/api_handlers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/classes/web/routes/api/api_handlers.py b/app/classes/web/routes/api/api_handlers.py
index a03be351..706c346f 100644
--- a/app/classes/web/routes/api/api_handlers.py
+++ b/app/classes/web/routes/api/api_handlers.py
@@ -264,6 +264,7 @@ def api_handlers(handler_args):
         (
             r"/api/v2/servers/([0-9]+)/webhook/?",
             ApiServersServerWebhooksIndexHandler,
+            handler_args,
         ),
         (
             r"/api/v2/servers/([0-9]+)/action/([a-z_]+)/?",

From 9a8856391684e0c1f8b093c9ed828ee68be594a8 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 15:54:56 -0400
Subject: [PATCH 185/210] Swap server ID for name in send.

---
 .../web/routes/api/servers/server/webhooks/webhook/index.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 876b2e11..540ccaac 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -171,8 +171,10 @@ class ApiServersServerWebhooksManagementIndexHandler(BaseApiHandler):
         try:
             webhook_provider = WebhookFactory.create_provider(webhook["webhook_type"])
             webhook_provider.send(
-                server_name=server_id,  # TODO get actual server name
-                title="Tickle Test Webhook",
+                server_name=self.controller.servers.get_server_data_by_id(server_id)[
+                    "server_name"
+                ],
+                title="Test Webhook",
                 url=webhook["url"],
                 message=webhook["body"],
                 color=4915409,  # Prestigious purple!

From 60e377a2e13847d9486dd38c11a15b70648c3f7f Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 28 Sep 2023 21:30:48 +0100
Subject: [PATCH 186/210] Refine Mattermost embed formatting

---
 app/classes/web/webhooks/mattermost_webhook.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/webhooks/mattermost_webhook.py b/app/classes/web/webhooks/mattermost_webhook.py
index 7598d6e7..ecd3b3db 100644
--- a/app/classes/web/webhooks/mattermost_webhook.py
+++ b/app/classes/web/webhooks/mattermost_webhook.py
@@ -17,7 +17,13 @@ class MattermostWebhook(WebhookProvider):
         Returns:
         tuple: A tuple containing the constructed payload (dict) incl headers (dict).
         """
-        formatted_text = f"#### {title} \n *Server: {server_name}* \n\n {message}"
+        formatted_text = (
+            f"-----\n\n"
+            f"#### {title}\n"
+            f"##### Server: ```{server_name}```\n\n"
+            f"```\n{message}\n```\n\n"
+            f"-----"
+        )
 
         headers = {"Content-Type": "application/json"}
         payload = {
@@ -53,6 +59,11 @@ class MattermostWebhook(WebhookProvider):
 
         Raises:
         Exception: If there's an error in dispatching the webhook.
+
+        Note:
+        - To set webhook username & pfp Mattermost needs to be configured to allow this!
+        - Mattermost's `config.json` setting is `"EnablePostUsernameOverride": true`
+        - Mattermost's `config.json` setting is `"EnablePostIconOverride": true`
         """
         payload, headers = self._construct_mattermost_payload(
             server_name, title, message

From f742a5026cc5d78754d5c65b92caf228942f6838 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:17:27 -0400
Subject: [PATCH 187/210] Refactor naming to match method calls

---
 app/classes/web/webhooks/webhook_factory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
index 79cf2810..cabad095 100644
--- a/app/classes/web/webhooks/webhook_factory.py
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -76,4 +76,4 @@ class WebhookFactory:
         Returns:
         List[str]: A list of supported monitored actions.
         """
-        return ["server_start", "server_stop", "server_crash", "server_backup"]
+        return ["start_server", "stop_server", "crash_detected", "backup_server"]

From bd1b67e83b872086c3a8cae7da6a851ae3f8e6f8 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:17:49 -0400
Subject: [PATCH 188/210] Make webhook edit page data method calls

---
 app/classes/web/panel_handler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 333bf02a..79f7343d 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1123,8 +1123,8 @@ class PanelHandler(BaseHandler):
                 page_data["webhook"]["trigger"]
             ).split(",")
 
-            page_data["providers"] = WebhookFactory.get_supported_providers
-            page_data["triggers"] = WebhookFactory.get_monitored_events
+            page_data["providers"] = WebhookFactory.get_supported_providers()
+            page_data["triggers"] = WebhookFactory.get_monitored_events()
 
             if not EnumPermissionsServer.CONFIG in page_data["user_permissions"]:
                 if not superuser:

From 5cdf114fd5e19225621c9e32537d0cfc425ccf54 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:18:07 -0400
Subject: [PATCH 189/210] Add callbacks to method calls

---
 app/classes/shared/server.py | 43 +++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 72c41e65..7979be6c 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -12,6 +12,7 @@ import html
 import urllib.request
 import glob
 import json
+from functools import wraps
 
 from zoneinfo import ZoneInfo
 
@@ -25,7 +26,7 @@ from app.classes.minecraft.stats import Stats
 from app.classes.minecraft.mc_ping import ping, ping_bedrock
 from app.classes.models.servers import HelperServers, Servers
 from app.classes.models.server_stats import HelperServerStats
-from app.classes.models.management import HelpersManagement
+from app.classes.models.management import HelpersManagement, HelpersWebhooks
 from app.classes.models.users import HelperUsers
 from app.classes.models.server_permissions import PermissionsServers
 from app.classes.shared.console import Console
@@ -33,6 +34,7 @@ from app.classes.shared.helpers import Helpers
 from app.classes.shared.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
 from app.classes.shared.websocket_manager import WebSocketManager
+from app.classes.web.webhooks.webhook_factory import WebhookFactory
 
 with redirect_stderr(NullWriter()):
     import psutil
@@ -165,6 +167,38 @@ class ServerInstance:
         self.stats_helper.server_crash_reset()
         self.stats_helper.set_update(False)
 
+    @staticmethod
+    def callback(called_func):
+        @wraps(called_func)
+        def wrapper(*args, **kwargs):
+            res = None
+            try:
+                res = called_func(*args, **kwargs)
+            finally:
+                events = WebhookFactory.get_monitored_events()
+                if called_func.__name__ in events:
+                    server_webhooks = HelpersWebhooks.get_webhooks_by_server(
+                        args[0].server_id, True
+                    )
+                    for swebhook in server_webhooks:
+                        if called_func.__name__ in str(swebhook.trigger).split(","):
+                            webhook = HelpersWebhooks.get_webhook_by_id(swebhook.id)
+                            webhook_provider = WebhookFactory.create_provider(
+                                webhook["webhook_type"]
+                            )
+                            if res is not False:
+                                webhook_provider.send(
+                                    server_name=args[0].name,
+                                    title=webhook["name"],
+                                    url=webhook["url"],
+                                    message=webhook["body"],
+                                    # color=webhook["color"],
+                                    # TODO implement frontend color picker
+                                )
+            return res
+
+        return wrapper
+
     # **********************************************************************************
     #                               Minecraft Server Management
     # **********************************************************************************
@@ -332,6 +366,7 @@ class ServerInstance:
             logger.critical(f"Unable to write/access {self.server_path}")
             Console.critical(f"Unable to write/access {self.server_path}")
 
+    @callback
     def start_server(self, user_id, forge_install=False):
         if not user_id:
             user_lang = self.helper.get_setting("language")
@@ -775,6 +810,7 @@ class ServerInstance:
         if self.server_thread:
             self.server_thread.join()
 
+    @callback
     def stop_server(self):
         running = self.check_running()
         if not running:
@@ -882,6 +918,7 @@ class ServerInstance:
         self.last_rc = poll
         return False
 
+    @callback
     def send_command(self, command):
         if not self.check_running() and command.lower() != "start":
             logger.warning(f'Server not running, unable to send command "{command}"')
@@ -894,6 +931,7 @@ class ServerInstance:
         self.process.stdin.flush()
         return True
 
+    @callback
     def crash_detected(self, name):
         # clear the old scheduled watcher task
         self.server_scheduler.remove_job(f"c_{self.server_id}")
@@ -927,6 +965,7 @@ class ServerInstance:
         )
         return False
 
+    @callback
     def kill(self):
         logger.info(f"Terminating server {self.server_id} and all child processes")
         try:
@@ -1015,6 +1054,7 @@ class ServerInstance:
             f.write("eula=true")
         self.run_threaded_server(user_id)
 
+    @callback
     def backup_server(self):
         if self.settings["backup_path"] == "":
             logger.critical("Backup path is None. Canceling Backup!")
@@ -1229,6 +1269,7 @@ class ServerInstance:
             if f["path"].endswith(".zip")
         ]
 
+    @callback
     def jar_update(self):
         self.stats_helper.set_update(True)
         update_thread = threading.Thread(

From 1b20520ac52136831e560cdd00f12404e7f1729f Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:19:37 -0400
Subject: [PATCH 190/210] Add support for jar_update, send_command

---
 app/classes/web/webhooks/webhook_factory.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
index cabad095..4b6d43ae 100644
--- a/app/classes/web/webhooks/webhook_factory.py
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -76,4 +76,11 @@ class WebhookFactory:
         Returns:
         List[str]: A list of supported monitored actions.
         """
-        return ["start_server", "stop_server", "crash_detected", "backup_server"]
+        return [
+            "start_server",
+            "stop_server",
+            "crash_detected",
+            "backup_server",
+            "jar_update",
+            "send_command",
+        ]

From c1b5dbc090ec4d35629114e5313897762565effb Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:47:03 -0400
Subject: [PATCH 191/210] Add translations (english)

---
 app/classes/web/panel_handler.py                      | 1 +
 app/frontend/templates/panel/server_webhook_edit.html | 4 ++--
 app/frontend/templates/panel/server_webhooks.html     | 8 +++++++-
 app/translations/en_EN.json                           | 9 ++++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 79f7343d..6e636078 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -763,6 +763,7 @@ class PanelHandler(BaseHandler):
                 ] = self.controller.management.get_webhooks_by_server(
                     server_id, model=True
                 )
+                page_data["triggers"] = WebhookFactory.get_monitored_events()
 
             def get_banned_players_html():
                 banned_players = self.controller.servers.get_banned_players(server_id)
diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index 493e3fda..80eefd0b 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -70,9 +70,9 @@
                   <select class="form-control selectpicker show-tick" name="trigger" id="trigger-select" data-icon-base="fas" data-tick-icon="fa-check" multiple data-style="custom-picker">
                   {% for trigger in data['triggers'] %}
                   {% if trigger in data["webhook"]["trigger"] %}
-                  <option selected>{{trigger}}</option>
+                  <option value="{{trigger}}" selected>{{translate('webhooks', trigger , data['lang'])}}</option>
                   {% else %}
-                  <option>{{trigger}}</option>
+                  <option value="{{trigger}}">{{translate('webhooks', trigger , data['lang'])}}</option>
                   {% end %}
                   {% end %}
                   </select>
diff --git a/app/frontend/templates/panel/server_webhooks.html b/app/frontend/templates/panel/server_webhooks.html
index 247f1212..e1d00706 100644
--- a/app/frontend/templates/panel/server_webhooks.html
+++ b/app/frontend/templates/panel/server_webhooks.html
@@ -79,7 +79,13 @@
                           <p>{{webhook.webhook_type}}</p>
                         </td>
                         <td id="{{webhook.trigger}}" class="trigger" style="overflow: scroll; max-width: 30px;">
-                          <p style="overflow: scroll;" class="no-scroll">{{webhook.trigger}}</p>
+                          <ul>
+                            {% for trigger in webhook.trigger.split(",") %}
+                            {% if trigger in data["triggers"] %}
+                            <li>{{translate('webhooks', trigger , data['lang'])}}</li>
+                            {%end%}
+                            {%end%}
+                          </ul>
                         </td>
                         <td id="{{webhook.enabled}}" class="enabled">
                           <input style="width: 10px !important;" type="checkbox" class="webhook-enabled-toggle" data-webhook-id="{{webhook.id}}" data-webhook-enabled="{{ 'true' if webhook.enabled else 'false' }}">
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 4418ec9c..46eab6ee 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -641,6 +641,13 @@
         "areYouSureRun": "Are you sure you want to test this websocket?",
         "edit": "Edit",
         "run": "Test Run Webhook",
-        "new": "New Webhook"
+        "new": "New Webhook",
+        "start_server": "Server Started",
+        "stop_server": "Server Stopped",
+        "crash_detected": "Server Crashed",
+        "jar_update": "Server Executable Updated",
+        "backup_server": "Server Backup Completed",
+        "send_command": "Server Command Received",
+        "kill": "Server Killed"
     }
 }
\ No newline at end of file

From 4bf77d2e7a4a5be65e10a8ae8f97f65d4ba979ce Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:47:19 -0400
Subject: [PATCH 192/210] Only fire when enabled

---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 7979be6c..61fbc634 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -186,7 +186,7 @@ class ServerInstance:
                             webhook_provider = WebhookFactory.create_provider(
                                 webhook["webhook_type"]
                             )
-                            if res is not False:
+                            if res is not False and swebhook.enabled:
                                 webhook_provider.send(
                                     server_name=args[0].name,
                                     title=webhook["name"],

From c410650ae237b1d5cd9c1fda7e759bad8a52d56b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 17:47:36 -0400
Subject: [PATCH 193/210] Add kill server watcher option

---
 app/classes/web/webhooks/webhook_factory.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
index 4b6d43ae..899f43e9 100644
--- a/app/classes/web/webhooks/webhook_factory.py
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -83,4 +83,5 @@ class WebhookFactory:
             "backup_server",
             "jar_update",
             "send_command",
+            "kill",
         ]

From 6a81a5b3379d5a8c19b4e21a2c31bb2e88be5b68 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 19:07:03 -0400
Subject: [PATCH 194/210] Add accent color option

---
 app/classes/models/management.py                  |  3 +++
 app/classes/shared/server.py                      |  3 +--
 app/classes/web/panel_handler.py                  |  1 +
 .../routes/api/servers/server/webhooks/index.py   |  1 +
 .../api/servers/server/webhooks/webhook/index.py  |  3 ++-
 app/classes/web/webhooks/discord_webhook.py       | 10 +++++++---
 .../templates/panel/server_webhook_edit.html      | 15 +++++++++++++++
 app/migrations/20230603_webhooks.py               |  1 +
 app/translations/en_EN.json                       |  3 ++-
 9 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index 15e9915c..e86e3209 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -86,6 +86,7 @@ class Webhooks(BaseModel):
     bot_name = CharField(default="Crafty Controller")
     trigger = CharField(default="server_start,server_stop")
     body = CharField(default="")
+    color = CharField(default="#005cd1")
     enabled = BooleanField(default=True)
 
     class Meta:
@@ -541,6 +542,7 @@ class HelpersWebhooks:
                 Webhooks.url: create_data["url"],
                 Webhooks.bot_name: create_data["bot_name"],
                 Webhooks.body: create_data["body"],
+                Webhooks.color: create_data["color"],
                 Webhooks.trigger: create_data["trigger"],
                 Webhooks.enabled: create_data["enabled"],
             }
@@ -568,6 +570,7 @@ class HelpersWebhooks:
                     "bot_name": webhook.bot_name,
                     "trigger": webhook.trigger,
                     "body": webhook.body,
+                    "color": webhook.color,
                     "enabled": webhook.enabled,
                 }
         else:
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 61fbc634..33dc212e 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -192,8 +192,7 @@ class ServerInstance:
                                     title=webhook["name"],
                                     url=webhook["url"],
                                     message=webhook["body"],
-                                    # color=webhook["color"],
-                                    # TODO implement frontend color picker
+                                    color=webhook["color"],
                                 )
             return res
 
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 6e636078..58b6056c 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1071,6 +1071,7 @@ class PanelHandler(BaseHandler):
             page_data["webhook"]["bot_name"] = "Crafty Controller"
             page_data["webhook"]["trigger"] = []
             page_data["webhook"]["body"] = ""
+            page_data["webhook"]["color"] = "#005cd1"
             page_data["webhook"]["enabled"] = True
 
             page_data["providers"] = WebhookFactory.get_supported_providers()
diff --git a/app/classes/web/routes/api/servers/server/webhooks/index.py b/app/classes/web/routes/api/servers/server/webhooks/index.py
index a96518af..223171c8 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/index.py
@@ -22,6 +22,7 @@ new_webhook_schema = {
         "bot_name": {"type": "string"},
         "trigger": {"type": "array"},
         "body": {"type": "string"},
+        "color": {"type": "string", "default": "#005cd1"},
         "enabled": {
             "type": "boolean",
             "default": True,
diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index 540ccaac..dad0953b 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -23,6 +23,7 @@ webhook_patch_schema = {
         "bot_name": {"type": "string"},
         "trigger": {"type": "array"},
         "body": {"type": "string"},
+        "color": {"type": "string", "default": "#005cd1"},
         "enabled": {
             "type": "boolean",
             "default": True,
@@ -177,7 +178,7 @@ class ApiServersServerWebhooksManagementIndexHandler(BaseApiHandler):
                 title="Test Webhook",
                 url=webhook["url"],
                 message=webhook["body"],
-                color=4915409,  # Prestigious purple!
+                color="#4b00d1",  # Prestigious purple!
             )
         except Exception as e:
             self.finish_json(500, {"status": "error", "error": str(e)})
diff --git a/app/classes/web/webhooks/discord_webhook.py b/app/classes/web/webhooks/discord_webhook.py
index 2b5f4504..e63649a1 100644
--- a/app/classes/web/webhooks/discord_webhook.py
+++ b/app/classes/web/webhooks/discord_webhook.py
@@ -24,6 +24,10 @@ class DiscordWebhook(WebhookProvider):
             current_datetime.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
         )
 
+        # Convert the hex to an integer
+        sanitized_hex = color[1:] if color.startswith("#") else color
+        color_int = int(sanitized_hex, 16)
+
         headers = {"Content-type": "application/json"}
         payload = {
             "username": self.WEBHOOK_USERNAME,
@@ -32,7 +36,7 @@ class DiscordWebhook(WebhookProvider):
                 {
                     "title": title,
                     "description": message,
-                    "color": color,
+                    "color": color_int,
                     "author": {"name": server_name},
                     "footer": {"text": f"Crafty Controller v.{self.CRAFTY_VERSION}"},
                     "timestamp": formatted_datetime,
@@ -54,7 +58,7 @@ class DiscordWebhook(WebhookProvider):
         title (str): The title for the notification message.
         url (str): The webhook URL to send the notification to.
         message (str): The main content or body of the notification message.
-        color (int, optional): The color code for the embed's side stripe.
+        color (str, optional): The color code for the embed's side stripe.
         Defaults to a pretty blue if not provided.
 
         Returns:
@@ -64,7 +68,7 @@ class DiscordWebhook(WebhookProvider):
         Raises:
         Exception: If there's an error in dispatching the webhook.
         """
-        color = kwargs.get("color", 23761)  # Default to a color if not provided.
+        color = kwargs.get("color", "#005cd1")  # Default to a color if not provided.
         payload, headers = self._construct_discord_payload(
             server_name, title, message, color
         )
diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index 80eefd0b..a388bbf5 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -83,6 +83,10 @@
                       {{ data["webhook"]["body"] }}
                     </textarea>
                 </div>
+                <div class="form-group">
+                  <label for="bot_name">{{ translate('webhooks', 'color' , data['lang']) }}</label>
+                  <input type="color" class="form-control" name="color" id="color" value='{{data["webhook"]["color"]}}'>
+                </div>
                 <div class="form-check-flat">
                   <label for="enabled" class="form-check-label ml-4 mb-4">
                     <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked=""
@@ -209,6 +213,9 @@
       //We need to make sure these are sent regardless of whether or not they're checked
       formDataObject.enabled = $("#enabled").prop('checked');
       formDataObject.trigger = select_val;
+      if(formDataObject.webhook_type != "Discord"){
+        delete formDataObject.color
+      }
 
       console.log(formDataObject);
       // Format the plain form data as JSON
@@ -236,6 +243,14 @@
 
     });
     window.onload(startup())
+    
+  function hexToDiscordInt(hexColor) {
+    // Remove the hash at the start if it's there
+    const sanitizedHex = hexColor.startsWith('#') ? hexColor.slice(1) : hexColor;
+    
+    // Convert the hex to an integer
+    return parseInt(sanitizedHex, 16);
+  }
   </script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.10/js/bootstrap-select.min.js"></script>
 
diff --git a/app/migrations/20230603_webhooks.py b/app/migrations/20230603_webhooks.py
index 6470d5fc..433ea9c1 100644
--- a/app/migrations/20230603_webhooks.py
+++ b/app/migrations/20230603_webhooks.py
@@ -13,6 +13,7 @@ def migrate(migrator, database, **kwargs):
         bot_name=peewee.CharField(default="Crafty Controller"),
         trigger=peewee.CharField(default="server_start,server_stop"),
         body=peewee.CharField(default=""),
+        color=peewee.CharField(default=""),
         enabled=peewee.BooleanField(default=True),
     )
     """
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 46eab6ee..a1c56dd6 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -637,8 +637,9 @@
         "url": "Webhook URL",
         "bot_name": "Bot Name",
         "webhook_body": "Webhook Body",
+        "color": "Select Color Accent",
         "areYouSureDel": "Are you sure you want to delete this webhook?",
-        "areYouSureRun": "Are you sure you want to test this websocket?",
+        "areYouSureRun": "Are you sure you want to test this webhook?",
         "edit": "Edit",
         "run": "Test Run Webhook",
         "new": "New Webhook",

From a62252ed15c17fbd5d0f64ceb617950b15fa0024 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 19:15:01 -0400
Subject: [PATCH 195/210] Allow custom bot naming

---
 app/classes/web/webhooks/discord_webhook.py    | 7 ++++---
 app/classes/web/webhooks/mattermost_webhook.py | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/classes/web/webhooks/discord_webhook.py b/app/classes/web/webhooks/discord_webhook.py
index e63649a1..a60d63d0 100644
--- a/app/classes/web/webhooks/discord_webhook.py
+++ b/app/classes/web/webhooks/discord_webhook.py
@@ -3,7 +3,7 @@ from app.classes.web.webhooks.base_webhook import WebhookProvider
 
 
 class DiscordWebhook(WebhookProvider):
-    def _construct_discord_payload(self, server_name, title, message, color):
+    def _construct_discord_payload(self, server_name, title, message, color, bot_name):
         """
         Constructs the payload required for sending a Discord webhook notification.
 
@@ -30,7 +30,7 @@ class DiscordWebhook(WebhookProvider):
 
         headers = {"Content-type": "application/json"}
         payload = {
-            "username": self.WEBHOOK_USERNAME,
+            "username": bot_name,
             "avatar_url": self.WEBHOOK_PFP_URL,
             "embeds": [
                 {
@@ -69,7 +69,8 @@ class DiscordWebhook(WebhookProvider):
         Exception: If there's an error in dispatching the webhook.
         """
         color = kwargs.get("color", "#005cd1")  # Default to a color if not provided.
+        bot_name = kwargs.get("bot_name", self.WEBHOOK_USERNAME)
         payload, headers = self._construct_discord_payload(
-            server_name, title, message, color
+            server_name, title, message, color, bot_name
         )
         return self._send_request(url, payload, headers)
diff --git a/app/classes/web/webhooks/mattermost_webhook.py b/app/classes/web/webhooks/mattermost_webhook.py
index ecd3b3db..68e33f11 100644
--- a/app/classes/web/webhooks/mattermost_webhook.py
+++ b/app/classes/web/webhooks/mattermost_webhook.py
@@ -2,7 +2,7 @@ from app.classes.web.webhooks.base_webhook import WebhookProvider
 
 
 class MattermostWebhook(WebhookProvider):
-    def _construct_mattermost_payload(self, server_name, title, message):
+    def _construct_mattermost_payload(self, server_name, title, message, bot_name):
         """
         Constructs the payload required for sending a Mattermost webhook notification.
 
@@ -28,7 +28,7 @@ class MattermostWebhook(WebhookProvider):
         headers = {"Content-Type": "application/json"}
         payload = {
             "text": formatted_text,
-            "username": self.WEBHOOK_USERNAME,
+            "username": bot_name,
             "icon_url": self.WEBHOOK_PFP_URL,
             "props": {
                 "card": (
@@ -65,7 +65,8 @@ class MattermostWebhook(WebhookProvider):
         - Mattermost's `config.json` setting is `"EnablePostUsernameOverride": true`
         - Mattermost's `config.json` setting is `"EnablePostIconOverride": true`
         """
+        bot_name = kwargs.get("bot_name", self.WEBHOOK_USERNAME)
         payload, headers = self._construct_mattermost_payload(
-            server_name, title, message
+            server_name, title, message, bot_name
         )
         return self._send_request(url, payload, headers)

From 19d72e57665c48e150f86996c106d06339b90058 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 19:26:21 -0400
Subject: [PATCH 196/210] Refactor test webhooks with data

---
 .../web/routes/api/servers/server/webhooks/webhook/index.py  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
index dad0953b..4b58011e 100644
--- a/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
+++ b/app/classes/web/routes/api/servers/server/webhooks/webhook/index.py
@@ -175,10 +175,11 @@ class ApiServersServerWebhooksManagementIndexHandler(BaseApiHandler):
                 server_name=self.controller.servers.get_server_data_by_id(server_id)[
                     "server_name"
                 ],
-                title="Test Webhook",
+                title=f"Test Webhook: {webhook['name']}",
                 url=webhook["url"],
                 message=webhook["body"],
-                color="#4b00d1",  # Prestigious purple!
+                color=webhook["color"],  # Prestigious purple!
+                bot_name="Crafty Webhooks Tester",
             )
         except Exception as e:
             self.finish_json(500, {"status": "error", "error": str(e)})

From e51b2bd0def9611f9b56959685692d56703d8523 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 19:26:32 -0400
Subject: [PATCH 197/210] Add bot_name to send call

---
 app/classes/shared/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 33dc212e..412dc1ec 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -188,6 +188,7 @@ class ServerInstance:
                             )
                             if res is not False and swebhook.enabled:
                                 webhook_provider.send(
+                                    bot_name=webhook["bot_name"],
                                     server_name=args[0].name,
                                     title=webhook["name"],
                                     url=webhook["url"],

From 6a6ca166bc0a1e66cdd38b150a6a7b4c856163b9 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 20:00:38 -0400
Subject: [PATCH 198/210] Accurately display enabled webhook status

---
 .../templates/panel/server_webhook_edit.html  | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index a388bbf5..89974988 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -87,12 +87,12 @@
                   <label for="bot_name">{{ translate('webhooks', 'color' , data['lang']) }}</label>
                   <input type="color" class="form-control" name="color" id="color" value='{{data["webhook"]["color"]}}'>
                 </div>
-                <div class="form-check-flat">
-                  <label for="enabled" class="form-check-label ml-4 mb-4">
-                    <input type="checkbox" class="form-check-input" id="enabled" name="enabled" checked=""
-                      value="1">{{ translate('webhooks', 'enabled', data['lang']) }}
-                  </label>
-
+                <div class="form-group">
+                  <div class="custom-control custom-switch">
+                    <input type="checkbox" class="custom-control-input" id="enabled" name="enabled" {% if data['webhook']['enabled'] %}checked{%end%}
+                    value="1">
+                    <label for="enabled" class="custom-control-label">{{ translate('webhooks', 'enabled', data['lang']) }}</label>
+                  </div>
                 </div>
                   <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{
                     translate('serverConfig', 'save', data['lang']) }}</button>
@@ -112,6 +112,20 @@
 
   </div>
   <style>
+      .custom-control-input:checked~.custom-control-label::before {
+    color: black !important;
+    background-color: blueviolet !important;
+    border-color: var(--outline) !important;
+  }
+
+  .custom-control-label::before {
+    background-color: white !important;
+    top: calc(-0.2rem);
+  }
+
+  .custom-switch .custom-control-label::after {
+    top: calc(-0.125rem + 1px);
+  }
     #body-input {
       background-color: var(--card-banner-bg);
       outline-color: var(--outline);
@@ -125,7 +139,12 @@
 
   {% block js %}
   <script>
-
+  $(function () {
+    $('.form-check-input').bootstrapToggle({
+      on: '',
+      off: ''
+    });
+  })
 
     //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
     function getCookie(name) {
@@ -242,7 +261,6 @@
     });
 
     });
-    window.onload(startup())
     
   function hexToDiscordInt(hexColor) {
     // Remove the hash at the start if it's there

From 197818c4ac57e41c37d30acdba2f644d4c5bdb08 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 20:00:48 -0400
Subject: [PATCH 199/210] Fix general exception

---
 app/classes/shared/server.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 412dc1ec..4da4afc7 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -12,7 +12,6 @@ import html
 import urllib.request
 import glob
 import json
-from functools import wraps
 
 from zoneinfo import ZoneInfo
 
@@ -20,7 +19,7 @@ from zoneinfo import ZoneInfo
 from tzlocal import get_localzone
 from tzlocal.utils import ZoneInfoNotFoundError
 from apscheduler.schedulers.background import BackgroundScheduler
-from apscheduler.jobstores.base import JobLookupError
+from apscheduler.jobstores.base import JobLookupError, ConflictingIdError
 
 from app.classes.minecraft.stats import Stats
 from app.classes.minecraft.mc_ping import ping, ping_bedrock
@@ -169,7 +168,6 @@ class ServerInstance:
 
     @staticmethod
     def callback(called_func):
-        @wraps(called_func)
         def wrapper(*args, **kwargs):
             res = None
             try:
@@ -296,13 +294,13 @@ class ServerInstance:
                 seconds=30,
                 id="save_stats_" + str(self.server_id),
             )
-        except:
-            self.server_scheduler.remove_job("save_" + str(self.server_id))
+        except ConflictingIdError:
+            self.server_scheduler.remove_job("save_stats_" + str(self.server_id))
             self.server_scheduler.add_job(
                 self.record_server_stats,
                 "interval",
                 seconds=30,
-                id="save_" + str(self.server_id),
+                id="save_stats_" + str(self.server_id),
             )
 
     def setup_server_run_command(self):

From bfad3354950ae13ec034aed73e0d28507fc81242 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 28 Sep 2023 20:03:39 -0400
Subject: [PATCH 200/210] Comment callback

---
 app/classes/shared/server.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 4da4afc7..7350c5ce 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -168,6 +168,9 @@ class ServerInstance:
 
     @staticmethod
     def callback(called_func):
+        # Usage of @callback on method
+        # definition to run a webhook check
+        # on method completion
         def wrapper(*args, **kwargs):
             res = None
             try:

From 345bffbab60994a51c7e335e79f1232b862bd0b1 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 4 Oct 2023 11:45:53 -0400
Subject: [PATCH 201/210] Add logging statements to callbacks

---
 app/classes/shared/server.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 7350c5ce..30d9adb0 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -173,6 +173,7 @@ class ServerInstance:
         # on method completion
         def wrapper(*args, **kwargs):
             res = None
+            logger.debug("Checking for callbacks")
             try:
                 res = called_func(*args, **kwargs)
             finally:
@@ -183,6 +184,10 @@ class ServerInstance:
                     )
                     for swebhook in server_webhooks:
                         if called_func.__name__ in str(swebhook.trigger).split(","):
+                            logger.info(
+                                f"Found callback for event {called_func.__name__}"
+                                f" for server {args[0].server_id}"
+                            )
                             webhook = HelpersWebhooks.get_webhook_by_id(swebhook.id)
                             webhook_provider = WebhookFactory.create_provider(
                                 webhook["webhook_type"]

From 6d938cabc8794918aa12ad3bd8e4757cc40e60b1 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 4 Oct 2023 12:45:23 -0400
Subject: [PATCH 202/210] Set some stats logging to debug

Add stop server logging
---
 app/classes/minecraft/stats.py | 2 +-
 app/classes/shared/server.py   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py
index c336612a..a3f85c05 100644
--- a/app/classes/minecraft/stats.py
+++ b/app/classes/minecraft/stats.py
@@ -226,7 +226,7 @@ class Stats:
     def get_server_players(self, server_id):
         server = HelperServers.get_server_data_by_id(server_id)
 
-        logger.info(f"Getting players for server {server}")
+        logger.debug(f"Getting players for server {server['server_name']}")
 
         internal_ip = server["server_ip"]
         server_port = server["server_port"]
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 2f62dc68..8bc31a52 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -792,6 +792,7 @@ class ServerInstance:
                     f"Assuming it was never started."
                 )
         if self.settings["stop_command"]:
+            logger.info(f"Stop command requested for {self.settings['server_name']}.")
             self.send_command(self.settings["stop_command"])
             self.write_player_cache()
         else:
@@ -1631,7 +1632,7 @@ class ServerInstance:
     def get_server_players(self):
         server = HelperServers.get_server_data_by_id(self.server_id)
 
-        logger.info(f"Getting players for server {server}")
+        logger.debug(f"Getting players for server {server['server_name']}")
 
         internal_ip = server["server_ip"]
         server_port = server["server_port"]

From 447e04cb8e09b9ffe7504d1e19e395b930d7bc6a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 5 Oct 2023 16:22:42 -0400
Subject: [PATCH 203/210] Add log message on restart

---
 app/classes/shared/server.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 8bc31a52..7febadea 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -862,6 +862,9 @@ class ServerInstance:
         if not self.check_running():
             self.run_threaded_server(user_id)
         else:
+            logger.info(
+                f"Restart command detected. Sending stop command to {self.server_id}."
+            )
             self.stop_threaded_server()
             time.sleep(2)
             self.run_threaded_server(user_id)

From aa5484e96b30f00366dad86c7533e42a1347b54d Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Thu, 5 Oct 2023 18:05:12 -0400
Subject: [PATCH 204/210] Retain provider selection on edit

---
 app/frontend/templates/panel/server_webhook_edit.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/frontend/templates/panel/server_webhook_edit.html b/app/frontend/templates/panel/server_webhook_edit.html
index 89974988..0db33947 100644
--- a/app/frontend/templates/panel/server_webhook_edit.html
+++ b/app/frontend/templates/panel/server_webhook_edit.html
@@ -44,8 +44,11 @@
                 action="/panel/edit_webhook?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['webhook']['id'] }}">
               {% end %}
                 <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type">
+                <option value="{{data['webhook']['webhook_type']}}">{{data['webhook']['webhook_type']}}</option>
                 {% for type in data['providers'] %}
+                {% if type != data['webhook']['webhook_type'] %}
                 <option value="{{type}}">{{type}}</option>
+                {%end%}
                 {% end %}
                 </select>
                 <br>

From 74386ad960de1bcc93501e4639ecd3add2aa5582 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 5 Oct 2023 23:12:38 +0100
Subject: [PATCH 205/210] Add slack webhook provider

---
 app/classes/web/webhooks/slack_webhook.py   | 96 +++++++++++++++++++++
 app/classes/web/webhooks/webhook_factory.py |  4 +-
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 app/classes/web/webhooks/slack_webhook.py

diff --git a/app/classes/web/webhooks/slack_webhook.py b/app/classes/web/webhooks/slack_webhook.py
new file mode 100644
index 00000000..1e14c514
--- /dev/null
+++ b/app/classes/web/webhooks/slack_webhook.py
@@ -0,0 +1,96 @@
+from app.classes.web.webhooks.base_webhook import WebhookProvider
+
+
+class SlackWebhook(WebhookProvider):
+    def _construct_slack_payload(self, server_name, title, message, color, bot_name):
+        """
+        Constructs the payload required for sending a Slack webhook notification.
+
+        The method formats the given information into a Markdown-styled message for MM,
+        including an information card containing the Crafty version.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        message (str): The main content of the notification message.
+        color (int): The color code for the side stripe in the Slack block.
+
+        Returns:
+        tuple: A tuple containing the constructed payload (dict) incl headers (dict).
+
+        Note:
+        - Block Builder/designer
+        - https://app.slack.com/block-kit-builder/
+        """
+        headers = {"Content-Type": "application/json"}
+        payload = {
+            "username": bot_name,
+            "attachments": [
+                {
+                    "color": color,
+                    "blocks": [
+                        {
+                            "type": "section",
+                            "text": {"type": "plain_text", "text": server_name},
+                        },
+                        {"type": "divider"},
+                        {
+                            "type": "section",
+                            "text": {
+                                "type": "mrkdwn",
+                                "text": f"*{title}*\n{message}",
+                            },
+                            "accessory": {
+                                "type": "image",
+                                "image_url": self.WEBHOOK_PFP_URL,
+                                "alt_text": "Crafty Controller Logo",
+                            },
+                        },
+                        {
+                            "type": "context",
+                            "elements": [
+                                {
+                                    "type": "mrkdwn",
+                                    "text": (
+                                        f"*Crafty Controller "
+                                        f"v{self.CRAFTY_VERSION}*"
+                                    ),
+                                }
+                            ],
+                        },
+                        {"type": "divider"},
+                    ],
+                }
+            ],
+        }
+
+        return payload, headers
+
+    def send(self, server_name, title, url, message, **kwargs):
+        """
+        Sends a Slack webhook notification using the given details.
+
+        The method constructs and dispatches a payload suitable for
+        Slack's webhook system.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        url (str): The webhook URL to send the notification to.
+        message (str): The main content or body of the notification message.
+        color (str, optional): The color code for the blocks's colour accent.
+        Defaults to a pretty blue if not provided.
+
+        Returns:
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
+        """
+        color = kwargs.get("color", "#005cd1")  # Default to a color if not provided.
+        bot_name = kwargs.get("bot_name", self.WEBHOOK_USERNAME)
+        payload, headers = self._construct_slack_payload(
+            server_name, title, message, color, bot_name
+        )
+        return self._send_request(url, payload, headers)
diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
index 899f43e9..01309b4e 100644
--- a/app/classes/web/webhooks/webhook_factory.py
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -1,5 +1,6 @@
 from app.classes.web.webhooks.discord_webhook import DiscordWebhook
 from app.classes.web.webhooks.mattermost_webhook import MattermostWebhook
+from app.classes.web.webhooks.slack_webhook import SlackWebhook
 
 
 class WebhookFactory:
@@ -17,8 +18,7 @@ class WebhookFactory:
     _registry = {
         "Discord": DiscordWebhook,
         "Mattermost": MattermostWebhook,
-        # "Signal",
-        # "Slack",
+        "Slack": SlackWebhook,
         # "SMTP",
         # "Splunk",
         # "Teams",

From baf9b5baa49b8669effd816f80fcc4a4cc043f8b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Fri, 6 Oct 2023 00:22:34 +0100
Subject: [PATCH 206/210] Add teams adaptive card webhook provider

---
 .../web/webhooks/teams_adaptive_webhook.py    | 124 ++++++++++++++++++
 app/classes/web/webhooks/webhook_factory.py   |   6 +-
 2 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 app/classes/web/webhooks/teams_adaptive_webhook.py

diff --git a/app/classes/web/webhooks/teams_adaptive_webhook.py b/app/classes/web/webhooks/teams_adaptive_webhook.py
new file mode 100644
index 00000000..1e4f442d
--- /dev/null
+++ b/app/classes/web/webhooks/teams_adaptive_webhook.py
@@ -0,0 +1,124 @@
+from datetime import datetime
+from app.classes.web.webhooks.base_webhook import WebhookProvider
+
+
+class TeamsWebhook(WebhookProvider):
+    def _construct_teams_payload(self, server_name, title, message):
+        """
+        Constructs the payload required for sending a Teams Adaptive card notification.
+
+        This method prepares a payload for the Teams webhook API using the provided
+        message content, the Crafty Controller version, and the current UTC datetime.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        message (str): The main content of the notification message.
+
+        Returns:
+        tuple: A tuple containing the constructed payload (dict) incl headers (dict).
+
+        Note:
+        - Adaptive Card Designer
+        - https://www.adaptivecards.io/designer/
+        """
+        current_datetime = datetime.utcnow()
+        formatted_datetime = current_datetime.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+        headers = {"Content-type": "application/json"}
+        payload = {
+            "type": "message",
+            "attachments": [
+                {
+                    "contentType": "application/vnd.microsoft.card.adaptive",
+                    "content": {
+                        "body": [
+                            {
+                                "type": "TextBlock",
+                                "size": "Medium",
+                                "weight": "Bolder",
+                                "text": f"{title}",
+                            },
+                            {
+                                "type": "ColumnSet",
+                                "columns": [
+                                    {
+                                        "type": "Column",
+                                        "items": [
+                                            {
+                                                "type": "Image",
+                                                "style": "Person",
+                                                "url": f"{self.WEBHOOK_PFP_URL}",
+                                                "size": "Small",
+                                            }
+                                        ],
+                                        "width": "auto",
+                                    },
+                                    {
+                                        "type": "Column",
+                                        "items": [
+                                            {
+                                                "type": "TextBlock",
+                                                "weight": "Bolder",
+                                                "text": f"{server_name}",
+                                                "wrap": True,
+                                            },
+                                            {
+                                                "type": "TextBlock",
+                                                "spacing": "None",
+                                                "text": "{{DATE("
+                                                + f"{formatted_datetime}"
+                                                + ",SHORT)}}",
+                                                "isSubtle": True,
+                                                "wrap": True,
+                                            },
+                                        ],
+                                        "width": "stretch",
+                                    },
+                                ],
+                            },
+                            {
+                                "type": "TextBlock",
+                                "text": f"{message}",
+                                "wrap": True,
+                            },
+                            {
+                                "type": "TextBlock",
+                                "text": f"Crafty Controller v{self.CRAFTY_VERSION}",
+                                "wrap": True,
+                                "separator": True,
+                                "isSubtle": True,
+                            },
+                        ],
+                        "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+                        "version": "1.6",
+                    },
+                }
+            ],
+        }
+
+        return payload, headers
+
+    def send(self, server_name, title, url, message, **kwargs):
+        """
+        Sends a Teams Adaptive card notification using the given details.
+
+        The method constructs and dispatches a payload suitable for
+        Discords's webhook system.
+
+        Parameters:
+        server_name (str): The name of the server triggering the notification.
+        title (str): The title for the notification message.
+        url (str): The webhook URL to send the notification to.
+        message (str): The main content or body of the notification message.
+        Defaults to a pretty blue if not provided.
+
+        Returns:
+        str: "Dispatch successful!" if the message is sent successfully, otherwise an
+        exception is raised.
+
+        Raises:
+        Exception: If there's an error in dispatching the webhook.
+        """
+        payload, headers = self._construct_teams_payload(server_name, title, message)
+        return self._send_request(url, payload, headers)
diff --git a/app/classes/web/webhooks/webhook_factory.py b/app/classes/web/webhooks/webhook_factory.py
index 01309b4e..608bf4e5 100644
--- a/app/classes/web/webhooks/webhook_factory.py
+++ b/app/classes/web/webhooks/webhook_factory.py
@@ -1,6 +1,7 @@
 from app.classes.web.webhooks.discord_webhook import DiscordWebhook
 from app.classes.web.webhooks.mattermost_webhook import MattermostWebhook
 from app.classes.web.webhooks.slack_webhook import SlackWebhook
+from app.classes.web.webhooks.teams_adaptive_webhook import TeamsWebhook
 
 
 class WebhookFactory:
@@ -19,10 +20,7 @@ class WebhookFactory:
         "Discord": DiscordWebhook,
         "Mattermost": MattermostWebhook,
         "Slack": SlackWebhook,
-        # "SMTP",
-        # "Splunk",
-        # "Teams",
-        # "Telegram",
+        "Teams": TeamsWebhook,
         # "Custom",
     }
 

From d6f93368be3acba0e1095d77a521c79a67298c20 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Fri, 6 Oct 2023 18:33:37 +0100
Subject: [PATCH 207/210] Update changelog !594

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 266ec6bf..ce01d1b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ## --- [4.2.0] - 2023/TBD
 ### New features
 - Finish and Activate Arcadia notification backend ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/621) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/626) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/632))
+- Add initial Webhook Notification (Discord, Mattermost, Slack, Teams) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/594))
 ### Bug fixes
 - PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 - Fix hidden servers appearing visible on public mobile status page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/612))

From d10de65c5a18fcc81562d81f0866dcd4001acb82 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Fri, 6 Oct 2023 19:20:53 +0100
Subject: [PATCH 208/210] Add missing bot_name params in webhook docstrings

---
 app/classes/web/webhooks/discord_webhook.py    | 2 ++
 app/classes/web/webhooks/mattermost_webhook.py | 2 ++
 app/classes/web/webhooks/slack_webhook.py      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/classes/web/webhooks/discord_webhook.py b/app/classes/web/webhooks/discord_webhook.py
index a60d63d0..e7ed6ba0 100644
--- a/app/classes/web/webhooks/discord_webhook.py
+++ b/app/classes/web/webhooks/discord_webhook.py
@@ -15,6 +15,7 @@ class DiscordWebhook(WebhookProvider):
         title (str): The title for the notification message.
         message (str): The main content of the notification message.
         color (int): The color code for the side stripe in the Discord embed message.
+        bot_name (str): Override for the Webhook's name set on creation
 
         Returns:
         tuple: A tuple containing the constructed payload (dict) incl headers (dict).
@@ -60,6 +61,7 @@ class DiscordWebhook(WebhookProvider):
         message (str): The main content or body of the notification message.
         color (str, optional): The color code for the embed's side stripe.
         Defaults to a pretty blue if not provided.
+        bot_name (str): Override for the Webhook's name set on creation
 
         Returns:
         str: "Dispatch successful!" if the message is sent successfully, otherwise an
diff --git a/app/classes/web/webhooks/mattermost_webhook.py b/app/classes/web/webhooks/mattermost_webhook.py
index 68e33f11..3dc97c05 100644
--- a/app/classes/web/webhooks/mattermost_webhook.py
+++ b/app/classes/web/webhooks/mattermost_webhook.py
@@ -13,6 +13,7 @@ class MattermostWebhook(WebhookProvider):
         server_name (str): The name of the server triggering the notification.
         title (str): The title for the notification message.
         message (str): The main content of the notification message.
+        bot_name (str): Override for the Webhook's name set on creation.
 
         Returns:
         tuple: A tuple containing the constructed payload (dict) incl headers (dict).
@@ -52,6 +53,7 @@ class MattermostWebhook(WebhookProvider):
         title (str): The title for the notification message.
         url (str): The webhook URL to send the notification to.
         message (str): The main content or body of the notification message.
+        bot_name (str): Override for the Webhook's name set on creation, see note!
 
         Returns:
         str: "Dispatch successful!" if the message is sent successfully, otherwise an
diff --git a/app/classes/web/webhooks/slack_webhook.py b/app/classes/web/webhooks/slack_webhook.py
index 1e14c514..cd7c71bf 100644
--- a/app/classes/web/webhooks/slack_webhook.py
+++ b/app/classes/web/webhooks/slack_webhook.py
@@ -14,6 +14,7 @@ class SlackWebhook(WebhookProvider):
         title (str): The title for the notification message.
         message (str): The main content of the notification message.
         color (int): The color code for the side stripe in the Slack block.
+        bot_name (str): Override for the Webhook's name set on creation, (not working).
 
         Returns:
         tuple: A tuple containing the constructed payload (dict) incl headers (dict).
@@ -80,6 +81,7 @@ class SlackWebhook(WebhookProvider):
         message (str): The main content or body of the notification message.
         color (str, optional): The color code for the blocks's colour accent.
         Defaults to a pretty blue if not provided.
+        bot_name (str): Override for the Webhook's name set on creation, (not working).
 
         Returns:
         str: "Dispatch successful!" if the message is sent successfully, otherwise an

From 773810369179653a1edefabd2b8d47c18f0d5c95 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Fri, 6 Oct 2023 19:25:30 +0100
Subject: [PATCH 209/210] Add discord embed designer to payload construct
 docstring

---
 app/classes/web/webhooks/discord_webhook.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/classes/web/webhooks/discord_webhook.py b/app/classes/web/webhooks/discord_webhook.py
index e7ed6ba0..eebe38aa 100644
--- a/app/classes/web/webhooks/discord_webhook.py
+++ b/app/classes/web/webhooks/discord_webhook.py
@@ -19,6 +19,10 @@ class DiscordWebhook(WebhookProvider):
 
         Returns:
         tuple: A tuple containing the constructed payload (dict) incl headers (dict).
+
+        Note:
+        - Discord embed designer
+        - https://discohook.org/
         """
         current_datetime = datetime.utcnow()
         formatted_datetime = (

From d750b2946143174ee5c3059cf50476315a20a96e Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 7 Oct 2023 15:45:30 +0100
Subject: [PATCH 210/210] Update changelog !635

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce01d1b7..f4b0a708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Make files hover cursor pointer ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/627))
 - Use `Jar` class naming for jar refresh to make room for steamCMD naming in the future ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/630))
 - Improve ui visibility of Build Wizard selection tabs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/633))
+- Add additional logging for server bootstrap & moves unnecessary logging to `debug` for improved log clarity ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/635))
 ### Lang
 TBD
 <br><br>