From be7a816f786023002e0c46b2d6ab00a389d220a0 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 7 Aug 2022 01:30:59 -0400
Subject: [PATCH 1/3] Fix reaction tasks not firing

Fix delay not being accurate
---
 app/classes/shared/tasks.py                            | 4 ++--
 app/classes/web/panel_handler.py                       | 2 ++
 app/frontend/templates/panel/server_schedule_edit.html | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 7055d1cb..a654df6d 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -3,7 +3,7 @@ import time
 import logging
 import threading
 import asyncio
-from datetime import datetime
+import datetime
 
 from tzlocal import get_localzone
 from tzlocal.utils import ZoneInfoNotFoundError
@@ -199,7 +199,7 @@ class TasksManager:
             "interval",
             hours=12,
             id="update_watcher",
-            start_date=datetime.now(),
+            start_date=datetime.datetime.now(),
         )
         # self.scheduler.add_job(
         #    self.scheduler.print_jobs, "interval", seconds=10, id="-1"
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 2334c862..2a69717e 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -962,6 +962,7 @@ class PanelHandler(BaseHandler):
             page_data["schedule"]["command"] = ""
             page_data["schedule"]["one_time"] = False
             page_data["schedule"]["cron_string"] = ""
+            page_data["schedule"]["delay"] = 0
             page_data["schedule"]["time"] = ""
             page_data["schedule"]["interval"] = ""
             # we don't need to check difficulty here.
@@ -1041,6 +1042,7 @@ class PanelHandler(BaseHandler):
                 page_data["schedule"]["command"] = schedule.command
             else:
                 page_data["schedule"]["command"] = ""
+            page_data["schedule"]["delay"] = schedule.delay
             page_data["schedule"]["enabled"] = schedule.enabled
             page_data["schedule"]["one_time"] = schedule.one_time
             page_data["schedule"]["cron_string"] = schedule.cron_string
diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html
index 34057466..943c233e 100644
--- a/app/frontend/templates/panel/server_schedule_edit.html
+++ b/app/frontend/templates/panel/server_schedule_edit.html
@@ -136,7 +136,8 @@
                       <label for="delay">{{ translate('serverScheduleConfig', 'offset' , data['lang']) }} <small
                           class="text-muted ml-1"> - {{ translate('serverScheduleConfig', 'offset-explain' ,
                           data['lang']) }}</small> </label>
-                      <input type="number" class="form-control" name="delay" id="delay" value="0">
+                      <input type="number" class="form-control" name="delay" id="delay"
+                        value="{{ data['schedule']['delay']}}">
                       <br>
                       <br>
                       <label for="parent">{{ translate('serverScheduleConfig', 'parent' , data['lang']) }} <small

From 2a316be57fbe18b7168f502265babfd479b0e1c5 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Thu, 11 Aug 2022 04:21:33 +0100
Subject: [PATCH 2/3] Update offline staff credit.json

retire staff
---
 app/config/credits.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/config/credits.json b/app/config/credits.json
index ae2017d9..fac21fdb 100644
--- a/app/config/credits.json
+++ b/app/config/credits.json
@@ -105,21 +105,6 @@
 				],
 				"blurb": "Developer at work and at home, testing his own code is a pain, so his coding precept is \"Testing is Doubting\"",
 				"pic": "/static/assets/images/credits/silversthorn.png"
-			},
-			{
-				"name": "ThatOneLukas",
-				"title": "Software Engineer",
-				"loc": "Helsinki, FI",
-				"tags": [
-					"Staff",
-					[
-						"Developer",
-						"https://gitlab.com/LukasDoesDev"
-					],
-					null
-				],
-				"blurb": "Arch Linux enthusiast who likes 80s/90s music, Rust (The programming language) and light distros like Arch Linux btw. Dislikes C, C++, Go, and Microsoft. Also doesn't like Finnish weather that freezes molten snow to (deadly) ice.",
-				"pic": "/static/assets/images/credits/lukas.png"
 			}
 		],
 		"support": [
@@ -217,6 +202,21 @@
 				],
 				"blurb": "His interests include learning, Linux, and programming. He loves pentesting apps and gaming.",
 				"pic": "/static/assets/images/credits/mcgaming.png"
+			},
+			{
+				"name": "ThatOneLukas",
+				"title": "Software Engineer",
+				"loc": "Helsinki, FI",
+				"tags": [
+					"Staff",
+					[
+						"Developer",
+						"https://gitlab.com/LukasDoesDev"
+					],
+					null
+				],
+				"blurb": "Arch Linux enthusiast who likes 80s/90s music, Rust (The programming language) and light distros like Arch Linux btw. Dislikes C, C++, Go, and Microsoft. Also doesn't like Finnish weather that freezes molten snow to (deadly) ice.",
+				"pic": "/static/assets/images/credits/lukas.png"
 			}
 		]
 	},

From 974e0b8bf3cd9f53ff7f19f0f911e2e96ff3894c Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 14 Aug 2022 17:29:17 +0100
Subject: [PATCH 3/3] Update changelog !423

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cdba0be..13b639e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,9 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix reaction tasks not firing ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
+- QOL task delay offset not following over on task edit ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/423))
 ### Tweaks
-TBD
 ### Lang
 TBD
 <br><br>