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 01/13] 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 4f7b2aaa9540b3849aef079b6080b3c11a29b569 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 4 Sep 2023 23:20:49 -0400
Subject: [PATCH 02/13] 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 03/13] 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 04/13] =?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 05/13] 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 06/13] 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 07/13] 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 8c2cfacb4e592594453ca1ca64dacf8905a46539 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 8 Sep 2023 20:27:47 -0400
Subject: [PATCH 08/13] 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 09/13] 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 10/13] 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 11/13] 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 12/13] 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 13/13] 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>