From 1a9dd53ebe8d4111897a7135439df1f5bf21fe6b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 13:48:18 -0400
Subject: [PATCH 01/26] Remove roles url from href

Fixes trace when clicking "roles config" tab while on roles config page.
---
 app/frontend/templates/panel/panel_edit_role.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index 86ee953a..79751791 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -39,7 +39,7 @@
         <div class="card-body  pt-0">
           <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
             <li class="nav-item">
-              <a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config" role="tab" aria-selected="true">
+              <a class="nav-link active" href="" role="tab" aria-selected="true">
                 <i class="fas fa-cogs"></i>{{ translate('rolesConfig', 'config', data['lang']) }}</a>
             </li>
             <!-- <li class="nav-item">

From df7d10886ee5fada4efa9526671566e7162e2b88 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 14:55:40 -0400
Subject: [PATCH 02/26] Fix &amp; with bleach

---
 app/classes/web/base_handler.py  |  2 +-
 app/classes/web/panel_handler.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index b9a69c48..4ab15f06 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -104,7 +104,7 @@ class BaseHandler(tornado.web.RequestHandler):
         strip: bool = True,
     ) -> t.Optional[str]:
         arg = self._get_argument(name, default, self.request.arguments, strip)
-        return self.autobleach(name, arg)
+        return self.autobleach(name, arg).replace("&amp;", "&")
 
     def get_arguments(self, name: str, strip: bool = True) -> t.List[str]:
         if not isinstance(strip, bool):
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 44844bbf..f2747ae9 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1727,7 +1727,7 @@ class PanelHandler(BaseHandler):
                 if interval_type == "days":
                     sch_time = bleach.clean(self.get_argument("time", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":
@@ -1743,7 +1743,7 @@ class PanelHandler(BaseHandler):
                 delay = bleach.clean(self.get_argument("delay", None))
                 parent = bleach.clean(self.get_argument("parent", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":
@@ -1763,7 +1763,7 @@ class PanelHandler(BaseHandler):
                     return
                 action = bleach.clean(self.get_argument("action", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":
@@ -1889,7 +1889,7 @@ class PanelHandler(BaseHandler):
                 if interval_type == "days":
                     sch_time = bleach.clean(self.get_argument("time", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":
@@ -1904,7 +1904,7 @@ class PanelHandler(BaseHandler):
                 delay = bleach.clean(self.get_argument("delay", None))
                 parent = bleach.clean(self.get_argument("parent", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":
@@ -1924,7 +1924,7 @@ class PanelHandler(BaseHandler):
                     return
                 action = bleach.clean(self.get_argument("action", None))
                 if action == "command":
-                    command = bleach.clean(self.get_argument("command", None))
+                    command = self.get_argument("command", None)
                 elif action == "start":
                     command = "start_server"
                 elif action == "stop":

From 74379449883c519b51307983654e4ad3c73ed35e Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 15:56:18 -0400
Subject: [PATCH 03/26] Fix &amp; issues

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

diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index 4ab15f06..e772d633 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -104,7 +104,10 @@ class BaseHandler(tornado.web.RequestHandler):
         strip: bool = True,
     ) -> t.Optional[str]:
         arg = self._get_argument(name, default, self.request.arguments, strip)
-        return self.autobleach(name, arg).replace("&amp;", "&")
+        bleached = self.autobleach(name, arg)
+        if "&amp;" in str(bleached):
+            bleached = bleached.replace("&amp;", "&")
+        return bleached
 
     def get_arguments(self, name: str, strip: bool = True) -> t.List[str]:
         if not isinstance(strip, bool):

From 296a5a46deca37c91ebfb94fc9ecf2ef94f56a25 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 16:01:42 -0400
Subject: [PATCH 04/26] Add comments. Debug logging

---
 app/classes/shared/file_helpers.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index 28edbef7..f4493f4c 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -227,17 +227,21 @@ class FileHelpers:
             )  # comments over 65535 bytes will be truncated
             for root, dirs, files in os.walk(path_to_zip, topdown=True):
                 for l_dir in dirs:
+                    # make all paths in exclusions a unix style slash to match directories.
                     if str(os.path.join(root, l_dir)).replace("\\", "/") in ex_replace:
                         dirs.remove(l_dir)
                 ziproot = path_to_zip
+                # iterate through list of files
                 for file in files:
+                    # check if file/dir is in exclusions list. Only proceed if not exluded.
                     if (
                         str(os.path.join(root, file)).replace("\\", "/")
                         not in ex_replace
                         and file != "crafty.sqlite"
                     ):
                         try:
-                            logger.info(f"backing up: {os.path.join(root, file)}")
+                            logger.debug(f"backing up: {os.path.join(root, file)}")
+                            # add trailing slash to zip root dir if not windows.
                             if os.name == "nt":
                                 zip_file.write(
                                     os.path.join(root, file),
@@ -254,12 +258,20 @@ class FileHelpers:
                                 f"Error backing up: {os.path.join(root, file)}!"
                                 f" - Error was: {e}"
                             )
+                    # debug logging for exlusions list
+                    else:
+                        logger.debug(f"Found {file} in exclusion list. Skipping...")
+
+                    # add current file bytes to total bytes.
                     total_bytes += os.path.getsize(os.path.join(root, file))
+                    # calcualte percentage based off total size and current archive size
                     percent = round((total_bytes / dir_bytes) * 100, 2)
+                    # package results
                     results = {
                         "percent": percent,
                         "total_files": self.helper.human_readable_file_size(dir_bytes),
                     }
+                    # send status results to page.
                     self.helper.websocket_helper.broadcast_page_params(
                         "/panel/server_detail",
                         {"id": str(server_id)},

From d45e32013be91ccf151195b26e713b509d5a8447 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 16:51:41 -0400
Subject: [PATCH 05/26] Fix backup exclusion issue

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

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index f4493f4c..e239cd5a 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -226,7 +226,7 @@ class FileHelpers:
                 comment, "utf-8"
             )  # comments over 65535 bytes will be truncated
             for root, dirs, files in os.walk(path_to_zip, topdown=True):
-                for l_dir in dirs:
+                for l_dir in dirs[:]:
                     # make all paths in exclusions a unix style slash to match directories.
                     if str(os.path.join(root, l_dir)).replace("\\", "/") in ex_replace:
                         dirs.remove(l_dir)

From 6a6376ea8a6fcab8e9a593304f3fed600a16c494 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 16:52:27 -0400
Subject: [PATCH 06/26] appease the linter

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

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index e239cd5a..82b5a560 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -227,13 +227,15 @@ class FileHelpers:
             )  # comments over 65535 bytes will be truncated
             for root, dirs, files in os.walk(path_to_zip, topdown=True):
                 for l_dir in dirs[:]:
-                    # make all paths in exclusions a unix style slash to match directories.
+                    # make all paths in exclusions a unix style slash
+                    # to match directories.
                     if str(os.path.join(root, l_dir)).replace("\\", "/") in ex_replace:
                         dirs.remove(l_dir)
                 ziproot = path_to_zip
                 # iterate through list of files
                 for file in files:
-                    # check if file/dir is in exclusions list. Only proceed if not exluded.
+                    # check if file/dir is in exclusions list.
+                    # Only proceed if not exluded.
                     if (
                         str(os.path.join(root, file)).replace("\\", "/")
                         not in ex_replace

From a0d921ffe30acd37da30572d3da985578241a5d2 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 18:02:49 -0400
Subject: [PATCH 07/26] Cleanup virtual term scroll

Add scroll to bottom button when scrolled
---
 app/frontend/templates/panel/server_term.html | 30 +++++++++++++++++--
 app/translations/en_EN.json                   |  3 +-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 5c460568..37b763d2 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -40,6 +40,9 @@
           </span>
 
           <div class="col-md-12">
+            <button id="to-bottom" style="visibility: hidden; float: right;" class="btn btn-outline-success">{{ translate('serverDetails', 'reset', data['lang']) }}</button>
+            <br />
+            <br />
             <div class="input-group">
               <div id="virt_console" class="" style="width: 100%; font-size: .8em; padding: 5px 10px; border: 1px solid #383e5d; background-color:#2a2c44;height:500px; overflow: scroll;"></div>
             </div>
@@ -193,8 +196,7 @@
   function new_line_handler(data) {
     $('#virt_console').append(data.line)
     const elem = document.getElementById('virt_console');
-    const scrollDiff = (elem.scrollHeight - elem.scrollTop) - elem.clientHeight;
-    if (!$("#stop_scroll").is(':checked') && scrollDiff < 450) {
+    if (!$("#stop_scroll").is(':checked') && chkScroll) {
       scrollConsole()
     }
   }
@@ -293,6 +295,30 @@
       return nextCommand;
     }
   }
+
+  const chkScroll = (e) => {
+    const elem = $(e.currentTarget);
+
+    if (Math.round(elem[0].scrollHeight - elem.scrollTop()) <= elem.outerHeight()) {
+      document.getElementById("to-bottom").style.visibility = "hidden";
+      return true;
+    }else{
+      document.getElementById("to-bottom").style.visibility = "visible";
+      return false;
+    }
+  }
+
+  const scrollToBottom = (id) => {
+   const element = $(`#virt_console`);
+   element.animate({
+      scrollTop: element.prop("scrollHeight")
+   }, 500);
+}
+
+  $(document).ready(() => {
+    $('#virt_console').on('scroll', chkScroll);
+    $('#to-bottom').on('click', scrollToBottom)
+  });
 </script>
 
 {% end %}
\ No newline at end of file
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index 176cf2b8..bd21b722 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -359,7 +359,8 @@
         "schedule": "Schedule",
         "serverDetails": "Server Details",
         "terminal": "Terminal",
-        "metrics": "Metrics"
+        "metrics": "Metrics",
+        "reset": "Reset Scroll"
     },
     "serverFiles": {
         "clickUpload": "Click here to select your files",

From 84838aae4d356660b5006068cf26e3e56556ca88 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 7 Sep 2022 18:16:18 -0400
Subject: [PATCH 08/26] Fix vterm scroll logic when user is on bottom

---
 app/frontend/templates/panel/server_term.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 37b763d2..1d807314 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -196,7 +196,7 @@
   function new_line_handler(data) {
     $('#virt_console').append(data.line)
     const elem = document.getElementById('virt_console');
-    if (!$("#stop_scroll").is(':checked') && chkScroll) {
+    if (!scrolled) {
       scrollConsole()
     }
   }
@@ -301,10 +301,10 @@
 
     if (Math.round(elem[0].scrollHeight - elem.scrollTop()) <= elem.outerHeight()) {
       document.getElementById("to-bottom").style.visibility = "hidden";
-      return true;
+      scrolled = false;
     }else{
       document.getElementById("to-bottom").style.visibility = "visible";
-      return false;
+      scrolled = true;
     }
   }
 
@@ -316,6 +316,7 @@
 }
 
   $(document).ready(() => {
+    var scrolled;
     $('#virt_console').on('scroll', chkScroll);
     $('#to-bottom').on('click', scrollToBottom)
   });

From 17b6ec9fe3a5d8df8d673188f64ddc3d63233661 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 9 Sep 2022 13:16:26 -0400
Subject: [PATCH 09/26] Cleanup JS errors

---
 app/frontend/templates/base.html | 4 ----
 app/translations/de_DE.json      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html
index 100ab16c..e2634486 100755
--- a/app/frontend/templates/base.html
+++ b/app/frontend/templates/base.html
@@ -525,10 +525,6 @@
 
       });
     });
-
-    $(window).unload(function () {
-      jQuery.get("/public/logout")
-    });
   </script>
 
   {% block js %}
diff --git a/app/translations/de_DE.json b/app/translations/de_DE.json
index fb5a5d32..ccfb5ca4 100644
--- a/app/translations/de_DE.json
+++ b/app/translations/de_DE.json
@@ -457,7 +457,7 @@
         "absoluteZipPath": "Absoluter Pfad zu dem Server",
         "addRole": "Server zu existierender Rolle hinzufügen",
         "autoCreate": "Wenn keine ausgewählt werden, wird Crafty eine erstellen!",
-        "bePatient": "Bitte haben Sie etwas Geduld, da wir ' + (importing ? 'import' :  'download')",
+        "bePatient": "Bitte haben Sie etwas Geduld, da wir ' + (importing ? 'import' :  'download') + '",
         "buildServer": "Server erstellen!",
         "clickRoot": "Hier klicken, um das Stammverzeichnis auszuwählen",
         "close": "Schließen",

From e14e795b475efebc211eb83a38c00f499fa0ff4a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 9 Sep 2022 14:49:31 -0400
Subject: [PATCH 10/26] Add schedules to backup restore

Persist execution command
---
 app/classes/web/ajax_handler.py | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index bd8f9424..845b2886 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -383,6 +383,8 @@ class AjaxHandler(BaseHandler):
             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):
@@ -401,6 +403,27 @@ class AjaxHandler(BaseHandler):
                     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.controller.management.create_scheduled_task(
+                            new_server_id,
+                            schedule.action,
+                            schedule.interval,
+                            schedule.interval_type,
+                            schedule.start_time,
+                            schedule.command,
+                            schedule.name,
+                            schedule.enabled,
+                        )
+                    # preserve execution command
+                    new_server_obj = self.controller.servers.get_server_obj(
+                        new_server_id
+                    )
+                    new_server_obj.execution_command = server_data["execution_command"]
+                    self.controller.servers.update_server(new_server_obj)
+                    # remove old server's tasks
                     try:
                         self.tasks_manager.remove_all_server_tasks(server_id)
                     except:
@@ -424,6 +447,26 @@ class AjaxHandler(BaseHandler):
                     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.controller.management.create_scheduled_task(
+                            new_server_id,
+                            schedule.action,
+                            schedule.interval,
+                            schedule.interval_type,
+                            schedule.start_time,
+                            schedule.command,
+                            schedule.name,
+                            schedule.enabled,
+                        )
+                    # preserve execution command
+                    new_server_obj = self.controller.servers.get_server_obj(
+                        new_server_id
+                    )
+                    new_server_obj.execution_command = server_data["execution_command"]
+                    self.controller.servers.update_server(new_server_obj)
                     try:
                         self.tasks_manager.remove_all_server_tasks(server_id)
                     except:

From 375df0c27da02aea113685eb31a47edf760afbec Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 9 Sep 2022 15:00:08 -0400
Subject: [PATCH 11/26] Only check for gravatar if internet

---
 app/classes/web/panel_handler.py             | 6 +++++-
 app/classes/web/routes/api/users/user/pfp.py | 6 +++++-
 app/classes/web/server_handler.py            | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 44844bbf..0c858772 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -338,7 +338,11 @@ class PanelHandler(BaseHandler):
             rating = "g"
 
         # Get grvatar hash for profile pictures
-        if exec_user["email"] != "default@example.com" or "":
+        if (
+            self.helper.check_internet()
+            and exec_user["email"] != "default@example.com"
+            and exec_user["email"] == ""
+        ):
             gravatar = libgravatar.Gravatar(
                 libgravatar.sanitize_email(exec_user["email"])
             )
diff --git a/app/classes/web/routes/api/users/user/pfp.py b/app/classes/web/routes/api/users/user/pfp.py
index a4f0a480..0e68027c 100644
--- a/app/classes/web/routes/api/users/user/pfp.py
+++ b/app/classes/web/routes/api/users/user/pfp.py
@@ -28,7 +28,11 @@ class ApiUsersUserPfpHandler(BaseApiHandler):
             rating = "g"
 
         # Get grvatar hash for profile pictures
-        if user["email"] != "default@example.com" or "":
+        if (
+            self.helper.check_internet()
+            and user["email"] != "default@example.com"
+            and user["email"] == ""
+        ):
             gravatar = libgravatar.Gravatar(libgravatar.sanitize_email(user["email"]))
             url = gravatar.get_image(
                 size=80,
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 1c1d6fc6..5b5b2c49 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -138,7 +138,11 @@ class ServerHandler(BaseHandler):
         else:
             rating = "g"
 
-        if exec_user["email"] != "default@example.com" or "":
+        if (
+            self.helper.check_internet()
+            and exec_user["email"] != "default@example.com"
+            and exec_user["email"] == ""
+        ):
             gravatar = libgravatar.Gravatar(
                 libgravatar.sanitize_email(exec_user["email"])
             )

From 2b35da71fcafaf14685ad3ab6bad6999cb19304c Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 9 Sep 2022 15:04:45 -0400
Subject: [PATCH 12/26] Fix logic with gravatar email

---
 app/classes/web/panel_handler.py             | 6 +++---
 app/classes/web/routes/api/users/user/pfp.py | 6 +++---
 app/classes/web/server_handler.py            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 0c858772..2192a55b 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -339,9 +339,9 @@ class PanelHandler(BaseHandler):
 
         # Get grvatar hash for profile pictures
         if (
-            self.helper.check_internet()
-            and exec_user["email"] != "default@example.com"
-            and exec_user["email"] == ""
+            not self.helper.check_internet()
+            or exec_user["email"] != "default@example.com"
+            or exec_user["email"] != ""
         ):
             gravatar = libgravatar.Gravatar(
                 libgravatar.sanitize_email(exec_user["email"])
diff --git a/app/classes/web/routes/api/users/user/pfp.py b/app/classes/web/routes/api/users/user/pfp.py
index 0e68027c..86e88dbc 100644
--- a/app/classes/web/routes/api/users/user/pfp.py
+++ b/app/classes/web/routes/api/users/user/pfp.py
@@ -29,9 +29,9 @@ class ApiUsersUserPfpHandler(BaseApiHandler):
 
         # Get grvatar hash for profile pictures
         if (
-            self.helper.check_internet()
-            and user["email"] != "default@example.com"
-            and user["email"] == ""
+            not self.helper.check_internet()
+            or user["email"] != "default@example.com"
+            or user["email"] != ""
         ):
             gravatar = libgravatar.Gravatar(libgravatar.sanitize_email(user["email"]))
             url = gravatar.get_image(
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 5b5b2c49..954c31ae 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -139,9 +139,9 @@ class ServerHandler(BaseHandler):
             rating = "g"
 
         if (
-            self.helper.check_internet()
-            and exec_user["email"] != "default@example.com"
-            and exec_user["email"] == ""
+            not self.helper.check_internet()
+            or exec_user["email"] != "default@example.com"
+            or exec_user["email"] != ""
         ):
             gravatar = libgravatar.Gravatar(
                 libgravatar.sanitize_email(exec_user["email"])

From 82c0452f552dfdc5e43169728876ad5e01dbb614 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 12 Sep 2022 15:34:47 -0400
Subject: [PATCH 13/26] Add pfp caching for users

---
 app/classes/controllers/users_controller.py  | 12 +++++++
 app/classes/models/users.py                  |  2 ++
 app/classes/shared/helpers.py                | 28 +++++++++++++++
 app/classes/shared/tasks.py                  |  6 ++++
 app/classes/web/panel_handler.py             | 36 --------------------
 app/classes/web/routes/api/users/user/pfp.py | 34 ++----------------
 app/classes/web/server_handler.py            | 34 ------------------
 app/frontend/templates/notify.html           | 14 ++++++--
 app/migrations/20220912_user_pfp.py          | 19 +++++++++++
 9 files changed, 80 insertions(+), 105 deletions(-)
 create mode 100644 app/migrations/20220912_user_pfp.py

diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py
index 13b8fb4f..d7ce4393 100644
--- a/app/classes/controllers/users_controller.py
+++ b/app/classes/controllers/users_controller.py
@@ -147,14 +147,24 @@ class UsersController:
         return HelperServers.get_total_owned_servers(exec_user_id)
 
     def update_user(self, user_id: str, user_data=None, user_crafty_data=None):
+        # check if user crafty perms were updated
         if user_crafty_data is None:
             user_crafty_data = {}
+        # check if general user data was updated
         if user_data is None:
             user_data = {}
+        # get current user data
         base_data = HelperUsers.get_user(user_id)
         up_data = {}
+        # check if we updated user email. If so we update gravatar
+        if user_data["email"]:
+            pfp = self.helper.get_gravatar_image(user_data["email"])
+            up_data["pfp"] = pfp
+        # create sets to store role data
         added_roles = set()
         removed_roles = set()
+
+        # search for changes in user data
         for key in user_data:
             if key == "user_id":
                 continue
@@ -174,8 +184,10 @@ class UsersController:
                 up_data["hints"] = user_data["hints"]
             elif base_data[key] != user_data[key]:
                 up_data[key] = user_data[key]
+        # change last update for user
         up_data["last_update"] = self.helper.get_time_as_string()
         logger.debug(f"user: {user_data} +role:{added_roles} -role:{removed_roles}")
+
         for role in added_roles:
             HelperUsers.get_or_create(user_id=user_id, role_id=role)
         permissions_mask = user_crafty_data.get("permissions_mask", "000")
diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index 0d8e596b..a6e87316 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -42,6 +42,7 @@ class Users(BaseModel):
     preparing = BooleanField(default=False)
     hints = BooleanField(default=True)
     manager = IntegerField(default=None, null=True)
+    pfp = CharField(default="/static/assets/images/faces-clipart/pic-3.png")
 
     class Meta:
         table_name = "users"
@@ -220,6 +221,7 @@ class HelperUsers:
                 Users.password: pw_enc,
                 Users.email: email,
                 Users.enabled: enabled,
+                Users.pfp: self.helper.get_gravatar_image(email),
                 Users.superuser: superuser,
                 Users.created: Helpers.get_time_as_string(),
                 Users.manager: manager,
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index be278578..8d76131a 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -20,6 +20,7 @@ import itertools
 from datetime import datetime
 from socket import gethostname
 from contextlib import redirect_stderr, suppress
+import libgravatar
 from packaging import version as pkg_version
 
 from app.classes.shared.null_writer import NullWriter
@@ -658,6 +659,33 @@ class Helpers:
             return True
         return False
 
+    def get_gravatar_image(self, email):
+        profile_url = "/static/assets/images/faces-clipart/pic-3.png"
+        # http://en.gravatar.com/site/implement/images/#rating
+        if self.get_setting("allow_nsfw_profile_pictures"):
+            rating = "x"
+        else:
+            rating = "g"
+
+        # Get grvatar hash for profile pictures
+        if not self.check_internet() or email != "default@example.com" or email != "":
+            gravatar = libgravatar.Gravatar(libgravatar.sanitize_email(email))
+            url = gravatar.get_image(
+                size=80,
+                default="404",
+                force_default=False,
+                rating=rating,
+                filetype_extension=False,
+                use_ssl=True,
+            )  # + "?d=404"
+            try:
+                if requests.head(url).status_code != 404:
+                    profile_url = url
+            except:
+                profile_url = "/static/assets/images/faces-clipart/pic-3.png"
+
+        return profile_url
+
     @staticmethod
     def get_file_contents(path: str, lines=100):
 
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index a654df6d..f3b5b24b 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -666,6 +666,12 @@ class TasksManager:
             logger.info(
                 "No updates found! You are on the most up to date Crafty version."
             )
+        logger.info("Refreshing Gravatar PFPs...")
+        for user in HelperUsers.get_all_users():
+            if user.email:
+                HelperUsers.update_user(
+                    user.id, {"pfp": self.helper.get_gravatar_image(user.email)}
+                )
 
     def log_watcher(self):
         self.controller.servers.check_for_old_logs()
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 2192a55b..59ec0abf 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -8,7 +8,6 @@ import logging
 import threading
 import shlex
 import bleach
-import libgravatar
 import requests
 import tornado.web
 import tornado.escape
@@ -331,41 +330,6 @@ class PanelHandler(BaseHandler):
             "superuser": superuser,
         }
 
-        # http://en.gravatar.com/site/implement/images/#rating
-        if self.helper.get_setting("allow_nsfw_profile_pictures"):
-            rating = "x"
-        else:
-            rating = "g"
-
-        # Get grvatar hash for profile pictures
-        if (
-            not self.helper.check_internet()
-            or exec_user["email"] != "default@example.com"
-            or exec_user["email"] != ""
-        ):
-            gravatar = libgravatar.Gravatar(
-                libgravatar.sanitize_email(exec_user["email"])
-            )
-            url = gravatar.get_image(
-                size=80,
-                default="404",
-                force_default=False,
-                rating=rating,
-                filetype_extension=False,
-                use_ssl=True,
-            )  # + "?d=404"
-            try:
-                if requests.head(url).status_code != 404:
-                    profile_url = url
-                else:
-                    profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-            except:
-                profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-        else:
-            profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-
-        page_data["user_image"] = profile_url
-
         if page == "unauthorized":
             template = "panel/denied.html"
 
diff --git a/app/classes/web/routes/api/users/user/pfp.py b/app/classes/web/routes/api/users/user/pfp.py
index 86e88dbc..2bc10ba5 100644
--- a/app/classes/web/routes/api/users/user/pfp.py
+++ b/app/classes/web/routes/api/users/user/pfp.py
@@ -1,6 +1,4 @@
 import logging
-import libgravatar
-import requests
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
@@ -21,33 +19,5 @@ class ApiUsersUserPfpHandler(BaseApiHandler):
             f'User {auth_data[4]["user_id"]} is fetching the pfp for user {user_id}'
         )
 
-        # http://en.gravatar.com/site/implement/images/#rating
-        if self.helper.get_setting("allow_nsfw_profile_pictures"):
-            rating = "x"
-        else:
-            rating = "g"
-
-        # Get grvatar hash for profile pictures
-        if (
-            not self.helper.check_internet()
-            or user["email"] != "default@example.com"
-            or user["email"] != ""
-        ):
-            gravatar = libgravatar.Gravatar(libgravatar.sanitize_email(user["email"]))
-            url = gravatar.get_image(
-                size=80,
-                default="404",
-                force_default=False,
-                rating=rating,
-                filetype_extension=False,
-                use_ssl=True,
-            )
-            try:
-                requests.head(url).raise_for_status()
-            except requests.HTTPError as e:
-                logger.debug("Gravatar profile picture not found", exc_info=e)
-            else:
-                self.finish_json(200, {"status": "ok", "data": url})
-                return
-
-        self.finish_json(200, {"status": "ok", "data": None})
+        self.finish_json(200, {"status": "ok", "data": user["pfp"]})
+        return
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 954c31ae..b2419905 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -5,8 +5,6 @@ import time
 import tornado.web
 import tornado.escape
 import bleach
-import libgravatar
-import requests
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.shared.helpers import Helpers
@@ -133,38 +131,6 @@ class ServerHandler(BaseHandler):
             "superuser": superuser,
         }
 
-        if self.helper.get_setting("allow_nsfw_profile_pictures"):
-            rating = "x"
-        else:
-            rating = "g"
-
-        if (
-            not self.helper.check_internet()
-            or exec_user["email"] != "default@example.com"
-            or exec_user["email"] != ""
-        ):
-            gravatar = libgravatar.Gravatar(
-                libgravatar.sanitize_email(exec_user["email"])
-            )
-            url = gravatar.get_image(
-                size=80,
-                default="404",
-                force_default=False,
-                rating=rating,
-                filetype_extension=False,
-                use_ssl=True,
-            )  # + "?d=404"
-            try:
-                if requests.head(url).status_code != 404:
-                    profile_url = url
-                else:
-                    profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-            except:
-                profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-        else:
-            profile_url = "/static/assets/images/faces-clipart/pic-3.png"
-
-        page_data["user_image"] = profile_url
         if superuser:
             page_data["roles"] = list_roles
 
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 07659b12..78f62409 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -18,10 +18,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" src="{{ data['user_image'] }}" 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" src="{{ data['user_image'] }}" 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'] %}            
@@ -46,4 +46,12 @@
         <a class="dropdown-item" href="/public/logout"><i class="dropdown-item-icon mdi mdi-power text-primary"></i>{{ translate('notify', 'logout', data['lang']) }}</a>
       </div>
     </li>
-  </ul>
\ No newline at end of file
+  </ul>
+
+  <script>
+    function pfpError(image) {
+    image.onerror = "";
+    image.src = "/static/assets/images/faces-clipart/pic-3.png";
+    return true;
+  }
+  </script>
\ No newline at end of file
diff --git a/app/migrations/20220912_user_pfp.py b/app/migrations/20220912_user_pfp.py
new file mode 100644
index 00000000..f70a28a8
--- /dev/null
+++ b/app/migrations/20220912_user_pfp.py
@@ -0,0 +1,19 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns(
+        "users",
+        pfp=peewee.CharField(default="/static/assets/images/faces-clipart/pic-3.png"),
+    )
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns("users", ["pfp"])
+    """
+    Write your rollback migrations here.
+    """

From 67d465b94ca952e8b4b840cef21c94b38b1d7ad4 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 12 Sep 2022 15:36:13 -0400
Subject: [PATCH 14/26] Add debug logging

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

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 8d76131a..aa53132e 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -681,8 +681,8 @@ class Helpers:
             try:
                 if requests.head(url).status_code != 404:
                     profile_url = url
-            except:
-                profile_url = "/static/assets/images/faces-clipart/pic-3.png"
+            except Exception as e:
+                logger.debug(f"Could not pull resource from Gravatar with error {e}")
 
         return profile_url
 

From a3c1d9e05143e0b490c79c6c94751a0dea17c354 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 14 Sep 2022 13:13:32 -0400
Subject: [PATCH 15/26] Fix typo in panel handler for  unloaded config

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

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 44844bbf..d32d74b5 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -549,7 +549,7 @@ class PanelHandler(BaseHandler):
                         "log_path": server_temp_obj["log_path"],
                         "executable": server_temp_obj["executable"],
                         "execution_command": server_temp_obj["execution_command"],
-                        "shutdown_timeout": server_obj["shutdown_timeout"],
+                        "shutdown_timeout": server_temp_obj["shutdown_timeout"],
                         "stop_command": server_temp_obj["stop_command"],
                         "executable_update_url": server_temp_obj[
                             "executable_update_url"

From 187860056c96ab60a79b4ab371a37de190563f7b Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Fri, 16 Sep 2022 13:09:10 -0400
Subject: [PATCH 16/26] Create set from list for client list size change

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

diff --git a/app/classes/web/websocket_helper.py b/app/classes/web/websocket_helper.py
index 4946242b..0346d672 100644
--- a/app/classes/web/websocket_helper.py
+++ b/app/classes/web/websocket_helper.py
@@ -27,7 +27,7 @@ class WebSocketHelper:
             f"Sending to {len(self.clients)} clients: "
             f"{json.dumps({'event': event_type, 'data': data})}"
         )
-        for client in self.clients:
+        for client in self.clients[:]:
             try:
                 self.send_message(client, event_type, data)
             except Exception as e:
@@ -91,7 +91,7 @@ class WebSocketHelper:
             f"clients: {json.dumps({'event': event_type, 'data': data})}"
         )
 
-        for client in clients:
+        for client in clients[:]:
             try:
                 self.send_message(client, event_type, data)
             except Exception as e:

From 0933d5a7260c7f3275a30ca067b2155c46ddc12b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 21:31:42 +0100
Subject: [PATCH 17/26] Update changelog to track
 1b2fef06fb3b02b76c9506caf7e07e932df95fab

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc64adc8..5fba5782 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+Fixed bug where trying to reconfigure unloaded server would stack [Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab)
 ### Tweaks
 TBD
 ### Lang

From dc5760ba2460678b4305d2ae29ef35037790d415 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 21:36:13 +0100
Subject: [PATCH 18/26] Update changelog !452

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fba5782..cdc91683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ### New features
 TBD
 ### Bug fixes
-Fixed bug where trying to reconfigure unloaded server would stack [Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab)
+- Fixed bug where trying to reconfigure unloaded server would stack [Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab)
+- Fixes traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only**([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 ### Tweaks
 TBD
 ### Lang

From 8ce36b5cc8261ff88a75cb97a1484111efb20ee3 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 21:42:48 +0100
Subject: [PATCH 19/26] Update changelog !453

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdc91683..5d83a0d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@
 ### New features
 TBD
 ### Bug fixes
-- Fixed bug where trying to reconfigure unloaded server would stack [Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab)
-- Fixes traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only**([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
+- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab))
+- Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
+- Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 ### Tweaks
 TBD
 ### Lang

From e6351dab75292d39794dab5612921ed3e6f39a68 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 21:49:50 +0100
Subject: [PATCH 20/26] Update changelog !454

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d83a0d5..79d05990 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ TBD
 - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 ### Tweaks
-TBD
+- Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
 ### Lang
 TBD
 <br><br>

From c6dfd9688db637ab943bbc73acef28986828ff85 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 21:58:41 +0100
Subject: [PATCH 21/26] Update changelog !455

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79d05990..7e7db3d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ TBD
 - Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab))
 - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
+- Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))
 ### Tweaks
 - Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
 ### Lang

From ad8d85ef59e1c0f2470ff0959858bf087da55524 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 22:07:31 +0100
Subject: [PATCH 22/26] Update changelog !457

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7db3d9..f1bba2cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ TBD
 - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))
+- Temp fix for `&amp;` issue in pathing and minecraft colour codes ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/457))
 ### Tweaks
 - Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
 ### Lang

From bc1993b3058680382ee17b73c7c2a04892944492 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 22:12:48 +0100
Subject: [PATCH 23/26] Update changelog !458

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bba2cd..c4a47f56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ TBD
 - Temp fix for `&amp;` issue in pathing and minecraft colour codes ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/457))
 ### Tweaks
 - Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
+- Persist schedules and execution commands across backup restores ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/458))
 ### Lang
 TBD
 <br><br>

From be577317421fc691a90fed16193fb5125b97d73b Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 22:20:00 +0100
Subject: [PATCH 24/26] Update changelog !459

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a47f56..9f44f85d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ TBD
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))
 - Temp fix for `&amp;` issue in pathing and minecraft colour codes ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/457))
+- Cache Gravatar pfp's as to not query every page load ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/459))
 ### Tweaks
 - Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
 - Persist schedules and execution commands across backup restores ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/458))

From bce7c6aa4fd080601561071960e0588f07b1eda3 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 22:34:07 +0100
Subject: [PATCH 25/26] Update changelog !460

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f44f85d..e3c3e060 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab))
+- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/460))
 - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))

From f9818f33da29397679871a626db694e4db257d52 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 19 Sep 2022 22:42:11 +0100
Subject: [PATCH 26/26] Update changelog !461

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3c3e060..ba4e47a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ TBD
 - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))
 - Temp fix for `&amp;` issue in pathing and minecraft colour codes ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/457))
 - Cache Gravatar pfp's as to not query every page load ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/459))
+- Fix crash on client list changing while sending websockets ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/461))
 ### Tweaks
 - Add button to scroll to bottom of vterm ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/454))
 - Persist schedules and execution commands across backup restores ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/458))