From fd6b9258957980e5988afefe1d304c12323a0450 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Wed, 18 Dec 2024 17:08:42 +0100
Subject: [PATCH 001/122] Init commit

---
 pkg/config/config.go           | 98 ++++++++++++++++++++++++++++++++++
 pkg/server/.vscode/launch.json |  7 +++
 pkg/server/server_test.go      | 55 +++++++++++++++++++
 3 files changed, 160 insertions(+)
 create mode 100644 pkg/server/.vscode/launch.json
 create mode 100644 pkg/server/server_test.go

diff --git a/pkg/config/config.go b/pkg/config/config.go
index e0a17981..89fd4665 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -38,6 +38,104 @@ type GochanConfig struct {
 	testing      bool
 }
 
+func SetMockConfig() {
+	cfg = &GochanConfig{
+		SystemCriticalConfig: SystemCriticalConfig{
+			ListenIP:     "127.0.0.1",
+			Port:         8080,
+			UseFastCGI:   false,
+			DocumentRoot: "/var/www/html",
+			TemplateDir:  "/var/www/html/templates",
+			LogDir:       "/var/log/gochan",
+			Plugins:      []string{},
+			PluginSettings: map[string]any{
+				"examplePlugin": true,
+			},
+			SiteHeaderURL: "http://example.com",
+			WebRoot:       "/",
+			SiteDomain:    "example.com",
+			Verbose:       true,
+			RandomSeed:    "testseed",
+		},
+		SiteConfig: SiteConfig{
+			FirstPage:             []string{"index"},
+			Username:              "admin",
+			CookieMaxAge:          "1h",
+			StaffSessionDuration:  "2h",
+			Lockdown:              false,
+			LockdownMessage:       "",
+			SiteName:              "Test Site",
+			SiteSlogan:            "A testing site",
+			Modboard:              "mod",
+			MaxRecentPosts:        10,
+			RecentPostsWithNoFile: false,
+			EnableAppeals:         true,
+			MinifyHTML:            false,
+			MinifyJS:              false,
+			GeoIPType:             "none",
+			GeoIPOptions:          make(map[string]any),
+			Captcha: CaptchaConfig{
+				Type:                 "none",
+				OnlyNeededForThreads: false,
+				SiteKey:              "",
+				AccountSecret:        "",
+			},
+			FingerprintVideoThumbnails: false,
+			FingerprintHashLength:      16,
+		},
+		BoardConfig: BoardConfig{
+			InheritGlobalStyles: true,
+			Styles:              []Style{},
+			DefaultStyle:        "default",
+			Banners:             []PageBanner{},
+			PostConfig: PostConfig{
+				MaxLineLength:            1000,
+				ReservedTrips:            []string{},
+				ThreadsPerPage:           10,
+				RepliesOnBoardPage:       5,
+				StickyRepliesOnBoardPage: 2,
+				NewThreadsRequireUpload:  false,
+				CyclicalThreadNumPosts:   100,
+				BanColors:                []string{"#FF0000"},
+				BanMessage:               "You are banned!",
+				EmbedWidth:               640,
+				EmbedHeight:              360,
+				EnableEmbeds:             true,
+				ImagesOpenNewTab:         false,
+				NewTabOnOutlinks:         true,
+				DisableBBcode:            false,
+			},
+			UploadConfig: UploadConfig{
+				RejectDuplicateImages: true,
+				ThumbWidth:            150,
+				ThumbHeight:           150,
+				ThumbWidthReply:       100,
+				ThumbHeightReply:      100,
+				ThumbWidthCatalog:     200,
+				ThumbHeightCatalog:    200,
+				AllowOtherExtensions:  map[string]string{"pdf": "application/pdf"},
+				StripImageMetadata:    "none",
+				ExiftoolPath:          "",
+			},
+			DateTimeFormat:         "2006-01-02 15:04:05",
+			ShowPosterID:           true,
+			EnableSpoileredImages:  false,
+			EnableSpoileredThreads: false,
+			Worksafe:               false,
+			ThreadPage:             1,
+			Cooldowns:              BoardCooldowns{NewThread: 60, Reply: 30, ImageReply: 15},
+			RenderURLsAsLinks:      true,
+			ThreadsPerPage:         10,
+			EnableGeoIP:            false,
+			EnableNoFlag:           false,
+			CustomFlags:            []geoip.Country{},
+			isGlobal:               true,
+		},
+		jsonLocation: "test_config.json",
+		testing:      true,
+	}
+}
+
 // ValidateValues checks to make sure that the configuration options are usable
 // (e.g., ListenIP is a valid IP address, Port isn't a negative number, etc)
 func (gcfg *GochanConfig) ValidateValues() error {
diff --git a/pkg/server/.vscode/launch.json b/pkg/server/.vscode/launch.json
new file mode 100644
index 00000000..5c7247b4
--- /dev/null
+++ b/pkg/server/.vscode/launch.json
@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}
\ No newline at end of file
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
new file mode 100644
index 00000000..25fe7024
--- /dev/null
+++ b/pkg/server/server_test.go
@@ -0,0 +1,55 @@
+package server
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/config"
+)
+
+func TestServeJSON(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	writer := httptest.NewRecorder()
+	data := map[string]interface{}{
+		"status":    "success",
+		"postID":    "777",
+		"srcBoard":  "srcBoard",
+		"destBoard": "destBoard",
+	}
+
+	ServeJSON(writer, data)
+
+	// Check the status code
+	if writer.Code != http.StatusOK {
+		t.Errorf("expected status code %d, got %d", http.StatusOK, writer.Code)
+	}
+
+	// Check the content type
+	if writer.Header().Get("Content-Type") != "application/json" {
+		t.Errorf("expected content type application/json, got %s", writer.Header().Get("Content-Type"))
+	}
+
+	// Check the response body
+	var response map[string]interface{}
+	if err := json.Unmarshal(writer.Body.Bytes(), &response); err != nil {
+		t.Fatalf("failed to unmarshal response: %v", err)
+	}
+
+	// Debugging output
+	for key, value := range response {
+		t.Logf("Response key: %s, value: %v", key, value)
+	}
+
+	for key, expectedValue := range data {
+		actualValue := response[key]
+		if actualValue != expectedValue {
+			t.Errorf("expected %s to be %v, got %v", key, expectedValue, actualValue)
+		} else {
+			t.Logf("Match for %s: expected %v, got %v", key, expectedValue, actualValue)
+		}
+	}
+}

From 5cfa7628d931309734f0fc6b0c97101ac609f806 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Thu, 19 Dec 2024 10:34:40 +0100
Subject: [PATCH 002/122] Draft : Server tests

---
 pkg/server/server_test.go | 88 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 25fe7024..4f72dc08 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestServeJSON(t *testing.T) {
@@ -53,3 +54,90 @@ func TestServeJSON(t *testing.T) {
 		}
 	}
 }
+
+func TestServeErrorPage(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	// Set writer and error string message
+	writer := httptest.NewRecorder()
+	err := "Unexpected error has occurred."
+
+	ServeErrorPage(writer, err)
+
+	body := writer.Body.String()
+	t.Log("=============")
+	t.Log("Response Body:", body)
+	t.Log("=============")
+
+	// Check response code & content-type
+	assert.Equal(t, http.StatusOK, writer.Code)
+	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
+
+	// Check the response body for the error message
+	//assert.Contains(t, body, err)     // Check if the body contains the error message
+	//assert.Contains(t, body, "Error") // Check if the body contains the error title or header
+}
+
+func TestServeError(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	tests := []struct {
+		name      string
+		err       string
+		wantsJSON bool
+		data      map[string]interface{}
+		expected  string
+	}{
+		{
+			name:      "JSON response with error",
+			err:       "some error occurred",
+			wantsJSON: true,
+			data:      nil,
+			expected:  `some error occurred`,
+		},
+		{
+			name:      "JSON response with existing data",
+			err:       "another error occurred",
+			wantsJSON: true,
+			data:      map[string]interface{}{"info": "some info"},
+			expected:  `another error occurred`,
+		},
+		{
+			name:      "Non-JSON response",
+			err:       "page not found",
+			wantsJSON: false,
+			data:      nil,
+			expected:  "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a response recorder to capture the response
+			rr := httptest.NewRecorder()
+			// Call the ServeError function
+			ServeError(rr, tt.err, tt.wantsJSON, tt.data)
+
+			// Check the response
+			if tt.wantsJSON {
+				// Check if the response is JSON
+				var responseMap map[string]interface{}
+				if err := json.NewDecoder(rr.Body).Decode(&responseMap); err != nil {
+					t.Fatalf("Failed to decode JSON response: %v", err)
+				}
+
+				// Check if the expected error is present
+				if responseMap["error"] != tt.expected {
+					t.Errorf("Expected error %v, got %v", tt.expected, responseMap["error"])
+				}
+			} else {
+				// Check if the response body matches the expected error message
+				if rr.Body.String() != tt.expected {
+					t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
+				}
+			}
+		})
+	}
+}

From a56969ad6565d625016e583451316343359e7e0e Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:38:04 +0100
Subject: [PATCH 003/122] Update server_test.go

---
 pkg/server/server_test.go | 88 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 25fe7024..4f72dc08 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestServeJSON(t *testing.T) {
@@ -53,3 +54,90 @@ func TestServeJSON(t *testing.T) {
 		}
 	}
 }
+
+func TestServeErrorPage(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	// Set writer and error string message
+	writer := httptest.NewRecorder()
+	err := "Unexpected error has occurred."
+
+	ServeErrorPage(writer, err)
+
+	body := writer.Body.String()
+	t.Log("=============")
+	t.Log("Response Body:", body)
+	t.Log("=============")
+
+	// Check response code & content-type
+	assert.Equal(t, http.StatusOK, writer.Code)
+	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
+
+	// Check the response body for the error message
+	//assert.Contains(t, body, err)     // Check if the body contains the error message
+	//assert.Contains(t, body, "Error") // Check if the body contains the error title or header
+}
+
+func TestServeError(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	tests := []struct {
+		name      string
+		err       string
+		wantsJSON bool
+		data      map[string]interface{}
+		expected  string
+	}{
+		{
+			name:      "JSON response with error",
+			err:       "some error occurred",
+			wantsJSON: true,
+			data:      nil,
+			expected:  `some error occurred`,
+		},
+		{
+			name:      "JSON response with existing data",
+			err:       "another error occurred",
+			wantsJSON: true,
+			data:      map[string]interface{}{"info": "some info"},
+			expected:  `another error occurred`,
+		},
+		{
+			name:      "Non-JSON response",
+			err:       "page not found",
+			wantsJSON: false,
+			data:      nil,
+			expected:  "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a response recorder to capture the response
+			rr := httptest.NewRecorder()
+			// Call the ServeError function
+			ServeError(rr, tt.err, tt.wantsJSON, tt.data)
+
+			// Check the response
+			if tt.wantsJSON {
+				// Check if the response is JSON
+				var responseMap map[string]interface{}
+				if err := json.NewDecoder(rr.Body).Decode(&responseMap); err != nil {
+					t.Fatalf("Failed to decode JSON response: %v", err)
+				}
+
+				// Check if the expected error is present
+				if responseMap["error"] != tt.expected {
+					t.Errorf("Expected error %v, got %v", tt.expected, responseMap["error"])
+				}
+			} else {
+				// Check if the response body matches the expected error message
+				if rr.Body.String() != tt.expected {
+					t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
+				}
+			}
+		})
+	}
+}

From 999e6543b307404256d533fff1502f6990aaa551 Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:40:40 +0100
Subject: [PATCH 004/122] Add server coverage tests

---
 pkg/server/server_test.go | 143 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 pkg/server/server_test.go

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
new file mode 100644
index 00000000..4f72dc08
--- /dev/null
+++ b/pkg/server/server_test.go
@@ -0,0 +1,143 @@
+package server
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestServeJSON(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	writer := httptest.NewRecorder()
+	data := map[string]interface{}{
+		"status":    "success",
+		"postID":    "777",
+		"srcBoard":  "srcBoard",
+		"destBoard": "destBoard",
+	}
+
+	ServeJSON(writer, data)
+
+	// Check the status code
+	if writer.Code != http.StatusOK {
+		t.Errorf("expected status code %d, got %d", http.StatusOK, writer.Code)
+	}
+
+	// Check the content type
+	if writer.Header().Get("Content-Type") != "application/json" {
+		t.Errorf("expected content type application/json, got %s", writer.Header().Get("Content-Type"))
+	}
+
+	// Check the response body
+	var response map[string]interface{}
+	if err := json.Unmarshal(writer.Body.Bytes(), &response); err != nil {
+		t.Fatalf("failed to unmarshal response: %v", err)
+	}
+
+	// Debugging output
+	for key, value := range response {
+		t.Logf("Response key: %s, value: %v", key, value)
+	}
+
+	for key, expectedValue := range data {
+		actualValue := response[key]
+		if actualValue != expectedValue {
+			t.Errorf("expected %s to be %v, got %v", key, expectedValue, actualValue)
+		} else {
+			t.Logf("Match for %s: expected %v, got %v", key, expectedValue, actualValue)
+		}
+	}
+}
+
+func TestServeErrorPage(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	// Set writer and error string message
+	writer := httptest.NewRecorder()
+	err := "Unexpected error has occurred."
+
+	ServeErrorPage(writer, err)
+
+	body := writer.Body.String()
+	t.Log("=============")
+	t.Log("Response Body:", body)
+	t.Log("=============")
+
+	// Check response code & content-type
+	assert.Equal(t, http.StatusOK, writer.Code)
+	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
+
+	// Check the response body for the error message
+	//assert.Contains(t, body, err)     // Check if the body contains the error message
+	//assert.Contains(t, body, "Error") // Check if the body contains the error title or header
+}
+
+func TestServeError(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	tests := []struct {
+		name      string
+		err       string
+		wantsJSON bool
+		data      map[string]interface{}
+		expected  string
+	}{
+		{
+			name:      "JSON response with error",
+			err:       "some error occurred",
+			wantsJSON: true,
+			data:      nil,
+			expected:  `some error occurred`,
+		},
+		{
+			name:      "JSON response with existing data",
+			err:       "another error occurred",
+			wantsJSON: true,
+			data:      map[string]interface{}{"info": "some info"},
+			expected:  `another error occurred`,
+		},
+		{
+			name:      "Non-JSON response",
+			err:       "page not found",
+			wantsJSON: false,
+			data:      nil,
+			expected:  "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a response recorder to capture the response
+			rr := httptest.NewRecorder()
+			// Call the ServeError function
+			ServeError(rr, tt.err, tt.wantsJSON, tt.data)
+
+			// Check the response
+			if tt.wantsJSON {
+				// Check if the response is JSON
+				var responseMap map[string]interface{}
+				if err := json.NewDecoder(rr.Body).Decode(&responseMap); err != nil {
+					t.Fatalf("Failed to decode JSON response: %v", err)
+				}
+
+				// Check if the expected error is present
+				if responseMap["error"] != tt.expected {
+					t.Errorf("Expected error %v, got %v", tt.expected, responseMap["error"])
+				}
+			} else {
+				// Check if the response body matches the expected error message
+				if rr.Body.String() != tt.expected {
+					t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
+				}
+			}
+		})
+	}
+}

From c43a15bb0ad13017da11a45a2c61264ab9c72abd Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:43:16 +0100
Subject: [PATCH 005/122] create SetMockConfig for tests

---
 pkg/config/config.go | 98 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index e0a17981..89fd4665 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -38,6 +38,104 @@ type GochanConfig struct {
 	testing      bool
 }
 
+func SetMockConfig() {
+	cfg = &GochanConfig{
+		SystemCriticalConfig: SystemCriticalConfig{
+			ListenIP:     "127.0.0.1",
+			Port:         8080,
+			UseFastCGI:   false,
+			DocumentRoot: "/var/www/html",
+			TemplateDir:  "/var/www/html/templates",
+			LogDir:       "/var/log/gochan",
+			Plugins:      []string{},
+			PluginSettings: map[string]any{
+				"examplePlugin": true,
+			},
+			SiteHeaderURL: "http://example.com",
+			WebRoot:       "/",
+			SiteDomain:    "example.com",
+			Verbose:       true,
+			RandomSeed:    "testseed",
+		},
+		SiteConfig: SiteConfig{
+			FirstPage:             []string{"index"},
+			Username:              "admin",
+			CookieMaxAge:          "1h",
+			StaffSessionDuration:  "2h",
+			Lockdown:              false,
+			LockdownMessage:       "",
+			SiteName:              "Test Site",
+			SiteSlogan:            "A testing site",
+			Modboard:              "mod",
+			MaxRecentPosts:        10,
+			RecentPostsWithNoFile: false,
+			EnableAppeals:         true,
+			MinifyHTML:            false,
+			MinifyJS:              false,
+			GeoIPType:             "none",
+			GeoIPOptions:          make(map[string]any),
+			Captcha: CaptchaConfig{
+				Type:                 "none",
+				OnlyNeededForThreads: false,
+				SiteKey:              "",
+				AccountSecret:        "",
+			},
+			FingerprintVideoThumbnails: false,
+			FingerprintHashLength:      16,
+		},
+		BoardConfig: BoardConfig{
+			InheritGlobalStyles: true,
+			Styles:              []Style{},
+			DefaultStyle:        "default",
+			Banners:             []PageBanner{},
+			PostConfig: PostConfig{
+				MaxLineLength:            1000,
+				ReservedTrips:            []string{},
+				ThreadsPerPage:           10,
+				RepliesOnBoardPage:       5,
+				StickyRepliesOnBoardPage: 2,
+				NewThreadsRequireUpload:  false,
+				CyclicalThreadNumPosts:   100,
+				BanColors:                []string{"#FF0000"},
+				BanMessage:               "You are banned!",
+				EmbedWidth:               640,
+				EmbedHeight:              360,
+				EnableEmbeds:             true,
+				ImagesOpenNewTab:         false,
+				NewTabOnOutlinks:         true,
+				DisableBBcode:            false,
+			},
+			UploadConfig: UploadConfig{
+				RejectDuplicateImages: true,
+				ThumbWidth:            150,
+				ThumbHeight:           150,
+				ThumbWidthReply:       100,
+				ThumbHeightReply:      100,
+				ThumbWidthCatalog:     200,
+				ThumbHeightCatalog:    200,
+				AllowOtherExtensions:  map[string]string{"pdf": "application/pdf"},
+				StripImageMetadata:    "none",
+				ExiftoolPath:          "",
+			},
+			DateTimeFormat:         "2006-01-02 15:04:05",
+			ShowPosterID:           true,
+			EnableSpoileredImages:  false,
+			EnableSpoileredThreads: false,
+			Worksafe:               false,
+			ThreadPage:             1,
+			Cooldowns:              BoardCooldowns{NewThread: 60, Reply: 30, ImageReply: 15},
+			RenderURLsAsLinks:      true,
+			ThreadsPerPage:         10,
+			EnableGeoIP:            false,
+			EnableNoFlag:           false,
+			CustomFlags:            []geoip.Country{},
+			isGlobal:               true,
+		},
+		jsonLocation: "test_config.json",
+		testing:      true,
+	}
+}
+
 // ValidateValues checks to make sure that the configuration options are usable
 // (e.g., ListenIP is a valid IP address, Port isn't a negative number, etc)
 func (gcfg *GochanConfig) ValidateValues() error {

From 4ae2c564ae16891eeb9be44caabb15d6fe9dc0b3 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Thu, 19 Dec 2024 11:06:57 +0100
Subject: [PATCH 006/122] fix code smells for deepsource

---
 pkg/server/server_test.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 4f72dc08..9784ed82 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -75,8 +75,8 @@ func TestServeErrorPage(t *testing.T) {
 	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
 
 	// Check the response body for the error message
-	//assert.Contains(t, body, err)     // Check if the body contains the error message
-	//assert.Contains(t, body, "Error") // Check if the body contains the error title or header
+	//assert.Contains(t, body, err)       Check if the body contains the error message
+	//assert.Contains(t, body, "Error")   Check if the body contains the error title or header
 }
 
 func TestServeError(t *testing.T) {
@@ -132,11 +132,9 @@ func TestServeError(t *testing.T) {
 				if responseMap["error"] != tt.expected {
 					t.Errorf("Expected error %v, got %v", tt.expected, responseMap["error"])
 				}
-			} else {
+			} else if rr.Body.String() != tt.expected {
 				// Check if the response body matches the expected error message
-				if rr.Body.String() != tt.expected {
-					t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
-				}
+				t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
 			}
 		})
 	}

From 3b8fcc25586b2670be40e840e40044da8d0b6abd Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:08:02 +0100
Subject: [PATCH 007/122] fix code smells for deepsource

---
 pkg/server/server_test.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 4f72dc08..9784ed82 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -75,8 +75,8 @@ func TestServeErrorPage(t *testing.T) {
 	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
 
 	// Check the response body for the error message
-	//assert.Contains(t, body, err)     // Check if the body contains the error message
-	//assert.Contains(t, body, "Error") // Check if the body contains the error title or header
+	//assert.Contains(t, body, err)       Check if the body contains the error message
+	//assert.Contains(t, body, "Error")   Check if the body contains the error title or header
 }
 
 func TestServeError(t *testing.T) {
@@ -132,11 +132,9 @@ func TestServeError(t *testing.T) {
 				if responseMap["error"] != tt.expected {
 					t.Errorf("Expected error %v, got %v", tt.expected, responseMap["error"])
 				}
-			} else {
+			} else if rr.Body.String() != tt.expected {
 				// Check if the response body matches the expected error message
-				if rr.Body.String() != tt.expected {
-					t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
-				}
+				t.Errorf("Expected response %v, got %v", tt.expected, rr.Body.String())
 			}
 		})
 	}

From 0b3540a8eda0bead61fec5cd4eb982081d85bb6c Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Thu, 19 Dec 2024 15:16:11 +0100
Subject: [PATCH 008/122] Add serverstatic_test.go + changed
 GetSystemCriticalConfig() type return

---
 pkg/building/building_test.go   |   4 +-
 pkg/config/config.go            |  26 ++++----
 pkg/config/config_test.go       |  16 ++---
 pkg/config/preload.go           |   4 +-
 pkg/config/testing.go           |  28 ++++----
 pkg/config/util.go              |  90 +++++++++++++-------------
 pkg/server/server_test.go       |   2 +-
 pkg/server/serverstatic_test.go | 110 ++++++++++++++++++++++++++++++++
 8 files changed, 195 insertions(+), 85 deletions(-)
 create mode 100644 pkg/server/serverstatic_test.go

diff --git a/pkg/building/building_test.go b/pkg/building/building_test.go
index 2b113002..7ff5f5b5 100644
--- a/pkg/building/building_test.go
+++ b/pkg/building/building_test.go
@@ -32,7 +32,7 @@ func TestBuildJS(t *testing.T) {
 	systemCriticalCfg.LogDir = path.Join(outDir, "logs")
 	systemCriticalCfg.WebRoot = "/chan"
 	systemCriticalCfg.TimeZone = 8
-	config.SetSystemCriticalConfig(&systemCriticalCfg)
+	config.SetSystemCriticalConfig(systemCriticalCfg)
 
 	boardCfg := config.GetBoardConfig("")
 	boardCfg.Styles = []config.Style{
@@ -154,7 +154,7 @@ func TestBuildFrontPage(t *testing.T) {
 			systemCriticalCfg.LogDir = path.Join(outDir, "logs")
 			systemCriticalCfg.WebRoot = "/chan"
 			systemCriticalCfg.TimeZone = 8
-			config.SetSystemCriticalConfig(&systemCriticalCfg)
+			config.SetSystemCriticalConfig(systemCriticalCfg)
 
 			boardCfg := config.GetBoardConfig("")
 			boardCfg.Styles = []config.Style{{Name: "test1", Filename: "test1.css"}}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 89fd4665..5b3719f2 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -24,7 +24,7 @@ const (
 )
 
 var (
-	cfg     *GochanConfig
+	Cfg     *GochanConfig
 	cfgPath string
 
 	boardConfigs = map[string]BoardConfig{}
@@ -39,7 +39,7 @@ type GochanConfig struct {
 }
 
 func SetMockConfig() {
-	cfg = &GochanConfig{
+	Cfg = &GochanConfig{
 		SystemCriticalConfig: SystemCriticalConfig{
 			ListenIP:     "127.0.0.1",
 			Port:         8080,
@@ -432,24 +432,24 @@ type PostConfig struct {
 }
 
 func WriteConfig() error {
-	return cfg.Write()
+	return Cfg.Write()
 }
 
 // GetSQLConfig returns SQL configuration info. It returns a value instead of a a pointer to it
 // because it is not safe to edit while Gochan is running
 func GetSQLConfig() SQLConfig {
-	return cfg.SQLConfig
+	return Cfg.SQLConfig
 }
 
 // GetSystemCriticalConfig returns system-critical configuration options like listening IP
 // It returns a value instead of a pointer, because it is not usually safe to edit while Gochan is running.
-func GetSystemCriticalConfig() SystemCriticalConfig {
-	return cfg.SystemCriticalConfig
+func GetSystemCriticalConfig() *SystemCriticalConfig {
+	return &Cfg.SystemCriticalConfig
 }
 
 // GetSiteConfig returns the global site configuration (site name, slogan, etc)
 func GetSiteConfig() *SiteConfig {
-	return &cfg.SiteConfig
+	return &Cfg.SiteConfig
 }
 
 // GetBoardConfig returns the custom configuration for the specified board (if it exists)
@@ -457,14 +457,14 @@ func GetSiteConfig() *SiteConfig {
 func GetBoardConfig(board string) *BoardConfig {
 	bc, exists := boardConfigs[board]
 	if board == "" || !exists {
-		return &cfg.BoardConfig
+		return &Cfg.BoardConfig
 	}
 	return &bc
 }
 
 // UpdateBoardConfig updates or establishes the configuration for the given board
 func UpdateBoardConfig(dir string) error {
-	ba, err := os.ReadFile(path.Join(cfg.DocumentRoot, dir, "board.json"))
+	ba, err := os.ReadFile(path.Join(Cfg.DocumentRoot, dir, "board.json"))
 	if err != nil {
 		if os.IsNotExist(err) {
 			// board doesn't have a custom config, use global config
@@ -472,7 +472,7 @@ func UpdateBoardConfig(dir string) error {
 		}
 		return err
 	}
-	boardcfg := cfg.BoardConfig
+	boardcfg := Cfg.BoardConfig
 	if err = json.Unmarshal(ba, &boardcfg); err != nil {
 		return err
 	}
@@ -488,13 +488,13 @@ func DeleteBoardConfig(dir string) {
 }
 
 func VerboseMode() bool {
-	return cfg.testing || cfg.SystemCriticalConfig.Verbose
+	return Cfg.testing || Cfg.SystemCriticalConfig.Verbose
 }
 
 func SetVerbose(verbose bool) {
-	cfg.Verbose = verbose
+	Cfg.Verbose = verbose
 }
 
 func GetVersion() *GochanVersion {
-	return cfg.Version
+	return Cfg.Version
 }
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 6d448314..e1066080 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -26,17 +26,17 @@ func TestValidJSON(t *testing.T) {
 func TestValidateValues(t *testing.T) {
 	InitConfig("3.1.0")
 	SetRandomSeed("test")
-	assert.NoError(t, cfg.ValidateValues())
+	assert.NoError(t, Cfg.ValidateValues())
 
-	cfg.CookieMaxAge = "not a duration"
-	assert.Error(t, cfg.ValidateValues())
-	cfg.CookieMaxAge = "1y"
-	assert.NoError(t, cfg.ValidateValues())
+	Cfg.CookieMaxAge = "not a duration"
+	assert.Error(t, Cfg.ValidateValues())
+	Cfg.CookieMaxAge = "1y"
+	assert.NoError(t, Cfg.ValidateValues())
 
 	SetTestDBConfig("not a valid driver", "127.0.0.1", "gochan", "gochan", "", "")
-	assert.Error(t, cfg.ValidateValues())
+	assert.Error(t, Cfg.ValidateValues())
 	SetTestDBConfig("postgresql", "127.0.0.1", "gochan", "gochan", "", "")
-	assert.NoError(t, cfg.ValidateValues())
+	assert.NoError(t, Cfg.ValidateValues())
 }
 
 type webRootTest struct {
@@ -61,7 +61,7 @@ func TestWebPath(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.expectPath, func(t *testing.T) {
-			cfg.WebRoot = tC.webRoot
+			Cfg.WebRoot = tC.webRoot
 			wp := WebPath(tC.pathArgs...)
 			assert.Equal(t, tC.expectPath, wp)
 		})
diff --git a/pkg/config/preload.go b/pkg/config/preload.go
index 6a26cd8e..de921750 100644
--- a/pkg/config/preload.go
+++ b/pkg/config/preload.go
@@ -9,11 +9,11 @@ func PreloadModule(l *lua.LState) int {
 	t := l.NewTable()
 	l.SetFuncs(t, map[string]lua.LGFunction{
 		"system_critical_config": func(l *lua.LState) int {
-			l.Push(luar.New(l, &cfg.SystemCriticalConfig))
+			l.Push(luar.New(l, &Cfg.SystemCriticalConfig))
 			return 1
 		},
 		"site_config": func(l *lua.LState) int {
-			l.Push(luar.New(l, &cfg.SiteConfig))
+			l.Push(luar.New(l, &Cfg.SiteConfig))
 			return 1
 		},
 		"board_config": func(l *lua.LState) int {
diff --git a/pkg/config/testing.go b/pkg/config/testing.go
index b0bbec26..c938fa23 100644
--- a/pkg/config/testing.go
+++ b/pkg/config/testing.go
@@ -3,8 +3,8 @@ package config
 import "github.com/gochan-org/gochan/pkg/gcutil/testutil"
 
 func setDefaultCfgIfNotSet() {
-	if cfg == nil {
-		cfg = defaultGochanConfig
+	if Cfg == nil {
+		Cfg = defaultGochanConfig
 	}
 }
 
@@ -13,7 +13,7 @@ func SetVersion(version string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	cfg.Version = ParseVersion(version)
+	Cfg.Version = ParseVersion(version)
 }
 
 // SetTestTemplateDir sets the directory for templates, used only in testing. If it is not run via `go test`, it will panic.
@@ -21,7 +21,7 @@ func SetTestTemplateDir(dir string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	cfg.TemplateDir = dir
+	Cfg.TemplateDir = dir
 }
 
 // SetTestDBConfig sets up the database configuration for a testing environment. If it is not run via `go test`, it will panic
@@ -29,19 +29,19 @@ func SetTestDBConfig(dbType string, dbHost string, dbName string, dbUsername str
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	cfg.DBtype = dbType
-	cfg.DBhost = dbHost
-	cfg.DBname = dbName
-	cfg.DBusername = dbUsername
-	cfg.DBpassword = dbPassword
-	cfg.DBprefix = dbPrefix
+	Cfg.DBtype = dbType
+	Cfg.DBhost = dbHost
+	Cfg.DBname = dbName
+	Cfg.DBusername = dbUsername
+	Cfg.DBpassword = dbPassword
+	Cfg.DBprefix = dbPrefix
 }
 
 // SetRandomSeed is usd to set a deterministic seed to make testing easier. If it is not run via `go test`, it will panic
 func SetRandomSeed(seed string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	cfg.RandomSeed = seed
+	Cfg.RandomSeed = seed
 }
 
 // SetSystemCriticalConfig sets system critical configuration values in testing. It will panic if it is not run in a
@@ -49,14 +49,14 @@ func SetRandomSeed(seed string) {
 func SetSystemCriticalConfig(systemCritical *SystemCriticalConfig) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	cfg.SystemCriticalConfig = *systemCritical
+	Cfg.SystemCriticalConfig = *systemCritical
 }
 
 // SetSiteConfig sets the site configuration values in testing. It will panic if it is not run in a test environment
 func SetSiteConfig(siteConfig *SiteConfig) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	cfg.SiteConfig = *siteConfig
+	Cfg.SiteConfig = *siteConfig
 }
 
 // SetBoardConfig applies the configuration to the given board. It will panic if it is not run in a test environment
@@ -65,7 +65,7 @@ func SetBoardConfig(board string, boardCfg *BoardConfig) {
 	setDefaultCfgIfNotSet()
 
 	if board == "" {
-		cfg.BoardConfig = *boardCfg
+		Cfg.BoardConfig = *boardCfg
 	} else {
 		boardConfigs[board] = *boardCfg
 	}
diff --git a/pkg/config/util.go b/pkg/config/util.go
index 30363cea..5ef84745 100644
--- a/pkg/config/util.go
+++ b/pkg/config/util.go
@@ -54,7 +54,7 @@ func GetUser() (int, int) {
 }
 
 func TakeOwnership(fp string) (err error) {
-	if runtime.GOOS == "windows" || fp == "" || cfg.Username == "" {
+	if runtime.GOOS == "windows" || fp == "" || Cfg.Username == "" {
 		// Chown returns an error in Windows so skip it, also skip if Username isn't set
 		// because otherwise it'll think we want to switch to uid and gid 0 (root)
 		return nil
@@ -63,7 +63,7 @@ func TakeOwnership(fp string) (err error) {
 }
 
 func TakeOwnershipOfFile(f *os.File) error {
-	if runtime.GOOS == "windows" || f == nil || cfg.Username == "" {
+	if runtime.GOOS == "windows" || f == nil || Cfg.Username == "" {
 		// Chown returns an error in Windows so skip it, also skip if Username isn't set
 		// because otherwise it'll think we want to switch to uid and gid 0 (root)
 		return nil
@@ -73,27 +73,27 @@ func TakeOwnershipOfFile(f *os.File) error {
 
 // InitConfig loads and parses gochan.json on startup and verifies its contents
 func InitConfig(versionStr string) {
-	cfg = defaultGochanConfig
+	Cfg = defaultGochanConfig
 	if strings.HasSuffix(os.Args[0], ".test") {
 		// create a dummy config for testing if we're using go test
-		cfg = defaultGochanConfig
-		cfg.ListenIP = "127.0.0.1"
-		cfg.Port = 8080
-		cfg.UseFastCGI = true
-		cfg.testing = true
-		cfg.TemplateDir = "templates"
-		cfg.DBtype = "sqlite3"
-		cfg.DBhost = "./testdata/gochantest.db"
-		cfg.DBname = "gochan"
-		cfg.DBusername = "gochan"
-		cfg.SiteDomain = "127.0.0.1"
-		cfg.RandomSeed = "test"
-		cfg.Version = ParseVersion(versionStr)
-		cfg.SiteSlogan = "Gochan testing"
-		cfg.Verbose = true
-		cfg.Captcha.OnlyNeededForThreads = true
-		cfg.Cooldowns = BoardCooldowns{0, 0, 0}
-		cfg.BanColors = []string{
+		Cfg = defaultGochanConfig
+		Cfg.ListenIP = "127.0.0.1"
+		Cfg.Port = 8080
+		Cfg.UseFastCGI = true
+		Cfg.testing = true
+		Cfg.TemplateDir = "templates"
+		Cfg.DBtype = "sqlite3"
+		Cfg.DBhost = "./testdata/gochantest.db"
+		Cfg.DBname = "gochan"
+		Cfg.DBusername = "gochan"
+		Cfg.SiteDomain = "127.0.0.1"
+		Cfg.RandomSeed = "test"
+		Cfg.Version = ParseVersion(versionStr)
+		Cfg.SiteSlogan = "Gochan testing"
+		Cfg.Verbose = true
+		Cfg.Captcha.OnlyNeededForThreads = true
+		Cfg.Cooldowns = BoardCooldowns{0, 0, 0}
+		Cfg.BanColors = []string{
 			"admin:#0000A0",
 			"somemod:blue",
 		}
@@ -114,21 +114,21 @@ func InitConfig(versionStr string) {
 		os.Exit(1)
 	}
 
-	if err = json.Unmarshal(cfgBytes, cfg); err != nil {
+	if err = json.Unmarshal(cfgBytes, Cfg); err != nil {
 		fmt.Printf("Error parsing %s: %s", cfgPath, err.Error())
 		os.Exit(1)
 	}
-	cfg.jsonLocation = cfgPath
+	Cfg.jsonLocation = cfgPath
 
-	if err = cfg.ValidateValues(); err != nil {
+	if err = Cfg.ValidateValues(); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 
 	if runtime.GOOS != "windows" {
 		var gcUser *user.User
-		if cfg.Username != "" {
-			gcUser, err = user.Lookup(cfg.Username)
+		if Cfg.Username != "" {
+			gcUser, err = user.Lookup(Cfg.Username)
 		} else {
 			gcUser, err = user.Current()
 		}
@@ -147,51 +147,51 @@ func InitConfig(versionStr string) {
 		}
 	}
 
-	if _, err = os.Stat(cfg.DocumentRoot); err != nil {
+	if _, err = os.Stat(Cfg.DocumentRoot); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
-	if _, err = os.Stat(cfg.TemplateDir); err != nil {
+	if _, err = os.Stat(Cfg.TemplateDir); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
-	if _, err = os.Stat(cfg.LogDir); os.IsNotExist(err) {
-		err = os.MkdirAll(cfg.LogDir, DirFileMode)
+	if _, err = os.Stat(Cfg.LogDir); os.IsNotExist(err) {
+		err = os.MkdirAll(Cfg.LogDir, DirFileMode)
 	}
 	if err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 
-	cfg.LogDir = gcutil.FindResource(cfg.LogDir, "log", "/var/log/gochan/")
+	Cfg.LogDir = gcutil.FindResource(Cfg.LogDir, "log", "/var/log/gochan/")
 
-	if cfg.Port == 0 {
-		cfg.Port = 80
+	if Cfg.Port == 0 {
+		Cfg.Port = 80
 	}
 
-	if len(cfg.FirstPage) == 0 {
-		cfg.FirstPage = []string{"index.html", "1.html", "firstrun.html"}
+	if len(Cfg.FirstPage) == 0 {
+		Cfg.FirstPage = []string{"index.html", "1.html", "firstrun.html"}
 	}
 
-	if cfg.WebRoot == "" {
-		cfg.WebRoot = "/"
+	if Cfg.WebRoot == "" {
+		Cfg.WebRoot = "/"
 	}
 
-	if cfg.WebRoot[0] != '/' {
-		cfg.WebRoot = "/" + cfg.WebRoot
+	if Cfg.WebRoot[0] != '/' {
+		Cfg.WebRoot = "/" + Cfg.WebRoot
 	}
-	if cfg.WebRoot[len(cfg.WebRoot)-1] != '/' {
-		cfg.WebRoot += "/"
+	if Cfg.WebRoot[len(Cfg.WebRoot)-1] != '/' {
+		Cfg.WebRoot += "/"
 	}
 
 	_, zoneOffset := time.Now().Zone()
-	cfg.TimeZone = zoneOffset / 60 / 60
+	Cfg.TimeZone = zoneOffset / 60 / 60
 
-	cfg.Version = ParseVersion(versionStr)
-	cfg.Version.Normalize()
+	Cfg.Version = ParseVersion(versionStr)
+	Cfg.Version.Normalize()
 }
 
 // WebPath returns an absolute path, starting at the web root (which is "/" by default)
 func WebPath(part ...string) string {
-	return path.Join(cfg.WebRoot, path.Join(part...))
+	return path.Join(Cfg.WebRoot, path.Join(part...))
 }
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 9784ed82..09fac76d 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -109,7 +109,7 @@ func TestServeError(t *testing.T) {
 			err:       "page not found",
 			wantsJSON: false,
 			data:      nil,
-			expected:  "",
+			expected:  "", // Should we expect something ?
 		},
 	}
 
diff --git a/pkg/server/serverstatic_test.go b/pkg/server/serverstatic_test.go
new file mode 100644
index 00000000..0a379d2e
--- /dev/null
+++ b/pkg/server/serverstatic_test.go
@@ -0,0 +1,110 @@
+package server
+
+import (
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path"
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestServeFile(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	tempDir, err := ioutil.TempDir("", "testservefile")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	// Set the DocumentRoot in the mock config
+	sysConfig := config.GetSystemCriticalConfig()
+	sysConfig.DocumentRoot = tempDir
+	sysConfig.WebRoot = "/"
+
+	// Create a test file
+	testFileName := "testfile.txt"
+	testFilePath := path.Join(tempDir, testFileName)
+	err = ioutil.WriteFile(testFilePath, []byte("Hello, World!"), 0644)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	req := httptest.NewRequest("GET", "/"+testFileName, nil)
+	rr := httptest.NewRecorder()
+
+	serveFile(rr, req)
+
+	res := rr.Result()
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "Hello, World!", string(body))
+}
+
+func TestServeFile_NotFound(t *testing.T) {
+	// Set up a mock configuration
+	config.SetMockConfig()
+
+	// Create a temporary directory for testing
+	tempDir, err := ioutil.TempDir("", "testservefile")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tempDir) // Clean up after the test
+
+	// Set the DocumentRoot in the mock config
+	sysConfig := config.GetSystemCriticalConfig() // This should return a pointer now
+	sysConfig.DocumentRoot = tempDir
+	sysConfig.WebRoot = "/"
+
+	// Create a request for a non-existent file
+	req := httptest.NewRequest("GET", "/nonexistentfile.txt", nil)
+	rr := httptest.NewRecorder()
+
+	// Call the serveFile function
+	serveFile(rr, req)
+
+	// Check the response
+	res := rr.Result()
+	assert.Equal(t, http.StatusNotFound, res.StatusCode)
+}
+
+func TestSetFileHeaders(t *testing.T) {
+	tests := []struct {
+		filename      string
+		expectedType  string
+		expectedCache string
+	}{
+		{"image.png", "image/png", "max-age=86400"},
+		{"image.gif", "image/gif", "max-age=86400"},
+		{"image.jpg", "image/jpeg", "max-age=86400"},
+		{"image.jpeg", "image/jpeg", "max-age=86400"},
+		{"style.css", "text/css", "max-age=43200"},
+		{"script.js", "text/javascript", "max-age=43200"},
+		{"data.json", "application/json", "max-age=5, must-revalidate"},
+		{"video.webm", "video/webm", "max-age=86400"},
+		{"index.html", "text/html", "max-age=5, must-revalidate"},
+		{"index.htm", "text/html", "max-age=5, must-revalidate"},
+		{"unknownfile.xyz", "application/octet-stream", "max-age=86400"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.filename, func(t *testing.T) {
+			rr := httptest.NewRecorder()
+
+			setFileHeaders(tt.filename, rr)
+
+			assert.Equal(t, tt.expectedType, rr.Header().Get("Content-Type"))
+			assert.Equal(t, tt.expectedCache, rr.Header().Get("Cache-Control"))
+		})
+	}
+}

From 358a84c7e30ff7fe6e717055c1330baefa51f0f3 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Thu, 19 Dec 2024 15:23:16 +0100
Subject: [PATCH 009/122] Small fix config.go

---
 pkg/config/config.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 7a0cb288..f5307d4c 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -39,8 +39,8 @@ type GochanConfig struct {
 }
 
 func SetMockConfig() {
-  
-	cfg = &GochanConfig{
+
+	Cfg = &GochanConfig{
 
 		SystemCriticalConfig: SystemCriticalConfig{
 			ListenIP:     "127.0.0.1",

From 2984f9060babddd3adbfc44f5926179d831ec80e Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:24:59 +0100
Subject: [PATCH 010/122] small fix config.go

---
 pkg/config/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 7a0cb288..17feed93 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -40,7 +40,7 @@ type GochanConfig struct {
 
 func SetMockConfig() {
   
-	cfg = &GochanConfig{
+	Cfg = &GochanConfig{
 
 		SystemCriticalConfig: SystemCriticalConfig{
 			ListenIP:     "127.0.0.1",

From 69e40f5cfb479a817b07072f9fef9c436b4fce01 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Thu, 19 Dec 2024 15:30:54 +0100
Subject: [PATCH 011/122] Delete launch.json

---
 pkg/server/.vscode/launch.json | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 pkg/server/.vscode/launch.json

diff --git a/pkg/server/.vscode/launch.json b/pkg/server/.vscode/launch.json
deleted file mode 100644
index 5c7247b4..00000000
--- a/pkg/server/.vscode/launch.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": []
-}
\ No newline at end of file

From c6724f0b0685a0b1ae05210f6f885921a25a0b06 Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:31:38 +0100
Subject: [PATCH 012/122] Delete pkg/server/.vscode directory

---
 pkg/server/.vscode/launch.json | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 pkg/server/.vscode/launch.json

diff --git a/pkg/server/.vscode/launch.json b/pkg/server/.vscode/launch.json
deleted file mode 100644
index 5c7247b4..00000000
--- a/pkg/server/.vscode/launch.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": []
-}
\ No newline at end of file

From 2b0a6a9d54302c84850949775a05947f7ae0f64b Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 20 Dec 2024 23:06:06 -0800
Subject: [PATCH 013/122] Call InitMinifier in canMinify in case it hasn't been
 called already elsewhere

---
 pkg/server/serverutil/minifier.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/server/serverutil/minifier.go b/pkg/server/serverutil/minifier.go
index 8570b75a..6e1dd4f1 100644
--- a/pkg/server/serverutil/minifier.go
+++ b/pkg/server/serverutil/minifier.go
@@ -34,7 +34,12 @@ func InitMinifier() {
 	}
 }
 
-func canMinify(mediaType string) bool {
+func canMinify(mediaType string) (minify bool) {
+	defer func() {
+		if minify && minifier == nil {
+			InitMinifier()
+		}
+	}()
 	siteConfig := config.GetSiteConfig()
 	if mediaType == "text/html" && siteConfig.MinifyHTML {
 		return true

From 64e1e6e15afe457455bfd2efbd88dd5f85fabb5e Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Mon, 23 Dec 2024 09:19:05 -0800
Subject: [PATCH 014/122] Fix PanicIfNotTest and GoToGochanRoot

---
 pkg/gcutil/testutil/testutil.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/gcutil/testutil/testutil.go b/pkg/gcutil/testutil/testutil.go
index 37755a37..b2fb5974 100644
--- a/pkg/gcutil/testutil/testutil.go
+++ b/pkg/gcutil/testutil/testutil.go
@@ -3,7 +3,7 @@ package testutil
 import (
 	"errors"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 	"testing"
 )
@@ -14,7 +14,7 @@ const (
 
 // PanicIfNotTest panics if the function was called directly or indirectly by a test function via go test
 func PanicIfNotTest() {
-	if !strings.HasSuffix(os.Args[0], ".test") && os.Args[1] != "-test.run" {
+	if !strings.HasSuffix(os.Args[0], ".test") && !strings.HasSuffix(os.Args[0], ".test.exe") && os.Args[1] != "-test.run" {
 		panic("the testutil package should only be used in tests")
 	}
 }
@@ -30,7 +30,7 @@ func GoToGochanRoot(t *testing.T) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		if path.Base(dir) == "gochan" {
+		if filepath.Base(dir) == "gochan" {
 			return dir, nil
 		}
 		if err = os.Chdir(".."); err != nil {

From 3794a44a101873bc282d2deae105b54a94fc674d Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:47:46 -0800
Subject: [PATCH 015/122] Update expected results for consts.js tests

---
 pkg/gctemplates/templatetests/templatecases_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/gctemplates/templatetests/templatecases_test.go b/pkg/gctemplates/templatetests/templatecases_test.go
index a56681b4..affaf46a 100644
--- a/pkg/gctemplates/templatetests/templatecases_test.go
+++ b/pkg/gctemplates/templatetests/templatecases_test.go
@@ -230,7 +230,7 @@ var (
 					".ext": "thumb.png",
 				},
 			},
-			expectedOutput: `var styles=[{Name:"Pipes",Filename:"pipes.css"},{Name:"Yotsuba A",Filename:"yotsuba.css"}];var defaultStyle="pipes.css";var webroot="/";var serverTZ=-1;var fileTypes=[".ext",];`,
+			expectedOutput: `const styles=[{Name:"Pipes",Filename:"pipes.css"},{Name:"Yotsuba A",Filename:"yotsuba.css"}];const defaultStyle="pipes.css";const webroot="/";const serverTZ=-1;const fileTypes=[".ext",];`,
 		},
 		{
 			desc: "empty values",
@@ -239,7 +239,7 @@ var (
 				"webroot":      "",
 				"timezone":     0,
 			},
-			expectedOutput: `var styles=[];var defaultStyle="";var webroot="";var serverTZ=0;var fileTypes=[];`,
+			expectedOutput: `const styles=[];const defaultStyle="";const webroot="";const serverTZ=0;const fileTypes=[];`,
 		},
 		{
 			desc: "escaped string",
@@ -248,7 +248,7 @@ var (
 				"webroot":      "",
 				"timezone":     0,
 			},
-			expectedOutput: `var styles=[];var defaultStyle="\&#34;a\\a\&#34;";var webroot="";var serverTZ=0;var fileTypes=[];`,
+			expectedOutput: `const styles=[];const defaultStyle="\&#34;a\\a\&#34;";const webroot="";const serverTZ=0;const fileTypes=[];`,
 		},
 	}
 )

From 9c538c8d10a3b30884103b2052925c8d366f1cb2 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Tue, 24 Dec 2024 08:23:25 +0100
Subject: [PATCH 016/122] Merge testutil fix & fix tests

---
 pkg/config/config.go            | 122 +++-----------------------------
 pkg/config/config_test.go       |  16 ++---
 pkg/config/preload.go           |   4 +-
 pkg/config/testing.go           |  28 ++++----
 pkg/config/util.go              |  90 +++++++++++------------
 pkg/server/server_test.go       |  37 +++++++---
 pkg/server/serverstatic_test.go |   8 +--
 7 files changed, 111 insertions(+), 194 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index f5307d4c..650dc544 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -24,7 +24,7 @@ const (
 )
 
 var (
-	Cfg     *GochanConfig
+	cfg     *GochanConfig
 	cfgPath string
 
 	boardConfigs = map[string]BoardConfig{}
@@ -38,106 +38,6 @@ type GochanConfig struct {
 	testing      bool
 }
 
-func SetMockConfig() {
-
-	Cfg = &GochanConfig{
-
-		SystemCriticalConfig: SystemCriticalConfig{
-			ListenIP:     "127.0.0.1",
-			Port:         8080,
-			UseFastCGI:   false,
-			DocumentRoot: "/var/www/html",
-			TemplateDir:  "/var/www/html/templates",
-			LogDir:       "/var/log/gochan",
-			Plugins:      []string{},
-			PluginSettings: map[string]any{
-				"examplePlugin": true,
-			},
-			SiteHeaderURL: "http://example.com",
-			WebRoot:       "/",
-			SiteDomain:    "example.com",
-			Verbose:       true,
-			RandomSeed:    "testseed",
-		},
-		SiteConfig: SiteConfig{
-			FirstPage:             []string{"index"},
-			Username:              "admin",
-			CookieMaxAge:          "1h",
-			StaffSessionDuration:  "2h",
-			Lockdown:              false,
-			LockdownMessage:       "",
-			SiteName:              "Test Site",
-			SiteSlogan:            "A testing site",
-			Modboard:              "mod",
-			MaxRecentPosts:        10,
-			RecentPostsWithNoFile: false,
-			EnableAppeals:         true,
-			MinifyHTML:            false,
-			MinifyJS:              false,
-			GeoIPType:             "none",
-			GeoIPOptions:          make(map[string]any),
-			Captcha: CaptchaConfig{
-				Type:                 "none",
-				OnlyNeededForThreads: false,
-				SiteKey:              "",
-				AccountSecret:        "",
-			},
-			FingerprintVideoThumbnails: false,
-			FingerprintHashLength:      16,
-		},
-		BoardConfig: BoardConfig{
-			InheritGlobalStyles: true,
-			Styles:              []Style{},
-			DefaultStyle:        "default",
-			Banners:             []PageBanner{},
-			PostConfig: PostConfig{
-				MaxLineLength:            1000,
-				ReservedTrips:            []string{},
-				ThreadsPerPage:           10,
-				RepliesOnBoardPage:       5,
-				StickyRepliesOnBoardPage: 2,
-				NewThreadsRequireUpload:  false,
-				CyclicalThreadNumPosts:   100,
-				BanColors:                []string{"#FF0000"},
-				BanMessage:               "You are banned!",
-				EmbedWidth:               640,
-				EmbedHeight:              360,
-				EnableEmbeds:             true,
-				ImagesOpenNewTab:         false,
-				NewTabOnOutlinks:         true,
-				DisableBBcode:            false,
-			},
-			UploadConfig: UploadConfig{
-				RejectDuplicateImages: true,
-				ThumbWidth:            150,
-				ThumbHeight:           150,
-				ThumbWidthReply:       100,
-				ThumbHeightReply:      100,
-				ThumbWidthCatalog:     200,
-				ThumbHeightCatalog:    200,
-				AllowOtherExtensions:  map[string]string{"pdf": "application/pdf"},
-				StripImageMetadata:    "none",
-				ExiftoolPath:          "",
-			},
-			DateTimeFormat:         "2006-01-02 15:04:05",
-			ShowPosterID:           true,
-			EnableSpoileredImages:  false,
-			EnableSpoileredThreads: false,
-			Worksafe:               false,
-			ThreadPage:             1,
-			Cooldowns:              BoardCooldowns{NewThread: 60, Reply: 30, ImageReply: 15},
-			RenderURLsAsLinks:      true,
-			ThreadsPerPage:         10,
-			EnableGeoIP:            false,
-			EnableNoFlag:           false,
-			CustomFlags:            []geoip.Country{},
-			isGlobal:               true,
-		},
-		jsonLocation: "test_config.json",
-		testing:      true,
-	}
-}
-
 // ValidateValues checks to make sure that the configuration options are usable
 // (e.g., ListenIP is a valid IP address, Port isn't a negative number, etc)
 func (gcfg *GochanConfig) ValidateValues() error {
@@ -434,24 +334,24 @@ type PostConfig struct {
 }
 
 func WriteConfig() error {
-	return Cfg.Write()
+	return cfg.Write()
 }
 
 // GetSQLConfig returns SQL configuration info. It returns a value instead of a a pointer to it
 // because it is not safe to edit while Gochan is running
 func GetSQLConfig() SQLConfig {
-	return Cfg.SQLConfig
+	return cfg.SQLConfig
 }
 
 // GetSystemCriticalConfig returns system-critical configuration options like listening IP
 // It returns a value instead of a pointer, because it is not usually safe to edit while Gochan is running.
 func GetSystemCriticalConfig() *SystemCriticalConfig {
-	return &Cfg.SystemCriticalConfig
+	return &cfg.SystemCriticalConfig
 }
 
 // GetSiteConfig returns the global site configuration (site name, slogan, etc)
 func GetSiteConfig() *SiteConfig {
-	return &Cfg.SiteConfig
+	return &cfg.SiteConfig
 }
 
 // GetBoardConfig returns the custom configuration for the specified board (if it exists)
@@ -459,14 +359,14 @@ func GetSiteConfig() *SiteConfig {
 func GetBoardConfig(board string) *BoardConfig {
 	bc, exists := boardConfigs[board]
 	if board == "" || !exists {
-		return &Cfg.BoardConfig
+		return &cfg.BoardConfig
 	}
 	return &bc
 }
 
 // UpdateBoardConfig updates or establishes the configuration for the given board
 func UpdateBoardConfig(dir string) error {
-	ba, err := os.ReadFile(path.Join(Cfg.DocumentRoot, dir, "board.json"))
+	ba, err := os.ReadFile(path.Join(cfg.DocumentRoot, dir, "board.json"))
 	if err != nil {
 		if os.IsNotExist(err) {
 			// board doesn't have a custom config, use global config
@@ -474,7 +374,7 @@ func UpdateBoardConfig(dir string) error {
 		}
 		return err
 	}
-	boardcfg := Cfg.BoardConfig
+	boardcfg := cfg.BoardConfig
 	if err = json.Unmarshal(ba, &boardcfg); err != nil {
 		return err
 	}
@@ -490,13 +390,13 @@ func DeleteBoardConfig(dir string) {
 }
 
 func VerboseMode() bool {
-	return Cfg.testing || Cfg.SystemCriticalConfig.Verbose
+	return cfg.testing || cfg.SystemCriticalConfig.Verbose
 }
 
 func SetVerbose(verbose bool) {
-	Cfg.Verbose = verbose
+	cfg.Verbose = verbose
 }
 
 func GetVersion() *GochanVersion {
-	return Cfg.Version
+	return cfg.Version
 }
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index e1066080..6d448314 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -26,17 +26,17 @@ func TestValidJSON(t *testing.T) {
 func TestValidateValues(t *testing.T) {
 	InitConfig("3.1.0")
 	SetRandomSeed("test")
-	assert.NoError(t, Cfg.ValidateValues())
+	assert.NoError(t, cfg.ValidateValues())
 
-	Cfg.CookieMaxAge = "not a duration"
-	assert.Error(t, Cfg.ValidateValues())
-	Cfg.CookieMaxAge = "1y"
-	assert.NoError(t, Cfg.ValidateValues())
+	cfg.CookieMaxAge = "not a duration"
+	assert.Error(t, cfg.ValidateValues())
+	cfg.CookieMaxAge = "1y"
+	assert.NoError(t, cfg.ValidateValues())
 
 	SetTestDBConfig("not a valid driver", "127.0.0.1", "gochan", "gochan", "", "")
-	assert.Error(t, Cfg.ValidateValues())
+	assert.Error(t, cfg.ValidateValues())
 	SetTestDBConfig("postgresql", "127.0.0.1", "gochan", "gochan", "", "")
-	assert.NoError(t, Cfg.ValidateValues())
+	assert.NoError(t, cfg.ValidateValues())
 }
 
 type webRootTest struct {
@@ -61,7 +61,7 @@ func TestWebPath(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.expectPath, func(t *testing.T) {
-			Cfg.WebRoot = tC.webRoot
+			cfg.WebRoot = tC.webRoot
 			wp := WebPath(tC.pathArgs...)
 			assert.Equal(t, tC.expectPath, wp)
 		})
diff --git a/pkg/config/preload.go b/pkg/config/preload.go
index de921750..6a26cd8e 100644
--- a/pkg/config/preload.go
+++ b/pkg/config/preload.go
@@ -9,11 +9,11 @@ func PreloadModule(l *lua.LState) int {
 	t := l.NewTable()
 	l.SetFuncs(t, map[string]lua.LGFunction{
 		"system_critical_config": func(l *lua.LState) int {
-			l.Push(luar.New(l, &Cfg.SystemCriticalConfig))
+			l.Push(luar.New(l, &cfg.SystemCriticalConfig))
 			return 1
 		},
 		"site_config": func(l *lua.LState) int {
-			l.Push(luar.New(l, &Cfg.SiteConfig))
+			l.Push(luar.New(l, &cfg.SiteConfig))
 			return 1
 		},
 		"board_config": func(l *lua.LState) int {
diff --git a/pkg/config/testing.go b/pkg/config/testing.go
index c938fa23..b0bbec26 100644
--- a/pkg/config/testing.go
+++ b/pkg/config/testing.go
@@ -3,8 +3,8 @@ package config
 import "github.com/gochan-org/gochan/pkg/gcutil/testutil"
 
 func setDefaultCfgIfNotSet() {
-	if Cfg == nil {
-		Cfg = defaultGochanConfig
+	if cfg == nil {
+		cfg = defaultGochanConfig
 	}
 }
 
@@ -13,7 +13,7 @@ func SetVersion(version string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	Cfg.Version = ParseVersion(version)
+	cfg.Version = ParseVersion(version)
 }
 
 // SetTestTemplateDir sets the directory for templates, used only in testing. If it is not run via `go test`, it will panic.
@@ -21,7 +21,7 @@ func SetTestTemplateDir(dir string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	Cfg.TemplateDir = dir
+	cfg.TemplateDir = dir
 }
 
 // SetTestDBConfig sets up the database configuration for a testing environment. If it is not run via `go test`, it will panic
@@ -29,19 +29,19 @@ func SetTestDBConfig(dbType string, dbHost string, dbName string, dbUsername str
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
 
-	Cfg.DBtype = dbType
-	Cfg.DBhost = dbHost
-	Cfg.DBname = dbName
-	Cfg.DBusername = dbUsername
-	Cfg.DBpassword = dbPassword
-	Cfg.DBprefix = dbPrefix
+	cfg.DBtype = dbType
+	cfg.DBhost = dbHost
+	cfg.DBname = dbName
+	cfg.DBusername = dbUsername
+	cfg.DBpassword = dbPassword
+	cfg.DBprefix = dbPrefix
 }
 
 // SetRandomSeed is usd to set a deterministic seed to make testing easier. If it is not run via `go test`, it will panic
 func SetRandomSeed(seed string) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	Cfg.RandomSeed = seed
+	cfg.RandomSeed = seed
 }
 
 // SetSystemCriticalConfig sets system critical configuration values in testing. It will panic if it is not run in a
@@ -49,14 +49,14 @@ func SetRandomSeed(seed string) {
 func SetSystemCriticalConfig(systemCritical *SystemCriticalConfig) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	Cfg.SystemCriticalConfig = *systemCritical
+	cfg.SystemCriticalConfig = *systemCritical
 }
 
 // SetSiteConfig sets the site configuration values in testing. It will panic if it is not run in a test environment
 func SetSiteConfig(siteConfig *SiteConfig) {
 	testutil.PanicIfNotTest()
 	setDefaultCfgIfNotSet()
-	Cfg.SiteConfig = *siteConfig
+	cfg.SiteConfig = *siteConfig
 }
 
 // SetBoardConfig applies the configuration to the given board. It will panic if it is not run in a test environment
@@ -65,7 +65,7 @@ func SetBoardConfig(board string, boardCfg *BoardConfig) {
 	setDefaultCfgIfNotSet()
 
 	if board == "" {
-		Cfg.BoardConfig = *boardCfg
+		cfg.BoardConfig = *boardCfg
 	} else {
 		boardConfigs[board] = *boardCfg
 	}
diff --git a/pkg/config/util.go b/pkg/config/util.go
index 5ef84745..30363cea 100644
--- a/pkg/config/util.go
+++ b/pkg/config/util.go
@@ -54,7 +54,7 @@ func GetUser() (int, int) {
 }
 
 func TakeOwnership(fp string) (err error) {
-	if runtime.GOOS == "windows" || fp == "" || Cfg.Username == "" {
+	if runtime.GOOS == "windows" || fp == "" || cfg.Username == "" {
 		// Chown returns an error in Windows so skip it, also skip if Username isn't set
 		// because otherwise it'll think we want to switch to uid and gid 0 (root)
 		return nil
@@ -63,7 +63,7 @@ func TakeOwnership(fp string) (err error) {
 }
 
 func TakeOwnershipOfFile(f *os.File) error {
-	if runtime.GOOS == "windows" || f == nil || Cfg.Username == "" {
+	if runtime.GOOS == "windows" || f == nil || cfg.Username == "" {
 		// Chown returns an error in Windows so skip it, also skip if Username isn't set
 		// because otherwise it'll think we want to switch to uid and gid 0 (root)
 		return nil
@@ -73,27 +73,27 @@ func TakeOwnershipOfFile(f *os.File) error {
 
 // InitConfig loads and parses gochan.json on startup and verifies its contents
 func InitConfig(versionStr string) {
-	Cfg = defaultGochanConfig
+	cfg = defaultGochanConfig
 	if strings.HasSuffix(os.Args[0], ".test") {
 		// create a dummy config for testing if we're using go test
-		Cfg = defaultGochanConfig
-		Cfg.ListenIP = "127.0.0.1"
-		Cfg.Port = 8080
-		Cfg.UseFastCGI = true
-		Cfg.testing = true
-		Cfg.TemplateDir = "templates"
-		Cfg.DBtype = "sqlite3"
-		Cfg.DBhost = "./testdata/gochantest.db"
-		Cfg.DBname = "gochan"
-		Cfg.DBusername = "gochan"
-		Cfg.SiteDomain = "127.0.0.1"
-		Cfg.RandomSeed = "test"
-		Cfg.Version = ParseVersion(versionStr)
-		Cfg.SiteSlogan = "Gochan testing"
-		Cfg.Verbose = true
-		Cfg.Captcha.OnlyNeededForThreads = true
-		Cfg.Cooldowns = BoardCooldowns{0, 0, 0}
-		Cfg.BanColors = []string{
+		cfg = defaultGochanConfig
+		cfg.ListenIP = "127.0.0.1"
+		cfg.Port = 8080
+		cfg.UseFastCGI = true
+		cfg.testing = true
+		cfg.TemplateDir = "templates"
+		cfg.DBtype = "sqlite3"
+		cfg.DBhost = "./testdata/gochantest.db"
+		cfg.DBname = "gochan"
+		cfg.DBusername = "gochan"
+		cfg.SiteDomain = "127.0.0.1"
+		cfg.RandomSeed = "test"
+		cfg.Version = ParseVersion(versionStr)
+		cfg.SiteSlogan = "Gochan testing"
+		cfg.Verbose = true
+		cfg.Captcha.OnlyNeededForThreads = true
+		cfg.Cooldowns = BoardCooldowns{0, 0, 0}
+		cfg.BanColors = []string{
 			"admin:#0000A0",
 			"somemod:blue",
 		}
@@ -114,21 +114,21 @@ func InitConfig(versionStr string) {
 		os.Exit(1)
 	}
 
-	if err = json.Unmarshal(cfgBytes, Cfg); err != nil {
+	if err = json.Unmarshal(cfgBytes, cfg); err != nil {
 		fmt.Printf("Error parsing %s: %s", cfgPath, err.Error())
 		os.Exit(1)
 	}
-	Cfg.jsonLocation = cfgPath
+	cfg.jsonLocation = cfgPath
 
-	if err = Cfg.ValidateValues(); err != nil {
+	if err = cfg.ValidateValues(); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 
 	if runtime.GOOS != "windows" {
 		var gcUser *user.User
-		if Cfg.Username != "" {
-			gcUser, err = user.Lookup(Cfg.Username)
+		if cfg.Username != "" {
+			gcUser, err = user.Lookup(cfg.Username)
 		} else {
 			gcUser, err = user.Current()
 		}
@@ -147,51 +147,51 @@ func InitConfig(versionStr string) {
 		}
 	}
 
-	if _, err = os.Stat(Cfg.DocumentRoot); err != nil {
+	if _, err = os.Stat(cfg.DocumentRoot); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
-	if _, err = os.Stat(Cfg.TemplateDir); err != nil {
+	if _, err = os.Stat(cfg.TemplateDir); err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
-	if _, err = os.Stat(Cfg.LogDir); os.IsNotExist(err) {
-		err = os.MkdirAll(Cfg.LogDir, DirFileMode)
+	if _, err = os.Stat(cfg.LogDir); os.IsNotExist(err) {
+		err = os.MkdirAll(cfg.LogDir, DirFileMode)
 	}
 	if err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 
-	Cfg.LogDir = gcutil.FindResource(Cfg.LogDir, "log", "/var/log/gochan/")
+	cfg.LogDir = gcutil.FindResource(cfg.LogDir, "log", "/var/log/gochan/")
 
-	if Cfg.Port == 0 {
-		Cfg.Port = 80
+	if cfg.Port == 0 {
+		cfg.Port = 80
 	}
 
-	if len(Cfg.FirstPage) == 0 {
-		Cfg.FirstPage = []string{"index.html", "1.html", "firstrun.html"}
+	if len(cfg.FirstPage) == 0 {
+		cfg.FirstPage = []string{"index.html", "1.html", "firstrun.html"}
 	}
 
-	if Cfg.WebRoot == "" {
-		Cfg.WebRoot = "/"
+	if cfg.WebRoot == "" {
+		cfg.WebRoot = "/"
 	}
 
-	if Cfg.WebRoot[0] != '/' {
-		Cfg.WebRoot = "/" + Cfg.WebRoot
+	if cfg.WebRoot[0] != '/' {
+		cfg.WebRoot = "/" + cfg.WebRoot
 	}
-	if Cfg.WebRoot[len(Cfg.WebRoot)-1] != '/' {
-		Cfg.WebRoot += "/"
+	if cfg.WebRoot[len(cfg.WebRoot)-1] != '/' {
+		cfg.WebRoot += "/"
 	}
 
 	_, zoneOffset := time.Now().Zone()
-	Cfg.TimeZone = zoneOffset / 60 / 60
+	cfg.TimeZone = zoneOffset / 60 / 60
 
-	Cfg.Version = ParseVersion(versionStr)
-	Cfg.Version.Normalize()
+	cfg.Version = ParseVersion(versionStr)
+	cfg.Version.Normalize()
 }
 
 // WebPath returns an absolute path, starting at the web root (which is "/" by default)
 func WebPath(part ...string) string {
-	return path.Join(Cfg.WebRoot, path.Join(part...))
+	return path.Join(cfg.WebRoot, path.Join(part...))
 }
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 09fac76d..91f31d2d 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -2,17 +2,27 @@ package server
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestServeJSON(t *testing.T) {
-	// Set up a mock configuration
-	config.SetMockConfig()
+
+	dir, err := testutil.GoToGochanRoot(t)
+	if !assert.NoError(t, err) {
+		t.Fatalf("Failed to get current working directory: %v", err)
+		fmt.Println("Current working directory:", dir)
+		return
+	}
+
+	config.SetVersion("4.0.1")
+	config.SetRandomSeed("test")
 
 	writer := httptest.NewRecorder()
 	data := map[string]interface{}{
@@ -56,14 +66,21 @@ func TestServeJSON(t *testing.T) {
 }
 
 func TestServeErrorPage(t *testing.T) {
-	// Set up a mock configuration
-	config.SetMockConfig()
+
+	dir, err := testutil.GoToGochanRoot(t)
+	if !assert.NoError(t, err) {
+		t.Fatalf("Failed to get current working directory: %v", err)
+		fmt.Println("Current working directory:", dir)
+		return
+	}
+
+	config.SetVersion("4.0.1")
 
 	// Set writer and error string message
 	writer := httptest.NewRecorder()
-	err := "Unexpected error has occurred."
+	errorMsg := "Unexpected error has occurred."
 
-	ServeErrorPage(writer, err)
+	ServeErrorPage(writer, errorMsg)
 
 	body := writer.Body.String()
 	t.Log("=============")
@@ -75,13 +92,13 @@ func TestServeErrorPage(t *testing.T) {
 	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
 
 	// Check the response body for the error message
-	//assert.Contains(t, body, err)       Check if the body contains the error message
-	//assert.Contains(t, body, "Error")   Check if the body contains the error title or header
+	assert.Contains(t, body, err)
+	assert.Contains(t, body, "Error")
 }
 
 func TestServeError(t *testing.T) {
-	// Set up a mock configuration
-	config.SetMockConfig()
+
+	config.SetVersion("4.0.1")
 
 	tests := []struct {
 		name      string
diff --git a/pkg/server/serverstatic_test.go b/pkg/server/serverstatic_test.go
index 0a379d2e..11372a6c 100644
--- a/pkg/server/serverstatic_test.go
+++ b/pkg/server/serverstatic_test.go
@@ -13,8 +13,8 @@ import (
 )
 
 func TestServeFile(t *testing.T) {
-	// Set up a mock configuration
-	config.SetMockConfig()
+
+	config.SetVersion("4.0.1")
 
 	tempDir, err := ioutil.TempDir("", "testservefile")
 	if err != nil {
@@ -51,8 +51,8 @@ func TestServeFile(t *testing.T) {
 }
 
 func TestServeFile_NotFound(t *testing.T) {
-	// Set up a mock configuration
-	config.SetMockConfig()
+
+	config.SetVersion("4.0.1")
 
 	// Create a temporary directory for testing
 	tempDir, err := ioutil.TempDir("", "testservefile")

From cb1bda430bfdad291f409c6465c2459f1f2b37a5 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Tue, 24 Dec 2024 08:32:46 +0100
Subject: [PATCH 017/122] deepsource fix

---
 pkg/server/server_test.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 91f31d2d..451647ec 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -14,10 +13,9 @@ import (
 
 func TestServeJSON(t *testing.T) {
 
-	dir, err := testutil.GoToGochanRoot(t)
+	_, err := testutil.GoToGochanRoot(t)
 	if !assert.NoError(t, err) {
 		t.Fatalf("Failed to get current working directory: %v", err)
-		fmt.Println("Current working directory:", dir)
 		return
 	}
 
@@ -67,10 +65,9 @@ func TestServeJSON(t *testing.T) {
 
 func TestServeErrorPage(t *testing.T) {
 
-	dir, err := testutil.GoToGochanRoot(t)
+	_, err := testutil.GoToGochanRoot(t)
 	if !assert.NoError(t, err) {
 		t.Fatalf("Failed to get current working directory: %v", err)
-		fmt.Println("Current working directory:", dir)
 		return
 	}
 

From 9170c18df61119e82d01a8ae0ca07ae605fab847 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 24 Dec 2024 23:19:24 -0800
Subject: [PATCH 018/122] Properly attach file to QR submitted form, prevent
 scrolling on QR submission

---
 frontend/ts/dom/qr.ts         | 16 ++++++++++++++++
 frontend/ts/dom/uploaddata.ts | 12 +++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/frontend/ts/dom/qr.ts b/frontend/ts/dom/qr.ts
index 25c6f612..47a34b47 100755
--- a/frontend/ts/dom/qr.ts
+++ b/frontend/ts/dom/qr.ts
@@ -93,6 +93,21 @@ function setButtonTimeout(prefix = "", cooldown = 5) {
 	timeoutCB();
 }
 
+function fixFileList() {
+	let files:FileList = null;
+	const $browseBtns = $<HTMLInputElement>("input[name=imagefile]");
+	$browseBtns.each((_i, el) => {
+		if(el.files?.length > 0 && !files) {
+			files = el.files;
+			return false;
+		}
+	});
+	$browseBtns.each((_i, el) => {
+		if(files)
+			el.files = files;
+	});
+}
+
 export function initQR() {
 	if($qr !== null) {
 		// QR box already initialized
@@ -204,6 +219,7 @@ export function initQR() {
 	resetSubmitButtonText();
 
 	$postform.on("submit", function(e) {
+		fixFileList();
 		const $form = $<HTMLFormElement>(this);
 		e.preventDefault();
 		copyCaptchaResponse($form);
diff --git a/frontend/ts/dom/uploaddata.ts b/frontend/ts/dom/uploaddata.ts
index 61c7afe3..f82948db 100644
--- a/frontend/ts/dom/uploaddata.ts
+++ b/frontend/ts/dom/uploaddata.ts
@@ -86,13 +86,19 @@ function replaceBrowseButton() {
 		$("<a/>").addClass("browse-text")
 			.attr("href", "#")
 			.text("Select/drop/paste upload here")
-			.on("click", () => $browseBtn.trigger("click"))
+			.on("click", e => {
+				e.preventDefault();
+				$browseBtn.trigger("click");
+			})
 	).on("dragenter dragover drop", dragAndDrop).insertBefore($browseBtn);
 
 	$("form#postform, form#qrpostform").on("paste", e => {
 		const clipboardData = (e.originalEvent as ClipboardEvent).clipboardData;
-		if(clipboardData.items.length < 1 || clipboardData.items[0].kind !== "file") {
-			console.log("No files in clipboard");
+		if(clipboardData.items.length < 1) {
+			alertLightbox("No files in clipboard", "Unable to paste");
+			return;
+		}
+		if(clipboardData.items[0].kind !== "file") {
 			return;
 		}
 		const clipboardFile = clipboardData.items[0].getAsFile();

From 10be5cb0f3505c80472f739430c2927801b0b130 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:20:57 -0800
Subject: [PATCH 019/122] Update golang.org/x/net dependency

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 980e2c0a..684bd028 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/yuin/gopher-lua v1.1.1
 	golang.org/x/crypto v0.31.0
 	golang.org/x/image v0.23.0
-	golang.org/x/net v0.32.0
+	golang.org/x/net v0.33.0
 	layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf
 	layeh.com/gopher-luar v1.0.11
 )
diff --git a/go.sum b/go.sum
index b22a5be0..8310c354 100644
--- a/go.sum
+++ b/go.sum
@@ -189,8 +189,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

From 6b263ca48f6eb7b33a35fd56aeebf68b8008babd Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:43:57 -0800
Subject: [PATCH 020/122] Replace ioutil with io and os, fix
 serverstatic_test.go tests

---
 pkg/server/server_test.go       | 16 ++++++++++------
 pkg/server/serverstatic_test.go | 10 +++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 451647ec..70f8a2c9 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -7,7 +7,10 @@ import (
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
+	_ "github.com/gochan-org/gochan/pkg/gcsql/initsql"
+	"github.com/gochan-org/gochan/pkg/gctemplates"
 	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
+	_ "github.com/gochan-org/gochan/pkg/posting/uploads/inituploads"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -64,14 +67,15 @@ func TestServeJSON(t *testing.T) {
 }
 
 func TestServeErrorPage(t *testing.T) {
-
 	_, err := testutil.GoToGochanRoot(t)
-	if !assert.NoError(t, err) {
-		t.Fatalf("Failed to get current working directory: %v", err)
+	if !assert.NoError(t, err, "Unable to switch to gochan root directory") {
 		return
 	}
-
 	config.SetVersion("4.0.1")
+	config.SetTestTemplateDir("templates")
+	if !assert.NoError(t, gctemplates.InitTemplates()) {
+		return
+	}
 
 	// Set writer and error string message
 	writer := httptest.NewRecorder()
@@ -89,7 +93,7 @@ func TestServeErrorPage(t *testing.T) {
 	assert.Equal(t, "text/html; charset=utf-8", writer.Header().Get("Content-Type"))
 
 	// Check the response body for the error message
-	assert.Contains(t, body, err)
+	assert.Contains(t, body, errorMsg)
 	assert.Contains(t, body, "Error")
 }
 
@@ -123,7 +127,7 @@ func TestServeError(t *testing.T) {
 			err:       "page not found",
 			wantsJSON: false,
 			data:      nil,
-			expected:  "", // Should we expect something ?
+			expected:  "<!doctype html><meta charset=utf-8><title>Error :c</title><h1>Error</h1><p>page not found<hr><address>Site powered by Gochan 4.0.1</address>",
 		},
 	}
 
diff --git a/pkg/server/serverstatic_test.go b/pkg/server/serverstatic_test.go
index 11372a6c..78b6c68b 100644
--- a/pkg/server/serverstatic_test.go
+++ b/pkg/server/serverstatic_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -16,7 +16,7 @@ func TestServeFile(t *testing.T) {
 
 	config.SetVersion("4.0.1")
 
-	tempDir, err := ioutil.TempDir("", "testservefile")
+	tempDir, err := os.MkdirTemp("", "testservefile")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -30,7 +30,7 @@ func TestServeFile(t *testing.T) {
 	// Create a test file
 	testFileName := "testfile.txt"
 	testFilePath := path.Join(tempDir, testFileName)
-	err = ioutil.WriteFile(testFilePath, []byte("Hello, World!"), 0644)
+	err = os.WriteFile(testFilePath, []byte("Hello, World!"), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -43,7 +43,7 @@ func TestServeFile(t *testing.T) {
 	res := rr.Result()
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -55,7 +55,7 @@ func TestServeFile_NotFound(t *testing.T) {
 	config.SetVersion("4.0.1")
 
 	// Create a temporary directory for testing
-	tempDir, err := ioutil.TempDir("", "testservefile")
+	tempDir, err := os.MkdirTemp("", "testservefile")
 	if err != nil {
 		t.Fatal(err)
 	}

From 8dd8214974ff95d6c79b05b6089c0fe7f448a017 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:54:04 -0800
Subject: [PATCH 021/122] Fix deepsource JS-0045

---
 frontend/ts/dom/qr.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/ts/dom/qr.ts b/frontend/ts/dom/qr.ts
index 47a34b47..ee84ef09 100755
--- a/frontend/ts/dom/qr.ts
+++ b/frontend/ts/dom/qr.ts
@@ -101,6 +101,7 @@ function fixFileList() {
 			files = el.files;
 			return false;
 		}
+		return;
 	});
 	$browseBtns.each((_i, el) => {
 		if(files)

From 3bec5d2c3d69220a16173ea7b19c89def17b53a2 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 25 Dec 2024 14:57:52 -0800
Subject: [PATCH 022/122] Fix JS-0045 really this time

---
 frontend/ts/dom/qr.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/ts/dom/qr.ts b/frontend/ts/dom/qr.ts
index ee84ef09..3aa5d549 100755
--- a/frontend/ts/dom/qr.ts
+++ b/frontend/ts/dom/qr.ts
@@ -101,7 +101,7 @@ function fixFileList() {
 			files = el.files;
 			return false;
 		}
-		return;
+		return null;
 	});
 	$browseBtns.each((_i, el) => {
 		if(files)

From 89c7a64da0c0168a230af604c936373a3652caa7 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 29 Dec 2024 16:54:36 -0800
Subject: [PATCH 023/122] Don't require screen in get_pre2021.sh

---
 tools/get_pre2021.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/get_pre2021.sh b/tools/get_pre2021.sh
index b2e24565..764a92d9 100755
--- a/tools/get_pre2021.sh
+++ b/tools/get_pre2021.sh
@@ -10,11 +10,6 @@ RELEASE_DIR="gochan-${TESTING_VERSION}_linux"
 RELEASE_GZ="$RELEASE_DIR.tar.gz"
 RELEASE_URL="https://github.com/gochan-org/gochan/releases/download/$TESTING_VERSION/$RELEASE_GZ"
 
-if [ -z "$STY" ]; then
-	echo "This command should be run from a screen instance"
-	echo "Example: screen -S get_pre2021 $0"
-	exit 1
-fi
 
 if [ "$USER" != "vagrant" ]; then
 	echo "This must be run in the vagrant VM (expected \$USER to be vagrant, got $USER)"
@@ -29,7 +24,7 @@ echo "Extracting $RELEASE_GZ"
 tar -xf gochan-v2.12.0_linux.tar.gz
 cd $RELEASE_DIR
 
-cp examples/configs/gochan.example.json gochan.json
+cp sample-configs/gochan.example.json gochan.json
 echo "Modifying $PWD/gochan.json for testing migration"
 sed -i gochan.json \
 	-e 's/"Port": .*/"Port": 9000,/' \
@@ -64,4 +59,4 @@ else
 	exit 1
 fi
 
-sudo ./gochan
\ No newline at end of file
+sudo ./gochan

From 75d5b32cdc4ae46710aa8a896da7e2e9ddc001e8 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:49:05 -0800
Subject: [PATCH 024/122] Start working on making it possible to migrate old
 imageboard DB in place

---
 .../internal/common/handler.go                |  5 +++++
 .../internal/gcupdate/gcupdate.go             | 14 ++++++++-----
 .../internal/pre2021/boards.go                | 11 ++++++++++
 .../internal/pre2021/pre2021.go               | 15 +++++++-------
 cmd/gochan-migration/main.go                  | 20 +++++++++++++++----
 pkg/gcsql/database.go                         |  3 +--
 6 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/handler.go b/cmd/gochan-migration/internal/common/handler.go
index 3edb3815..fa92a541 100644
--- a/cmd/gochan-migration/internal/common/handler.go
+++ b/cmd/gochan-migration/internal/common/handler.go
@@ -56,6 +56,11 @@ type DBMigrator interface {
 	// will exit
 	IsMigrated() (bool, error)
 
+	// IsMigratingInPlace returns true if the old database name is the same as the new database name,
+	// meaning that the tables will be altered to match the new schema, instead of creating tables in the
+	// new database and copying data over
+	IsMigratingInPlace() bool
+
 	// MigrateDB alters the database schema to match the new schema, then migrates the imageboard
 	// data (posts, boards, etc) to the new database. It is assumed that MigrateDB will handle
 	// logging any errors that occur during the migration
diff --git a/cmd/gochan-migration/internal/gcupdate/gcupdate.go b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
index ff2e0718..7e194781 100644
--- a/cmd/gochan-migration/internal/gcupdate/gcupdate.go
+++ b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
@@ -2,7 +2,6 @@ package gcupdate
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -22,6 +21,11 @@ type GCDatabaseUpdater struct {
 	TargetDBVer int
 }
 
+// IsMigratingInPlace implements common.DBMigrator.
+func (dbu *GCDatabaseUpdater) IsMigratingInPlace() bool {
+	return true
+}
+
 func (dbu *GCDatabaseUpdater) Init(options *common.MigrationOptions) error {
 	dbu.options = options
 	sqlCfg := config.GetSQLConfig()
@@ -174,7 +178,7 @@ func (dbu *GCDatabaseUpdater) migrateFileBans(ctx context.Context, sqlConfig *co
 	tx, err := dbu.db.BeginTx(ctx, nil)
 	defer func() {
 		if a := recover(); a != nil {
-			err = errors.New(fmt.Sprintf("recovered: %v", a))
+			err = fmt.Errorf("recovered: %v", a)
 			errEv.Caller(4).Err(err).Send()
 			errEv.Discard()
 		} else if err != nil {
@@ -262,7 +266,7 @@ func (dbu *GCDatabaseUpdater) migrateFilenameBans(ctx context.Context, _ *config
 	tx, err := dbu.db.BeginTx(ctx, nil)
 	defer func() {
 		if a := recover(); a != nil {
-			err = errors.New(fmt.Sprintf("recovered: %v", a))
+			err = fmt.Errorf("recovered: %v", a)
 			errEv.Caller(4).Err(err).Send()
 			errEv.Discard()
 		} else if err != nil {
@@ -320,7 +324,7 @@ func (dbu *GCDatabaseUpdater) migrateUsernameBans(ctx context.Context, _ *config
 	tx, err := dbu.db.BeginTx(ctx, nil)
 	defer func() {
 		if a := recover(); a != nil {
-			err = errors.New(fmt.Sprintf("recovered: %v", a))
+			err = fmt.Errorf("recovered: %v", a)
 			errEv.Caller(4).Err(err).Send()
 			errEv.Discard()
 		} else if err != nil {
@@ -378,7 +382,7 @@ func (dbu *GCDatabaseUpdater) migrateWordfilters(ctx context.Context, sqlConfig
 	tx, err := dbu.db.BeginTx(ctx, nil)
 	defer func() {
 		if a := recover(); a != nil {
-			err = errors.New(fmt.Sprintf("recovered: %v", a))
+			err = fmt.Errorf("recovered: %v", a)
 			errEv.Caller(4).Err(err).Send()
 			errEv.Discard()
 		} else if err != nil {
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index c5aa1c20..6497c34c 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -1,12 +1,19 @@
 package pre2021
 
 import (
+	"fmt"
 	"log"
 
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
 func (m *Pre2021Migrator) MigrateBoards() error {
+	defer func() {
+		if r := recover(); r != nil {
+			common.LogFatal().Interface("recover", r).Msg("Recovered from panic in MigrateBoards")
+		}
+	}()
 	if m.oldBoards == nil {
 		m.oldBoards = map[int]string{}
 	}
@@ -14,10 +21,14 @@ func (m *Pre2021Migrator) MigrateBoards() error {
 		m.newBoards = map[int]string{}
 	}
 	// get all boards from new db
+	fmt.Println("0")
 	err := gcsql.ResetBoardSectionArrays()
+	fmt.Println("1")
 	if err != nil {
+		fmt.Println("2")
 		return nil
 	}
+	fmt.Println("3")
 
 	// get boards from old db
 	rows, err := m.db.QuerySQL(boardsQuery)
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 0d3ffcc1..ae5ebdd0 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -12,12 +12,6 @@ import (
 
 type Pre2021Config struct {
 	config.SQLConfig
-	// DBtype       string
-	// DBhost       string
-	// DBname       string
-	// DBusername   string
-	// DBpassword   string
-	// DBprefix     string
 	DocumentRoot string
 }
 
@@ -31,6 +25,11 @@ type Pre2021Migrator struct {
 	newBoards map[int]string // map[board]dir
 }
 
+// IsMigratingInPlace implements common.DBMigrator.
+func (m *Pre2021Migrator) IsMigratingInPlace() bool {
+	return m.config.DBname == config.GetSQLConfig().DBname
+}
+
 func (m *Pre2021Migrator) readConfig() error {
 	ba, err := os.ReadFile(m.options.OldChanConfig)
 	if err != nil {
@@ -68,7 +67,7 @@ func (m *Pre2021Migrator) IsMigrated() (bool, error) {
 		return false, gcsql.ErrUnsupportedDB
 	}
 	if err = m.db.QueryRowSQL(query,
-		[]interface{}{m.config.DBprefix + "migrated", m.config.DBname},
+		[]interface{}{m.config.DBprefix + "database_version", m.config.DBname},
 		[]interface{}{&migrated}); err != nil {
 		return migrated, err
 	}
@@ -82,12 +81,14 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	}
 	if migrated {
 		// db is already migrated, stop
+		common.LogWarning().Msg("Database is already migrated (database_version table exists)")
 		return true, nil
 	}
 
 	if err := m.MigrateBoards(); err != nil {
 		return false, err
 	}
+	common.LogInfo().Msg("Migrated boards")
 	// if err = m.MigratePosts(); err != nil {
 	// 	return false, err
 	// }
diff --git a/cmd/gochan-migration/main.go b/cmd/gochan-migration/main.go
index bf84f45a..c52e87fd 100644
--- a/cmd/gochan-migration/main.go
+++ b/cmd/gochan-migration/main.go
@@ -56,9 +56,14 @@ func main() {
 		fatalEv.Discard()
 	}()
 
-	if !updateDB && (options.ChanType == "" || options.OldChanConfig == "") {
-		flag.PrintDefaults()
-		fatalEv.Msg("Missing required oldchan value")
+	if !updateDB {
+		if options.ChanType == "" {
+			flag.PrintDefaults()
+			fatalEv.Msg("Missing required oldchan value")
+		} else if options.OldChanConfig == "" {
+			flag.PrintDefaults()
+			fatalEv.Msg("Missing required oldconfig value")
+		}
 	} else if updateDB {
 		options.ChanType = "gcupdate"
 	}
@@ -82,8 +87,15 @@ func main() {
 	default:
 		fatalEv.Msg("Unsupported chan type, Currently only pre2021 database migration is supported")
 	}
+	migratingInPlace := migrator.IsMigratingInPlace()
+	common.LogInfo().
+		Str("oldChanType", options.ChanType).
+		Str("oldChanConfig", options.OldChanConfig).
+		Bool("migratingInPlace", migratingInPlace).
+		Msg("Starting database migration")
+
 	config.InitConfig(versionStr)
-	if !updateDB {
+	if !migratingInPlace {
 		sqlCfg := config.GetSQLConfig()
 		err = gcsql.ConnectToDB(&sqlCfg)
 		if err != nil {
diff --git a/pkg/gcsql/database.go b/pkg/gcsql/database.go
index 163c5554..f9cdb51a 100644
--- a/pkg/gcsql/database.go
+++ b/pkg/gcsql/database.go
@@ -416,8 +416,7 @@ func SetupMockDB(driver string) (sqlmock.Sqlmock, error) {
 	return mock, err
 }
 
-// Open opens and returns a new gochan database connection with the provided host, driver, DB name,
-// username, password, and table prefix
+// Open opens and returns a new gochan database connection with the provided SQL options
 func Open(cfg *config.SQLConfig) (db *GCDB, err error) {
 	db, err = setupDBConn(cfg)
 	if err != nil {

From 06321bb5fd2f145a61f6eb40ad19ed05df207099 Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Tue, 31 Dec 2024 09:40:01 +0100
Subject: [PATCH 025/122] Footer & Header Templates Tests

---
 pkg/gctemplates/templatetests/templates_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/gctemplates/templatetests/templates_test.go b/pkg/gctemplates/templatetests/templates_test.go
index d8ce11c7..8c088bba 100644
--- a/pkg/gctemplates/templatetests/templates_test.go
+++ b/pkg/gctemplates/templatetests/templates_test.go
@@ -108,3 +108,11 @@ func TestTemplateBase(t *testing.T) {
 
 	initTemplatesMock(t, mock)
 }
+
+func TestBaseFooter(t *testing.T) {
+	runTemplateTestCases(t, gctemplates.PageFooter, baseFooterCases)
+}
+
+func TestBaseHeader(t *testing.T) {
+	runTemplateTestCases(t, gctemplates.PageHeader, baseHeaderCases)
+}

From 6b5498cb7aa063d7f5d9e56dd1be5d69841c7bc3 Mon Sep 17 00:00:00 2001
From: "o.nihilist" <107046146+onihilist@users.noreply.github.com>
Date: Tue, 31 Dec 2024 09:40:29 +0100
Subject: [PATCH 026/122] Footer & Header Templates Tests

---
 .../templatetests/templatecases_test.go       | 201 ++++++++++++++++++
 1 file changed, 201 insertions(+)

diff --git a/pkg/gctemplates/templatetests/templatecases_test.go b/pkg/gctemplates/templatetests/templatecases_test.go
index affaf46a..740ed489 100644
--- a/pkg/gctemplates/templatetests/templatecases_test.go
+++ b/pkg/gctemplates/templatetests/templatecases_test.go
@@ -70,6 +70,18 @@ var (
 		AnonymousName: "Anonymous Coward",
 	}
 
+	simpleBoard2 = &gcsql.Board{
+		ID:            2,
+		SectionID:     2,
+		URI:           "sup",
+		Dir:           "sup",
+		Title:         "Gochan Support board",
+		Subtitle:      "Board for helping out gochan users/admins",
+		Description:   "Board for helping out gochan users/admins",
+		DefaultStyle:  "yotsuba.css",
+		AnonymousName: "Anonymous Coward",
+	}
+
 	banPageCases = []templateTestCase{
 		{
 			desc: "appealable permaban",
@@ -251,6 +263,195 @@ var (
 			expectedOutput: `const styles=[];const defaultStyle="\&#34;a\\a\&#34;";const webroot="";const serverTZ=0;const fileTypes=[];`,
 		},
 	}
+
+	baseFooterCases = []templateTestCase{
+		{
+			desc: "base footer test",
+			data: map[string]any{
+				"boardConfig": simpleBoardConfig,
+				"board":       simpleBoard1,
+				"numPages":    1,
+				"sections": []gcsql.Section{
+					{ID: 1},
+				},
+			},
+			expectedOutput: footer,
+		},
+		{
+			desc: "base footer test",
+			data: map[string]any{
+				"boardConfig": simpleBoardConfig,
+				"board":       simpleBoard2,
+				"numPages":    3,
+				"sections": []gcsql.Section{
+					{ID: 1},
+				},
+			},
+			expectedOutput: footer,
+		},
+	}
+
+	baseHeaderCases = []templateTestCase{
+		{
+			desc: "Header Test /test/",
+			data: map[string]any{
+				"boardConfig": simpleBoardConfig,
+				"board":       simpleBoard1,
+				"numPages":    1,
+				"sections": []gcsql.Section{
+					{ID: 1},
+				},
+			},
+			expectedOutput: headBeginning +
+				`<title>/test/-Testing board</title>` +
+				`<link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/>` +
+				`<link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script>` +
+				`<script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section">` +
+				`<a href="/"class="topbar-item">home</a></div>` +
+				`<div class="topbar-section"><a href="/test/"class="topbar-item"title="Testing board">/test/</a>` +
+				`<a href="/test2/" class="topbar-item" title="Testing board#2">/test2/</a></div></div>` +
+				`<div id="content">`,
+		},
+		{
+			desc: "Header Test /sup/",
+			data: map[string]any{
+				"boardConfig": simpleBoardConfig,
+				"board":       simpleBoard2,
+				"numPages":    1,
+				"sections": []gcsql.Section{
+					{ID: 1},
+				},
+			},
+			expectedOutput: headBeginning +
+				`<title>/sup/-Gochan Support board</title>` +
+				`<link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/>` +
+				`<link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script>` +
+				`<script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section">` +
+				`<a href="/"class="topbar-item">home</a></div>` +
+				`<div class="topbar-section"><a href="/test/"class="topbar-item"title="Testing board">/test/</a>` +
+				`<a href="/test2/" class="topbar-item" title="Testing board#2">/test2/</a></div></div>` +
+				`<div id="content">`,
+		},
+		{
+			desc: "Perma Ban Header Test",
+			data: map[string]any{
+				"ban": &gcsql.IPBan{
+					RangeStart: "192.168.56.0",
+					RangeEnd:   "192.168.56.255",
+					IPBanBase: gcsql.IPBanBase{
+						IsActive:  true,
+						Permanent: true,
+						StaffID:   1,
+						Message:   "ban message goes here",
+					},
+				},
+				"ip":         "192.168.56.1",
+				"siteConfig": testingSiteConfig,
+				"systemCritical": config.SystemCriticalConfig{
+					WebRoot: "/",
+				},
+				"boardConfig": config.BoardConfig{
+					DefaultStyle: "pipes.css",
+				},
+			},
+			expectedOutput: `<!DOCTYPE html><html lang="en"><head>` +
+				`<meta charset="UTF-8"><meta name="viewport"content="width=device-width, initial-scale=1.0">` +
+				`<title>YOU'RE PERMABANNED,&nbsp;IDIOT!</title><link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/><link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script><script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section"><a href="/"class="topbar-item">home</a></div></div><div id="content">`,
+		},
+		{
+			desc: "Appealable Perma Ban Header Test",
+			data: map[string]any{
+				"ban": &gcsql.IPBan{
+					RangeStart: "192.168.56.0",
+					RangeEnd:   "192.168.56.255",
+					IPBanBase: gcsql.IPBanBase{
+						Permanent: true,
+						CanAppeal: true,
+						StaffID:   1,
+						Message:   "ban message goes here",
+					},
+				},
+				"ip":         "192.168.56.1",
+				"siteConfig": testingSiteConfig,
+				"systemCritical": config.SystemCriticalConfig{
+					WebRoot: "/",
+				},
+				"boardConfig": config.BoardConfig{
+					DefaultStyle: "pipes.css",
+				},
+			},
+			expectedOutput: `<!DOCTYPE html><html lang="en"><head>` +
+				`<meta charset="UTF-8"><meta name="viewport"content="width=device-width, initial-scale=1.0">` +
+				`<title>YOU ARE BANNED:(</title><link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/><link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script><script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section"><a href="/"class="topbar-item">home</a></div></div><div id="content">`,
+		},
+		{
+			desc: "Appealable Temp Ban Header Test",
+			data: map[string]any{
+				"ban": &gcsql.IPBan{
+					RangeStart: "192.168.56.0",
+					RangeEnd:   "192.168.56.255",
+					IPBanBase: gcsql.IPBanBase{
+						CanAppeal: true,
+						StaffID:   1,
+						Message:   "ban message goes here",
+					},
+				},
+				"ip":         "192.168.56.1",
+				"siteConfig": testingSiteConfig,
+				"systemCritical": config.SystemCriticalConfig{
+					WebRoot: "/",
+				},
+				"boardConfig": config.BoardConfig{
+					DefaultStyle: "pipes.css",
+				},
+			},
+			expectedOutput: `<!DOCTYPE html><html lang="en">` +
+				`<head><meta charset="UTF-8"><meta name="viewport"content="width=device-width, initial-scale=1.0">` +
+				`<title>YOU ARE BANNED:(</title><link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/><link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script><script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section"><a href="/"class="topbar-item">home</a></div></div><div id="content">`,
+		},
+		{
+			desc: "Unappealable Temp Ban Header Test",
+			data: map[string]any{
+				"ban": &gcsql.IPBan{
+					RangeStart: "192.168.56.0",
+					RangeEnd:   "192.168.56.255",
+					IPBanBase: gcsql.IPBanBase{
+						StaffID: 1,
+						Message: "ban message goes here",
+					},
+				},
+				"ip":         "192.168.56.1",
+				"siteConfig": testingSiteConfig,
+				"systemCritical": config.SystemCriticalConfig{
+					WebRoot: "/",
+				},
+				"boardConfig": config.BoardConfig{
+					DefaultStyle: "pipes.css",
+				},
+			},
+			expectedOutput: `<!DOCTYPE html><html lang="en"><head>` +
+				`<meta charset="UTF-8"><meta name="viewport"content="width=device-width, initial-scale=1.0">` +
+				`<title>YOU ARE BANNED:(</title><link rel="stylesheet"href="/css/global.css"/>` +
+				`<link id="theme"rel="stylesheet"href="/css/pipes.css"/><link rel="shortcut icon"href="/favicon.png">` +
+				`<script type="text/javascript"src="/js/consts.js"></script><script type="text/javascript"src="/js/gochan.js"></script>` +
+				`</head><body><div id="topbar"><div class="topbar-section"><a href="/"class="topbar-item">home</a></div></div><div id="content">`,
+		},
+	}
 )
 
 const (

From 0d0aca83afb1f92ac66c64c1a437be18bbc8670b Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:36:20 -0800
Subject: [PATCH 027/122] Add gcsql.GetSectionFromName and start overhaul of
 pre2021 migration

---
 .../internal/common/handler.go                |   1 -
 .../internal/pre2021/boards.go                | 258 ++++++++++--------
 .../internal/pre2021/posts.go                 |  24 +-
 .../internal/pre2021/pre2021.go               |   7 +-
 .../internal/pre2021/queries.go               |  62 +----
 pkg/gcsql/sections.go                         |  24 +-
 6 files changed, 202 insertions(+), 174 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/handler.go b/cmd/gochan-migration/internal/common/handler.go
index fa92a541..fa3e64ee 100644
--- a/cmd/gochan-migration/internal/common/handler.go
+++ b/cmd/gochan-migration/internal/common/handler.go
@@ -41,7 +41,6 @@ type MigrationOptions struct {
 	OldChanConfig string
 	OldDBName     string
 	NewDBName     string
-	DirAction     int
 }
 
 // DBMigrator is used for handling the migration from one database type to a
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 6497c34c..4c44ac84 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -1,92 +1,139 @@
 package pre2021
 
 import (
-	"fmt"
-	"log"
+	"errors"
+	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
-func (m *Pre2021Migrator) MigrateBoards() error {
-	defer func() {
-		if r := recover(); r != nil {
-			common.LogFatal().Interface("recover", r).Msg("Recovered from panic in MigrateBoards")
-		}
-	}()
-	if m.oldBoards == nil {
-		m.oldBoards = map[int]string{}
-	}
-	if m.newBoards == nil {
-		m.newBoards = map[int]string{}
-	}
-	// get all boards from new db
-	fmt.Println("0")
-	err := gcsql.ResetBoardSectionArrays()
-	fmt.Println("1")
-	if err != nil {
-		fmt.Println("2")
-		return nil
-	}
-	fmt.Println("3")
+type boardTable struct {
+	id               int
+	listOrder        int
+	dir              string
+	boardType        int
+	uploadType       int
+	title            string
+	subtitle         string
+	description      string
+	section          int
+	maxFileSize      int
+	maxPages         int
+	defaultStyle     string
+	locked           bool
+	createdOn        time.Time
+	anonymous        string
+	forcedAnon       bool
+	maxAge           int
+	autosageAfter    int
+	noImagesAfter    int
+	maxMessageLength int
+	embedsAllowed    bool
+	redirectToThread bool
+	requireFile      bool
+	enableCatalog    bool
+}
 
-	// get boards from old db
-	rows, err := m.db.QuerySQL(boardsQuery)
+func (m *Pre2021Migrator) migrateBoardsInPlace() error {
+	return nil
+}
+
+func (m *Pre2021Migrator) createSectionIfNotExist(sectionCheck *gcsql.Section) (int, error) {
+	// to be used when not migrating in place, otherwise the section table should be altered
+	section, err := gcsql.GetSectionFromName(sectionCheck.Name)
+	if errors.Is(err, gcsql.ErrSectionDoesNotExist) {
+		// section doesn't exist, create it
+		section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, section.Hidden, section.Position)
+		if err != nil {
+			return 0, err
+		}
+	}
+	return section.ID, nil
+}
+
+func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
+	// creates sections in the new db if they don't exist, and also creates a migration section that
+	// boards will be set to, to be moved to the correct section by the admin after migration
+	rows, err := m.db.QuerySQL(sectionsQuery)
 	if err != nil {
 		return err
 	}
 	defer rows.Close()
+
 	for rows.Next() {
-		var id int
-		var dir string
-		var title string
-		var subtitle string
-		var description string
-		var section int
-		var max_file_size int
-		var max_pages int
-		var default_style string
-		var locked bool
-		var anonymous string
-		var forced_anon bool
-		var max_age int
-		var autosage_after int
-		var no_images_after int
-		var max_message_length int
-		var embeds_allowed bool
-		var redirect_to_thread bool
-		var require_file bool
-		var enable_catalog bool
+		var section gcsql.Section
 		if err = rows.Scan(
-			&id,
-			&dir,
-			&title,
-			&subtitle,
-			&description,
-			&section,
-			&max_file_size,
-			&max_pages,
-			&default_style,
-			&locked,
-			&anonymous,
-			&forced_anon,
-			&max_age,
-			&autosage_after,
-			&no_images_after,
-			&max_message_length,
-			&embeds_allowed,
-			&redirect_to_thread,
-			&require_file,
-			&enable_catalog); err != nil {
+			&section.ID,
+			&section.Position,
+			&section.Hidden,
+			&section.Name,
+			&section.Abbreviation,
+		); err != nil {
+			return err
+		}
+		if _, err = m.createSectionIfNotExist(&section); err != nil {
+			return err
+		}
+	}
+	if err = rows.Close(); err != nil {
+		return err
+	}
+	m.migrationSectionID, err = m.createSectionIfNotExist(&gcsql.Section{
+		Name:         "Migrated Boards",
+		Abbreviation: "mb",
+		Hidden:       true,
+	})
+
+	return err
+}
+
+func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
+	if m.oldBoards == nil {
+		m.oldBoards = make(map[string]boardTable)
+	}
+	if m.newBoards == nil {
+		m.newBoards = make(map[string]boardTable)
+	}
+	errEv := common.LogError()
+	defer errEv.Discard()
+
+	err := m.migrateSectionsToNewDB()
+	if err != nil {
+		errEv.Err(err).Msg("Failed to migrate sections")
+	}
+
+	// get all boards from new db
+	if err = gcsql.ResetBoardSectionArrays(); err != nil {
+		return nil
+	}
+
+	// get boards from old db
+	rows, err := m.db.QuerySQL(boardsQuery)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to query old database boards")
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var board boardTable
+		if err = rows.Scan(
+			&board.id, &board.listOrder, &board.dir, &board.boardType, &board.uploadType, &board.title, &board.subtitle,
+			&board.description, &board.section, &board.maxFileSize, &board.maxPages, &board.defaultStyle, &board.locked,
+			&board.createdOn, &board.anonymous, &board.forcedAnon, &board.maxAge, &board.autosageAfter, &board.noImagesAfter,
+			&board.maxMessageLength, &board.embedsAllowed, &board.redirectToThread, &board.requireFile, &board.enableCatalog,
+		); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan row into board")
 			return err
 		}
 		found := false
-		for b := range gcsql.AllBoards {
-			if _, ok := m.oldBoards[id]; !ok {
-				m.oldBoards[id] = dir
+		for _, newBoard := range gcsql.AllBoards {
+			if _, ok := m.oldBoards[board.dir]; !ok {
+				m.oldBoards[board.dir] = board
 			}
-			if gcsql.AllBoards[b].Dir == dir {
-				log.Printf("Board /%s/ already exists in new db, moving on\n", dir)
+
+			if newBoard.Dir == board.dir {
+				common.LogWarning().Str("board", board.dir).Msg("Board already exists in new db, moving on")
 				found = true
 				break
 			}
@@ -97,48 +144,41 @@ func (m *Pre2021Migrator) MigrateBoards() error {
 		// create new board using the board data from the old db
 		// omitting things like ID and creation date since we don't really care
 		if err = gcsql.CreateBoard(&gcsql.Board{
-			Dir:         dir,
-			Title:       title,
-			Subtitle:    subtitle,
-			Description: description,
-			SectionID:   section,
-			MaxFilesize: max_file_size,
-			// MaxPages:         max_pages,
-			DefaultStyle:   default_style,
-			Locked:         locked,
-			AnonymousName:  anonymous,
-			ForceAnonymous: forced_anon,
-			// MaxAge:           max_age,
-			AutosageAfter:    autosage_after,
-			NoImagesAfter:    no_images_after,
-			MaxMessageLength: max_message_length,
-			AllowEmbeds:      embeds_allowed,
-			RedirectToThread: redirect_to_thread,
-			RequireFile:      require_file,
-			EnableCatalog:    enable_catalog,
+			Dir:              board.dir,
+			Title:            board.title,
+			Subtitle:         board.subtitle,
+			Description:      board.description,
+			SectionID:        board.section,
+			MaxFilesize:      board.maxFileSize,
+			DefaultStyle:     board.defaultStyle,
+			Locked:           board.locked,
+			AnonymousName:    board.anonymous,
+			ForceAnonymous:   board.forcedAnon,
+			AutosageAfter:    board.autosageAfter,
+			NoImagesAfter:    board.noImagesAfter,
+			MaxMessageLength: board.maxMessageLength,
+			AllowEmbeds:      board.embedsAllowed,
+			RedirectToThread: board.redirectToThread,
+			RequireFile:      board.requireFile,
+			EnableCatalog:    board.enableCatalog,
 		}, false); err != nil {
+			errEv.Err(err).Caller().Str("board", board.dir).Msg("Failed to create board")
 			return err
 		}
-		m.newBoards[id] = dir
-		log.Printf("/%s/ successfully migrated in the database", dir)
-		// Automatic directory migration has the potential to go horribly wrong, so I'm leaving this
-		// commented out for now
-		// switch m.options.DirAction {
-		// case common.DirCopy:
-
-		// case common.DirMove:
-		// 	// move the old directory (probably should copy instead) to the new one
-		// 	newDocumentRoot := config.GetSystemCriticalConfig().DocumentRoot
-		// 	log.Println("Old board path:", path.Join(m.config.DocumentRoot, dir))
-		// 	log.Println("Old board path:", path.Join(newDocumentRoot, dir))
-		// 	if err = os.Rename(
-		// 		path.Join(m.config.DocumentRoot, dir),
-		// 		path.Join(newDocumentRoot, dir),
-		// 	); err != nil {
-		// 		return err
-		// 	}
-		// 	log.Printf("/%s/ directory/files successfully moved")
-		// }
+		m.newBoards[board.dir] = board
+		common.LogInfo().Str("board", board.dir).Msg("Board successfully migrated")
 	}
 	return nil
 }
+
+func (m *Pre2021Migrator) MigrateBoards() error {
+	defer func() {
+		if r := recover(); r != nil {
+			common.LogFatal().Interface("recover", r).Msg("Recovered from panic in MigrateBoards")
+		}
+	}()
+	if m.IsMigratingInPlace() {
+		return m.migrateBoardsInPlace()
+	}
+	return m.migrateBoardsToNewDB()
+}
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 8398627b..2318d111 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -3,9 +3,9 @@ package pre2021
 import (
 	"database/sql"
 	"fmt"
-	"log"
 	"time"
 
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
@@ -39,6 +39,7 @@ type postTable struct {
 	reviewed          bool
 
 	newBoardID int
+	foundBoard bool
 	// oldParentID int
 }
 
@@ -102,12 +103,21 @@ func (m *Pre2021Migrator) migrateThreads() error {
 			tx.Rollback()
 			return err
 		}
-		_, ok := m.oldBoards[post.boardid]
-		if !ok {
-			// board doesn't exist
-			log.Printf(
-				"Pre-migrated post #%d has an invalid boardid %d (board doesn't exist), skipping",
-				post.id, post.boardid)
+		var postBoardDir string
+		for _, oldBoard := range m.oldBoards {
+			if oldBoard.id == post.boardid {
+				postBoardDir = oldBoard.dir
+			}
+		}
+		for _, newBoard := range gcsql.AllBoards {
+			if newBoard.Dir == postBoardDir {
+				post.newBoardID = newBoard.ID
+				post.foundBoard = true
+			}
+		}
+		if !post.foundBoard {
+			common.LogWarning().Int("boardID", post.boardid).
+				Msg("Pre-migrated post has an invalid boardid (board doesn't exist), skipping")
 			continue
 		}
 
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index ae5ebdd0..3bd53a6c 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -20,9 +20,10 @@ type Pre2021Migrator struct {
 	options *common.MigrationOptions
 	config  Pre2021Config
 
-	posts     []postTable
-	oldBoards map[int]string // map[boardid]dir
-	newBoards map[int]string // map[board]dir
+	migrationSectionID int
+	posts              []postTable
+	oldBoards          map[string]boardTable
+	newBoards          map[string]boardTable
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 6482a7be..b0c49809 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -1,57 +1,15 @@
 package pre2021
 
 const (
-	boardsQuery = `SELECT
-	id,
-	dir,
-	type,
-	upload_type,
-	title,
-	subtitle,
-	description,
-	section,
-	max_file_size,
-	max_pages,
-	default_style,
-	locked,
-	anonymous,
-	forced_anon,
-	max_age,
-	autosage_after,
-	no_images_after,
-	max_message_length,
-	embeds_allowed,
-	redirect_to_thread,
-	require_file,
-	enable_catalog
-	FROM DBPREFIXboards`
+	sectionsQuery = `SELECT id, list_order, hidden, name, abbreviation FROM DBPREFIXsections`
 
-	postsQuery = `SELECT
-	id,
-	boardid,
-	parentid,
-	name,
-	tripcode,
-	email,
-	subject,
-	message,
-	message_raw,
-	password,
-	filename,
-	filename_original,
-	file_checksum,
-	filesize,
-	image_w,
-	image_h,
-	thumb_w,
-	thumb_h,
-	ip,
-	tag,
-	timestamp,
-	autosage,
-	deleted_timestamp,
-	bumped,
-	stickied,
-	locked,
-	reviewed from DBPREFIXposts WHERE deleted_timestamp = NULL`
+	boardsQuery = `SELECT id, list_order, dir, type, upload_type, title, subtitle, description, section, max_file_size, max_pages,
+default_style, locked, created_on, anonymous, forced_anon, max_age, autosage_after, no_images_after, max_message_length, embeds_allowed,
+redirect_to_thread, require_file, enable_catalog
+FROM DBPREFIXboards`
+
+	postsQuery = `SELECT id, boardid, parentid, name, tripcode, email, subject, message, message_raw, password, filename,
+filename_original, file_checksum, filesize, image_w, image_h, thumb_w, thumb_h, ip, tag, timestamp, autosage, deleted_timestamp,
+bumped, stickied, locked, reviewed
+FROM DBPREFIXposts WHERE deleted_timestamp = NULL`
 )
diff --git a/pkg/gcsql/sections.go b/pkg/gcsql/sections.go
index 50db9f72..18ab4037 100644
--- a/pkg/gcsql/sections.go
+++ b/pkg/gcsql/sections.go
@@ -9,7 +9,8 @@ import (
 var (
 	// AllSections provides a quick and simple way to access a list of all non-hidden sections without
 	// having to do any SQL queries. It and AllBoards are updated by ResetBoardSectionArrays
-	AllSections []Section
+	AllSections            []Section
+	ErrSectionDoesNotExist = errors.New("section does not exist")
 )
 
 // GetAllSections gets a list of all existing sections, optionally omitting hidden ones
@@ -62,18 +63,37 @@ func getOrCreateDefaultSectionID() (sectionID int, err error) {
 	return id, nil
 }
 
+// GetSectionFromID returns a section from the database, given its ID
 func GetSectionFromID(id int) (*Section, error) {
 	const query = `SELECT id, name, abbreviation, position, hidden FROM DBPREFIXsections WHERE id = ?`
 	var section Section
 	err := QueryRowTimeoutSQL(nil, query, []any{id}, []any{
 		&section.ID, &section.Name, &section.Abbreviation, &section.Position, &section.Hidden,
 	})
-	if err != nil {
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, ErrSectionDoesNotExist
+	} else if err != nil {
 		return nil, err
 	}
 	return &section, err
 }
 
+// GetSectionFromID returns a section from the database, given its name
+func GetSectionFromName(name string) (*Section, error) {
+	const query = `SELECT id, name, abbreviation, position, hidden FROM DBPREFIXsections WHERE name = ?`
+	var section Section
+	err := QueryRowTimeoutSQL(nil, query, []any{name}, []any{
+		&section.ID, &section.Name, &section.Abbreviation, &section.Position, &section.Hidden,
+	})
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, ErrSectionDoesNotExist
+	} else if err != nil {
+		return nil, err
+	}
+	return &section, err
+}
+
+// DeleteSection deletes a section from the database and resets the AllSections array
 func DeleteSection(id int) error {
 	const query = `DELETE FROM DBPREFIXsections WHERE id = ?`
 	_, err := ExecSQL(query, id)

From bdf4bddc4d8985375988f8adaf34261ccb28c88c Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:46:02 -0800
Subject: [PATCH 028/122] Bump version to 4.0.2 for hotfix release Resolves
 issue #112

---
 build.py              | 2 +-
 frontend/package.json | 2 +-
 html/error/404.html   | 2 +-
 html/error/500.html   | 2 +-
 html/error/502.html   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.py b/build.py
index 22eebbf8..c5fbe2dd 100755
--- a/build.py
+++ b/build.py
@@ -39,7 +39,7 @@ release_files = (
 	"README.md",
 )
 
-GOCHAN_VERSION = "4.0.1"
+GOCHAN_VERSION = "4.0.2"
 DATABASE_VERSION = "4"  # stored in DBNAME.DBPREFIXdatabase_version
 
 PATH_NOTHING = -1
diff --git a/frontend/package.json b/frontend/package.json
index fff7198c..22fc29b8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gochan.js",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "",
   "main": "./ts/main.ts",
   "private": true,
diff --git a/html/error/404.html b/html/error/404.html
index 7299fdc1..602780fd 100755
--- a/html/error/404.html
+++ b/html/error/404.html
@@ -7,6 +7,6 @@
 <h1>404: File not found</h1>
 <img src="/error/lol 404.gif" alt="lol 404">
 <p>The requested file could not be found on this server.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.1
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
 </body>
 </html>
\ No newline at end of file
diff --git a/html/error/500.html b/html/error/500.html
index 6578dbd6..8fe12c28 100755
--- a/html/error/500.html
+++ b/html/error/500.html
@@ -7,6 +7,6 @@
 <h1>Error 500: Internal Server error</h1>
 <img src="/error/server500.gif" alt="server burning">
 <p>The server encountered an error while trying to serve the page, and we apologize for the inconvenience. The <a href="https://en.wikipedia.org/wiki/Idiot">system administrator</a> will try to fix things as soon they get around to it, whenever that is. Hopefully soon.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.1
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
 </body>
 </html>
\ No newline at end of file
diff --git a/html/error/502.html b/html/error/502.html
index 651b5634..e5644dd5 100644
--- a/html/error/502.html
+++ b/html/error/502.html
@@ -7,6 +7,6 @@
 <h1>Error 502: Bad gateway</h1>
 <img src="/error/server500.gif" alt="server burning">
 <p>The server encountered an error while trying to serve the page, and we apologize for the inconvenience. The <a href="https://en.wikipedia.org/wiki/Idiot">system administrator</a> will try to fix things as soon they get around to it, whenever that is. Hopefully soon.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.1
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
 </body>
 </html>
\ No newline at end of file

From 3d15c272e910ce0362e82df2de471cbcb6e0b45a Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:16:25 -0800
Subject: [PATCH 029/122] Include stack trace in MigrateBoards recovery log,
 replace old stuff in IsMigrated with common.TableExists

---
 .../internal/pre2021/boards.go                | 16 +++++++--
 .../internal/pre2021/pre2021.go               | 34 +++++++------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 4c44ac84..a1c7770f 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -2,10 +2,13 @@ package pre2021
 
 import (
 	"errors"
+	"runtime/debug"
+	"strings"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/rs/zerolog"
 )
 
 type boardTable struct {
@@ -44,7 +47,7 @@ func (m *Pre2021Migrator) createSectionIfNotExist(sectionCheck *gcsql.Section) (
 	section, err := gcsql.GetSectionFromName(sectionCheck.Name)
 	if errors.Is(err, gcsql.ErrSectionDoesNotExist) {
 		// section doesn't exist, create it
-		section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, section.Hidden, section.Position)
+		section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, true, 0)
 		if err != nil {
 			return 0, err
 		}
@@ -174,7 +177,16 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 func (m *Pre2021Migrator) MigrateBoards() error {
 	defer func() {
 		if r := recover(); r != nil {
-			common.LogFatal().Interface("recover", r).Msg("Recovered from panic in MigrateBoards")
+			stackTrace := debug.Stack()
+			traceLines := strings.Split(string(stackTrace), "\n")
+			zlArr := zerolog.Arr()
+			for _, line := range traceLines {
+				zlArr.Str(line)
+			}
+			common.LogFatal().Caller().
+				Interface("recover", r).
+				Array("stackTrace", zlArr).
+				Msg("Recovered from panic in MigrateBoards")
 		}
 	}()
 	if m.IsMigratingInPlace() {
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 3bd53a6c..6d5615eb 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -2,8 +2,10 @@
 package pre2021
 
 import (
+	"context"
 	"encoding/json"
 	"os"
+	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/config"
@@ -24,6 +26,7 @@ type Pre2021Migrator struct {
 	posts              []postTable
 	oldBoards          map[string]boardTable
 	newBoards          map[string]boardTable
+	threads            map[int]int // old thread id (previously stored in posts as the id) to new thread id (threads.id)
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
@@ -36,48 +39,34 @@ func (m *Pre2021Migrator) readConfig() error {
 	if err != nil {
 		return err
 	}
+	m.config.SQLConfig = config.GetSQLConfig()
 	return json.Unmarshal(ba, &m.config)
 }
 
 func (m *Pre2021Migrator) Init(options *common.MigrationOptions) error {
 	m.options = options
 	var err error
+	m.config.SQLConfig = config.GetSQLConfig()
 	if err = m.readConfig(); err != nil {
 		return err
 	}
-	m.config.DBTimeoutSeconds = config.DefaultSQLTimeout
-	m.config.DBMaxOpenConnections = config.DefaultSQLMaxConns
-	m.config.DBMaxIdleConnections = config.DefaultSQLMaxConns
-	m.config.DBConnMaxLifetimeMin = config.DefaultSQLConnMaxLifetimeMin
 
 	m.db, err = gcsql.Open(&m.config.SQLConfig)
 	return err
 }
 
 func (m *Pre2021Migrator) IsMigrated() (bool, error) {
-	var migrated bool
-	var err error
-	var query string
-	switch m.config.DBtype {
-	case "mysql":
-		fallthrough
-	case "postgres":
-		query = `SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.TABLES
-		WHERE TABLE_NAME = ? AND TABLE_SCHEMA = ?`
-	default:
-		return false, gcsql.ErrUnsupportedDB
-	}
-	if err = m.db.QueryRowSQL(query,
-		[]interface{}{m.config.DBprefix + "database_version", m.config.DBname},
-		[]interface{}{&migrated}); err != nil {
-		return migrated, err
-	}
-	return migrated, err
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(m.config.DBTimeoutSeconds)*time.Second)
+	defer cancel()
+	return common.TableExists(ctx, m.db, nil, "DBPREFIXdatabase_version", &m.config.SQLConfig)
 }
 
 func (m *Pre2021Migrator) MigrateDB() (bool, error) {
+	errEv := common.LogError()
+	defer errEv.Discard()
 	migrated, err := m.IsMigrated()
 	if err != nil {
+		errEv.Caller().Err(err).Msg("Error checking if database is migrated")
 		return false, err
 	}
 	if migrated {
@@ -87,6 +76,7 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	}
 
 	if err := m.MigrateBoards(); err != nil {
+		errEv.Caller().Err(err).Msg("Failed to migrate boards")
 		return false, err
 	}
 	common.LogInfo().Msg("Migrated boards")

From 8b994dce5736483073b616112ef5b029375b30b3 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 1 Jan 2025 11:55:44 -0800
Subject: [PATCH 030/122] Consolidate board fields in pre-2021 migration struct
 and use equivalent gcsql.Board fields

---
 .../internal/pre2021/boards.go                | 86 +++++--------------
 .../internal/pre2021/posts.go                 |  5 --
 .../internal/pre2021/pre2021.go               |  5 +-
 .../internal/pre2021/queries.go               |  4 +-
 4 files changed, 26 insertions(+), 74 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index a1c7770f..da483068 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -4,38 +4,16 @@ import (
 	"errors"
 	"runtime/debug"
 	"strings"
-	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
+	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/rs/zerolog"
 )
 
-type boardTable struct {
-	id               int
-	listOrder        int
-	dir              string
-	boardType        int
-	uploadType       int
-	title            string
-	subtitle         string
-	description      string
-	section          int
-	maxFileSize      int
-	maxPages         int
-	defaultStyle     string
-	locked           bool
-	createdOn        time.Time
-	anonymous        string
-	forcedAnon       bool
-	maxAge           int
-	autosageAfter    int
-	noImagesAfter    int
-	maxMessageLength int
-	embedsAllowed    bool
-	redirectToThread bool
-	requireFile      bool
-	enableCatalog    bool
+type migrationBoard struct {
+	oldID int
+	gcsql.Board
 }
 
 func (m *Pre2021Migrator) migrateBoardsInPlace() error {
@@ -47,7 +25,7 @@ func (m *Pre2021Migrator) createSectionIfNotExist(sectionCheck *gcsql.Section) (
 	section, err := gcsql.GetSectionFromName(sectionCheck.Name)
 	if errors.Is(err, gcsql.ErrSectionDoesNotExist) {
 		// section doesn't exist, create it
-		section, err = gcsql.NewSection(sectionCheck.Name, section.Abbreviation, true, 0)
+		section, err = gcsql.NewSection(sectionCheck.Name, sectionCheck.Abbreviation, true, 0)
 		if err != nil {
 			return 0, err
 		}
@@ -92,11 +70,8 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 }
 
 func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
-	if m.oldBoards == nil {
-		m.oldBoards = make(map[string]boardTable)
-	}
-	if m.newBoards == nil {
-		m.newBoards = make(map[string]boardTable)
+	if m.boards == nil {
+		m.boards = make(map[string]migrationBoard)
 	}
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -119,57 +94,40 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		var board boardTable
+		var board migrationBoard
+		var maxPages int
 		if err = rows.Scan(
-			&board.id, &board.listOrder, &board.dir, &board.boardType, &board.uploadType, &board.title, &board.subtitle,
-			&board.description, &board.section, &board.maxFileSize, &board.maxPages, &board.defaultStyle, &board.locked,
-			&board.createdOn, &board.anonymous, &board.forcedAnon, &board.maxAge, &board.autosageAfter, &board.noImagesAfter,
-			&board.maxMessageLength, &board.embedsAllowed, &board.redirectToThread, &board.requireFile, &board.enableCatalog,
+			&board.ID, &board.NavbarPosition, &board.Dir, &board.Title, &board.Subtitle,
+			&board.Description, &board.SectionID, &board.MaxFilesize, &maxPages, &board.DefaultStyle, &board.Locked,
+			&board.CreatedAt, &board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter,
+			&board.MaxMessageLength, &board.AllowEmbeds, &board.RedirectToThread, &board.RequireFile, &board.EnableCatalog,
 		); err != nil {
 			errEv.Err(err).Caller().Msg("Failed to scan row into board")
 			return err
 		}
+		board.MaxThreads = maxPages * config.GetBoardConfig(board.Dir).ThreadsPerPage
 		found := false
 		for _, newBoard := range gcsql.AllBoards {
-			if _, ok := m.oldBoards[board.dir]; !ok {
-				m.oldBoards[board.dir] = board
+			if _, ok := m.boards[board.Dir]; !ok {
+				m.boards[board.Dir] = board
 			}
-
-			if newBoard.Dir == board.dir {
-				common.LogWarning().Str("board", board.dir).Msg("Board already exists in new db, moving on")
+			if newBoard.Dir == board.Dir {
+				common.LogWarning().Str("board", board.Dir).Msg("Board already exists in new db, moving on")
 				found = true
 				break
 			}
 		}
+		m.boards[board.Dir] = board
 		if found {
 			continue
 		}
 		// create new board using the board data from the old db
 		// omitting things like ID and creation date since we don't really care
-		if err = gcsql.CreateBoard(&gcsql.Board{
-			Dir:              board.dir,
-			Title:            board.title,
-			Subtitle:         board.subtitle,
-			Description:      board.description,
-			SectionID:        board.section,
-			MaxFilesize:      board.maxFileSize,
-			DefaultStyle:     board.defaultStyle,
-			Locked:           board.locked,
-			AnonymousName:    board.anonymous,
-			ForceAnonymous:   board.forcedAnon,
-			AutosageAfter:    board.autosageAfter,
-			NoImagesAfter:    board.noImagesAfter,
-			MaxMessageLength: board.maxMessageLength,
-			AllowEmbeds:      board.embedsAllowed,
-			RedirectToThread: board.redirectToThread,
-			RequireFile:      board.requireFile,
-			EnableCatalog:    board.enableCatalog,
-		}, false); err != nil {
-			errEv.Err(err).Caller().Str("board", board.dir).Msg("Failed to create board")
+		if err = gcsql.CreateBoard(&board.Board, false); err != nil {
+			errEv.Err(err).Caller().Str("board", board.Dir).Msg("Failed to create board")
 			return err
 		}
-		m.newBoards[board.dir] = board
-		common.LogInfo().Str("board", board.dir).Msg("Board successfully migrated")
+		common.LogInfo().Str("board", board.Dir).Msg("Board successfully created")
 	}
 	return nil
 }
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 2318d111..751dbf4f 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -104,11 +104,6 @@ func (m *Pre2021Migrator) migrateThreads() error {
 			return err
 		}
 		var postBoardDir string
-		for _, oldBoard := range m.oldBoards {
-			if oldBoard.id == post.boardid {
-				postBoardDir = oldBoard.dir
-			}
-		}
 		for _, newBoard := range gcsql.AllBoards {
 			if newBoard.Dir == postBoardDir {
 				post.newBoardID = newBoard.ID
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 6d5615eb..3d04f99c 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -24,9 +24,8 @@ type Pre2021Migrator struct {
 
 	migrationSectionID int
 	posts              []postTable
-	oldBoards          map[string]boardTable
-	newBoards          map[string]boardTable
-	threads            map[int]int // old thread id (previously stored in posts as the id) to new thread id (threads.id)
+	boards             map[string]migrationBoard
+	threads            map[int]gcsql.Thread // old thread id (previously stored in posts as the id) to new thread id (threads.id)
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index b0c49809..fe0ae120 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -3,8 +3,8 @@ package pre2021
 const (
 	sectionsQuery = `SELECT id, list_order, hidden, name, abbreviation FROM DBPREFIXsections`
 
-	boardsQuery = `SELECT id, list_order, dir, type, upload_type, title, subtitle, description, section, max_file_size, max_pages,
-default_style, locked, created_on, anonymous, forced_anon, max_age, autosage_after, no_images_after, max_message_length, embeds_allowed,
+	boardsQuery = `SELECT id, list_order, dir, title, subtitle, description, section, max_file_size, max_pages,
+default_style, locked, created_on, anonymous, forced_anon, autosage_after, no_images_after, max_message_length, embeds_allowed,
 redirect_to_thread, require_file, enable_catalog
 FROM DBPREFIXboards`
 

From b34a956baa1cfb9083c0edb86d476dbde1cead49 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 1 Jan 2025 14:52:43 -0800
Subject: [PATCH 031/122] Start adding pre-2021 testing

---
 .../internal/pre2021/sqlite3_test.go          |  54 ++++++++++++++++++
 tools/gochan-pre2021.sqlite3db                | Bin 0 -> 81920 bytes
 2 files changed, 54 insertions(+)
 create mode 100644 cmd/gochan-migration/internal/pre2021/sqlite3_test.go
 create mode 100644 tools/gochan-pre2021.sqlite3db

diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
new file mode 100644
index 00000000..0b6c1dfe
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -0,0 +1,54 @@
+package pre2021
+
+import (
+	"path"
+	"testing"
+
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	sqlite3DBPath = "tools/gochan-pre2021.sqlite3db" // relative to gochan project root
+)
+
+func TestMigrateToNewDB(t *testing.T) {
+	dir, err := testutil.GoToGochanRoot(t)
+	if !assert.NoError(t, err) {
+		return
+	}
+	if !assert.NoError(t, common.InitTestMigrationLog(t)) {
+		return
+	}
+	dbPath := path.Join(dir, sqlite3DBPath)
+
+	oldSQLConfig := config.SQLConfig{
+		DBtype:     "sqlite3",
+		DBname:     path.Base(dbPath),
+		DBhost:     dbPath,
+		DBprefix:   "gc_",
+		DBusername: "gochan",
+		DBpassword: "password",
+	}
+	migrator := Pre2021Migrator{
+		config: Pre2021Config{
+			SQLConfig: oldSQLConfig,
+		},
+	}
+	outDir := t.TempDir()
+
+	config.SetTestDBConfig("sqlite3", path.Join(outDir, "gochan-migrated.sqlite3db"), "gochan-migrated.sqlite3db", "gochan", "password", "gc_")
+	sqlConfig := config.GetSQLConfig()
+
+	if !assert.NoError(t, gcsql.ConnectToDB(&sqlConfig)) {
+		return
+	}
+	if !assert.NoError(t, gcsql.CheckAndInitializeDatabase("sqlite3", "4")) {
+		return
+	}
+
+	assert.NoError(t, migrator.migrateBoardsToNewDB())
+}
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
new file mode 100644
index 0000000000000000000000000000000000000000..137996f869215ea9a1c309704733aa93078447df
GIT binary patch
literal 81920
zcmeI5&2QW09mh%0vR)F2NgPA)QqMHf%$5@?da<3vE!L`@+5~l+)Uk^dL#xpeZLy(9
zg{0zSKo3saVZe6ScG-P@z<?cgSqJP;px9+QY#2~rhXUKV>vkAAV2ADZ@XeA)+ldei
zjq#;riF}^l^YZ&V?++#Z?!2+8+KRMom~GjXD%>fK=ed_9iR0*$<Id8*e~5H4;$P4w
z-*bM@=_#&o|A%oVEdGbdWZjR0#NiGCAOHd&00JNY0w4eaAOHd&00JQJ^a*6*85Sv9
z>Ei$a5C8!X009sH0T2KI5C8!X009s<wglMvKPf)q#4p6ZihmG)EB;dax%g9ZzySgv
z00JNY0w4eaAOHd&00JNY0wC}d31pMPG{4iR%bkuQYgR0qaId#yT~jSPo*5OUQ{-<d
z9mBM(lW}2^iFXXkwuH=xFvYI64B2d2u`_~@XP3K%+1yq&TQRNJiI_0S!dteyy)E*>
zc_v^f4O=yIE5_FUG4U6i_$j^N009sH0T2KI5C8!X009sH0T2KI5cmoZn2jYke!7wz
zi&dT70;!`}<zjhpzF4A{R4y+UuPj#<A1c;2_ym`luB1-8+X|6_rIK#2^?y9`9-qCN
z{X+a%R>-{f6;Kmd009sH0T2KI5C8!X009sHf#XJCPl%u4Qs*+sOh(LADk+)IRFYQ<
z&flEeY^(af;%;fVSd4IbwX11TN1;c!(M@B?&?T9!-CM%aY*%-efby26<b{aP+ar{T
z^Fb!2C=;pDwQ`}fbhS__R3bC7uv}Uih>AI>ZFxtLC=;;=&pn=}gfc9l4Ab@+UnP|X
zwJa?!E)7KPIXPN-3Nl2+Lh*8GNl^9svZgjKNmk3~YE5ZNk<=aCFqLL+9=tgAF2pDg
z7bfX7PI*Ya-K*^4Qla$Dn%q_jbI;S=b46#TJL-0$r8MqZ-L|dJJ@knDURy4fDXk@c
z6;5d}ryI8=!<0;AM|mKzsMwVsEj#z4?JE;6?6%NXCex|DGATbvnb<8;kqL`DSeaOX
zanAk!>|Z$X9=+iJ0T2KI5C8!X009sH0T2KI5CDN^kHFqoY=TQpB$F5BWnSQ?l9j1s
zGM0>`Qpr?HZ8jDCy7TVtl)S>eLC>CpFOi?B?`*VG%k}BqSkNWAr7#H!EqPy}k6q`u
z6CJgqScQhwcRRkcyii;&UaRVc{;+LyE$(*`w|A1KT#YA_GnZdWIk}n-a>X_nHt3&{
zAIuc<BIo^FdJa-ku^Oh@Vc+IIBp;P)%cXLV4~ZqBm@GSKD%Y6!IVXND{`=W0V&oVE
zKmY_l00ck)1V8`;KmY_l00clFL?A6p@b2D4EFp}i*cJl2|BvVYhe*Kz1V8`;KmY_l
z00ck)1V8`;KmY`e6#=&X=f%Hs^uhrGAOHd&00JNY0w4eaAOHd&00JOzEC`(9g>w`4
z$tnQ-T7Vw#P%aeN_y2kEUmU$~fB*=900@8p2!H?xfB*=900@8p2plH@Y2jST+XcY)
z|Bq9_LKhGK0T2KI5C8!X009sH0T2KI5Qrwg*8f8G9w$oKKhXyc5C8!X009sH0T2KI
z5C8!X009tqIt0EeJje0O1Yl-nW{lpG?8uPaL#{$6G4GN5uF<-_i_Y$VLBEAXvUcBZ
z<Iiz=J@y=zB0Gbb%-C2sg<aXES2(hT<uWtkx43V_Z-F`Oz0Ff>$?@^arI%hBo4hg^
z<LS6CUP*BkG9<vP1#Zye_m#G+YA-7f<aS3>3Js%u$5tD6Ri#Px0vz*uw{ANI1<0m=
zEYXwvd;JddpiGv^m4(8)ogLq9VBIj)9aWb#=I9#`9Qor}I((Cj%!=V|OST7;DKA&9
zML1<rpK<ZH#btk!eK+%B`fG73_1VaGgkO(b5+>4To=%Y?77zdd5C8#(zz@`TA~!X~
z|76-`HhFg%b=OpHa5B2GUaM}@q>bt;t2HTbmS)o_wJF_L+o-)(TbFLH-?&*_e@lA3
z_LfxL+_-gPje^~*t!+qax9ER!b@fs@rKy%pV@6Xkr8_sPtE&_^@Rq(+d$qc`x*-)w
zu&J8To7MG|>(%wyg~hzIxpw1?&Dy@~%JtgH>(VR}d-0pn%uJrb*bh6(5z%%#njtsq
zk0EKRwx;xD!B<1_(sm_+)UEDTf0(6({C<9Y-DYN(a{D%Nf)oyx_RRV)(Bb$>6kS_>
zP-g>j-BQ1&M2jt4DP3K>R`!HDWEI&ugj9*e+EljXu4dOQ`{6+#`jpa)#$B3UymIT-
zYOT5!&grYw)jKtcw?Xp{TWQwGEcC{Wo3%R|)tk4&(kq+m>r{8@fe3|^eY-^gG*&Z$
zVhM5+*cD=|$%0aYQe$C{&Ko1iEJjD7X4O*e+J;3Eb$Oc%7DdaIi%e2C>W=kk>o8F!
z$kJ>pmJ=)4c;2yF(a~O|2^EPe?JcEAk!qT;dl>GG^-V^b%ucJO(y;5cQTL{P2bNF}
z<X)G;I92LsWMq|^I*ocmwq?!OIar=Wp3YN;^TLqb?)Rrg61nMV{zs{xo04_bpRf+e
zJ&T7rD%X9Op2`7Scjn4IFu#I%oYc+{^^jFR$I!Olk(C!C>#HwUS1n4Andcr%(QiBc
zv^z-nkQkjF!Jm>pP5`&pKT2|r<(BM@Z*K>Zi^Zr`$mDF5YPL;_ke;UQQ;cfi%7YHo
zJgY}K)ViaB1*YbGZlO>?)s`*l2Ogt5ju;^-K7_h%*!#o8A;sYuy|2smlPcGc^|~84
zs1_mhY_qGR^N%hHP7C=U7|7jl7PS!XY-F&7c<#fr5NdS&J(V{uGItski)={tIyPye
z_U)d*%M<iHgCX=us|y*uV@q1U)cu;}w-%?CQj4-WhHfeSc}VAP$3}A(FY<3Wy@_>C
zQ*9bRm3v)9ZzuzoLLapO&so;QFHy++qbi@s&Cl~6Ec!i^tm{UX;%h6q?UX|Ab*wK|
zRz|(P!;}b3LEfdlKB(W(!y{{$KKjQimyW^A^F>GNm8B<gXi<i$ZKy4$^O^XU+)3dg
zC;mSBtL#elY{p8xnD}(`Z}I<*ycz$5JaB*j2rvSVW=|(_`8@x@3BSA9rIi&8`_xuh
zXVY_acCf4I@f)h6QDn2x3Oa-<z0(@6L$F+tphIZ1WS!>Cwh<l5@4KD#(ZEckRK6ND
z!Ek0G{qv<z59164G%~iuL~e4D|8U+%<%|sk$@x4ph{tgq229sd%)TjK#M+g*-;Qiq
ztO)9%`B|ylGnpbuQ`YZ>S8C+(1dL>|4m-?xOOt7_E;nrTJ`J8vuvAOuFP|FCtxWQq
zsyCGf-gwEDPR@1R$6hb_XJb^IldMkf$=O8i{CWQUV3Kdq(ukf8!z#3YdOB2Gp3E>M
z=9HGR%}`p}uVn<-ORY%@o1n_}4yYtD%yc!K-!n6=ju(T<NP~8uqkDQPtfT8OjE;}J
z>*5&_4sFeluAy4(w>9#Ux3)~>zA7^%0#>D-icBp~KIzO&Kg{?_n@Yzpomr80CJw6X
zxeueU(>j8z3=|uitGF9i!R7%e5jFYrbquzqLNgW$c)&W4d}#G};Bte!8yfYIJ@eO4
zYW_r)7P$(oq5OGnv|Kv>gM|}LFZbgYe8x;u)^eQBlY@L6*P-c#33f;ueUNN`Zl>t3
zbAxi}T{yB5pc_{Wqq)DF>a9ZL@7&ZnDDdFiw^Zz@e-t=!#=GxcH|5>_6$1JB-E@%V
zKt&2I$9w(v6=!<;qQMQbAkIV9jL}Q@!xK4p50Gs(Ia^Zo-SCJK<aS@Gb%d1N>bAFz
zjLVfeDy{?CP>?HUT42jN0kz&4N8j9G=w|G1?H$p~2x3#w6t;sIkrerEb=w_k)K4;C
zQmEh_?BR`^Bp-L5mG#KVp<9IB<Y@2fX{XzGB>LTkrs{WDx8Z!A80<D2*I~Mi{_XMJ
zYD{W%O)V(gz9x~*&!<Ln)pLi;CRBafa3&M%B;83Sa_7$RdslpQm@8?+K2n3qFh{0K
zXn5<ro#A)5l+F9H)(veXJQ`0pcTnDc=qKs!(o&-CNpdh**LfI-tWR(@r~FN<O5dy{
zq(^Vw)uv+94+Krx?W#@MevTUcTZ+2VvLn45UFuH9-M5{P&X-0<bG4~M3eKIxIz{K6
zCfw)$f5eF&vFRWV5C8!X009sH0T2KI5C8!X009sHfv*^W6+Xp@eC5JR$z)j=_-g;s
za;ehugMjk7v-z*;JM{Ad@1}$M?KHOjkBNWg#DCBm4iEqV5C8!X009sH0T2KI5C8!X
z0D)(Rz(j16o`5hjLC;T6bjkZYqr2?S@}pdm9%pb<R&{!2fsW_@KRd;WoPq!dfB*=9
z00@8p2!H?xfB*=9z_0||@Be?yi60Le1Hyp-2!H?xfB*=900@8p2!H?xfB*>m9|*j_
zC%N1NFIFmYvrV=Ewi;wLK$z?QML>m&8C;EUN>c`T@k@?gI6wddKmY_l00ck)1V8`;
zKmY_l00fQ~fuxX2IlBe!@BcsH#D9vP94{524G4e$2!H?xfB*=900@8p2!H?x95(`a
z`oaH9X*~5#VQ$v3(3LODJx?cHO*SR6nnX4knNcU3jDu$A0RZEt#pJeWv~6SVe}r16
AjsO4v

literal 0
HcmV?d00001


From 90986e58b8481092c223de573221071165776f7f Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 1 Jan 2025 14:53:10 -0800
Subject: [PATCH 032/122] Add pre2021 section migration

---
 .../internal/common/logger.go                 | 11 +++
 .../internal/pre2021/boards.go                | 73 ++++++++++++-------
 .../internal/pre2021/pre2021.go               |  3 +-
 3 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/logger.go b/cmd/gochan-migration/internal/common/logger.go
index 837d040b..0048d765 100644
--- a/cmd/gochan-migration/internal/common/logger.go
+++ b/cmd/gochan-migration/internal/common/logger.go
@@ -5,6 +5,7 @@ import (
 	"io/fs"
 	"os"
 	"path"
+	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcutil"
@@ -21,6 +22,16 @@ var (
 	migrationLog     zerolog.Logger
 )
 
+func InitTestMigrationLog(t *testing.T) (err error) {
+	dir := os.TempDir()
+	migrationLogFile, err = os.CreateTemp(dir, "migration-test")
+	if err != nil {
+		return err
+	}
+	migrationLog = zerolog.New(zerolog.NewTestWriter(t))
+	return nil
+}
+
 func InitMigrationLog() (err error) {
 	if migrationLogFile != nil {
 		// Migration log already initialized
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index da483068..0678e9a4 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -1,7 +1,6 @@
 package pre2021
 
 import (
-	"errors"
 	"runtime/debug"
 	"strings"
 
@@ -12,25 +11,30 @@ import (
 )
 
 type migrationBoard struct {
-	oldID int
+	oldSectionID int
 	gcsql.Board
 }
 
-func (m *Pre2021Migrator) migrateBoardsInPlace() error {
-	return nil
+type migrationSection struct {
+	oldID int
+	gcsql.Section
 }
 
-func (m *Pre2021Migrator) createSectionIfNotExist(sectionCheck *gcsql.Section) (int, error) {
-	// to be used when not migrating in place, otherwise the section table should be altered
-	section, err := gcsql.GetSectionFromName(sectionCheck.Name)
-	if errors.Is(err, gcsql.ErrSectionDoesNotExist) {
-		// section doesn't exist, create it
-		section, err = gcsql.NewSection(sectionCheck.Name, sectionCheck.Abbreviation, true, 0)
-		if err != nil {
-			return 0, err
-		}
+func (m *Pre2021Migrator) migrateSectionsInPlace() error {
+	return common.NewMigrationError("pre2021", "migrateSectionsInPlace not implemented")
+}
+
+func (m *Pre2021Migrator) migrateBoardsInPlace() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
+	err := m.migrateSectionsInPlace()
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to migrate sections")
+		return err
 	}
-	return section.ID, nil
+	err = common.NewMigrationError("pre2021", "migrateBoardsInPlace not implemented")
+	errEv.Err(err).Caller().Msg("Failed to migrate boards")
+	return err
 }
 
 func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
@@ -41,7 +45,8 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 		return err
 	}
 	defer rows.Close()
-
+	errEv := common.LogError()
+	defer errEv.Discard()
 	for rows.Next() {
 		var section gcsql.Section
 		if err = rows.Scan(
@@ -53,19 +58,29 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 		); err != nil {
 			return err
 		}
-		if _, err = m.createSectionIfNotExist(&section); err != nil {
+		m.sections = append(m.sections, migrationSection{
+			oldID:   section.ID,
+			Section: section,
+		})
+
+		for _, newSection := range gcsql.AllSections {
+			if newSection.Name == section.Name || newSection.Abbreviation == section.Abbreviation {
+				common.LogWarning().Str("section", section.Name).Msg("Section already exists in new db, moving on")
+				m.sections[len(m.sections)-1].ID = newSection.ID
+				break
+			}
+		}
+		if _, err = gcsql.NewSection(section.Name, section.Abbreviation, false, section.Position); err != nil {
+			errEv.Err(err).Caller().
+				Str("sectionName", section.Name).
+				Msg("Failed to create section")
 			return err
 		}
 	}
 	if err = rows.Close(); err != nil {
+		errEv.Caller().Msg("Failed to close section rows")
 		return err
 	}
-	m.migrationSectionID, err = m.createSectionIfNotExist(&gcsql.Section{
-		Name:         "Migrated Boards",
-		Abbreviation: "mb",
-		Hidden:       true,
-	})
-
 	return err
 }
 
@@ -76,14 +91,16 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
-	err := m.migrateSectionsToNewDB()
+	// get all boards from new db
+	err := gcsql.ResetBoardSectionArrays()
 	if err != nil {
-		errEv.Err(err).Msg("Failed to migrate sections")
+		errEv.Err(err).Caller().Msg("Failed to reset board section arrays")
+		return nil
 	}
 
-	// get all boards from new db
-	if err = gcsql.ResetBoardSectionArrays(); err != nil {
-		return nil
+	if err = m.migrateSectionsToNewDB(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to migrate sections")
+		return err
 	}
 
 	// get boards from old db
@@ -117,10 +134,12 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 				break
 			}
 		}
+
 		m.boards[board.Dir] = board
 		if found {
 			continue
 		}
+
 		// create new board using the board data from the old db
 		// omitting things like ID and creation date since we don't really care
 		if err = gcsql.CreateBoard(&board.Board, false); err != nil {
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 3d04f99c..47c80762 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -25,7 +25,8 @@ type Pre2021Migrator struct {
 	migrationSectionID int
 	posts              []postTable
 	boards             map[string]migrationBoard
-	threads            map[int]gcsql.Thread // old thread id (previously stored in posts as the id) to new thread id (threads.id)
+	sections           []migrationSection
+	threads            map[int]gcsql.Thread // old thread id (previously stored in posts ) to new thread id (threads.id)
 }
 
 // IsMigratingInPlace implements common.DBMigrator.

From beb048716eb3acadd66db5019de5dcf1e94b6bfa Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:58:09 -0800
Subject: [PATCH 033/122] Move setup functionality in test to a separate
 function

---
 .../internal/pre2021/sqlite3_test.go          | 61 +++++++++++++------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index 0b6c1dfe..a93c1a1f 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -4,7 +4,6 @@ import (
 	"path"
 	"testing"
 
-	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
@@ -15,40 +14,68 @@ const (
 	sqlite3DBPath = "tools/gochan-pre2021.sqlite3db" // relative to gochan project root
 )
 
-func TestMigrateToNewDB(t *testing.T) {
+func setupMigrationTest(t *testing.T) *Pre2021Migrator {
 	dir, err := testutil.GoToGochanRoot(t)
 	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.NoError(t, common.InitTestMigrationLog(t)) {
-		return
+		t.FailNow()
 	}
 	dbPath := path.Join(dir, sqlite3DBPath)
 
 	oldSQLConfig := config.SQLConfig{
-		DBtype:     "sqlite3",
-		DBname:     path.Base(dbPath),
-		DBhost:     dbPath,
-		DBprefix:   "gc_",
-		DBusername: "gochan",
-		DBpassword: "password",
+		DBtype:           "sqlite3",
+		DBname:           path.Base(dbPath),
+		DBhost:           dbPath,
+		DBprefix:         "gc_",
+		DBusername:       "gochan",
+		DBpassword:       "password",
+		DBTimeoutSeconds: 600,
 	}
-	migrator := Pre2021Migrator{
+	migrator := &Pre2021Migrator{
 		config: Pre2021Config{
 			SQLConfig: oldSQLConfig,
 		},
 	}
-	outDir := t.TempDir()
+	db, err := gcsql.Open(&oldSQLConfig)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	migrator.db = db
 
+	outDir := t.TempDir()
 	config.SetTestDBConfig("sqlite3", path.Join(outDir, "gochan-migrated.sqlite3db"), "gochan-migrated.sqlite3db", "gochan", "password", "gc_")
 	sqlConfig := config.GetSQLConfig()
+	sqlConfig.DBTimeoutSeconds = 600
 
 	if !assert.NoError(t, gcsql.ConnectToDB(&sqlConfig)) {
-		return
+		t.FailNow()
 	}
 	if !assert.NoError(t, gcsql.CheckAndInitializeDatabase("sqlite3", "4")) {
-		return
+		t.FailNow()
 	}
 
-	assert.NoError(t, migrator.migrateBoardsToNewDB())
+	return migrator
+}
+
+func TestMigrateToNewDB(t *testing.T) {
+	migrator := setupMigrationTest(t)
+
+	assert.NoError(t, migrator.migrateBoardsToNewDB())
+
+	newBoards, err := gcsql.GetAllBoards(false)
+	if !assert.NoError(t, err) {
+		return
+	}
+	assert.GreaterOrEqual(t, len(newBoards), 2, "Expected new boards list to have at least 2 boards") // old DB has 2 boards, /test/ and /hidden/
+
+	hiddenBoard, err := gcsql.GetBoardFromDir("hidden")
+	if !assert.NoError(t, err) {
+		return
+	}
+	t.Logf("Hidden board section ID: %d", hiddenBoard.SectionID)
+	hiddenSection, err := gcsql.GetSectionFromID(hiddenBoard.SectionID)
+	if !assert.NoError(t, err) {
+		return
+	}
+	assert.Equal(t, "Hidden", hiddenSection.Name, "Expected Hidden section to have name 'Hidden'")
+	assert.True(t, hiddenSection.Hidden, "Expected Hidden section to be hidden")
 }

From 525c5953d909c03722ea6d8322be38a78578e700 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:00:25 -0800
Subject: [PATCH 034/122] Properly migrate board and sections, and have board
 point to correct section

---
 .../internal/pre2021/boards.go                |  73 ++++++++++++------
 .../internal/pre2021/sqlite3_test.go          |  42 +++++++---
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 3 files changed, 80 insertions(+), 35 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 0678e9a4..1dd2aede 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -40,48 +40,59 @@ func (m *Pre2021Migrator) migrateBoardsInPlace() error {
 func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 	// creates sections in the new db if they don't exist, and also creates a migration section that
 	// boards will be set to, to be moved to the correct section by the admin after migration
+	errEv := common.LogError()
+	defer errEv.Discard()
+	// populate m.sections with all sections from the new db
+	currentAllSections, err := gcsql.GetAllSections(false)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get all sections from new db")
+		return err
+	}
+
+	for _, section := range currentAllSections {
+		m.sections = append(m.sections, migrationSection{
+			oldID:   -1,
+			Section: section,
+		})
+	}
+
 	rows, err := m.db.QuerySQL(sectionsQuery)
 	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to query old database sections")
 		return err
 	}
 	defer rows.Close()
-	errEv := common.LogError()
-	defer errEv.Discard()
 	for rows.Next() {
 		var section gcsql.Section
-		if err = rows.Scan(
-			&section.ID,
-			&section.Position,
-			&section.Hidden,
-			&section.Name,
-			&section.Abbreviation,
-		); err != nil {
+		if err = rows.Scan(&section.ID, &section.Position, &section.Hidden, &section.Name, &section.Abbreviation); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan row into section")
 			return err
 		}
-		m.sections = append(m.sections, migrationSection{
-			oldID:   section.ID,
-			Section: section,
-		})
+		var found bool
+		for s, newSection := range m.sections {
+			if section.Name == newSection.Name {
+				m.sections[s].oldID = section.ID
 
-		for _, newSection := range gcsql.AllSections {
-			if newSection.Name == section.Name || newSection.Abbreviation == section.Abbreviation {
-				common.LogWarning().Str("section", section.Name).Msg("Section already exists in new db, moving on")
-				m.sections[len(m.sections)-1].ID = newSection.ID
+				found = true
 				break
 			}
 		}
-		if _, err = gcsql.NewSection(section.Name, section.Abbreviation, false, section.Position); err != nil {
-			errEv.Err(err).Caller().
-				Str("sectionName", section.Name).
-				Msg("Failed to create section")
-			return err
+		if !found {
+			migratedSection, err := gcsql.NewSection(section.Name, section.Abbreviation, section.Hidden, section.Position)
+			if err != nil {
+				errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to migrate section")
+				return err
+			}
+			m.sections = append(m.sections, migrationSection{
+				Section: *migratedSection,
+			})
 		}
 	}
 	if err = rows.Close(); err != nil {
 		errEv.Caller().Msg("Failed to close section rows")
 		return err
 	}
-	return err
+	return nil
 }
 
 func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
@@ -99,7 +110,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	}
 
 	if err = m.migrateSectionsToNewDB(); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to migrate sections")
+		// error already logged
 		return err
 	}
 
@@ -110,6 +121,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		return err
 	}
 	defer rows.Close()
+
 	for rows.Next() {
 		var board migrationBoard
 		var maxPages int
@@ -134,9 +146,18 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 				break
 			}
 		}
+		if !found {
+			for _, section := range m.sections {
+				if section.oldID == board.oldSectionID {
+					board.SectionID = section.ID
+					break
+				}
+			}
+		}
 
 		m.boards[board.Dir] = board
 		if found {
+			// TODO: update board title, subtitle, section etc. in new db
 			continue
 		}
 
@@ -148,6 +169,10 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		}
 		common.LogInfo().Str("board", board.Dir).Msg("Board successfully created")
 	}
+	if err = gcsql.ResetBoardSectionArrays(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to reset board and section arrays")
+		return err
+	}
 	return nil
 }
 
diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index a93c1a1f..c0e0ad95 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -14,7 +14,7 @@ const (
 	sqlite3DBPath = "tools/gochan-pre2021.sqlite3db" // relative to gochan project root
 )
 
-func setupMigrationTest(t *testing.T) *Pre2021Migrator {
+func setupMigrationTest(t *testing.T, outDir string) *Pre2021Migrator {
 	dir, err := testutil.GoToGochanRoot(t)
 	if !assert.NoError(t, err) {
 		t.FailNow()
@@ -40,9 +40,10 @@ func setupMigrationTest(t *testing.T) *Pre2021Migrator {
 		t.FailNow()
 	}
 	migrator.db = db
+	migratedDBPath := path.Join(outDir, "gochan-migrated.sqlite3db")
+	t.Log("Migrated DB path:", migratedDBPath)
 
-	outDir := t.TempDir()
-	config.SetTestDBConfig("sqlite3", path.Join(outDir, "gochan-migrated.sqlite3db"), "gochan-migrated.sqlite3db", "gochan", "password", "gc_")
+	config.SetTestDBConfig("sqlite3", migratedDBPath, path.Base(migratedDBPath), "gochan", "password", "gc_")
 	sqlConfig := config.GetSQLConfig()
 	sqlConfig.DBTimeoutSeconds = 600
 
@@ -56,26 +57,45 @@ func setupMigrationTest(t *testing.T) *Pre2021Migrator {
 	return migrator
 }
 
-func TestMigrateToNewDB(t *testing.T) {
-	migrator := setupMigrationTest(t)
+func TestMigrateBoardsToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir)
+	assert.NoError(t, gcsql.ResetBoardSectionArrays())
+
+	numBoards := len(gcsql.AllBoards)
+	numSections := len(gcsql.AllSections)
+
+	assert.Equal(t, 1, numBoards, "Expected to have 1 board pre-migration (/test/ is automatically created during provisioning)")
+	assert.Equal(t, 1, numSections, "Expected to have 1 section pre-migration (Main is automatically created during provisioning)")
 
 	assert.NoError(t, migrator.migrateBoardsToNewDB())
 
-	newBoards, err := gcsql.GetAllBoards(false)
+	migratedBoards, err := gcsql.GetAllBoards(false)
 	if !assert.NoError(t, err) {
-		return
+		t.FailNow()
 	}
-	assert.GreaterOrEqual(t, len(newBoards), 2, "Expected new boards list to have at least 2 boards") // old DB has 2 boards, /test/ and /hidden/
+	migratedSections, err := gcsql.GetAllSections(false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	assert.Equal(t, len(migratedBoards), 2, "Expected updated boards list to have two boards")
+	assert.Equal(t, len(migratedSections), 2, "Expected updated sections list to have two sections")
 
 	hiddenBoard, err := gcsql.GetBoardFromDir("hidden")
 	if !assert.NoError(t, err) {
-		return
+		t.FailNow()
 	}
 	t.Logf("Hidden board section ID: %d", hiddenBoard.SectionID)
+
+	t.Log("Number of sections:", len(migratedSections))
+	for _, section := range migratedSections {
+		t.Logf("Section ID %d: %#v", section.ID, section)
+	}
 	hiddenSection, err := gcsql.GetSectionFromID(hiddenBoard.SectionID)
 	if !assert.NoError(t, err) {
-		return
+		t.FailNow()
 	}
-	assert.Equal(t, "Hidden", hiddenSection.Name, "Expected Hidden section to have name 'Hidden'")
+	assert.Equal(t, "Hidden section", hiddenSection.Name, "Expected /hidden/ board's section to have name 'Hidden'")
 	assert.True(t, hiddenSection.Hidden, "Expected Hidden section to be hidden")
 }
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 137996f869215ea9a1c309704733aa93078447df..c308c532ce9db711bef1f352a00e607e8095c9ee 100644
GIT binary patch
delta 218
zcmZo@U~On%ogmF9F;T{uQDS4lLVs@lLIx&2H3mL4zS|ocrTBOnjTj{vI7B%()I)P8
z*Tx%}D-;x^>KYjs87kyvrWYlaWaj5N<tG-UD5T{VDU_rZmt^LpV^K5tK)l1`+i}xa
z7#JA(CpLC(N?@G8&HsUciGMc(|8D*(n*{~d^Sg>OvN3RQh^qT0X6EIBFw6=mCN>66
fPEARV%#@VWJcZ)aWRS%fU>?v!0U(BhC5#RLU(-F}

delta 146
zcmZo@U~On%ogmF9Fj2;tQD9@jLVs=s1_ma++YJ1Le783?p68o<J8l|JBM+k_1BWOF
zhq}J|WTQAEL8tu0q7;R+{33;t)Z&uNy!6Sl;~X|6Firq#=fBFp|AGJNW<i0I{MwRC
uYz&;7>XIIrDXDo1#i_|9nfZAcnJGXXA0rzB2ZyMrZ(?R%E)XwabN~P<v?@IS


From 6d48a1948a7af24b360aaba7d49b38889ddcbc0b Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 19:51:38 -0800
Subject: [PATCH 035/122] Fully migrate and update board and section data to
 new DB for pre-2021

---
 .../internal/pre2021/boards.go                |  78 ++++++++++++------
 .../internal/pre2021/pre2021.go               |   8 +-
 .../internal/pre2021/sqlite3_test.go          |  40 +++++----
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 4 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 1dd2aede..26b7d7f6 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -12,6 +12,7 @@ import (
 
 type migrationBoard struct {
 	oldSectionID int
+	oldID        int
 	gcsql.Board
 }
 
@@ -71,8 +72,20 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 		var found bool
 		for s, newSection := range m.sections {
 			if section.Name == newSection.Name {
+				// section already exists, update values
 				m.sections[s].oldID = section.ID
-
+				m.sections[s].Abbreviation = section.Abbreviation
+				m.sections[s].Hidden = section.Hidden
+				m.sections[s].Position = section.Position
+				common.LogInfo().
+					Int("sectionID", section.ID).
+					Int("oldSectionID", m.sections[s].oldID).
+					Str("sectionName", section.Name).
+					Str("sectionAbbreviation", section.Abbreviation).
+					Msg("Section already exists in new db, updating values")
+				if err = m.sections[s].UpdateValues(); err != nil {
+					errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to update pre-existing section values")
+				}
 				found = true
 				break
 			}
@@ -96,9 +109,7 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 }
 
 func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
-	if m.boards == nil {
-		m.boards = make(map[string]migrationBoard)
-	}
+	m.boards = nil
 	errEv := common.LogError()
 	defer errEv.Discard()
 
@@ -110,10 +121,22 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	}
 
 	if err = m.migrateSectionsToNewDB(); err != nil {
-		// error already logged
+		// error should already be logged by migrateSectionsToNewDB
 		return err
 	}
 
+	allBoards, err := gcsql.GetAllBoards(false)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get all boards from new db")
+		return err
+	}
+	for _, board := range allBoards {
+		m.boards = append(m.boards, migrationBoard{
+			oldSectionID: -1,
+			Board:        board,
+		})
+	}
+
 	// get boards from old db
 	rows, err := m.db.QuerySQL(boardsQuery)
 	if err != nil {
@@ -126,44 +149,49 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		var board migrationBoard
 		var maxPages int
 		if err = rows.Scan(
-			&board.ID, &board.NavbarPosition, &board.Dir, &board.Title, &board.Subtitle,
-			&board.Description, &board.SectionID, &board.MaxFilesize, &maxPages, &board.DefaultStyle, &board.Locked,
-			&board.CreatedAt, &board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter,
-			&board.MaxMessageLength, &board.AllowEmbeds, &board.RedirectToThread, &board.RequireFile, &board.EnableCatalog,
+			&board.ID, &board.NavbarPosition, &board.Dir, &board.Title, &board.Subtitle, &board.Description,
+			&board.SectionID, &board.MaxFilesize, &maxPages, &board.DefaultStyle, &board.Locked, &board.CreatedAt,
+			&board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter, &board.MaxMessageLength,
+			&board.AllowEmbeds, &board.RedirectToThread, &board.RequireFile, &board.EnableCatalog,
 		); err != nil {
 			errEv.Err(err).Caller().Msg("Failed to scan row into board")
 			return err
 		}
 		board.MaxThreads = maxPages * config.GetBoardConfig(board.Dir).ThreadsPerPage
 		found := false
-		for _, newBoard := range gcsql.AllBoards {
-			if _, ok := m.boards[board.Dir]; !ok {
-				m.boards[board.Dir] = board
-			}
+
+		for b, newBoard := range m.boards {
 			if newBoard.Dir == board.Dir {
-				common.LogWarning().Str("board", board.Dir).Msg("Board already exists in new db, moving on")
+				m.boards[b].oldID = board.ID
+				m.boards[b].oldSectionID = board.SectionID
+				common.LogInfo().Str("board", board.Dir).Msg("Board already exists in new db, updating values")
+				// don't update other values in the array since they don't affect migrating threads or posts
+				if _, err = gcsql.ExecSQL(`UPDATE DBPREFIXboards
+					SET uri = ?, navbar_position = ?, title = ?, subtitle = ?, description = ?,
+					max_file_size = ?, max_threads = ?, default_style = ?, locked = ?,
+					anonymous_name = ?, force_anonymous = ?, autosage_after = ?, no_images_after = ?, max_message_length = ?,
+					min_message_length = ?, allow_embeds = ?, redirect_to_thread = ?, require_file = ?, enable_catalog = ?
+					WHERE id = ?`,
+					board.Dir, board.NavbarPosition, board.Title, board.Subtitle, board.Description,
+					board.MaxFilesize, board.MaxThreads, board.DefaultStyle, board.Locked,
+					board.AnonymousName, board.ForceAnonymous, board.AutosageAfter, board.NoImagesAfter, board.MaxMessageLength,
+					board.MinMessageLength, board.AllowEmbeds, board.RedirectToThread, board.RequireFile, board.EnableCatalog,
+					newBoard.ID); err != nil {
+					errEv.Err(err).Caller().Str("board", board.Dir).Msg("Failed to update board values")
+					return err
+				}
 				found = true
 				break
 			}
 		}
-		if !found {
-			for _, section := range m.sections {
-				if section.oldID == board.oldSectionID {
-					board.SectionID = section.ID
-					break
-				}
-			}
-		}
 
-		m.boards[board.Dir] = board
 		if found {
-			// TODO: update board title, subtitle, section etc. in new db
 			continue
 		}
 
 		// create new board using the board data from the old db
 		// omitting things like ID and creation date since we don't really care
-		if err = gcsql.CreateBoard(&board.Board, false); err != nil {
+		if err = gcsql.CreateBoard(&board.Board, board.IsHidden(false)); err != nil {
 			errEv.Err(err).Caller().Str("board", board.Dir).Msg("Failed to create board")
 			return err
 		}
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 47c80762..8892d75e 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -22,11 +22,9 @@ type Pre2021Migrator struct {
 	options *common.MigrationOptions
 	config  Pre2021Config
 
-	migrationSectionID int
-	posts              []postTable
-	boards             map[string]migrationBoard
-	sections           []migrationSection
-	threads            map[int]gcsql.Thread // old thread id (previously stored in posts ) to new thread id (threads.id)
+	posts    []postTable
+	boards   []migrationBoard
+	sections []migrationSection
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index c0e0ad95..868c123c 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -14,7 +14,7 @@ const (
 	sqlite3DBPath = "tools/gochan-pre2021.sqlite3db" // relative to gochan project root
 )
 
-func setupMigrationTest(t *testing.T, outDir string) *Pre2021Migrator {
+func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre2021Migrator {
 	dir, err := testutil.GoToGochanRoot(t)
 	if !assert.NoError(t, err) {
 		t.FailNow()
@@ -41,7 +41,6 @@ func setupMigrationTest(t *testing.T, outDir string) *Pre2021Migrator {
 	}
 	migrator.db = db
 	migratedDBPath := path.Join(outDir, "gochan-migrated.sqlite3db")
-	t.Log("Migrated DB path:", migratedDBPath)
 
 	config.SetTestDBConfig("sqlite3", migratedDBPath, path.Base(migratedDBPath), "gochan", "password", "gc_")
 	sqlConfig := config.GetSQLConfig()
@@ -59,7 +58,7 @@ func setupMigrationTest(t *testing.T, outDir string) *Pre2021Migrator {
 
 func TestMigrateBoardsToNewDB(t *testing.T) {
 	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir)
+	migrator := setupMigrationTest(t, outDir, false)
 	assert.NoError(t, gcsql.ResetBoardSectionArrays())
 
 	numBoards := len(gcsql.AllBoards)
@@ -68,7 +67,7 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	assert.Equal(t, 1, numBoards, "Expected to have 1 board pre-migration (/test/ is automatically created during provisioning)")
 	assert.Equal(t, 1, numSections, "Expected to have 1 section pre-migration (Main is automatically created during provisioning)")
 
-	assert.NoError(t, migrator.migrateBoardsToNewDB())
+	assert.NoError(t, migrator.MigrateBoards())
 
 	migratedBoards, err := gcsql.GetAllBoards(false)
 	if !assert.NoError(t, err) {
@@ -82,20 +81,29 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	assert.Equal(t, len(migratedBoards), 2, "Expected updated boards list to have two boards")
 	assert.Equal(t, len(migratedSections), 2, "Expected updated sections list to have two sections")
 
+	// Test migrated sections
+	mainSection, err := gcsql.GetSectionFromName("Main")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "mainmigration", mainSection.Abbreviation, "Expected Main section to have updated abbreviation name 'mainmigration'")
+
+	// Test migrated boards
+	testBoard, err := gcsql.GetBoardFromDir("test")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "Testing Board", testBoard.Title)
+	assert.Equal(t, "Board for testing pre-2021 migration", testBoard.Subtitle)
+	testBoardSection, err := gcsql.GetSectionFromID(testBoard.SectionID)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "Main", testBoardSection.Name, "Expected /test/ board to be in Main section")
+
 	hiddenBoard, err := gcsql.GetBoardFromDir("hidden")
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	t.Logf("Hidden board section ID: %d", hiddenBoard.SectionID)
-
-	t.Log("Number of sections:", len(migratedSections))
-	for _, section := range migratedSections {
-		t.Logf("Section ID %d: %#v", section.ID, section)
-	}
-	hiddenSection, err := gcsql.GetSectionFromID(hiddenBoard.SectionID)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, "Hidden section", hiddenSection.Name, "Expected /hidden/ board's section to have name 'Hidden'")
-	assert.True(t, hiddenSection.Hidden, "Expected Hidden section to be hidden")
+	assert.Equal(t, "Hidden Board", hiddenBoard.Title)
 }
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index c308c532ce9db711bef1f352a00e607e8095c9ee..632d3be5712b5d68cd31bb3a3f185a2a330716cc 100644
GIT binary patch
delta 32
ocmZo@U~On%ogmF9IZ?)$QF3F#yI4l2$^LO$8J#w>#{Yf*0ICiPqW}N^

delta 32
ocmZo@U~On%ogmF9F;T{uQDS4lyI97g$^LO$8Iv}%#{Yf*0IVeo;Q#;t


From 4699417370739e3235da57a090d2728bb91c6eac Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:03:26 -0800
Subject: [PATCH 036/122] Start adding stuff for testing migrating pre-2021 DB
 in place

---
 .../internal/pre2021/sqlite3_test.go          | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index 868c123c..28540fe1 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -1,6 +1,8 @@
 package pre2021
 
 import (
+	"io"
+	"os"
 	"path"
 	"testing"
 
@@ -20,6 +22,27 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 		t.FailNow()
 	}
 	dbPath := path.Join(dir, sqlite3DBPath)
+	if migrateInPlace {
+		oldDbFile, err := os.Open(dbPath)
+		if !assert.NoError(t, err) {
+			t.FailNow()
+		}
+		defer oldDbFile.Close()
+
+		newDbFile, err := os.OpenFile(path.Join(outDir, "gochan-pre2021.sqlite3db"), os.O_CREATE|os.O_RDWR, 0644)
+		if !assert.NoError(t, err) {
+			t.FailNow()
+		}
+		defer newDbFile.Close()
+
+		_, err = io.Copy(newDbFile, oldDbFile)
+		if !assert.NoError(t, err) {
+			t.FailNow()
+		}
+		assert.NoError(t, oldDbFile.Close())
+		assert.NoError(t, newDbFile.Close())
+		dbPath = path.Join(outDir, "gochan-pre2021.sqlite3db")
+	}
 
 	oldSQLConfig := config.SQLConfig{
 		DBtype:           "sqlite3",
@@ -59,6 +82,9 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 func TestMigrateBoardsToNewDB(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
 	assert.NoError(t, gcsql.ResetBoardSectionArrays())
 
 	numBoards := len(gcsql.AllBoards)
@@ -67,7 +93,9 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	assert.Equal(t, 1, numBoards, "Expected to have 1 board pre-migration (/test/ is automatically created during provisioning)")
 	assert.Equal(t, 1, numSections, "Expected to have 1 section pre-migration (Main is automatically created during provisioning)")
 
-	assert.NoError(t, migrator.MigrateBoards())
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
 
 	migratedBoards, err := gcsql.GetAllBoards(false)
 	if !assert.NoError(t, err) {

From 00fbd8f6c3603584d5c4c29f447f835731789568 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:31:55 -0800
Subject: [PATCH 037/122] Add TestMigrateBoardsInPlace

---
 .../internal/common/handler.go                |  8 +++-
 .../internal/pre2021/sqlite3_test.go          | 40 ++++++++++++++-----
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/handler.go b/cmd/gochan-migration/internal/common/handler.go
index fa3e64ee..b997f81d 100644
--- a/cmd/gochan-migration/internal/common/handler.go
+++ b/cmd/gochan-migration/internal/common/handler.go
@@ -25,10 +25,14 @@ func (me *MigrationError) OldChanType() string {
 
 func (me *MigrationError) Error() string {
 	from := me.oldChanType
+	errStr := "unable to migrate"
 	if from != "" {
-		from = " from " + from
+		errStr += " from " + from
 	}
-	return "unable to migrate " + from + ": " + me.errMessage
+	if me.errMessage != "" {
+		errStr += ": " + me.errMessage
+	}
+	return errStr
 }
 
 func NewMigrationError(oldChanType string, errMessage string) *MigrationError {
diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index 28540fe1..49bed7a1 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	sqlite3DBPath = "tools/gochan-pre2021.sqlite3db" // relative to gochan project root
+	sqlite3DBDir = "tools/" // relative to gochan project root
 )
 
 func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre2021Migrator {
@@ -21,15 +21,19 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	dbPath := path.Join(dir, sqlite3DBPath)
+	dbName := "gochan-pre2021.sqlite3db"
+	dbHost := path.Join(dir, sqlite3DBDir, dbName)
+	migratedDBName := "gochan-migrated.sqlite3db"
+	migratedDBHost := path.Join(outDir, migratedDBName)
+
 	if migrateInPlace {
-		oldDbFile, err := os.Open(dbPath)
+		oldDbFile, err := os.Open(dbHost)
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
 		defer oldDbFile.Close()
 
-		newDbFile, err := os.OpenFile(path.Join(outDir, "gochan-pre2021.sqlite3db"), os.O_CREATE|os.O_RDWR, 0644)
+		newDbFile, err := os.OpenFile(migratedDBHost, os.O_CREATE|os.O_WRONLY, 0644)
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
@@ -41,13 +45,14 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 		}
 		assert.NoError(t, oldDbFile.Close())
 		assert.NoError(t, newDbFile.Close())
-		dbPath = path.Join(outDir, "gochan-pre2021.sqlite3db")
+		migratedDBHost = dbHost
+		migratedDBName = dbName
 	}
 
 	oldSQLConfig := config.SQLConfig{
 		DBtype:           "sqlite3",
-		DBname:           path.Base(dbPath),
-		DBhost:           dbPath,
+		DBname:           dbName,
+		DBhost:           dbHost,
 		DBprefix:         "gc_",
 		DBusername:       "gochan",
 		DBpassword:       "password",
@@ -63,17 +68,18 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 		t.FailNow()
 	}
 	migrator.db = db
-	migratedDBPath := path.Join(outDir, "gochan-migrated.sqlite3db")
 
-	config.SetTestDBConfig("sqlite3", migratedDBPath, path.Base(migratedDBPath), "gochan", "password", "gc_")
+	config.SetTestDBConfig("sqlite3", migratedDBHost, migratedDBName, "gochan", "password", "gc_")
 	sqlConfig := config.GetSQLConfig()
 	sqlConfig.DBTimeoutSeconds = 600
 
 	if !assert.NoError(t, gcsql.ConnectToDB(&sqlConfig)) {
 		t.FailNow()
 	}
-	if !assert.NoError(t, gcsql.CheckAndInitializeDatabase("sqlite3", "4")) {
-		t.FailNow()
+	if !migrateInPlace {
+		if !assert.NoError(t, gcsql.CheckAndInitializeDatabase("sqlite3", "4")) {
+			t.FailNow()
+		}
 	}
 
 	return migrator
@@ -135,3 +141,15 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	}
 	assert.Equal(t, "Hidden Board", hiddenBoard.Title)
 }
+
+func TestMigrateBoardsInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.Error(t, migrator.MigrateBoards(), "Not yet implemented") {
+		t.FailNow()
+	}
+}

From d19f0eebe3b4ebd121c6ee11d88427ee8e8ede6f Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 20:36:19 -0800
Subject: [PATCH 038/122] Move board migration testing for pre2021 to a
 separate file

---
 .../internal/pre2021/boards_test.go           | 77 +++++++++++++++++++
 .../internal/pre2021/sqlite3_test.go          | 69 -----------------
 2 files changed, 77 insertions(+), 69 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/boards_test.go

diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
new file mode 100644
index 00000000..f65b37d7
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -0,0 +1,77 @@
+package pre2021
+
+import (
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigrateBoardsToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+	assert.NoError(t, gcsql.ResetBoardSectionArrays())
+
+	numBoards := len(gcsql.AllBoards)
+	numSections := len(gcsql.AllSections)
+
+	assert.Equal(t, 1, numBoards, "Expected to have 1 board pre-migration (/test/ is automatically created during provisioning)")
+	assert.Equal(t, 1, numSections, "Expected to have 1 section pre-migration (Main is automatically created during provisioning)")
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	migratedBoards, err := gcsql.GetAllBoards(false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	migratedSections, err := gcsql.GetAllSections(false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	assert.Equal(t, len(migratedBoards), 2, "Expected updated boards list to have two boards")
+	assert.Equal(t, len(migratedSections), 2, "Expected updated sections list to have two sections")
+
+	// Test migrated sections
+	mainSection, err := gcsql.GetSectionFromName("Main")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "mainmigration", mainSection.Abbreviation, "Expected Main section to have updated abbreviation name 'mainmigration'")
+
+	// Test migrated boards
+	testBoard, err := gcsql.GetBoardFromDir("test")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "Testing Board", testBoard.Title)
+	assert.Equal(t, "Board for testing pre-2021 migration", testBoard.Subtitle)
+	testBoardSection, err := gcsql.GetSectionFromID(testBoard.SectionID)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "Main", testBoardSection.Name, "Expected /test/ board to be in Main section")
+
+	hiddenBoard, err := gcsql.GetBoardFromDir("hidden")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, "Hidden Board", hiddenBoard.Title)
+}
+
+func TestMigrateBoardsInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.Error(t, migrator.MigrateBoards(), "Not yet implemented") {
+		t.FailNow()
+	}
+}
diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
index 49bed7a1..045217e9 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
@@ -84,72 +84,3 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 
 	return migrator
 }
-
-func TestMigrateBoardsToNewDB(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, false)
-	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
-		t.FailNow()
-	}
-	assert.NoError(t, gcsql.ResetBoardSectionArrays())
-
-	numBoards := len(gcsql.AllBoards)
-	numSections := len(gcsql.AllSections)
-
-	assert.Equal(t, 1, numBoards, "Expected to have 1 board pre-migration (/test/ is automatically created during provisioning)")
-	assert.Equal(t, 1, numSections, "Expected to have 1 section pre-migration (Main is automatically created during provisioning)")
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-
-	migratedBoards, err := gcsql.GetAllBoards(false)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	migratedSections, err := gcsql.GetAllSections(false)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-
-	assert.Equal(t, len(migratedBoards), 2, "Expected updated boards list to have two boards")
-	assert.Equal(t, len(migratedSections), 2, "Expected updated sections list to have two sections")
-
-	// Test migrated sections
-	mainSection, err := gcsql.GetSectionFromName("Main")
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, "mainmigration", mainSection.Abbreviation, "Expected Main section to have updated abbreviation name 'mainmigration'")
-
-	// Test migrated boards
-	testBoard, err := gcsql.GetBoardFromDir("test")
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, "Testing Board", testBoard.Title)
-	assert.Equal(t, "Board for testing pre-2021 migration", testBoard.Subtitle)
-	testBoardSection, err := gcsql.GetSectionFromID(testBoard.SectionID)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, "Main", testBoardSection.Name, "Expected /test/ board to be in Main section")
-
-	hiddenBoard, err := gcsql.GetBoardFromDir("hidden")
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, "Hidden Board", hiddenBoard.Title)
-}
-
-func TestMigrateBoardsInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.Error(t, migrator.MigrateBoards(), "Not yet implemented") {
-		t.FailNow()
-	}
-}

From 0dcffa06dfc8668604911fb9876d6301107ea7ad Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 21:31:41 -0800
Subject: [PATCH 039/122] Make createThread function public

---
 pkg/gcsql/posts.go   | 2 +-
 pkg/gcsql/threads.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 486d9031..f52826cb 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -371,7 +371,7 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 		// thread doesn't exist yet, this is a new post
 		p.IsTopPost = true
 		var threadID int
-		threadID, err = createThread(tx, boardID, locked, stickied, anchored, cyclical)
+		threadID, err = CreateThread(tx, boardID, locked, stickied, anchored, cyclical)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/gcsql/threads.go b/pkg/gcsql/threads.go
index 4624da83..b964f7ea 100644
--- a/pkg/gcsql/threads.go
+++ b/pkg/gcsql/threads.go
@@ -19,7 +19,8 @@ var (
 	ErrThreadLocked       = errors.New("thread is locked and cannot be replied to")
 )
 
-func createThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) (threadID int, err error) {
+// CreateThread creates a new thread in the database with the given board ID and statuses
+func CreateThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) (threadID int, err error) {
 	const lockedQuery = `SELECT locked FROM DBPREFIXboards WHERE id = ?`
 	const insertQuery = `INSERT INTO DBPREFIXthreads (board_id, locked, stickied, anchored, cyclical) VALUES (?,?,?,?,?)`
 	var boardIsLocked bool
@@ -32,8 +33,7 @@ func createThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored
 	if _, err = ExecTxSQL(tx, insertQuery, boardID, locked, stickied, anchored, cyclical); err != nil {
 		return 0, err
 	}
-	QueryRowTxSQL(tx, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
-	return threadID, err
+	return threadID, QueryRowTxSQL(tx, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
 }
 
 // GetThread returns a a thread object from the database, given its ID

From c80970c10e0fd9012f3fc576e9a65a22df876b82 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 22:28:29 -0800
Subject: [PATCH 040/122] Migrate thread data to new threads table

---
 .../internal/pre2021/boards.go                |  17 +-
 .../internal/pre2021/posts.go                 | 220 +++++++-----------
 .../internal/pre2021/posts_test.go            |  36 +++
 .../internal/pre2021/pre2021.go               |   2 +-
 .../{sqlite3_test.go => pre2021_test.go}      |   5 +
 .../internal/pre2021/queries.go               |   9 +-
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 7 files changed, 141 insertions(+), 148 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/posts_test.go
 rename cmd/gochan-migration/internal/pre2021/{sqlite3_test.go => pre2021_test.go} (93%)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 26b7d7f6..a7b842f3 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -133,6 +133,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	for _, board := range allBoards {
 		m.boards = append(m.boards, migrationBoard{
 			oldSectionID: -1,
+			oldID:        -1,
 			Board:        board,
 		})
 	}
@@ -149,7 +150,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		var board migrationBoard
 		var maxPages int
 		if err = rows.Scan(
-			&board.ID, &board.NavbarPosition, &board.Dir, &board.Title, &board.Subtitle, &board.Description,
+			&board.oldID, &board.NavbarPosition, &board.Dir, &board.Title, &board.Subtitle, &board.Description,
 			&board.SectionID, &board.MaxFilesize, &maxPages, &board.DefaultStyle, &board.Locked, &board.CreatedAt,
 			&board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter, &board.MaxMessageLength,
 			&board.AllowEmbeds, &board.RedirectToThread, &board.RequireFile, &board.EnableCatalog,
@@ -162,9 +163,13 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 
 		for b, newBoard := range m.boards {
 			if newBoard.Dir == board.Dir {
-				m.boards[b].oldID = board.ID
+				m.boards[b].oldID = board.oldID
 				m.boards[b].oldSectionID = board.SectionID
-				common.LogInfo().Str("board", board.Dir).Msg("Board already exists in new db, updating values")
+				common.LogInfo().
+					Str("board", board.Dir).
+					Int("oldBoardID", board.ID).
+					Int("migratedBoardID", newBoard.ID).
+					Msg("Board already exists in new db, updating values")
 				// don't update other values in the array since they don't affect migrating threads or posts
 				if _, err = gcsql.ExecSQL(`UPDATE DBPREFIXboards
 					SET uri = ?, navbar_position = ?, title = ?, subtitle = ?, description = ?,
@@ -195,7 +200,11 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 			errEv.Err(err).Caller().Str("board", board.Dir).Msg("Failed to create board")
 			return err
 		}
-		common.LogInfo().Str("board", board.Dir).Msg("Board successfully created")
+		m.boards = append(m.boards, board)
+		common.LogInfo().
+			Str("dir", board.Dir).
+			Int("boardID", board.ID).
+			Msg("Board successfully created")
 	}
 	if err = gcsql.ResetBoardSectionArrays(); err != nil {
 		errEv.Err(err).Caller().Msg("Failed to reset board and section arrays")
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 751dbf4f..aa004982 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -1,8 +1,6 @@
 package pre2021
 
 import (
-	"database/sql"
-	"fmt"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
@@ -10,168 +8,112 @@ import (
 )
 
 type postTable struct {
-	id                int
-	boardid           int
-	parentid          int
-	name              string
-	tripcode          string
-	email             string
-	subject           string
-	message           string
-	message_raw       string
-	password          string
-	filename          string
-	filename_original string
-	file_checksum     string
-	filesize          int
-	image_w           int
-	image_h           int
-	thumb_w           int
-	thumb_h           int
-	ip                string
-	tag               string
-	timestamp         time.Time
-	autosage          bool
-	deleted_timestamp time.Time
-	bumped            time.Time
-	stickied          bool
-	locked            bool
-	reviewed          bool
-
-	newBoardID int
-	foundBoard bool
-	// oldParentID int
+	gcsql.Post
+	// id               int
+	// boardID          int
+	// parentID         int
+	// name             string
+	// tripcode         string
+	// email            string
+	// subject          string
+	// message          string
+	// messageRaw       string
+	// password         string
+	filename         string
+	filenameOriginal string
+	fileChecksum     string
+	filesize         int
+	imageW           int
+	imageH           int
+	thumbW           int
+	thumbH           int
+	// ip               string
+	// tag              string
+	// timestamp        time.Time
+	autosage bool
+	bumped   time.Time
+	stickied bool
+	locked   bool
+	// reviewed         bool
+	oldID       int
+	boardID     int
+	oldBoardID  int
+	oldParentID int
 }
 
 func (m *Pre2021Migrator) MigratePosts() error {
-	var err error
-	if err = m.migrateThreads(); err != nil {
-		return err
+	if m.IsMigratingInPlace() {
+		return m.migratePostsInPlace()
 	}
-	return m.migratePostsUtil()
+	return m.migratePostsToNewDB()
 }
 
-func (m *Pre2021Migrator) migrateThreads() error {
-	tx, err := m.db.Begin()
-	if err != nil {
-		return err
-	}
+func (m *Pre2021Migrator) migratePostsToNewDB() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
 
-	stmt, err := m.db.PrepareSQL(postsQuery, tx)
+	tx, err := gcsql.BeginTx()
 	if err != nil {
-		tx.Rollback()
+		errEv.Err(err).Caller().Msg("Failed to start transaction")
 		return err
 	}
-	rows, err := stmt.Query()
-	if err != nil && err != sql.ErrNoRows {
-		tx.Rollback()
+	defer tx.Rollback()
+
+	rows, err := m.db.QuerySQL(threadsQuery)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get threads")
 		return err
 	}
-	defer stmt.Close()
 	defer rows.Close()
+
+	var threadIDsWithInvalidBoards []int
+	var missingBoardIDs []int
 	for rows.Next() {
-		var post postTable
+		var thread postTable
 		if err = rows.Scan(
-			&post.id,
-			&post.boardid,
-			&post.parentid,
-			&post.name,
-			&post.tripcode,
-			&post.email,
-			&post.subject,
-			&post.message,
-			&post.message_raw,
-			&post.password,
-			&post.filename,
-			&post.filename_original,
-			&post.file_checksum,
-			&post.filesize,
-			&post.image_w,
-			&post.image_h,
-			&post.thumb_w,
-			&post.thumb_h,
-			&post.ip,
-			&post.tag,
-			&post.timestamp,
-			&post.autosage,
-			&post.deleted_timestamp,
-			&post.bumped,
-			&post.stickied,
-			&post.locked,
-			&post.reviewed,
+			&thread.oldID, &thread.oldBoardID, &thread.oldParentID, &thread.Name, &thread.Tripcode, &thread.Email,
+			&thread.Subject, &thread.Message, &thread.MessageRaw, &thread.Password, &thread.filename,
+			&thread.filenameOriginal, &thread.fileChecksum, &thread.filesize, &thread.imageW, &thread.imageH,
+			&thread.thumbW, &thread.thumbH, &thread.IP, &thread.CreatedOn, &thread.autosage,
+			&thread.bumped, &thread.stickied, &thread.locked,
 		); err != nil {
-			tx.Rollback()
+			errEv.Err(err).Caller().Msg("Failed to scan thread")
 			return err
 		}
-		var postBoardDir string
-		for _, newBoard := range gcsql.AllBoards {
-			if newBoard.Dir == postBoardDir {
-				post.newBoardID = newBoard.ID
-				post.foundBoard = true
+		var foundBoard bool
+		for _, board := range m.boards {
+			if board.oldID == thread.oldBoardID {
+				thread.boardID = board.ID
+				foundBoard = true
+				break
 			}
 		}
-		if !post.foundBoard {
-			common.LogWarning().Int("boardID", post.boardid).
-				Msg("Pre-migrated post has an invalid boardid (board doesn't exist), skipping")
+		if !foundBoard {
+			threadIDsWithInvalidBoards = append(threadIDsWithInvalidBoards, thread.oldID)
+			missingBoardIDs = append(missingBoardIDs, thread.oldBoardID)
 			continue
 		}
 
-		// var stmt *sql.Stmt
-		// var err error
-		preparedStr, _ := gcsql.SetupSQLString(`SELECT id FROM DBPREFIXboards WHERE ui = ?`, m.db)
-		stmt, err := tx.Prepare(preparedStr)
-		if err != nil {
-			tx.Rollback()
-			return err
+		if thread.ThreadID, err = gcsql.CreateThread(tx, thread.boardID, thread.locked, thread.stickied, thread.autosage, false); err != nil {
+			errEv.Err(err).Caller().
+				Int("boardID", thread.boardID).
+				Msg("Failed to create thread")
 		}
-		stmt.QueryRow(post.boardid).Scan(&post.newBoardID)
-
-		// gcsql.QueryRowSQL(`SELECT id FROM DBPREFIXboards WHERE uri = ?`, []interface{}{})
-		if post.parentid == 0 {
-			// post is a thread, save it to the DBPREFIXthreads table
-			// []interfaceP{{post.newParentID}
-
-			if err = gcsql.QueryRowSQL(
-				`SELECT board_id FROM DBPREFIXthreads ORDER BY board_id LIMIT 1`,
-				nil,
-				[]interface{}{&post.newBoardID},
-			); err != nil {
-				tx.Rollback()
-				return err
-			}
-			fmt.Println("Current board ID:", post.newBoardID)
-			prepareStr, _ := gcsql.SetupSQLString(
-				`INSERT INTO DBPREFIXthreads
-				(board_id, locked, stickied)
-				VALUES(?, ?, ?)`, m.db)
-			stmt, err = tx.Prepare(prepareStr)
-			if err != nil {
-				tx.Rollback()
-				return err
-			}
-			stmt.Exec(post.newBoardID, post.locked, post.stickied)
-			// 			// stmt, err := db.Prepare("INSERT table SET unique_id=? ON DUPLICATE KEY UPDATE id=LAST_INSERT_ID(id)")
-			// 			gcsql.ExecSQL(`INSERT INTO DBPREFIXthreads (board_id) VALUES(?)`, post.newBoardID)
-
-			// 			/*
-			// id
-			// board_id
-			// locked
-			// stickied
-			// anchored
-			// cyclical
-			// last_bump
-			// deleted_at
-			// is_deleted
-
-			// 			*/
-
-		}
-		m.posts = append(m.posts, post)
 	}
-	return tx.Commit()
+	if len(threadIDsWithInvalidBoards) > 0 {
+		errEv.Caller().
+			Ints("threadIDs", threadIDsWithInvalidBoards).
+			Ints("boardIDs", missingBoardIDs).
+			Msg("Failed to find boards for threads")
+		return common.NewMigrationError("pre2021", "Found threads with missing boards")
+	}
+
+	if err = tx.Commit(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to commit transaction")
+	}
+	return err
 }
 
-func (*Pre2021Migrator) migratePostsUtil() error {
-	return nil
+func (m *Pre2021Migrator) migratePostsInPlace() error {
+	return common.NewMigrationError("pre2021", "not yet implemented")
 }
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
new file mode 100644
index 00000000..a04ab5f6
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -0,0 +1,36 @@
+package pre2021
+
+import (
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigratePostsToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	var numThreads int
+	if !assert.NoError(t, migrator.db.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXposts WHERE parentid = 0 AND deleted_timestamp IS NULL", nil, []any{&numThreads}), "Failed to get number of threads") {
+		t.FailNow()
+	}
+	assert.Equal(t, 2, numThreads, "Expected to have two threads pre-migration")
+
+	if !assert.NoError(t, migrator.MigratePosts()) {
+		t.FailNow()
+	}
+
+	var numMigratedThreads int
+	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numMigratedThreads}), "Failed to get number of migrated threads") {
+		t.FailNow()
+	}
+	assert.Equal(t, 2, numMigratedThreads, "Expected to have three migrated threads")
+}
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 8892d75e..9b19a3c3 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -77,7 +77,7 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 		errEv.Caller().Err(err).Msg("Failed to migrate boards")
 		return false, err
 	}
-	common.LogInfo().Msg("Migrated boards")
+	common.LogInfo().Msg("Migrated boards successfully")
 	// if err = m.MigratePosts(); err != nil {
 	// 	return false, err
 	// }
diff --git a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
similarity index 93%
rename from cmd/gochan-migration/internal/pre2021/sqlite3_test.go
rename to cmd/gochan-migration/internal/pre2021/pre2021_test.go
index 045217e9..e28eb26c 100644
--- a/cmd/gochan-migration/internal/pre2021/sqlite3_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -6,6 +6,7 @@ import (
 	"path"
 	"testing"
 
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
@@ -21,6 +22,10 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
+	if !assert.NoError(t, common.InitTestMigrationLog(t)) {
+		t.FailNow()
+	}
+
 	dbName := "gochan-pre2021.sqlite3db"
 	dbHost := path.Join(dir, sqlite3DBDir, dbName)
 	migratedDBName := "gochan-migrated.sqlite3db"
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index fe0ae120..f486de93 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -1,7 +1,7 @@
 package pre2021
 
 const (
-	sectionsQuery = `SELECT id, list_order, hidden, name, abbreviation FROM DBPREFIXsections`
+	sectionsQuery = "SELECT id, list_order, hidden, name, abbreviation FROM DBPREFIXsections"
 
 	boardsQuery = `SELECT id, list_order, dir, title, subtitle, description, section, max_file_size, max_pages,
 default_style, locked, created_on, anonymous, forced_anon, autosage_after, no_images_after, max_message_length, embeds_allowed,
@@ -9,7 +9,8 @@ redirect_to_thread, require_file, enable_catalog
 FROM DBPREFIXboards`
 
 	postsQuery = `SELECT id, boardid, parentid, name, tripcode, email, subject, message, message_raw, password, filename,
-filename_original, file_checksum, filesize, image_w, image_h, thumb_w, thumb_h, ip, tag, timestamp, autosage, deleted_timestamp,
-bumped, stickied, locked, reviewed
-FROM DBPREFIXposts WHERE deleted_timestamp = NULL`
+filename_original, file_checksum, filesize, image_w, image_h, thumb_w, thumb_h, ip, timestamp, autosage,
+bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
+
+	threadsQuery = postsQuery + " AND parentid = 0"
 )
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 632d3be5712b5d68cd31bb3a3f185a2a330716cc..e4a52098c3b648d5ae18a54bbe9f114fcaa596c0 100644
GIT binary patch
delta 626
zcmZo@U~On%ogmF9H&Mo!QEp>GoIWGl=KcCk4Z^(N7}$6U82A-<=kjgh6XyBFQ?Riy
zhNr%folS;;gOL{q0s}!L2MF-;8gnoh0~xF#8JWcjK$NIZkY8M)keLT$rKIMhmZYXA
zlw=g8CZ-TpVPs%rs%v1VYhbKkU}9xzZe?Hy6RJlNYgAyBVPFK>&8ul^3wMet&?&|s
zr!cwTuojndP{j=`jr0u7Ec8sx^x(D|7$<>UWNKw>0&@}6L1tEl=4e77RpCrB44j-G
z#|aAy14&R|ae$l%4z2RU5+EulPeHb9@~?erEDQ_`vJ)L8>l<ZQpa!T~TA~;L_9M)T
zps+@SE6gLfMbWH8bGV_E3DhrU@JPVoKajE<W@r@fs;eWMH@SVE8V`z}*6vf=tg!z<
F0|0WxmM{PS

delta 124
zcmZo@U~On%ogmF9IZ?)$QF3EKoIWG-=KcCk4ZI8t49t9m4Ezdwm-z}eHYW3lB{0h{
zFmmt$fx5adkmLXX-pMESsZIX1PfgvMNrr)w6C^DxjF9Fv=3p=esw+<{0iuHPl*t$N
Ls%=)-|DXW?u`?X_


From 95460e91d6143a65e1e46a6f53f1e7857f12104d Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Thu, 2 Jan 2025 23:15:23 -0800
Subject: [PATCH 041/122] Add thread post migration for pre2021

---
 .../internal/pre2021/posts.go                 |  77 +++++++++++++-----
 .../internal/pre2021/posts_test.go            |   6 ++
 pkg/gcsql/posts.go                            |  29 ++++---
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 4 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index aa004982..59bff89c 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -1,6 +1,7 @@
 package pre2021
 
 import (
+	"context"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
@@ -9,16 +10,11 @@ import (
 
 type postTable struct {
 	gcsql.Post
-	// id               int
-	// boardID          int
-	// parentID         int
-	// name             string
-	// tripcode         string
-	// email            string
-	// subject          string
-	// message          string
-	// messageRaw       string
-	// password         string
+	autosage bool
+	bumped   time.Time
+	stickied bool
+	locked   bool
+
 	filename         string
 	filenameOriginal string
 	fileChecksum     string
@@ -27,14 +23,7 @@ type postTable struct {
 	imageH           int
 	thumbW           int
 	thumbH           int
-	// ip               string
-	// tag              string
-	// timestamp        time.Time
-	autosage bool
-	bumped   time.Time
-	stickied bool
-	locked   bool
-	// reviewed         bool
+
 	oldID       int
 	boardID     int
 	oldBoardID  int
@@ -94,11 +83,61 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 			continue
 		}
 
-		if thread.ThreadID, err = gcsql.CreateThread(tx, thread.boardID, thread.locked, thread.stickied, thread.autosage, false); err != nil {
+		// create the thread as not locked so migration replies can be inserted. It will be locked after they are all inserted
+		if thread.ThreadID, err = gcsql.CreateThread(tx, thread.boardID, false, thread.stickied, thread.autosage, false); err != nil {
 			errEv.Err(err).Caller().
 				Int("boardID", thread.boardID).
 				Msg("Failed to create thread")
 		}
+
+		// insert thread top post
+		if err = thread.InsertWithContext(context.Background(), tx, true, thread.boardID, false, thread.stickied, thread.autosage, false); err != nil {
+			errEv.Err(err).Caller().
+				Int("boardID", thread.boardID).
+				Int("threadID", thread.ThreadID).
+				Msg("Failed to insert thread OP")
+		}
+
+		// get and insert replies
+		replyRows, err := m.db.QuerySQL(postsQuery+" AND parentid = ?", thread.oldID)
+		if err != nil {
+			errEv.Err(err).Caller().
+				Int("parentID", thread.oldID).
+				Msg("Failed to get reply rows")
+			return err
+		}
+		defer replyRows.Close()
+
+		for replyRows.Next() {
+			var reply postTable
+			if err = replyRows.Scan(
+				&reply.oldID, &reply.oldBoardID, &reply.oldParentID, &reply.Name, &reply.Tripcode, &reply.Email,
+				&reply.Subject, &reply.Message, &reply.MessageRaw, &reply.Password, &reply.filename,
+				&reply.filenameOriginal, &reply.fileChecksum, &reply.filesize, &reply.imageW, &reply.imageH,
+				&reply.thumbW, &reply.thumbH, &reply.IP, &reply.CreatedOn, &reply.autosage,
+				&reply.bumped, &reply.stickied, &reply.locked,
+			); err != nil {
+				errEv.Err(err).Caller().
+					Int("parentID", thread.oldID).
+					Msg("Failed to scan reply")
+				return err
+			}
+			reply.ThreadID = thread.ThreadID
+			if err = reply.InsertWithContext(context.Background(), tx, true, reply.boardID, false, false, false, false); err != nil {
+				errEv.Err(err).Caller().
+					Int("parentID", thread.oldID).
+					Msg("Failed to insert reply post")
+				return err
+			}
+		}
+
+		if thread.locked {
+			if _, err = gcsql.ExecTxSQL(tx, "UPDATE DBPREFIXthreads SET locked = TRUE WHERE id = ?", thread.ThreadID); err != nil {
+				errEv.Err(err).Caller().
+					Int("threadID", thread.ThreadID).
+					Msg("Unable to re-lock migrated thread")
+			}
+		}
 	}
 	if len(threadIDsWithInvalidBoards) > 0 {
 		errEv.Caller().
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index a04ab5f6..fa0cced6 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -33,4 +33,10 @@ func TestMigratePostsToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 	assert.Equal(t, 2, numMigratedThreads, "Expected to have three migrated threads")
+
+	var locked bool
+	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT locked FROM DBPREFIXthreads WHERE id = 1", nil, []any{&locked})) {
+		t.FailNow()
+	}
+	assert.True(t, locked, "Expected thread ID 1 to be locked")
 }
diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index f52826cb..3fa1bc5d 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -347,7 +347,7 @@ func (p *Post) Delete() error {
 	return err
 }
 
-func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
+func (p *Post) InsertWithContext(ctx context.Context, tx *sql.Tx, bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
 	if p.ID > 0 {
 		// already inserted
 		return ErrorPostAlreadySent
@@ -358,15 +358,7 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 	VALUES(?,?,PARAM_ATON,CURRENT_TIMESTAMP,?,?,?,?,?,?,?,?,?,?)`
 	bumpSQL := `UPDATE DBPREFIXthreads SET last_bump = CURRENT_TIMESTAMP WHERE id = ?`
 
-	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
-	defer cancel()
-
-	tx, err := BeginContextTx(ctx)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
+	var err error
 	if p.ThreadID == 0 {
 		// thread doesn't exist yet, this is a new post
 		p.IsTopPost = true
@@ -401,6 +393,23 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 			return err
 		}
 	}
+	return nil
+}
+
+func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
+	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+	defer cancel()
+
+	tx, err := BeginContextTx(ctx)
+	if err != nil {
+		return err
+	}
+	defer tx.Rollback()
+
+	if err = p.InsertWithContext(ctx, tx, bumpThread, boardID, locked, stickied, anchored, cyclical); err != nil {
+		return err
+	}
+
 	return tx.Commit()
 }
 
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index e4a52098c3b648d5ae18a54bbe9f114fcaa596c0..ff34a77fb6a26e974421ac3c258a2fa740fa4941 100644
GIT binary patch
delta 90
zcmZo@U~On%ogmF9KT*b+QGR2>qV-&J8Q6FV82A-<cWma_Fp-yqfq_AKqNBKKB$EsS
nCnqluh>8jWNe&QD<u&GDFa|OT@{3D=c=Cb0W}Aigy=?>lxF8kq

delta 88
zcmZo@U~On%ogmF9H&Mo!QEp?xqV-(g7}$6U82A-<=WgcNFp*a|oJod(lam(+goTBH
mBnJqn@)~n67y}vQi6!NUlke^|V_{%mke%o#xmkGM+eQGY{1s6E


From 7cddc3e43e5e406bd683c8119829ceb2ea9462ac Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 3 Jan 2025 21:14:16 -0800
Subject: [PATCH 042/122] Make pre-migration /test/ have board id 3, make sure
 no deleted threads were migrated

---
 .../internal/pre2021/boards_test.go           |   4 +++-
 .../internal/pre2021/posts_test.go            |   5 +++++
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
index f65b37d7..2f06e282 100644
--- a/cmd/gochan-migration/internal/pre2021/boards_test.go
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -34,7 +34,7 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 
-	assert.Equal(t, len(migratedBoards), 2, "Expected updated boards list to have two boards")
+	assert.Equal(t, len(migratedBoards), 3, "Expected updated boards list to have three boards")
 	assert.Equal(t, len(migratedSections), 2, "Expected updated sections list to have two sections")
 
 	// Test migrated sections
@@ -49,8 +49,10 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
+	assert.Equal(t, 1, testBoard.ID)
 	assert.Equal(t, "Testing Board", testBoard.Title)
 	assert.Equal(t, "Board for testing pre-2021 migration", testBoard.Subtitle)
+	assert.Equal(t, "Board for testing pre-2021 migration description", testBoard.Description)
 	testBoardSection, err := gcsql.GetSectionFromID(testBoard.SectionID)
 	if !assert.NoError(t, err) {
 		t.FailNow()
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index fa0cced6..93e16b69 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -39,4 +39,9 @@ func TestMigratePostsToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 	assert.True(t, locked, "Expected thread ID 1 to be locked")
+
+	// make sure deleted posts and threads weren't migrated
+	var numDeleted int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXposts WHERE message_raw LIKE '%deleted%' OR is_deleted", nil, []any{&numDeleted}))
+	assert.Zero(t, numDeleted, "Expected no deleted threads to be migrated")
 }
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index ff34a77fb6a26e974421ac3c258a2fa740fa4941..a78f7c80315e33f8a710fb5800aa3aafc949b278 100644
GIT binary patch
delta 425
zcmZo@U~On%ogmGqJW<A(QF&uRu0A94=5zXH3S7**hZ*=X_-^wa-q^U6SGZA$S(1T6
zl!HS(G?$Z^k(a|*ezIj;QM{3Xk*ThMp{{|6f`N&ZfuWU&nPXmlUS)26X)(hI1%^UK
zh&EA0L!dT!4r5&o4kivJPEHQa<c!1;XDC)k%1<mxaRLzvY57G8Ai0vvy!6e><6;@P
znE9VD@c-a{%l~AvpujbLX%1#l#*)<H5@s%DNyd!Kl$6vwCU#~~kcpfB=QBA7^As?!
zarZND_w#P&+r*#1^NUY?V`DY9LSr1G3<D#FsHnc7y}hukxhxYS5U7e8b21nMoy0uZ
ze*YonxeQ$s8`~!T+OwF2Pnbb!qN5mV6cbR}<h^?(8JQ<v+iPpWufQO}fCd^l*no-{
zd4V7>5JYl-057jG2ZJ$?!8EylPxj<Z`|?<T`Wz-U+9)>4vH&%30#&M7S_;E7r~)+@
UgETO^O!nNTI5}ir+@b>w0EMVyVE_OC

delta 262
zcmZo@U~On%ogmF9KT*b+QGR1Wu0A8v=5zXH3LH#)Y7Bg8e783?O7RId8Zk;TaENkn
zsE6iqGBe6^80${H7F)D=bzCGP2NVBW2L8AFKQ;>rJmeSRVwPmg$V^E|&0}I`7Ue8S
zE#CY;pUFX(cP;}PPXPnJ0`CsKO?<*Uzjz8ZHpcL<HL|nGFmO!P-6zS&Iyq~f(qxCd
zT$4-o*-ienXE6%{1B3KLM{(9jCK(3K$$R!nPQJF+R=!b&1<2*(<>ghiv=jzX93Y^|
zYs_J63}j4h*xxXD)4n|U##lz6Iu21$eM5VDVOeuoCPpAo6*cB$Fy`dsn7n@Xq0Nj3
H{?`Kldu&8u


From ee0b91059fdf6f5b4b835f734629d8c654ac8200 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 3 Jan 2025 22:01:16 -0800
Subject: [PATCH 043/122] Add pre-2021 post upload migration

---
 .../internal/pre2021/posts.go                 | 72 ++++++++++++++-----
 .../internal/pre2021/posts_test.go            |  4 ++
 .../internal/pre2021/pre2021.go               | 19 +++--
 pkg/gcsql/uploads.go                          | 36 ++++------
 4 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 59bff89c..44389776 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -2,10 +2,13 @@ package pre2021
 
 import (
 	"context"
+	"database/sql"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/gochan-org/gochan/pkg/gcutil"
+	"github.com/rs/zerolog"
 )
 
 type postTable struct {
@@ -37,6 +40,47 @@ func (m *Pre2021Migrator) MigratePosts() error {
 	return m.migratePostsToNewDB()
 }
 
+func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *postTable, errEv *zerolog.Event) error {
+	var err error
+
+	if post.oldParentID == 0 {
+		// migrating post was a thread OP, create the row in the threads table
+		if post.ThreadID, err = gcsql.CreateThread(tx, post.boardID, false, post.stickied, post.autosage, false); err != nil {
+			errEv.Err(err).Caller().
+				Int("boardID", post.boardID).
+				Msg("Failed to create thread")
+		}
+	}
+
+	// insert thread top post
+	if err = post.InsertWithContext(context.Background(), tx, true, post.boardID, false, post.stickied, post.autosage, false); err != nil {
+		errEv.Err(err).Caller().
+			Int("boardID", post.boardID).
+			Int("threadID", post.ThreadID).
+			Msg("Failed to insert thread OP")
+	}
+
+	if post.filename != "" {
+		if err = post.AttachFileTx(tx, &gcsql.Upload{
+			PostID:           post.ID,
+			OriginalFilename: post.filenameOriginal,
+			Filename:         post.filename,
+			Checksum:         post.fileChecksum,
+			FileSize:         post.filesize,
+			ThumbnailWidth:   post.thumbW,
+			ThumbnailHeight:  post.thumbH,
+			Width:            post.imageW,
+			Height:           post.imageH,
+		}); err != nil {
+			errEv.Err(err).Caller().
+				Int("oldPostID", post.oldID).
+				Msg("Failed to attach upload to migrated post")
+			return err
+		}
+	}
+	return nil
+}
+
 func (m *Pre2021Migrator) migratePostsToNewDB() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -57,6 +101,7 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 
 	var threadIDsWithInvalidBoards []int
 	var missingBoardIDs []int
+	var migratedThreads int
 	for rows.Next() {
 		var thread postTable
 		if err = rows.Scan(
@@ -83,19 +128,8 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 			continue
 		}
 
-		// create the thread as not locked so migration replies can be inserted. It will be locked after they are all inserted
-		if thread.ThreadID, err = gcsql.CreateThread(tx, thread.boardID, false, thread.stickied, thread.autosage, false); err != nil {
-			errEv.Err(err).Caller().
-				Int("boardID", thread.boardID).
-				Msg("Failed to create thread")
-		}
-
-		// insert thread top post
-		if err = thread.InsertWithContext(context.Background(), tx, true, thread.boardID, false, thread.stickied, thread.autosage, false); err != nil {
-			errEv.Err(err).Caller().
-				Int("boardID", thread.boardID).
-				Int("threadID", thread.ThreadID).
-				Msg("Failed to insert thread OP")
+		if err = m.migratePost(tx, &thread, errEv); err != nil {
+			return err
 		}
 
 		// get and insert replies
@@ -123,10 +157,7 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 				return err
 			}
 			reply.ThreadID = thread.ThreadID
-			if err = reply.InsertWithContext(context.Background(), tx, true, reply.boardID, false, false, false, false); err != nil {
-				errEv.Err(err).Caller().
-					Int("parentID", thread.oldID).
-					Msg("Failed to insert reply post")
+			if err = m.migratePost(tx, &reply, errEv); err != nil {
 				return err
 			}
 		}
@@ -138,6 +169,7 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 					Msg("Unable to re-lock migrated thread")
 			}
 		}
+		migratedThreads++
 	}
 	if len(threadIDsWithInvalidBoards) > 0 {
 		errEv.Caller().
@@ -149,8 +181,12 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 
 	if err = tx.Commit(); err != nil {
 		errEv.Err(err).Caller().Msg("Failed to commit transaction")
+		return err
 	}
-	return err
+	gcutil.LogInfo().
+		Int("migratedThreads", migratedThreads).
+		Msg("Migrated threads successfully")
+	return nil
 }
 
 func (m *Pre2021Migrator) migratePostsInPlace() error {
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index 93e16b69..d55d8d4e 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -44,4 +44,8 @@ func TestMigratePostsToNewDB(t *testing.T) {
 	var numDeleted int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXposts WHERE message_raw LIKE '%deleted%' OR is_deleted", nil, []any{&numDeleted}))
 	assert.Zero(t, numDeleted, "Expected no deleted threads to be migrated")
+
+	var numUploadPosts int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
+	assert.Equal(t, 1, numUploadPosts, "Expected to have 1 upload post")
 }
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 9b19a3c3..e81b6d0c 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -22,14 +22,14 @@ type Pre2021Migrator struct {
 	options *common.MigrationOptions
 	config  Pre2021Config
 
-	posts    []postTable
 	boards   []migrationBoard
 	sections []migrationSection
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
 func (m *Pre2021Migrator) IsMigratingInPlace() bool {
-	return m.config.DBname == config.GetSQLConfig().DBname
+	sqlConfig := config.GetSQLConfig()
+	return m.config.DBname == sqlConfig.DBname && m.config.DBhost == sqlConfig.DBhost && m.config.DBprefix == sqlConfig.DBprefix
 }
 
 func (m *Pre2021Migrator) readConfig() error {
@@ -56,7 +56,13 @@ func (m *Pre2021Migrator) Init(options *common.MigrationOptions) error {
 func (m *Pre2021Migrator) IsMigrated() (bool, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(m.config.DBTimeoutSeconds)*time.Second)
 	defer cancel()
-	return common.TableExists(ctx, m.db, nil, "DBPREFIXdatabase_version", &m.config.SQLConfig)
+	var sqlConfig config.SQLConfig
+	if m.IsMigratingInPlace() {
+		sqlConfig = config.GetSQLConfig()
+	} else {
+		sqlConfig = m.config.SQLConfig
+	}
+	return common.TableExists(ctx, m.db, nil, "DBPREFIXdatabase_version", &sqlConfig)
 }
 
 func (m *Pre2021Migrator) MigrateDB() (bool, error) {
@@ -74,13 +80,12 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	}
 
 	if err := m.MigrateBoards(); err != nil {
-		errEv.Caller().Err(err).Msg("Failed to migrate boards")
 		return false, err
 	}
 	common.LogInfo().Msg("Migrated boards successfully")
-	// if err = m.MigratePosts(); err != nil {
-	// 	return false, err
-	// }
+	if err = m.MigratePosts(); err != nil {
+		return false, err
+	}
 	// if err = m.MigrateStaff("password"); err != nil {
 	// 	return false, err
 	// }
diff --git a/pkg/gcsql/uploads.go b/pkg/gcsql/uploads.go
index 7b1eb1d7..aee41172 100644
--- a/pkg/gcsql/uploads.go
+++ b/pkg/gcsql/uploads.go
@@ -49,7 +49,7 @@ func (p *Post) nextFileOrder() (int, error) {
 	return next, err
 }
 
-func (p *Post) AttachFile(upload *Upload) error {
+func (p *Post) AttachFileTx(tx *sql.Tx, upload *Upload) error {
 	if upload == nil {
 		return nil // no upload to attach, so no error
 	}
@@ -69,38 +69,28 @@ func (p *Post) AttachFile(upload *Upload) error {
 	if upload.ID > 0 {
 		return ErrAlreadyAttached
 	}
-	tx, err := BeginTx()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
 
-	stmt, err := PrepareSQL(insertSQL, tx)
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-
-	if upload.FileOrder < 1 {
-		upload.FileOrder, err = p.nextFileOrder()
-		if err != nil {
-			return err
-		}
-	}
-	upload.PostID = p.ID
-	if _, err = stmt.Exec(
+	if _, err = ExecTxSQL(tx, insertSQL,
 		&upload.PostID, &upload.FileOrder, &upload.OriginalFilename, &upload.Filename, &upload.Checksum, &upload.FileSize,
 		&upload.IsSpoilered, &upload.ThumbnailWidth, &upload.ThumbnailHeight, &upload.Width, &upload.Height,
 	); err != nil {
 		return err
 	}
-	if upload.ID, err = getLatestID("DBPREFIXfiles", tx); err != nil {
+
+	upload.ID, err = getLatestID("DBPREFIXfiles", tx)
+	return err
+}
+
+func (p *Post) AttachFile(upload *Upload) error {
+	tx, err := BeginTx()
+	if err != nil {
 		return err
 	}
-	if err = tx.Commit(); err != nil {
+	defer tx.Rollback()
+	if err = p.AttachFileTx(tx, upload); err != nil {
 		return err
 	}
-	return stmt.Close()
+	return tx.Commit()
 }
 
 // GetUploadFilenameAndBoard returns the filename (or an empty string) and

From 9ca424f4da9b243a082185951d7390a2993f2347 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 3 Jan 2025 23:21:16 -0800
Subject: [PATCH 044/122] Ad test for pre2021 ban migration and start adding
 implementation

---
 cmd/gochan-migration/internal/pre2021/bans.go | 124 ++++++++++++++++++
 .../internal/pre2021/bans_test.go             |  27 ++++
 .../internal/pre2021/posts.go                 |   8 +-
 .../internal/pre2021/pre2021.go               |  10 +-
 .../internal/pre2021/queries.go               |   3 +
 pkg/gcsql/bans.go                             |  31 ++---
 6 files changed, 177 insertions(+), 26 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/bans.go
 create mode 100644 cmd/gochan-migration/internal/pre2021/bans_test.go

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
new file mode 100644
index 00000000..a7dafb47
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -0,0 +1,124 @@
+package pre2021
+
+import (
+	"errors"
+	"net"
+	"strings"
+	"time"
+
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
+	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/gochan-org/gochan/pkg/gcutil"
+)
+
+type migrationBan struct {
+	oldID        int
+	allowRead    string
+	ip           string
+	name         string
+	nameIsRegex  bool
+	filename     string
+	fileChecksum string
+	boards       string
+	staff        string
+	timestamp    time.Time
+	expires      time.Time
+	permaban     bool
+	reason       string
+	banType      int
+	staffNote    string
+	appealAt     time.Time
+	canAppeal    bool
+
+	boardIDs []int
+	banID    int
+	staffID  int
+	filterID int
+}
+
+func (m *Pre2021Migrator) migrateBansInPlace() error {
+	return common.NewMigrationError("pre2021", "migrateBansInPlace not yet implemented")
+}
+
+func (m *Pre2021Migrator) migrateBansToNewDB() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
+
+	tx, err := gcsql.BeginTx()
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to start transaction")
+		return err
+	}
+	defer tx.Rollback()
+
+	rows, err := m.db.QuerySQL(bansQuery)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get bans")
+		return err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var ban migrationBan
+		if err = rows.Scan(
+			&ban.oldID, &ban.allowRead, &ban.ip, &ban.name, &ban.nameIsRegex, &ban.filename, &ban.fileChecksum,
+			&ban.boards, &ban.staff, &ban.timestamp, &ban.expires, &ban.permaban, &ban.reason, &ban.banType, &ban.staffNote, &ban.appealAt, &ban.canAppeal,
+		); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan ban row")
+			return err
+		}
+
+		if ban.boards != "" && ban.boards != "*" {
+			boardDirs := strings.Split(ban.boards, ",")
+			for _, dir := range boardDirs {
+				dir = strings.TrimSpace(dir)
+				boardID, err := gcsql.GetBoardIDFromDir(dir)
+				if err != nil {
+					if errors.Is(err, gcsql.ErrBoardDoesNotExist) {
+						common.Logger().Warn().Str("board", dir).Msg("Found unrecognized ban board")
+						continue
+					} else {
+						errEv.Err(err).Caller().Str("board", dir).Msg("Failed getting board ID from dir")
+						return err
+					}
+				}
+				ban.boardIDs = append(ban.boardIDs, boardID)
+			}
+		}
+
+		if len(ban.boardIDs) == 0 {
+			if ban.ip != "" {
+				if net.ParseIP(ban.ip) == nil {
+					gcutil.LogWarning().
+						Int("oldID", ban.oldID).
+						Str("ip", ban.ip).
+						Msg("Found ban with invalid IP address, skipping")
+					continue
+				}
+				migratedBan := &gcsql.IPBan{
+					BoardID:    nil,
+					RangeStart: ban.ip,
+					RangeEnd:   ban.ip,
+					IssuedAt:   ban.timestamp,
+				}
+				migratedBan.CanAppeal = ban.canAppeal
+				migratedBan.AppealAt = ban.appealAt
+				migratedBan.ExpiresAt = ban.expires
+				migratedBan.Permanent = ban.permaban
+				migratedBan.Message = ban.reason
+				migratedBan.StaffNote = ban.staffNote
+				gcsql.NewIPBanTx(tx, migratedBan)
+			}
+		}
+
+	}
+
+	return nil
+}
+
+func (m *Pre2021Migrator) MigrateBans() error {
+	if m.IsMigratingInPlace() {
+		return m.migrateBansInPlace()
+	}
+	return m.migrateBansToNewDB()
+}
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
new file mode 100644
index 00000000..1662e354
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -0,0 +1,27 @@
+package pre2021
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigrateBansToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigratePosts()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBans()) {
+		t.FailNow()
+	}
+}
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 44389776..b10e5bd0 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -11,7 +11,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-type postTable struct {
+type migrationPost struct {
 	gcsql.Post
 	autosage bool
 	bumped   time.Time
@@ -40,7 +40,7 @@ func (m *Pre2021Migrator) MigratePosts() error {
 	return m.migratePostsToNewDB()
 }
 
-func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *postTable, errEv *zerolog.Event) error {
+func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *zerolog.Event) error {
 	var err error
 
 	if post.oldParentID == 0 {
@@ -103,7 +103,7 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 	var missingBoardIDs []int
 	var migratedThreads int
 	for rows.Next() {
-		var thread postTable
+		var thread migrationPost
 		if err = rows.Scan(
 			&thread.oldID, &thread.oldBoardID, &thread.oldParentID, &thread.Name, &thread.Tripcode, &thread.Email,
 			&thread.Subject, &thread.Message, &thread.MessageRaw, &thread.Password, &thread.filename,
@@ -143,7 +143,7 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 		defer replyRows.Close()
 
 		for replyRows.Next() {
-			var reply postTable
+			var reply migrationPost
 			if err = replyRows.Scan(
 				&reply.oldID, &reply.oldBoardID, &reply.oldParentID, &reply.Name, &reply.Tripcode, &reply.Email,
 				&reply.Subject, &reply.Message, &reply.MessageRaw, &reply.Password, &reply.filename,
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index e81b6d0c..7d80e3a3 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -89,9 +89,9 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	// if err = m.MigrateStaff("password"); err != nil {
 	// 	return false, err
 	// }
-	// if err = m.MigrateBans(); err != nil {
-	// 	return false, err
-	// }
+	if err = m.MigrateBans(); err != nil {
+		return false, err
+	}
 	// if err = m.MigrateAnnouncements(); err != nil {
 	// 	return false, err
 	// }
@@ -103,10 +103,6 @@ func (*Pre2021Migrator) MigrateStaff(_ string) error {
 	return nil
 }
 
-func (*Pre2021Migrator) MigrateBans() error {
-	return nil
-}
-
 func (*Pre2021Migrator) MigrateAnnouncements() error {
 	return nil
 }
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index f486de93..12069581 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -13,4 +13,7 @@ filename_original, file_checksum, filesize, image_w, image_h, thumb_w, thumb_h,
 bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
 
 	threadsQuery = postsQuery + " AND parentid = 0"
+
+	bansQuery = `SELECT  id, allow_read, COALESCE(ip, '') as ip, name, name_is_regex, filename, file_checksum, boards, staff,
+timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FROM DBPREFIXbanlist`
 )
diff --git a/pkg/gcsql/bans.go b/pkg/gcsql/bans.go
index 0a122b02..2632fcd3 100644
--- a/pkg/gcsql/bans.go
+++ b/pkg/gcsql/bans.go
@@ -25,7 +25,7 @@ type Ban interface {
 	Deactivate(int) error
 }
 
-func NewIPBan(ban *IPBan) error {
+func NewIPBanTx(tx *sql.Tx, ban *IPBan) error {
 	const query = `INSERT INTO DBPREFIXip_ban
 	(staff_id, board_id, banned_for_post_id, copy_post_text, is_thread_ban,
 		is_active, range_start, range_end, appeal_at, expires_at,
@@ -34,27 +34,28 @@ func NewIPBan(ban *IPBan) error {
 	if ban.ID > 0 {
 		return ErrBanAlreadyInserted
 	}
+	_, err := ExecTxSQL(tx, query, ban.StaffID, ban.BoardID, ban.BannedForPostID, ban.CopyPostText,
+		ban.IsThreadBan, ban.IsActive, ban.RangeStart, ban.RangeEnd, ban.AppealAt,
+		ban.ExpiresAt, ban.Permanent, ban.StaffNote, ban.Message, ban.CanAppeal)
+	if err != nil {
+		return err
+	}
+
+	ban.ID, err = getLatestID("DBPREFIXip_ban", tx)
+	return err
+}
+
+func NewIPBan(ban *IPBan) error {
 	tx, err := BeginTx()
 	if err != nil {
 		return err
 	}
 	defer tx.Rollback()
-	stmt, err := PrepareSQL(query, tx)
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-	if _, err = stmt.Exec(
-		ban.StaffID, ban.BoardID, ban.BannedForPostID, ban.CopyPostText,
-		ban.IsThreadBan, ban.IsActive, ban.RangeStart, ban.RangeEnd, ban.AppealAt,
-		ban.ExpiresAt, ban.Permanent, ban.StaffNote, ban.Message, ban.CanAppeal,
-	); err != nil {
-		return err
-	}
-	ban.ID, err = getLatestID("DBPREFIXip_ban", tx)
-	if err != nil {
+
+	if err = NewIPBanTx(tx, ban); err != nil {
 		return err
 	}
+
 	return tx.Commit()
 }
 

From a34a1f1d573db4a0cae5746bc33ff6910bf6f3f3 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 3 Jan 2025 23:39:45 -0800
Subject: [PATCH 045/122] Add board ban migration and verify that no invalid
 bans were migrated

---
 cmd/gochan-migration/internal/pre2021/bans.go |  62 +++++++++++-------
 .../internal/pre2021/bans_test.go             |  10 +++
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index a7dafb47..e5d15b19 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -1,6 +1,7 @@
 package pre2021
 
 import (
+	"database/sql"
 	"errors"
 	"net"
 	"strings"
@@ -9,6 +10,7 @@ import (
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/gochan-org/gochan/pkg/gcutil"
+	"github.com/rs/zerolog"
 )
 
 type migrationBan struct {
@@ -40,6 +42,27 @@ func (m *Pre2021Migrator) migrateBansInPlace() error {
 	return common.NewMigrationError("pre2021", "migrateBansInPlace not yet implemented")
 }
 
+func (m *Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int, errEv *zerolog.Event) error {
+	migratedBan := &gcsql.IPBan{
+		BoardID:    boardID,
+		RangeStart: ban.ip,
+		RangeEnd:   ban.ip,
+		IssuedAt:   ban.timestamp,
+	}
+	migratedBan.CanAppeal = ban.canAppeal
+	migratedBan.AppealAt = ban.appealAt
+	migratedBan.ExpiresAt = ban.expires
+	migratedBan.Permanent = ban.permaban
+	migratedBan.Message = ban.reason
+	migratedBan.StaffNote = ban.staffNote
+	if err := gcsql.NewIPBanTx(tx, migratedBan); err != nil {
+		errEv.Err(err).Caller().
+			Int("oldID", ban.oldID).Msg("Failed to migrate ban")
+		return err
+	}
+	return nil
+}
+
 func (m *Pre2021Migrator) migrateBansToNewDB() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -86,34 +109,29 @@ func (m *Pre2021Migrator) migrateBansToNewDB() error {
 			}
 		}
 
-		if len(ban.boardIDs) == 0 {
-			if ban.ip != "" {
-				if net.ParseIP(ban.ip) == nil {
-					gcutil.LogWarning().
-						Int("oldID", ban.oldID).
-						Str("ip", ban.ip).
-						Msg("Found ban with invalid IP address, skipping")
-					continue
+		if ban.ip != "" {
+			if net.ParseIP(ban.ip) == nil {
+				gcutil.LogWarning().
+					Int("oldID", ban.oldID).
+					Str("ip", ban.ip).
+					Msg("Found ban with invalid IP address, skipping")
+				continue
+			}
+			if len(ban.boardIDs) == 0 {
+				if err = m.migrateBan(tx, &ban, nil, errEv); err != nil {
+					return err
 				}
-				migratedBan := &gcsql.IPBan{
-					BoardID:    nil,
-					RangeStart: ban.ip,
-					RangeEnd:   ban.ip,
-					IssuedAt:   ban.timestamp,
+			} else {
+				for b := range ban.boardIDs {
+					if err = m.migrateBan(tx, &ban, &ban.boardIDs[b], errEv); err != nil {
+						return err
+					}
 				}
-				migratedBan.CanAppeal = ban.canAppeal
-				migratedBan.AppealAt = ban.appealAt
-				migratedBan.ExpiresAt = ban.expires
-				migratedBan.Permanent = ban.permaban
-				migratedBan.Message = ban.reason
-				migratedBan.StaffNote = ban.staffNote
-				gcsql.NewIPBanTx(tx, migratedBan)
 			}
 		}
-
 	}
 
-	return nil
+	return tx.Commit()
 }
 
 func (m *Pre2021Migrator) MigrateBans() error {
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 1662e354..5c4f7cb3 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -3,6 +3,7 @@ package pre2021
 import (
 	"testing"
 
+	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -24,4 +25,13 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateBans()) {
 		t.FailNow()
 	}
+	bans, err := gcsql.GetIPBans(0, 200, false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 4, len(bans), "Expected to have 4 valid bans")
+
+	var numInvalidBans int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
+	assert.Equal(t, 0, numInvalidBans, "Expected the invalid test to not be migrated")
 }
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index a78f7c80315e33f8a710fb5800aa3aafc949b278..555ae70da0fa2f788c00c29fd763db2cb55199b6 100644
GIT binary patch
delta 82
zcmV-Y0ImOkfCYen1&|v7B#|6L0VJ_tp+5-@YXAid^Z^X?vkE}!3>tw30TKWS7Yzsv
o4GkAFGYL5XK{E+FZfR^jlYmZelYUL@1ONa4gpq-Ov+qt3@qfD)jsO4v

delta 76
zcmV-S0JHyqfCYen1&|v7Bas|K0VA<sp+5-#000FIeE|+@vkE}!43UtDlYLF@6@dW(
i5&#Je4G0Yl4Hq*r2{{2lGYOM0PZX0PO<c3^P7v`2p%jP!


From 3faec688cc5c426324f1e9a9e4cbb0d3779a873a Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 13:57:44 -0800
Subject: [PATCH 046/122] Make function for registering components and
 Post.NextFileOrder public

---
 pkg/gcsql/provisioning.go |  2 +-
 pkg/gcsql/uploads.go      |  6 ++++--
 pkg/gcsql/util.go         | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg/gcsql/provisioning.go b/pkg/gcsql/provisioning.go
index cd9591ba..b1802f0f 100644
--- a/pkg/gcsql/provisioning.go
+++ b/pkg/gcsql/provisioning.go
@@ -54,7 +54,7 @@ func GetCompleteDatabaseVersion() (dbVersion, dbFlag int, err error) {
 		return 0, 0, err
 	}
 	if versionTableExists {
-		databaseVersion, versionError := getDatabaseVersion(gochanVersionKeyConstant)
+		databaseVersion, versionError := GetComponentVersion(gochanVersionKeyConstant)
 		if versionError != nil {
 			return 0, 0, versionError
 		}
diff --git a/pkg/gcsql/uploads.go b/pkg/gcsql/uploads.go
index aee41172..dc06a329 100644
--- a/pkg/gcsql/uploads.go
+++ b/pkg/gcsql/uploads.go
@@ -1,6 +1,7 @@
 package gcsql
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 
@@ -42,10 +43,11 @@ func GetThreadFiles(post *Post) ([]Upload, error) {
 	return uploads, nil
 }
 
-func (p *Post) nextFileOrder() (int, error) {
+// NextFileOrder gets what would be the next file_order value (not particularly useful until multi-file posting is implemented)
+func (p *Post) NextFileOrder(ctx context.Context, tx *sql.Tx) (int, error) {
 	const query = `SELECT COALESCE(MAX(file_order) + 1, 0) FROM DBPREFIXfiles WHERE post_id = ?`
 	var next int
-	err := QueryRowSQL(query, []any{p.ID}, []any{&next})
+	err := QueryRowContextSQL(ctx, tx, query, []any{p.ID}, []any{&next})
 	return next, err
 }
 
diff --git a/pkg/gcsql/util.go b/pkg/gcsql/util.go
index bee04275..872b286d 100644
--- a/pkg/gcsql/util.go
+++ b/pkg/gcsql/util.go
@@ -400,17 +400,22 @@ func doesTableExist(tableName string) (bool, error) {
 	return count > 0, nil
 }
 
-// getDatabaseVersion gets the version of the database, or an error if none or multiple exist
-func getDatabaseVersion(componentKey string) (int, error) {
+// GetComponentVersion gets the version of the database component (e.g., gochan), or an error if none exist
+func GetComponentVersion(componentKey string) (int, error) {
 	const sql = `SELECT version FROM DBPREFIXdatabase_version WHERE component = ?`
 	var version int
 	err := QueryRowSQL(sql, []any{componentKey}, []any{&version})
-	if err != nil {
-		return 0, err
-	}
 	return version, err
 }
 
+// RegisterComponent adds a new component and version to the database_version table. It returns an error if
+// the component is already in the table, or any other SQL errors that occurred
+func RegisterComponent(tx *sql.Tx, component string, version int) error {
+	const sql = "INSERT INTO DBPREFIXdatabase_version (component, version) VALUES (?,?)"
+	_, err := ExecTxSQL(tx, sql, component, version)
+	return err
+}
+
 // doesGochanPrefixTableExist returns true if any table with a gochan prefix was found.
 // Returns false if the prefix is an empty string
 func doesGochanPrefixTableExist() (bool, error) {

From b0635b15f6519c5f8a0cd194134170b2640bfd10 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 13:58:48 -0800
Subject: [PATCH 047/122] Organize .gitignore, add stuff to SQLite test db

---
 .gitignore                     |  35 ++++++++++++++++++++-------------
 tools/gochan-pre2021.sqlite3db | Bin 81920 -> 81920 bytes
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc334aa7..cce8d946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,30 @@
-/gochan*
-/lib/
-/log/
-/releases/
-/vagrant/.vagrant/
-/html/boards.json
+*.bak
 /html/index.html
 /html/test*
-/html/js/
-/templates/override
-*.bak
-*.log
+/html/boards.json
+.vscode/settings.json
+.parcel-cache
 *.swp
-*.db
+.vagrant/
+*.log
+/templates/override
+
+# Go output
+/gochan*
+/releases/
 *.so
-__debug_bin
+__debug_bin*
+
+# Node.js/TypeScript
+/html/js/
 node_modules
 /frontend/coverage
 /frontend/tests/coverage
-.parcel-cache
+
+# Python
 __pycache__
 .venv/
-.vscode/settings.json
\ No newline at end of file
+
+# SQLite
+*.db
+*.*-journal
\ No newline at end of file
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 555ae70da0fa2f788c00c29fd763db2cb55199b6..99c79a9637ffb910a3ca295ab31975437b14399e 100644
GIT binary patch
delta 165
zcmZo@U~On%ogmGqI#I@%QFUX&5`H#D{v8bbJ2ndntm98|V`O76H5E5@%*)F!%}Y+r
zP0cG&C@xLPN=+_75z9?2E>28OO-#wn%ri1DGSxLO)HN_wFfg++G_f)?<Yi!B;N;I`
y;D68mi2oe_e*TU8i})w;H}U6gYz*cX73O5t<xEeGPeih&xVcGxdy_t6od5tljWYNE

delta 57
zcmZo@U~On%ogmGqGEv5vQDtMo68^<31p*=*{7nq}@A)6`pX1-pzmb0t|0MpVjg49S
N%}x5-oAep$1ONi45}N=3


From 1dc22b657196ca67fb5a7feaa995cc87af2454a8 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 14:11:11 -0800
Subject: [PATCH 048/122] Add stubs for pre-2021 staff migration

---
 .../internal/common/handler.go                | 22 ++++++------
 .../internal/gcupdate/filters.go              |  1 -
 .../internal/gcupdate/gcupdate.go             |  2 +-
 .../internal/pre2021/boards.go                |  4 ++-
 .../internal/pre2021/pre2021.go               | 15 ++++----
 .../internal/pre2021/staff.go                 | 36 +++++++++++++++++++
 .../internal/pre2021/staff_test.go            | 23 ++++++++++++
 7 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/staff.go
 create mode 100644 cmd/gochan-migration/internal/pre2021/staff_test.go

diff --git a/cmd/gochan-migration/internal/common/handler.go b/cmd/gochan-migration/internal/common/handler.go
index b997f81d..d26d2a48 100644
--- a/cmd/gochan-migration/internal/common/handler.go
+++ b/cmd/gochan-migration/internal/common/handler.go
@@ -69,28 +69,26 @@ type DBMigrator interface {
 	// logging any errors that occur during the migration
 	MigrateDB() (bool, error)
 
-	// MigrateBoards gets info about the old boards in the board table and inserts each one
-	// into the new database if they don't already exist
+	// MigrateBoards migrates the board sections (if they exist) and boards if each one
+	// doesn't already exists
 	MigrateBoards() error
 
-	// MigratePosts gets the threads and replies in the old database, and inserts them into
-	// the new database, creating new threads to avoid putting replies in threads that already
-	// exist
+	// MigratePosts gets the threads and replies (excluding deleted ones) in the old database, and inserts them into
+	// the new database, creating new threads to avoid putting replies in threads that already exist
 	MigratePosts() error
 
 	// MigrateStaff gets the staff list in the old board and inserts them into the new board if
-	// the username doesn't already exist. It sets the starting password to the given password
-	MigrateStaff(password string) error
+	// the username doesn't already exist. Migrated staff accounts will need to have their password reset
+	// in order to be logged into
+	MigrateStaff() error
 
-	// MigrateBans gets the list of bans and appeals in the old database and inserts them into the
-	// new one if, for each entry, the IP/name/etc isn't already banned for the same length
-	// e.g. 1.1.1.1 is permabanned on both, 1.1.2.2 is banned for 5 days on both, etc
+	// MigrateBans migrates IP bans, appeals, and filters
 	MigrateBans() error
 
 	// MigrateAnnouncements gets the list of public and staff announcements in the old database
-	// and inserts them into the new database,
+	// and inserts them into the new database
 	MigrateAnnouncements() error
 
-	// Close closes the database if initialized and deltes the temporary columns created
+	// Close closes the database if initialized and deletes any temporary columns created
 	Close() error
 }
diff --git a/cmd/gochan-migration/internal/gcupdate/filters.go b/cmd/gochan-migration/internal/gcupdate/filters.go
index 322d6e34..76a25137 100644
--- a/cmd/gochan-migration/internal/gcupdate/filters.go
+++ b/cmd/gochan-migration/internal/gcupdate/filters.go
@@ -32,7 +32,6 @@ type filenameOrUsernameBanBase struct {
 	StaffID   int       // sql: staff_id
 	StaffNote string    // sql: staff_note
 	IssuedAt  time.Time // sql: issued_at
-	check     string    // replaced with username or filename
 	IsRegex   bool      // sql: is_regex
 }
 
diff --git a/cmd/gochan-migration/internal/gcupdate/gcupdate.go b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
index 7e194781..1059cc40 100644
--- a/cmd/gochan-migration/internal/gcupdate/gcupdate.go
+++ b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
@@ -475,7 +475,7 @@ func (*GCDatabaseUpdater) MigratePosts() error {
 	return gcutil.ErrNotImplemented
 }
 
-func (*GCDatabaseUpdater) MigrateStaff(_ string) error {
+func (*GCDatabaseUpdater) MigrateStaff() error {
 	return gcutil.ErrNotImplemented
 }
 
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index a7b842f3..b16b2981 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -22,7 +22,9 @@ type migrationSection struct {
 }
 
 func (m *Pre2021Migrator) migrateSectionsInPlace() error {
-	return common.NewMigrationError("pre2021", "migrateSectionsInPlace not implemented")
+	err := common.NewMigrationError("pre2021", "migrateSectionsInPlace not implemented")
+	common.LogError().Err(err).Caller().Msg("Failed to migrate sections")
+	return err
 }
 
 func (m *Pre2021Migrator) migrateBoardsInPlace() error {
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 7d80e3a3..b5d1f78b 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -83,12 +83,15 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 		return false, err
 	}
 	common.LogInfo().Msg("Migrated boards successfully")
+
 	if err = m.MigratePosts(); err != nil {
 		return false, err
 	}
-	// if err = m.MigrateStaff("password"); err != nil {
-	// 	return false, err
-	// }
+	common.LogInfo().Msg("Migrated threads, posts, and uploads successfully")
+
+	if err = m.MigrateStaff(); err != nil {
+		return false, err
+	}
 	if err = m.MigrateBans(); err != nil {
 		return false, err
 	}
@@ -99,12 +102,8 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	return true, nil
 }
 
-func (*Pre2021Migrator) MigrateStaff(_ string) error {
-	return nil
-}
-
 func (*Pre2021Migrator) MigrateAnnouncements() error {
-	return nil
+	return common.NewMigrationError("pre2021", "MigrateAnnouncements not yet implemented")
 }
 
 func (m *Pre2021Migrator) Close() error {
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
new file mode 100644
index 00000000..4ccc754a
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -0,0 +1,36 @@
+package pre2021
+
+import (
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
+	"github.com/gochan-org/gochan/pkg/gcsql"
+)
+
+type migrationStaff struct {
+	gcsql.Staff
+
+	oldID    int
+	boardIDs []int
+}
+
+func (*Pre2021Migrator) migrateStaffInPlace() error {
+	err := common.NewMigrationError("pre2021", "migrateSectionsInPlace not yet implemented")
+	common.LogError().Err(err).Caller().Msg("Failed to migrate sections")
+	return err
+}
+
+func (*Pre2021Migrator) migrateStaffToNewDB() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
+
+	err := common.NewMigrationError("pre2021", "migrateStaffToNewDB not yet implemented")
+	errEv.Err(err).Caller().Msg("Failed to migrate sections")
+
+	return err
+}
+
+func (m *Pre2021Migrator) MigrateStaff() error {
+	if m.IsMigratingInPlace() {
+		return m.migrateStaffInPlace()
+	}
+	return m.migrateStaffToNewDB()
+}
diff --git a/cmd/gochan-migration/internal/pre2021/staff_test.go b/cmd/gochan-migration/internal/pre2021/staff_test.go
new file mode 100644
index 00000000..bfbbf348
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/staff_test.go
@@ -0,0 +1,23 @@
+package pre2021
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigrateStaffToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+}

From 7cb3100140db60de88b641ea8558afbeb653f6ac Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:18:11 -0800
Subject: [PATCH 049/122] Implement pre-2021 staff migration to new DB

---
 .../internal/pre2021/bans_test.go             |   2 +-
 .../internal/pre2021/posts.go                 |   5 +
 .../internal/pre2021/pre2021.go               |   5 +-
 .../internal/pre2021/queries.go               |   2 +
 .../internal/pre2021/staff.go                 | 116 ++++++++++++++++--
 .../internal/pre2021/staff_test.go            |   6 +
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 7 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 5c4f7cb3..5f9e2c16 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -29,7 +29,7 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	assert.Equal(t, 4, len(bans), "Expected to have 4 valid bans")
+	assert.Equal(t, 6, len(bans), "Expected to have 4 valid bans")
 
 	var numInvalidBans int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index b10e5bd0..1f786a3b 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -171,6 +171,11 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 		}
 		migratedThreads++
 	}
+	if err = rows.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to close posts rows")
+		return err
+	}
+
 	if len(threadIDsWithInvalidBoards) > 0 {
 		errEv.Caller().
 			Ints("threadIDs", threadIDsWithInvalidBoards).
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index b5d1f78b..105c14a0 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -22,8 +22,9 @@ type Pre2021Migrator struct {
 	options *common.MigrationOptions
 	config  Pre2021Config
 
-	boards   []migrationBoard
-	sections []migrationSection
+	migrationUser *gcsql.Staff
+	boards        []migrationBoard
+	sections      []migrationSection
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 12069581..526a00a1 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -14,6 +14,8 @@ bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
 
 	threadsQuery = postsQuery + " AND parentid = 0"
 
+	staffQuery = `SELECT username, rank, boards, added_on, last_active FROM DBPREFIXstaff`
+
 	bansQuery = `SELECT  id, allow_read, COALESCE(ip, '') as ip, name, name_is_regex, filename, file_checksum, boards, staff,
 timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FROM DBPREFIXbanlist`
 )
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
index 4ccc754a..d2fb79df 100644
--- a/cmd/gochan-migration/internal/pre2021/staff.go
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -1,31 +1,125 @@
 package pre2021
 
 import (
+	"errors"
+	"strings"
+	"time"
+
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/gochan-org/gochan/pkg/gcutil"
+	"github.com/rs/zerolog"
 )
 
-type migrationStaff struct {
-	gcsql.Staff
-
-	oldID    int
-	boardIDs []int
-}
-
 func (*Pre2021Migrator) migrateStaffInPlace() error {
 	err := common.NewMigrationError("pre2021", "migrateSectionsInPlace not yet implemented")
 	common.LogError().Err(err).Caller().Msg("Failed to migrate sections")
 	return err
 }
 
-func (*Pre2021Migrator) migrateStaffToNewDB() error {
+func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff, error) {
+	if m.migrationUser != nil {
+		return m.migrationUser, nil
+	}
+
+	user := &gcsql.Staff{
+		Username: "pre2021-migration" + gcutil.RandomString(15),
+		AddedOn:  time.Now(),
+	}
+	_, err := gcsql.ExecSQL("INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,is_active) values(?,'',0,0)", user.Username)
+	if err != nil {
+		errEv.Err(err).Caller().Str("username", user.Username).Msg("Failed to create migration user")
+		return nil, err
+	}
+
+	if err = gcsql.QueryRowSQL("SELECT id FROM DBPREFIXstaff WHERE username = ?", []any{user.Username}, []any{&user.ID}); err != nil {
+		errEv.Err(err).Caller().Str("username", user.Username).Msg("Failed to get migration user ID")
+		return nil, err
+	}
+	m.migrationUser = user
+	return user, nil
+}
+
+func (m *Pre2021Migrator) migrateStaffToNewDB() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
-	err := common.NewMigrationError("pre2021", "migrateStaffToNewDB not yet implemented")
-	errEv.Err(err).Caller().Msg("Failed to migrate sections")
+	_, err := m.getMigrationUser(errEv)
+	if err != nil {
+		return err
+	}
 
-	return err
+	rows, err := m.db.QuerySQL(staffQuery)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get ban rows")
+		return err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var username string
+		var rank int
+		var boards string
+		var addedOn, lastActive time.Time
+
+		if err = rows.Scan(&username, &rank, &boards, &addedOn, &lastActive); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan staff row")
+			return err
+		}
+		_, err = gcsql.GetStaffByUsername(username, false)
+		if err == nil {
+			// found staff
+			gcutil.LogInfo().Str("username", username).Int("rank", rank).Msg("Found matching staff account")
+		}
+		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
+			// staff doesn't exist, create it (with invalid checksum to be updated by the admin)
+			if _, err2 := gcsql.ExecSQL(
+				"INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,added_on,last_login,is_active) values(?,'',?,?,?,1)",
+				username, rank, addedOn, lastActive,
+			); err2 != nil {
+				errEv.Err(err2).Caller().
+					Str("username", username).Int("rank", rank).
+					Msg("Failed to migrate staff account")
+				return err
+			}
+			gcutil.LogInfo().Str("username", username).Int("rank", rank).Msg("Successfully migrated staff account")
+		} else if err != nil {
+			errEv.Err(err).Caller().Str("username", username).Msg("Failed to get staff account info")
+			return err
+		}
+		staffID, err := gcsql.GetStaffID(username)
+		if err != nil {
+			errEv.Err(err).Caller().Str("username", username).Msg("Failed to get staff account ID")
+			return err
+		}
+		if boards != "" && boards != "*" {
+			boardsArr := strings.Split(boards, ",")
+			for _, board := range boardsArr {
+				board = strings.TrimSpace(board)
+				boardID, err := gcsql.GetBoardIDFromDir(board)
+				if err != nil {
+					errEv.Err(err).Caller().
+						Str("username", username).
+						Str("board", board).
+						Msg("Failed to get board ID")
+					return err
+				}
+				if _, err = gcsql.ExecSQL("INSERT INTO DBPREFIXboard_staff(board_id,staff_id) VALUES(?,?)", boardID, staffID); err != nil {
+					errEv.Err(err).Caller().
+						Str("username", username).
+						Str("board", board).
+						Msg("Failed to apply staff board info")
+					return err
+				}
+			}
+		}
+	}
+
+	if err = rows.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to close staff rows")
+		return err
+	}
+	return nil
 }
 
 func (m *Pre2021Migrator) MigrateStaff() error {
diff --git a/cmd/gochan-migration/internal/pre2021/staff_test.go b/cmd/gochan-migration/internal/pre2021/staff_test.go
index bfbbf348..5c81dea3 100644
--- a/cmd/gochan-migration/internal/pre2021/staff_test.go
+++ b/cmd/gochan-migration/internal/pre2021/staff_test.go
@@ -3,6 +3,7 @@ package pre2021
 import (
 	"testing"
 
+	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -20,4 +21,9 @@ func TestMigrateStaffToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateStaff()) {
 		t.FailNow()
 	}
+	migratedAdmin, err := gcsql.GetStaffByUsername("migratedadmin", true)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 3, migratedAdmin.Rank)
 }
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 99c79a9637ffb910a3ca295ab31975437b14399e..04ab152fb15a32b7ac781003429af6abedf74943 100644
GIT binary patch
delta 634
zcmZo@U~On%ogmGqF;T{uQDbAmLV0ffM+}_&@eKU$`Qtb9C<OEK@h~yVGNvcT7ndZa
zr7=y;)i+^eo4iQhftP`S0fZr7^Lu?E0b$-+1~wiWMxHl3HvIj3^1KuI#Wyx;@bEV3
zG6^wos>%Y9sQTnTekL5bndwD|C8;Ts4gAxU8u=K3(&D@vyu7^X#>SkMjE=^fHhGyj
zc1X%ZCM)?yTk`cYh`{WG(T&`!K<&~X?ff9^iHy9)92R<Ds0BA+mT#s;9t%*RGF+iN
zP$8$GrIDVYnT4LAo-so4c7N^3etrs!9TOW{>dV+bjtA*d1{p7jtjp9)&!{A|xI`x-
zGbJT84`y3pN^WMJk%5t^u7RPhfvJL#p_Q?*m7y^fp`g^n;`}^jEHZh_VAm?b{H4f=
z;#?!Rb2o4I_dUSD#GlE)znedEV`D6TN&piFgRUf_vavDDNlE#MMJc)YDTztRhDOFr
zNRCFf+Stm#!pgu9i;y!T2ZOpKBR|5#>1X8`&4Je50;QH)n*|fj@hgfj>oTI-$Rxn5
O&IuFT{#&1sRR93NY?sOa

delta 308
zcmZo@U~On%ogmGqI#I@%QFUX&LV0cm1_n<4Tn7I4{Es&CC<OCQ4B(rbt8c={I(d=4
z11~odvn*$Na(r<~Vp`hf_xeHtf_&KwtUO;BdA{(y=bz5U%v-y$@ez+yBO9X-1E)AI
z2QM$LxUn&(C8MJ;r%hgFj@@KF-+b9dW>%oIG)S5sB%R2}Ys_Jx2ZmacxA|r&q_F@M
zD8m)V0~K%@S{msYnpx->>KSWIcK7pUY?;{Dz}u+G1XQXj3q+#glRbS*Cb#;eE2J@_
z=vU-K(Ql-+dAq;w0X9bd!wmd~Hwz~0<ma+x<X{k&WaKwCo_<!I(HtoEoq_-RX2F8D
R{45;I;+)%m>oc+n000QCMQZ>6


From 01d7a722a5553691b9f6fdf951730899d9a789b3 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 15:37:46 -0800
Subject: [PATCH 050/122] Properly migrate ban staff ID

---
 cmd/gochan-migration/internal/pre2021/bans.go     | 15 +++++++++++++++
 .../internal/pre2021/bans_test.go                 |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index e5d15b19..e00ccb63 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -54,6 +54,7 @@ func (m *Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int
 	migratedBan.ExpiresAt = ban.expires
 	migratedBan.Permanent = ban.permaban
 	migratedBan.Message = ban.reason
+	migratedBan.StaffID = ban.staffID
 	migratedBan.StaffNote = ban.staffNote
 	if err := gcsql.NewIPBanTx(tx, migratedBan); err != nil {
 		errEv.Err(err).Caller().
@@ -109,6 +110,20 @@ func (m *Pre2021Migrator) migrateBansToNewDB() error {
 			}
 		}
 
+		ban.staffID, err = gcsql.GetStaffID(ban.staff)
+		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
+			// username not found after staff were migrated, use a stand-in account to be updated by the admin later
+			migrationUser, err := m.getMigrationUser(errEv)
+			if err != nil {
+				return err
+			}
+			common.LogWarning().
+				Str("username", ban.staff).
+				Str("migrationUser", migrationUser.Username).
+				Msg("Ban staff not found in migrated staff table, using migration user instead")
+			ban.staffID = migrationUser.ID
+		}
+
 		if ban.ip != "" {
 			if net.ParseIP(ban.ip) == nil {
 				gcutil.LogWarning().
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 5f9e2c16..01add7af 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -22,6 +22,10 @@ func TestMigrateBansToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+
 	if !assert.NoError(t, migrator.MigrateBans()) {
 		t.FailNow()
 	}
@@ -30,6 +34,7 @@ func TestMigrateBansToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 	assert.Equal(t, 6, len(bans), "Expected to have 4 valid bans")
+	assert.NotZero(t, bans[0].StaffID, "Expected ban staff ID field to be set")
 
 	var numInvalidBans int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))

From 4f9f1e0d3fad7339e9d81a6968052743e29cbedb Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 16:01:17 -0800
Subject: [PATCH 051/122] Add migrating pre-2021 name/file bans to filters

---
 cmd/gochan-migration/internal/pre2021/bans.go | 62 +++++++++++++++++--
 .../internal/pre2021/bans_test.go             | 11 ++++
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index e00ccb63..1fbfdfdb 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -1,6 +1,7 @@
 package pre2021
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"net"
@@ -33,9 +34,7 @@ type migrationBan struct {
 	canAppeal    bool
 
 	boardIDs []int
-	banID    int
 	staffID  int
-	filterID int
 }
 
 func (m *Pre2021Migrator) migrateBansInPlace() error {
@@ -110,20 +109,27 @@ func (m *Pre2021Migrator) migrateBansToNewDB() error {
 			}
 		}
 
+		migrationUser, err := m.getMigrationUser(errEv)
+		if err != nil {
+			return err
+		}
 		ban.staffID, err = gcsql.GetStaffID(ban.staff)
 		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
 			// username not found after staff were migrated, use a stand-in account to be updated by the admin later
-			migrationUser, err := m.getMigrationUser(errEv)
-			if err != nil {
-				return err
-			}
 			common.LogWarning().
 				Str("username", ban.staff).
 				Str("migrationUser", migrationUser.Username).
 				Msg("Ban staff not found in migrated staff table, using migration user instead")
 			ban.staffID = migrationUser.ID
+		} else if err != nil {
+			errEv.Err(err).Caller().Str("username", ban.staff).Msg("Failed to get staff from username")
+			return err
 		}
 
+		if ban.ip == "" && ban.name == "" && ban.fileChecksum == "" && ban.filename == "" {
+			common.LogWarning().Int("banID", ban.oldID).Msg("Found invalid ban (no IP, name, file checksum, or filename set)")
+			continue
+		}
 		if ban.ip != "" {
 			if net.ParseIP(ban.ip) == nil {
 				gcutil.LogWarning().
@@ -144,6 +150,50 @@ func (m *Pre2021Migrator) migrateBansToNewDB() error {
 				}
 			}
 		}
+		if ban.name != "" || ban.fileChecksum != "" || ban.filename != "" {
+			filter := &gcsql.Filter{
+				StaffID:     &ban.staffID,
+				StaffNote:   ban.staffNote,
+				IsActive:    true,
+				HandleIfAny: true,
+				MatchAction: "reject",
+				MatchDetail: ban.reason,
+			}
+			var conditions []gcsql.FilterCondition
+			if ban.name != "" {
+				nameCondition := gcsql.FilterCondition{
+					Field:     "name",
+					Search:    ban.name,
+					MatchMode: gcsql.ExactMatch,
+				}
+				if ban.nameIsRegex {
+					nameCondition.MatchMode = gcsql.RegexMatch
+				}
+				conditions = append(conditions, nameCondition)
+			}
+			if ban.fileChecksum != "" {
+				conditions = append(conditions, gcsql.FilterCondition{
+					Field:     "checksum",
+					MatchMode: gcsql.ExactMatch,
+					Search:    ban.fileChecksum,
+				})
+			}
+			if ban.filename != "" {
+				filenameCondition := gcsql.FilterCondition{
+					Field:     "filename",
+					Search:    ban.filename,
+					MatchMode: gcsql.ExactMatch,
+				}
+				if ban.nameIsRegex {
+					filenameCondition.MatchMode = gcsql.RegexMatch
+				}
+				conditions = append(conditions, filenameCondition)
+			}
+			if err = gcsql.ApplyFilterTx(context.Background(), tx, filter, conditions, ban.boardIDs); err != nil {
+				errEv.Err(err).Caller().Int("banID", ban.oldID).Msg("Failed to migrate ban to filter")
+				return err
+			}
+		}
 	}
 
 	return tx.Commit()
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 01add7af..f527894c 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -39,4 +39,15 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	var numInvalidBans int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
 	assert.Equal(t, 0, numInvalidBans, "Expected the invalid test to not be migrated")
+
+	filters, err := gcsql.GetAllFilters(gcsql.TrueOrFalse)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 1, len(filters))
+	conditions, err := filters[0].Conditions()
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 3, len(conditions), "Expected filter to have three conditions")
 }

From 175710b43b3ea693e2e158658d7db7eeaa4fa1f1 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:23:18 -0800
Subject: [PATCH 052/122] Add announcement migration

---
 .../internal/pre2021/announcements.go         |  66 ++++++++++++++++++
 .../internal/pre2021/pre2021.go               |  15 ++--
 .../internal/pre2021/pre2021_test.go          |  11 +++
 .../internal/pre2021/queries.go               |   2 +
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 5 files changed, 87 insertions(+), 7 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/announcements.go

diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
new file mode 100644
index 00000000..e885e296
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -0,0 +1,66 @@
+package pre2021
+
+import (
+	"errors"
+	"time"
+
+	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
+	"github.com/gochan-org/gochan/pkg/gcsql"
+)
+
+func (*Pre2021Migrator) migrateAnnouncementsInPlace() error {
+	return common.NewMigrationError("pre2021", "migrateAnnouncementsInPlace not implemented")
+}
+
+func (m *Pre2021Migrator) migrateAnnouncementsToNewDB() error {
+	errEv := common.LogError()
+	rows, err := m.db.QuerySQL(announcementsQuery)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get announcements")
+		return err
+	}
+	defer rows.Close()
+
+	if _, err = m.getMigrationUser(errEv); err != nil {
+		return err
+	}
+
+	for rows.Next() {
+		var id int
+		var subject, message, staff string
+		var timestamp time.Time
+		if err = rows.Scan(&id, &subject, &message, &staff, &timestamp); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan announcement row")
+			return err
+		}
+		staffID, err := gcsql.GetStaffID(staff)
+		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
+			// user doesn't exist, use migration user
+			common.LogWarning().Str("staff", staff).Msg("Staff username not found in database")
+			message += "\n(originally by " + staff + ")"
+		} else if err != nil {
+			errEv.Err(err).Caller().Str("staff", staff).Msg("Failed to get staff ID")
+			return err
+		}
+		if _, err = gcsql.ExecSQL(
+			"INSERT INTO DBPREFIXannouncements(staff_id,subject,message,timestamp) values(?,?,?,?)",
+			staffID, subject, message, timestamp,
+		); err != nil {
+			errEv.Err(err).Caller().Str("staff", staff).Msg("Failed to migrate announcement")
+			return err
+		}
+	}
+
+	if err = rows.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to close announcement rows")
+		return err
+	}
+	return nil
+}
+
+func (m *Pre2021Migrator) MigrateAnnouncements() error {
+	if m.IsMigratingInPlace() {
+		return m.migrateAnnouncementsInPlace()
+	}
+	return m.migrateAnnouncementsToNewDB()
+}
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 105c14a0..a4fe542b 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -93,20 +93,21 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	if err = m.MigrateStaff(); err != nil {
 		return false, err
 	}
+	common.LogInfo().Msg("Migrated staff successfully")
+
 	if err = m.MigrateBans(); err != nil {
 		return false, err
 	}
-	// if err = m.MigrateAnnouncements(); err != nil {
-	// 	return false, err
-	// }
+	common.LogInfo().Msg("Migrated bans and filters successfully")
+
+	if err = m.MigrateAnnouncements(); err != nil {
+		return false, err
+	}
+	common.LogInfo().Msg("Migrated staff announcements successfully")
 
 	return true, nil
 }
 
-func (*Pre2021Migrator) MigrateAnnouncements() error {
-	return common.NewMigrationError("pre2021", "MigrateAnnouncements not yet implemented")
-}
-
 func (m *Pre2021Migrator) Close() error {
 	if m.db != nil {
 		return m.db.Close()
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index e28eb26c..71a651b9 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -89,3 +89,14 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 
 	return migrator
 }
+
+func TestPre2021Migration(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+	migrated, err := migrator.MigrateDB()
+	assert.True(t, migrated)
+	assert.NoError(t, err)
+}
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 526a00a1..b8fbbc68 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -18,4 +18,6 @@ bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
 
 	bansQuery = `SELECT  id, allow_read, COALESCE(ip, '') as ip, name, name_is_regex, filename, file_checksum, boards, staff,
 timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FROM DBPREFIXbanlist`
+
+	announcementsQuery = "SELECT id, subject, message, poster, timestamp FROM DBPREFIXannouncements"
 )
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 04ab152fb15a32b7ac781003429af6abedf74943..9c99c2aba1ac978c25bc47d4d5982d02f3015c20 100644
GIT binary patch
delta 54
zcmZo@U~On%ogmGqIZ?)$QFCL$GJci~4E!553kodbXZK@dV=y&UpS)jQbF#gkSo1ge
K?cd}XxfB4go)8EC

delta 50
zcmZo@U~On%ogmGqF;T{uQDbAmGJcjF4E#Gb3nr}NXLn;{V=y%ppS)dOv-ySm_80Pu
G5()r)Dh~<(


From ea20cc408f638664376b1c0b18b5d997aeac33cd Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:28:48 -0800
Subject: [PATCH 053/122] Add cmd directory to test

---
 build.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.py b/build.py
index c5fbe2dd..e2c6feb6 100755
--- a/build.py
+++ b/build.py
@@ -425,15 +425,13 @@ def sass(watch=False):
 		sys.exit(status)
 
 def test(verbose=False, coverage=False):
-	pkgs = os.listdir("pkg")
-	for pkg in pkgs:
-		cmd = ["go", "test"]
-		if verbose:
-			cmd += ["-v"]
-		if coverage:
-			cmd += ["-cover"]
-		cmd += [path.join("./pkg", pkg)]
-		run_cmd(cmd, realtime=True, print_command=True)
+	cmd = ["go", "test"]
+	if verbose:
+		cmd += ["-v"]
+	if coverage:
+		cmd += ["-cover"]
+	cmd += ["./pkg/...", "./cmd/..."]
+	run_cmd(cmd, realtime=True, print_command=True)
 
 
 if __name__ == "__main__":

From 9e61ef2730c73a0778a84f7dfab39c338cc09938 Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Tue, 7 Jan 2025 12:01:18 +0100
Subject: [PATCH 054/122] Add update board button

---
 templates/boardpage.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/boardpage.html b/templates/boardpage.html
index 803b696c..55cfdcb0 100644
--- a/templates/boardpage.html
+++ b/templates/boardpage.html
@@ -34,6 +34,8 @@
 	</div>
 </form>
 <div id="left-bottom-content">
+	<a href="#" onClick="window.location.reload(); return false;">Update</a>
+	|
 	<a href="#">Scroll to top</a><br/>
 	<table id="pages">
 		<tr>

From ab42c1332b9471c259798b4b2950ec581a49855f Mon Sep 17 00:00:00 2001
From: onihilist <mashirooo.yt@gmail.com>
Date: Tue, 7 Jan 2025 12:24:11 +0100
Subject: [PATCH 055/122] Add update thread button

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

diff --git a/templates/threadpage.html b/templates/threadpage.html
index be856688..7d309126 100644
--- a/templates/threadpage.html
+++ b/templates/threadpage.html
@@ -3,7 +3,7 @@
 		<h1 id="board-title">/{{$.board.Dir}}/ - {{$.board.Title}}</h1>
 		<div id="board-subtitle">
 			{{$.board.Subtitle}}<br/>
-			<a href="{{webPathDir $.board.Dir}}" >Return</a> | <a href="{{webPath $.board.Dir "/catalog.html"}}">Catalog</a> | <a href="#footer">Bottom</a>
+			<a href="{{webPathDir $.board.Dir}}" >Return</a> | <a href="#" onClick="window.location.reload(); return false;">Update</a> | <a href="{{webPath $.board.Dir "/catalog.html"}}">Catalog</a> | <a href="#footer">Bottom</a>
 		</div>
 	</header><hr />
 	{{template "postbox.html" .}}<hr />

From 1704bbe959da68eed2aa48c9cfa370dec3e1dd10 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:03:10 -0800
Subject: [PATCH 056/122] Update failing board test cases

---
 pkg/gctemplates/templatetests/templatecases_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/gctemplates/templatetests/templatecases_test.go b/pkg/gctemplates/templatetests/templatecases_test.go
index 740ed489..25f233bb 100644
--- a/pkg/gctemplates/templatetests/templatecases_test.go
+++ b/pkg/gctemplates/templatetests/templatecases_test.go
@@ -208,7 +208,7 @@ var (
 				},
 			},
 			expectedOutput: boardPageHeaderBase +
-				`<form action="/util"method="POST"id="main-form"><div id="right-bottom-content"><div id="report-delbox"><input type="hidden"name="board"value="test"/><input type="hidden"name="boardid"value="1"/><label>[<input type="checkbox"name="fileonly"/>File only]</label> <input type="password" size="10" name="password" id="delete-password" /><input type="submit"name="delete_btn"value="Delete"onclick="return confirm('Are you sure you want to delete these posts?')"/><br/>Report reason:<input type="text"size="10"name="reason"id="reason"/><input type="submit"name="report_btn"value="Report"/><br/><input type="submit"name="edit_btn"value="Edit post"/>&nbsp;<input type="submit"name="move_btn"value="Move thread"/></div></div></form><div id="left-bottom-content"><a href="#">Scroll to top</a><br/><table id="pages"><tr><td>[<a href="/test/1.html">1</a>]</td></tr></table><span id="boardmenu-bottom">[<a href="/">home</a>]&nbsp;[]</span></div>` +
+				`<form action="/util"method="POST"id="main-form"><div id="right-bottom-content"><div id="report-delbox"><input type="hidden"name="board"value="test"/><input type="hidden"name="boardid"value="1"/><label>[<input type="checkbox"name="fileonly"/>File only]</label> <input type="password" size="10" name="password" id="delete-password" /><input type="submit"name="delete_btn"value="Delete"onclick="return confirm('Are you sure you want to delete these posts?')"/><br/>Report reason:<input type="text"size="10"name="reason"id="reason"/><input type="submit"name="report_btn"value="Report"/><br/><input type="submit"name="edit_btn"value="Edit post"/>&nbsp;<input type="submit"name="move_btn"value="Move thread"/></div></div></form><div id="left-bottom-content"><a href="#"onClick="window.location.reload(); return false;">Update</a>|<a href="#">Scroll to top</a><br/><table id="pages"><tr><td>[<a href="/test/1.html">1</a>]</td></tr></table><span id="boardmenu-bottom">[<a href="/">home</a>]&nbsp;[]</span></div>` +
 				footer,
 		},
 		{
@@ -222,7 +222,7 @@ var (
 				},
 			},
 			expectedOutput: boardPageHeaderBase +
-				`<form action="/util"method="POST"id="main-form"><div id="right-bottom-content"><div id="report-delbox"><input type="hidden"name="board"value="test"/><input type="hidden"name="boardid"value="1"/><label>[<input type="checkbox"name="fileonly"/>File only]</label> <input type="password" size="10" name="password" id="delete-password" /><input type="submit"name="delete_btn"value="Delete"onclick="return confirm('Are you sure you want to delete these posts?')"/><br/>Report reason:<input type="text"size="10"name="reason"id="reason"/><input type="submit"name="report_btn"value="Report"/><br/><input type="submit"name="edit_btn"value="Edit post"/>&nbsp;<input type="submit"name="move_btn"value="Move thread"/></div></div></form><div id="left-bottom-content"><a href="#">Scroll to top</a><br/><table id="pages"><tr><td>[<a href="/test/1.html">1</a>]</td></tr></table><span id="boardmenu-bottom">[<a href="/">home</a>]&nbsp;[]</span></div>` +
+				`<form action="/util"method="POST"id="main-form"><div id="right-bottom-content"><div id="report-delbox"><input type="hidden"name="board"value="test"/><input type="hidden"name="boardid"value="1"/><label>[<input type="checkbox"name="fileonly"/>File only]</label> <input type="password" size="10" name="password" id="delete-password" /><input type="submit"name="delete_btn"value="Delete"onclick="return confirm('Are you sure you want to delete these posts?')"/><br/>Report reason:<input type="text"size="10"name="reason"id="reason"/><input type="submit"name="report_btn"value="Report"/><br/><input type="submit"name="edit_btn"value="Edit post"/>&nbsp;<input type="submit"name="move_btn"value="Move thread"/></div></div></form><div id="left-bottom-content"><a href="#"onClick="window.location.reload(); return false;">Update</a>|<a href="#">Scroll to top</a><br/><table id="pages"><tr><td>[<a href="/test/1.html">1</a>]</td></tr></table><span id="boardmenu-bottom">[<a href="/">home</a>]&nbsp;[]</span></div>` +
 				footer,
 		},
 	}

From 22eff8d1d7c6f7d62c8b3575d5b1f638624d2566 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:41:12 -0800
Subject: [PATCH 057/122] Update JS board events test

---
 frontend/tests/boardevents.test.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/tests/boardevents.test.ts b/frontend/tests/boardevents.test.ts
index 620f300a..79c32d14 100644
--- a/frontend/tests/boardevents.test.ts
+++ b/frontend/tests/boardevents.test.ts
@@ -9,43 +9,42 @@ import { applyBBCode, handleKeydown } from "../ts/boardevents";
 
 document.documentElement.innerHTML = simpleHTML;
 
-function doBBCode(keycode: number, text: string, start: number, end: number) {
+function doBBCode(key:string, text: string, start: number, end: number) {
 	const $ta = $<HTMLTextAreaElement>("<textarea/>");
 	$ta.text(text);
 	const e = $.Event("keydown");
 	e.ctrlKey = true;
 	$ta[0].selectionStart = start;
 	$ta[0].selectionEnd = end;
-	e.keyCode = keycode;
-	e.which = keycode;
+	e.key = key;
 	$ta.first().trigger(e);
 	applyBBCode(e as JQuery.KeyDownEvent);
 	return $ta.text();
 }
 
 test("Tests BBCode events", () => {
-	let text = doBBCode(66, "bold", 0, 4);
+	let text = doBBCode("b", "bold", 0, 4);
 	expect(text).toEqual("[b]bold[/b]");
 	text += "italics";
-	text = doBBCode(73, text, text.length - 7, text.length);
+	text = doBBCode("i", text, text.length - 7, text.length);
 	expect(text).toEqual("[b]bold[/b][i]italics[/i]");
 
-	text = doBBCode(82, "strike" + text, 0, 6);
+	text = doBBCode("r", "strike" + text, 0, 6);
 	expect(text).toEqual("[s]strike[/s][b]bold[/b][i]italics[/i]");
 
-	text = doBBCode(83, text, 0, 13);
+	text = doBBCode("s", text, 0, 13);
 	expect(text).toEqual("[?][s]strike[/s][/?][b]bold[/b][i]italics[/i]");
 
-	text = doBBCode(85, text, text.length, text.length);
+	text = doBBCode("u", text, text.length, text.length);
 	expect(text).toEqual("[?][s]strike[/s][/?][b]bold[/b][i]italics[/i][u][/u]");
 
-	const invalidKeyCode = doBBCode(0, text, 0, 1); // passes an invalid keycode to applyBBCode, no change
+	const invalidKeyCode = doBBCode("x", text, 0, 1); // passes an invalid keycode to applyBBCode, no change
 	expect(invalidKeyCode).toEqual(text);
 });
 
 test("Tests proper form submission via JS", () => {
 	const $form = $("form#postform");
-	const text = doBBCode(83, "text", 0, 4);
+	const text = doBBCode("s", "text", 0, 4);
 	$form.find("textarea#postmsg").text(text);
 	let submitted = false;
 	$form.on("submit", () => {
@@ -54,7 +53,7 @@ test("Tests proper form submission via JS", () => {
 	});
 	const e = $.Event("keydown");
 	e.ctrlKey = true;
-	e.keyCode = 10;
+	e.key = "Enter";
 	$form.find("textarea#postmsg").first().trigger(e);
 	handleKeydown(e as JQuery.KeyDownEvent);
 	expect(submitted).toBeTruthy();

From 5d782c4eabb64f4c6338b926d756932f65f75ab6 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:44:19 -0800
Subject: [PATCH 058/122] Add clarification to migrator comments

---
 .../internal/common/handler.go                | 37 ++++++++-----------
 .../internal/pre2021/pre2021.go               |  4 +-
 cmd/gochan-migration/main.go                  |  2 +-
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/handler.go b/cmd/gochan-migration/internal/common/handler.go
index d26d2a48..30e1c44a 100644
--- a/cmd/gochan-migration/internal/common/handler.go
+++ b/cmd/gochan-migration/internal/common/handler.go
@@ -48,45 +48,40 @@ type MigrationOptions struct {
 }
 
 // DBMigrator is used for handling the migration from one database type to a
-// database compatible with gochan 3.x onward
+// database compatible with the latest gochan database version
 type DBMigrator interface {
-	// Init sets the variables for connecting to the databases
+	// Init sets up the migrator and sets up the database connection(s)
 	Init(options *MigrationOptions) error
 
-	// IsMigrated checks to see if the database has already been migrated and quits if it has
-	// and returns any errors that aren't "table doesn't exist". if the boolean value is true,
-	// it can be assumed that the database has already been migrated and gochan-migration
-	// will exit
+	// IsMigrated returns true if the database is already migrated, and an error if any occured,
+	// excluding missing table errors
 	IsMigrated() (bool, error)
 
-	// IsMigratingInPlace returns true if the old database name is the same as the new database name,
-	// meaning that the tables will be altered to match the new schema, instead of creating tables in the
-	// new database and copying data over
+	// IsMigratingInPlace returns true if the source database and the destination database are both the
+	// same installation, meaning both have the same host/connection, database, table and prefix, meaning that
+	// the tables will be altered during the migration to match the new schema, instead of creating tables in
+	// the destination database and copying data over
 	IsMigratingInPlace() bool
 
-	// MigrateDB alters the database schema to match the new schema, then migrates the imageboard
-	// data (posts, boards, etc) to the new database. It is assumed that MigrateDB will handle
-	// logging any errors that occur during the migration
+	// MigrateDB handles migration of the source database, altering it in place or migrating it to the configured
+	// gochan database. It returns true if the database is already migrated and an error if any occured. It is
+	// assumed that MigrateDB implementations will handle logging any errors that occur during the migration
 	MigrateDB() (bool, error)
 
-	// MigrateBoards migrates the board sections (if they exist) and boards if each one
-	// doesn't already exists
+	// MigrateBoards migrates the board sections and boards if each one doesn't already exists
 	MigrateBoards() error
 
-	// MigratePosts gets the threads and replies (excluding deleted ones) in the old database, and inserts them into
-	// the new database, creating new threads to avoid putting replies in threads that already exist
+	// MigratePosts migrates the threads and replies (excluding deleted ones), creating new threads where necessary
 	MigratePosts() error
 
-	// MigrateStaff gets the staff list in the old board and inserts them into the new board if
-	// the username doesn't already exist. Migrated staff accounts will need to have their password reset
-	// in order to be logged into
+	// MigrateStaff migrates the staff, creating new staff accounts that don't already exist. Accounts created by this
+	// will need to have their password reset in order to be logged into
 	MigrateStaff() error
 
 	// MigrateBans migrates IP bans, appeals, and filters
 	MigrateBans() error
 
-	// MigrateAnnouncements gets the list of public and staff announcements in the old database
-	// and inserts them into the new database
+	// MigrateAnnouncements migrates the list of public and staff announcements, if applicable
 	MigrateAnnouncements() error
 
 	// Close closes the database if initialized and deletes any temporary columns created
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index a4fe542b..d548f875 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -75,8 +75,6 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 		return false, err
 	}
 	if migrated {
-		// db is already migrated, stop
-		common.LogWarning().Msg("Database is already migrated (database_version table exists)")
 		return true, nil
 	}
 
@@ -105,7 +103,7 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	}
 	common.LogInfo().Msg("Migrated staff announcements successfully")
 
-	return true, nil
+	return false, nil
 }
 
 func (m *Pre2021Migrator) Close() error {
diff --git a/cmd/gochan-migration/main.go b/cmd/gochan-migration/main.go
index c52e87fd..e9941f73 100644
--- a/cmd/gochan-migration/main.go
+++ b/cmd/gochan-migration/main.go
@@ -115,7 +115,7 @@ func main() {
 		fatalEv.Msg("Unable to migrate database")
 	}
 	if migrated {
-		common.LogInfo().Msg("Database is already migrated")
+		common.LogWarning().Msg("Database is already migrated")
 	} else {
 		common.LogInfo().Str("chanType", options.ChanType).Msg("Database migration complete")
 	}

From 442319e77a850f15ea31f13c96a1ca0af454af42 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:33:19 -0800
Subject: [PATCH 059/122] Use fmt.Errorf and %w for unwrappable errors

---
 pkg/building/boards.go           | 54 ++++++++++++++++----------------
 pkg/building/building.go         | 21 ++++++-------
 pkg/building/catalog.go          |  2 +-
 pkg/building/threads.go          |  6 ++--
 pkg/gcsql/boards.go              |  2 +-
 pkg/gcsql/provisioning.go        |  4 +--
 pkg/gcsql/staff.go               |  2 +-
 pkg/gcsql/uploads.go             |  3 +-
 pkg/manage/actionsAdminPerm.go   |  6 ++--
 pkg/manage/actionsJanitorPerm.go |  9 +++---
 pkg/manage/actionsModPerm.go     | 12 +++----
 pkg/manage/actionsNoPerm.go      |  3 +-
 pkg/manage/filters.go            |  5 +--
 pkg/posting/uploads/attach.go    |  4 +--
 14 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/pkg/building/boards.go b/pkg/building/boards.go
index 4cbced43..20152d60 100644
--- a/pkg/building/boards.go
+++ b/pkg/building/boards.go
@@ -21,7 +21,7 @@ import (
 
 const (
 	dirIsAFileStr = `unable to create %q, path exists and is a file`
-	genericErrStr = `unable to create %q: %s`
+	genericErrStr = `unable to create %q: %w`
 	pathExistsStr = `unable to create %q, path already exists`
 )
 
@@ -63,12 +63,12 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 	if err != nil {
 		errEv.Err(err).Caller().
 			Msg("Failed getting board threads")
-		return fmt.Errorf("error getting threads for /%s/: %s", board.Dir, err.Error())
+		return fmt.Errorf("error getting threads for /%s/: %w", board.Dir, err)
 	}
 	topPosts, err := getBoardTopPosts(board.Dir)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed getting board threads")
-		return fmt.Errorf("error getting OP posts for /%s/: %s", board.Dir, err.Error())
+		return fmt.Errorf("error getting OP posts for /%s/: %w", board.Dir, err)
 	}
 	opMap := make(map[int]*Post)
 	for _, post := range topPosts {
@@ -102,13 +102,13 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 		catalogThread.Replies, err = thread.GetReplyCount()
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Failed getting reply count")
-			return errors.New("Error getting reply count: " + err.Error())
+			return fmt.Errorf("error getting reply count: %w", err)
 		}
 
 		catalogThread.Posts, err = getThreadPosts(&thread)
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Failed getting replies")
-			return errors.New("Failed getting replies: " + err.Error())
+			return fmt.Errorf("failed getting replies: %w", err)
 		}
 		if len(catalogThread.Posts) == 0 {
 			continue
@@ -122,7 +122,7 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 		catalogThread.uploads, err = thread.GetUploads()
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Failed getting thread uploads")
-			return errors.New("Failed getting thread uploads: " + err.Error())
+			return fmt.Errorf("failed getting thread uploads: %w", err)
 		}
 
 		var imagesOnBoardPage int
@@ -157,14 +157,14 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 			errEv.Err(err).Caller().
 				Str("page", "board.html").
 				Msg("Failed getting board page")
-			return fmt.Errorf("failed opening /%s/board.html: %s", board.Dir, err.Error())
+			return fmt.Errorf("failed opening /%s/board.html: %w", board.Dir, err)
 		}
 		defer boardPageFile.Close()
 
 		if err = config.TakeOwnershipOfFile(boardPageFile); err != nil {
 			errEv.Err(err).Caller().
 				Msg("Unable to take ownership of board.html")
-			return fmt.Errorf("unable to take ownership of /%s/board.html: %s", board.Dir, err.Error())
+			return fmt.Errorf("unable to take ownership of /%s/board.html: %w", board.Dir, err)
 		}
 		// Render board page template to the file,
 		// packaging the board/section list, threads, and board info
@@ -183,7 +183,7 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 			errEv.Err(err).Caller().
 				Str("page", "board.html").
 				Msg("Failed building board")
-			return fmt.Errorf("failed building /%s/: %s", board.Dir, err.Error())
+			return fmt.Errorf("failed building /%s/: %w", board.Dir, err)
 		}
 
 		if err = boardPageFile.Close(); err != nil {
@@ -207,14 +207,14 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 	if err != nil {
 		errEv.Err(err).Caller().
 			Msg("Failed opening catalog.json")
-		return fmt.Errorf("failed opening /%s/catalog.json: %s", board.Dir, err.Error())
+		return fmt.Errorf("failed opening /%s/catalog.json: %w", board.Dir, err)
 	}
 	defer catalogJSONFile.Close()
 
 	if err = config.TakeOwnershipOfFile(catalogJSONFile); err != nil {
 		errEv.Err(err).Caller().
 			Msg("Unable to take ownership of catalog.json")
-		return fmt.Errorf("unable to take ownership of /%s/catalog.json: %s", board.Dir, err.Error())
+		return fmt.Errorf("unable to take ownership of /%s/catalog.json: %w", board.Dir, err)
 	}
 	for _, page := range catalog.pages {
 		catalog.currentPage++
@@ -262,7 +262,7 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 		}
 		if err = serverutil.MinifyTemplate(gctemplates.BoardPage, data, currentPageFile, "text/html"); err != nil {
 			errEv.Err(err).Caller().Send()
-			return fmt.Errorf("failed building /%s/ boardpage: %s", board.Dir, err.Error())
+			return fmt.Errorf("failed building /%s/ boardpage: %w", board.Dir, err)
 		}
 		if err = currentPageFile.Close(); err != nil {
 			errEv.Err(err).Caller().Send()
@@ -307,7 +307,7 @@ func BuildBoards(verbose bool, which ...int) error {
 				errEv.Err(err).Caller().
 					Int("boardid", boardID).
 					Msg("Unable to get board information")
-				return fmt.Errorf("unable to get board information (ID: %d): %s", boardID, err.Error())
+				return fmt.Errorf("unable to get board information (ID: %d): %w", boardID, err)
 			}
 			boards = append(boards, *board)
 		}
@@ -446,12 +446,12 @@ func buildBoard(board *gcsql.Board, force bool) error {
 	} else if err = os.Mkdir(dirPath, config.DirFileMode); err != nil {
 		errEv.Err(os.ErrExist).Caller().
 			Str("dirPath", dirPath).Send()
-		return fmt.Errorf(genericErrStr, dirPath, err.Error())
+		return fmt.Errorf(genericErrStr, dirPath, err)
 	}
 	if err = config.TakeOwnership(dirPath); err != nil {
 		errEv.Err(err).Caller().
 			Str("dirPath", dirPath).Send()
-		return fmt.Errorf(genericErrStr, dirPath, err.Error())
+		return fmt.Errorf(genericErrStr, dirPath, err)
 	}
 
 	if resInfo != nil {
@@ -468,15 +468,15 @@ func buildBoard(board *gcsql.Board, force bool) error {
 			return err
 		}
 	} else if err = os.Mkdir(resPath, config.DirFileMode); err != nil {
-		err = fmt.Errorf(genericErrStr, resPath, err.Error())
+		err = fmt.Errorf(genericErrStr, resPath, err)
 		errEv.Err(err).Caller().
 			Str("resPath", resPath).Send()
-		return fmt.Errorf(genericErrStr, resPath, err.Error())
+		return fmt.Errorf(genericErrStr, resPath, err)
 	}
 	if err = config.TakeOwnership(resPath); err != nil {
 		errEv.Err(err).Caller().
 			Str("resPath", resPath).Send()
-		return fmt.Errorf(genericErrStr, resPath, err.Error())
+		return fmt.Errorf(genericErrStr, resPath, err)
 	}
 
 	if srcInfo != nil {
@@ -493,7 +493,7 @@ func buildBoard(board *gcsql.Board, force bool) error {
 			return err
 		}
 	} else if err = os.Mkdir(srcPath, config.DirFileMode); err != nil {
-		err = fmt.Errorf(genericErrStr, srcPath, err.Error())
+		err = fmt.Errorf(genericErrStr, srcPath, err)
 		errEv.Err(err).Caller().
 			Str("srcPath", srcPath).Send()
 		return err
@@ -501,7 +501,7 @@ func buildBoard(board *gcsql.Board, force bool) error {
 	if config.TakeOwnership(srcPath); err != nil {
 		errEv.Err(err).Caller().
 			Str("srcPath", srcPath).Send()
-		return fmt.Errorf(genericErrStr, srcPath, err.Error())
+		return fmt.Errorf(genericErrStr, srcPath, err)
 	}
 
 	if thumbInfo != nil {
@@ -514,12 +514,12 @@ func buildBoard(board *gcsql.Board, force bool) error {
 	} else if err = os.Mkdir(thumbPath, config.DirFileMode); err != nil {
 		errEv.Err(err).Caller().
 			Str("thumbPath", thumbPath).Send()
-		return fmt.Errorf(genericErrStr, thumbPath, err.Error())
+		return fmt.Errorf(genericErrStr, thumbPath, err)
 	}
 	if config.TakeOwnership(thumbPath); err != nil {
 		errEv.Err(err).Caller().
 			Str("thumbPath", thumbPath).Send()
-		return fmt.Errorf(genericErrStr, thumbPath, err.Error())
+		return fmt.Errorf(genericErrStr, thumbPath, err)
 	}
 
 	if err = BuildBoardPages(board, errEv); err != nil {
@@ -562,12 +562,12 @@ func BuildBoardListJSON() error {
 	defer errEv.Discard()
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("unable to open boards.json for writing: " + err.Error())
+		return fmt.Errorf("unable to open boards.json for writing: %w", err)
 	}
 
 	if err = config.TakeOwnershipOfFile(boardListFile); err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("unable to update boards.json ownership: " + err.Error())
+		return fmt.Errorf("unable to update boards.json ownership: %w", err)
 	}
 
 	boardsListJSONData := boardsListJSON{
@@ -585,15 +585,15 @@ func BuildBoardListJSON() error {
 	boardJSON, err := json.Marshal(boardsListJSONData)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Failed to create boards.json " + err.Error())
+		return fmt.Errorf("failed to create boards.json: %w", err)
 	}
 
 	if _, err = serverutil.MinifyWriter(boardListFile, boardJSON, "application/json"); err != nil {
-		errEv.Err(err).Caller().Send()
+		errEv.Err(err).Caller().Msg("Failed writing to boards.json")
 		return errors.New("failed writing boards.json file")
 	}
 	if err = boardListFile.Close(); err != nil {
-		errEv.Err(err).Caller().Send()
+		errEv.Err(err).Caller().Msg("Failed closing boards.json")
 		return errors.New("failed closing boards.json")
 	}
 	return nil
diff --git a/pkg/building/building.go b/pkg/building/building.go
index 54819f3f..5475ce6b 100644
--- a/pkg/building/building.go
+++ b/pkg/building/building.go
@@ -1,7 +1,6 @@
 package building
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -84,18 +83,18 @@ func BuildFrontPage() error {
 	err := gctemplates.InitTemplates(gctemplates.FrontPage)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Error loading front page template: " + err.Error())
+		return fmt.Errorf("failed loading front page template: %w", err)
 	}
 	criticalCfg := config.GetSystemCriticalConfig()
 	frontFile, err := os.OpenFile(path.Join(criticalCfg.DocumentRoot, "index.html"), os.O_CREATE|os.O_RDWR|os.O_TRUNC, config.NormalFileMode)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Failed opening front page for writing: " + err.Error())
+		return fmt.Errorf("failed opening front page for writing: %w", err)
 	}
 
 	if err = config.TakeOwnershipOfFile(frontFile); err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Failed setting file ownership for front page: " + err.Error())
+		return fmt.Errorf("failed setting file ownership for front page: %w", err)
 	}
 
 	var recentPostsArr []frontPagePost
@@ -103,7 +102,7 @@ func BuildFrontPage() error {
 	recentPostsArr, err = getFrontPagePosts()
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Failed loading recent posts: " + err.Error())
+		return fmt.Errorf("failed loading recent posts: %w", err)
 	}
 	if err = serverutil.MinifyTemplate(gctemplates.FrontPage, map[string]interface{}{
 		"siteConfig":  siteCfg,
@@ -113,7 +112,7 @@ func BuildFrontPage() error {
 		"recentPosts": recentPostsArr,
 	}, frontFile, "text/html"); err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Failed executing front page template: " + err.Error())
+		return fmt.Errorf("failed executing front page template: %w", err)
 	}
 	return frontFile.Close()
 }
@@ -139,7 +138,7 @@ func BuildPageHeader(writer io.Writer, pageTitle string, board string, misc map[
 // of every normal HTML page
 func BuildPageFooter(writer io.Writer) (err error) {
 	return serverutil.MinifyTemplate(gctemplates.PageFooter,
-		map[string]interface{}{}, writer, "text/html")
+		map[string]any{}, writer, "text/html")
 }
 
 // BuildJS minifies (if enabled) consts.js, which is built from a template
@@ -150,7 +149,7 @@ func BuildJS() error {
 	defer errEv.Discard()
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return errors.New("Error loading consts.js template:" + err.Error())
+		return fmt.Errorf("failed loading consts.js template: %w", err)
 	}
 
 	boardCfg := config.GetBoardConfig("")
@@ -159,12 +158,12 @@ func BuildJS() error {
 	constsJSFile, err := os.OpenFile(constsJSPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, config.NormalFileMode)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("error opening consts.js for writing: %s", err.Error())
+		return fmt.Errorf("failed opening consts.js for writing: %w", err)
 	}
 
 	if err = config.TakeOwnershipOfFile(constsJSFile); err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("unable to update file ownership for consts.js: %s", err.Error())
+		return fmt.Errorf("unable to update file ownership for consts.js: %w", err)
 	}
 
 	if err = serverutil.MinifyTemplate(gctemplates.JsConsts, map[string]any{
@@ -175,7 +174,7 @@ func BuildJS() error {
 		"fileTypes":    boardCfg.AllowOtherExtensions,
 	}, constsJSFile, "text/javascript"); err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("error building consts.js: %s", err.Error())
+		return fmt.Errorf("failed building consts.js: %w", err)
 	}
 	return constsJSFile.Close()
 }
diff --git a/pkg/building/catalog.go b/pkg/building/catalog.go
index 506be032..6a7db0a4 100644
--- a/pkg/building/catalog.go
+++ b/pkg/building/catalog.go
@@ -95,7 +95,7 @@ func BuildCatalog(boardID int) error {
 	catalogFile, err := os.OpenFile(catalogPath, os.O_CREATE|os.O_RDWR|os.O_TRUNC, config.NormalFileMode)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("failed opening /%s/catalog.html: %s", board.Dir, err.Error())
+		return fmt.Errorf("failed opening /%s/catalog.html: %w", board.Dir, err)
 	}
 
 	if err = config.TakeOwnershipOfFile(catalogFile); err != nil {
diff --git a/pkg/building/threads.go b/pkg/building/threads.go
index f1d6d9c9..4d74d49b 100644
--- a/pkg/building/threads.go
+++ b/pkg/building/threads.go
@@ -84,12 +84,12 @@ func BuildThreadPages(op *gcsql.Post) error {
 	threadPageFile, err = os.OpenFile(threadPageFilepath, os.O_CREATE|os.O_RDWR|os.O_TRUNC, config.NormalFileMode)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("unable to open /%s/res/%d.html: %s", board.Dir, op.ID, err.Error())
+		return fmt.Errorf("unable to open /%s/res/%d.html: %w", board.Dir, op.ID, err)
 	}
 
 	if err = config.TakeOwnershipOfFile(threadPageFile); err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("unable to set file permissions for /%s/res/%d.html: %s", board.Dir, op.ID, err.Error())
+		return fmt.Errorf("unable to set file permissions for /%s/res/%d.html: %w", board.Dir, op.ID, err)
 	}
 	errEv.Int("op", posts[0].ID)
 
@@ -107,7 +107,7 @@ func BuildThreadPages(op *gcsql.Post) error {
 		"captcha":     captchaCfg,
 	}, threadPageFile, "text/html"); err != nil {
 		errEv.Err(err).Caller().Send()
-		return fmt.Errorf("failed building /%s/res/%d threadpage: %s", board.Dir, posts[0].ID, err.Error())
+		return fmt.Errorf("failed building /%s/res/%d threadpage: %w", board.Dir, posts[0].ID, err)
 	}
 	if err = threadPageFile.Close(); err != nil {
 		errEv.Err(err).Caller().Send()
diff --git a/pkg/gcsql/boards.go b/pkg/gcsql/boards.go
index 9d1c9778..3404a386 100644
--- a/pkg/gcsql/boards.go
+++ b/pkg/gcsql/boards.go
@@ -176,7 +176,7 @@ func ResetBoardSectionArrays() error {
 	AllBoards = append(AllBoards, allBoardsArr...)
 	for _, board := range AllBoards {
 		if err = config.UpdateBoardConfig(board.Dir); err != nil {
-			return fmt.Errorf("unable to update board config for /%s/: %s", board.Dir, err.Error())
+			return fmt.Errorf("unable to update board config for /%s/: %w", board.Dir, err)
 		}
 	}
 
diff --git a/pkg/gcsql/provisioning.go b/pkg/gcsql/provisioning.go
index b1802f0f..2e4c4418 100644
--- a/pkg/gcsql/provisioning.go
+++ b/pkg/gcsql/provisioning.go
@@ -126,10 +126,10 @@ func buildNewDatabase(dbType string) error {
 		return err
 	}
 	if err = createDefaultAdminIfNoStaff(); err != nil {
-		return errors.New("failed creating default admin account: " + err.Error())
+		return fmt.Errorf("failed creating default admin account: %w", err)
 	}
 	if err = createDefaultBoardIfNoneExist(); err != nil {
-		return errors.New("failed creating default board if non already exists: " + err.Error())
+		return fmt.Errorf("failed creating default board if non already exists: %w", err)
 	}
 	return nil
 }
diff --git a/pkg/gcsql/staff.go b/pkg/gcsql/staff.go
index 9c5e4bfb..3962b3e5 100644
--- a/pkg/gcsql/staff.go
+++ b/pkg/gcsql/staff.go
@@ -146,7 +146,7 @@ func EndStaffSession(writer http.ResponseWriter, request *http.Request) error {
 	if err = QueryRowContextSQL(ctx, nil, `SELECT staff_id FROM DBPREFIXsessions WHERE data = ?`,
 		[]any{session.Value}, []any{&staffID}); err != nil && err != sql.ErrNoRows {
 		// something went wrong with the query and it's not caused by no rows being returned
-		return errors.New("failed getting staff ID: " + err.Error())
+		return fmt.Errorf("failed getting staff ID: %w", err)
 	}
 
 	_, err = ExecContextSQL(ctx, nil, `DELETE FROM DBPREFIXsessions WHERE data = ?`, sessionVal)
diff --git a/pkg/gcsql/uploads.go b/pkg/gcsql/uploads.go
index dc06a329..838f276e 100644
--- a/pkg/gcsql/uploads.go
+++ b/pkg/gcsql/uploads.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"fmt"
 
 	"github.com/gochan-org/gochan/pkg/events"
 )
@@ -61,7 +62,7 @@ func (p *Post) AttachFileTx(tx *sql.Tx, upload *Upload) error {
 		return errors.New("recovered from a panic in an event handler (incoming-upload)")
 	}
 	if err != nil {
-		return errors.New("unable to attach upload to post: " + err.Error())
+		return fmt.Errorf("unable to attach upload to post: %w", err)
 	}
 
 	const insertSQL = `INSERT INTO DBPREFIXfiles (
diff --git a/pkg/manage/actionsAdminPerm.go b/pkg/manage/actionsAdminPerm.go
index 2befbc64..121380df 100644
--- a/pkg/manage/actionsAdminPerm.go
+++ b/pkg/manage/actionsAdminPerm.go
@@ -187,7 +187,7 @@ func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.S
 			return "", err
 		}
 		if err = board.ModifyInDB(); err != nil {
-			return "", errors.New("Unable to apply changes: " + err.Error())
+			return "", fmt.Errorf("unable to apply changes: %w", err)
 		}
 	case "cancel":
 		// cancel button was clicked
@@ -201,7 +201,7 @@ func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.S
 	if requestType == "create" || requestType == "modify" || requestType == "delete" {
 		if err = gcsql.ResetBoardSectionArrays(); err != nil {
 			errEv.Err(err).Caller().Send()
-			return "", errors.New("unable to reset board list: " + err.Error())
+			return "", fmt.Errorf("unable to reset board list: %w", err)
 		}
 		if err = building.BuildBoardListJSON(); err != nil {
 			return "", err
@@ -339,7 +339,7 @@ func cleanupCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staf
 		if err != nil {
 			errEv.Err(err).Caller().
 				Str("sql", "optimization").Send()
-			err = errors.New("Error optimizing SQL tables: " + err.Error())
+			err = fmt.Errorf("failed optimizing SQL tables: %w", err)
 			return outputStr + "<tr><td>" + err.Error() + "</td></tr></table>", err
 		}
 		outputStr += "Cleanup finished"
diff --git a/pkg/manage/actionsJanitorPerm.go b/pkg/manage/actionsJanitorPerm.go
index e45cbf53..6d086a83 100644
--- a/pkg/manage/actionsJanitorPerm.go
+++ b/pkg/manage/actionsJanitorPerm.go
@@ -109,7 +109,7 @@ func recentPostsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.
 		"limit":       limit,
 	}, manageRecentsBuffer, "text/html"); err != nil {
 		errEv.Err(err).Caller().Send()
-		return "", errors.New("Error executing ban management page template: " + err.Error())
+		return "", fmt.Errorf("failed executing ban management page template: %w", err)
 	}
 	return manageRecentsBuffer.String(), nil
 }
@@ -130,7 +130,7 @@ func staffCallback(writer http.ResponseWriter, request *http.Request, staff *gcs
 	}
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed getting staff list")
-		err = errors.New("Error getting staff list: " + err.Error())
+		err = fmt.Errorf("failed getting staff list: %w", err)
 		return "", err
 	}
 	warnEv := gcutil.LogWarning().
@@ -236,16 +236,17 @@ func staffCallback(writer http.ResponseWriter, request *http.Request, staff *gcs
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Error getting updated staff list")
 			writer.WriteHeader(http.StatusInternalServerError)
-			err = errors.New("Unable to get updated staff list")
+			err = errors.New("unable to get updated staff list")
 			return "", err
 		}
+		data["allstaff"] = allStaff
 	}
 
 	staffBuffer := bytes.NewBufferString("")
 	if err = serverutil.MinifyTemplate(gctemplates.ManageStaff, data, staffBuffer, "text/html"); err != nil {
 		errEv.Err(err).Str("template", "manage_staff.html").Send()
 		writer.WriteHeader(http.StatusInternalServerError)
-		return "", errors.New("Unable to execute staff management page template")
+		return "", errors.New("unable to execute staff management page template")
 	}
 	return staffBuffer.String(), nil
 }
diff --git a/pkg/manage/actionsModPerm.go b/pkg/manage/actionsModPerm.go
index 7e8ab3a7..f0da8d2b 100644
--- a/pkg/manage/actionsModPerm.go
+++ b/pkg/manage/actionsModPerm.go
@@ -103,7 +103,7 @@ func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Sta
 	banlist, err := gcsql.GetIPBans(filterBoardID, limit, true)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Error getting ban list")
-		err = errors.New("Error getting ban list: " + err.Error())
+		err = fmt.Errorf("failed getting ban list: %w", err)
 		return "", err
 	}
 	manageBansBuffer := bytes.NewBufferString("")
@@ -115,7 +115,7 @@ func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Sta
 		"filterboardid": filterBoardID,
 	}, manageBansBuffer, "text/html"); err != nil {
 		errEv.Err(err).Str("template", "manage_bans.html").Caller().Send()
-		return "", errors.New("Error executing ban management page template: " + err.Error())
+		return "", fmt.Errorf("failed executing ban management page template: %w", err)
 	}
 	outputStr += manageBansBuffer.String()
 	return outputStr, nil
@@ -158,7 +158,7 @@ func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	appeals, err := gcsql.GetAppeals(banID, limit)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return "", errors.New("Unable to get appeals: " + err.Error())
+		return "", fmt.Errorf("failed to get appeals list: %w", err)
 	}
 
 	if wantsJSON {
@@ -171,7 +171,7 @@ func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	}
 	if err = serverutil.MinifyTemplate(gctemplates.ManageAppeals, pageData, manageAppealsBuffer, "text/html"); err != nil {
 		errEv.Err(err).Str("template", "manage_appeals.html").Caller().Send()
-		return "", errors.New("Error executing appeal management page template: " + err.Error())
+		return "", fmt.Errorf("failed executing appeal management page template: %w", err)
 	}
 	return manageAppealsBuffer.String(), err
 }
@@ -344,7 +344,7 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	var buf bytes.Buffer
 	if err = serverutil.MinifyTemplate(gctemplates.ManageFilters, data, &buf, "text/html"); err != nil {
 		errEv.Err(err).Caller().Str("template", gctemplates.ManageFilters).Send()
-		return "", errors.New("Unable to execute filter management template: " + err.Error())
+		return "", fmt.Errorf("failed to execute filter management template: %w", err)
 	}
 	return buf.String(), nil
 }
@@ -376,7 +376,7 @@ func ipSearchCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
 				Int("limit", limit).
 				Bool("onlyNotDeleted", true).
 				Send()
-			return "", fmt.Errorf("Error getting list of posts from %q by staff %s: %s", ipQuery, staff.Username, err.Error())
+			return "", fmt.Errorf("Error getting list of posts from %q by staff %s: %w", ipQuery, staff.Username, err)
 		}
 	}
 
diff --git a/pkg/manage/actionsNoPerm.go b/pkg/manage/actionsNoPerm.go
index 2cc2b79d..f1baac72 100644
--- a/pkg/manage/actionsNoPerm.go
+++ b/pkg/manage/actionsNoPerm.go
@@ -3,6 +3,7 @@ package manage
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"net/http"
 	"path"
 
@@ -41,7 +42,7 @@ func loginCallback(writer http.ResponseWriter, request *http.Request, staff *gcs
 			"redirect":    redirectAction,
 		}, manageLoginBuffer, "text/html"); err != nil {
 			errEv.Err(err).Str("template", "manage_login.html").Send()
-			return "", errors.New("Error executing staff login page template: " + err.Error())
+			return "", fmt.Errorf("failed executing staff login page template: %w", err)
 		}
 		output = manageLoginBuffer.String()
 	} else {
diff --git a/pkg/manage/filters.go b/pkg/manage/filters.go
index 18a7a846..f556a885 100644
--- a/pkg/manage/filters.go
+++ b/pkg/manage/filters.go
@@ -2,6 +2,7 @@ package manage
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -119,7 +120,7 @@ func submitFilterFormData(request *http.Request, staff *gcsql.Staff, infoEv, err
 					Str("boardIDField", k).
 					Str("boardIDStr", k[10:]).
 					Msg("Unable to parse board ID")
-				return errors.New("unable to parse board ID: " + err.Error())
+				return fmt.Errorf("unable to parse board ID: %w", err)
 			}
 			boardIDLogArr.Int(boardID)
 			boards = append(boards, boardID)
@@ -130,7 +131,7 @@ func submitFilterFormData(request *http.Request, staff *gcsql.Staff, infoEv, err
 			fieldIDstr := k[5:]
 			if _, err = strconv.Atoi(fieldIDstr); err != nil {
 				errEv.Err(err).Caller().Str("fieldID", fieldIDstr).Send()
-				return errors.New("failed to get field data: " + err.Error())
+				return fmt.Errorf("failed to get field data: %w", err)
 			}
 			fc := gcsql.FilterCondition{
 				Field: v[0],
diff --git a/pkg/posting/uploads/attach.go b/pkg/posting/uploads/attach.go
index 86822415..8f44ae3b 100644
--- a/pkg/posting/uploads/attach.go
+++ b/pkg/posting/uploads/attach.go
@@ -97,7 +97,7 @@ func AttachUploadFromRequest(request *http.Request, writer http.ResponseWriter,
 	data, err := io.ReadAll(file)
 	if err != nil {
 		errEv.Err(err).Caller().Send()
-		return nil, errors.New("Error while trying to read file: " + err.Error())
+		return nil, fmt.Errorf("got an error while trying to read file: %w", err)
 	}
 	defer file.Close()
 
@@ -152,7 +152,7 @@ func AttachUploadFromRequest(request *http.Request, writer http.ResponseWriter,
 
 	if err = uploadHandler(upload, post, postBoard.Dir, filePath, thumbPath, catalogThumbPath, infoEv, accessEv, errEv); err != nil {
 		// uploadHandler is assumed to handle logging
-		return nil, errors.New("error processing upload: " + err.Error())
+		return nil, fmt.Errorf("error processing upload: %w", err)
 	}
 
 	accessEv.Send()

From 625aadb0d0faab6ed1d21d8257db8833cb4a689a Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:37:27 -0800
Subject: [PATCH 060/122] Update TestPre2021Migration with proper assertion

---
 cmd/gochan-migration/internal/pre2021/pre2021_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index 71a651b9..02e23733 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -97,6 +97,6 @@ func TestPre2021Migration(t *testing.T) {
 		t.FailNow()
 	}
 	migrated, err := migrator.MigrateDB()
-	assert.True(t, migrated)
+	assert.False(t, migrated)
 	assert.NoError(t, err)
 }

From 2e40dafd849f0d02c20a8baa50170ffbd7b523a7 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 11 Jan 2025 14:08:42 -0800
Subject: [PATCH 061/122] remove deprecated dlvLoadConfig, show global
 variables in dlv debug session

---
 .vscode/launch.json | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 01109f95..dc96e081 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,12 +11,7 @@
             "mode": "auto",
             "cwd":"${workspaceFolder}",
             "program": "${workspaceFolder}/cmd/gochan/",
-            "env": {},
-            "args": [],
-            "dlvLoadConfig": {
-                "maxStringLen": 5000,
-                "maxArrayValues": 500
-            },
+            "showGlobalVariables": true
         },
         {
             "name": "gochan-migration",
@@ -25,12 +20,7 @@
             "mode": "auto",
             "cwd":"${workspaceFolder}",
             "program": "${workspaceFolder}/cmd/gochan-migration/",
-            "env": {},
-            "args": [],
-            "dlvLoadConfig": {
-                "maxStringLen": 5000,
-                "maxArrayValues": 500
-            },
+            "showGlobalVariables": true
         }
     ]
 }
\ No newline at end of file

From 74d8136f26d335cd34b4d9083bec8995dcbdc0e0 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 11 Jan 2025 14:39:21 -0800
Subject: [PATCH 062/122] Re-add upload.PostID and upload.FileOrder assignment

---
 pkg/gcsql/uploads.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/gcsql/uploads.go b/pkg/gcsql/uploads.go
index 838f276e..c6c8202b 100644
--- a/pkg/gcsql/uploads.go
+++ b/pkg/gcsql/uploads.go
@@ -73,6 +73,13 @@ func (p *Post) AttachFileTx(tx *sql.Tx, upload *Upload) error {
 		return ErrAlreadyAttached
 	}
 
+	if upload.FileOrder < 1 {
+		upload.FileOrder, err = p.NextFileOrder(context.Background(), tx)
+		if err != nil {
+			return err
+		}
+	}
+	upload.PostID = p.ID
 	if _, err = ExecTxSQL(tx, insertSQL,
 		&upload.PostID, &upload.FileOrder, &upload.OriginalFilename, &upload.Filename, &upload.Checksum, &upload.FileSize,
 		&upload.IsSpoilered, &upload.ThumbnailWidth, &upload.ThumbnailHeight, &upload.Width, &upload.Height,

From e7e9a360f91cbabe0249ca0946b871f058c78b37 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:00:06 -0800
Subject: [PATCH 063/122] Add serverError type to be used by error serving
 functions to set the HTTP status code

---
 pkg/server/server.go | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/pkg/server/server.go b/pkg/server/server.go
index f93172bf..3a7283ea 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"net/http"
 	"os"
 
@@ -15,17 +16,40 @@ var (
 	router *bunrouter.Router
 )
 
+type serverError struct {
+	err        any
+	statusCode int
+}
+
+func (e *serverError) Error() string {
+	return fmt.Sprint(e.err)
+}
+
+func (e *serverError) Unwrap() error {
+	if err, ok := e.err.(error); ok {
+		return err
+	}
+	return nil
+}
+
+func NewServerError(message any, statusCode int) error {
+	return &serverError{err: message, statusCode: statusCode}
+}
+
 // ServeJSON serves data as a JSON string
-func ServeJSON(writer http.ResponseWriter, data map[string]interface{}) {
+func ServeJSON(writer http.ResponseWriter, data map[string]any) {
 	jsonStr, _ := gcutil.MarshalJSON(data, false)
 	writer.Header().Set("Content-Type", "application/json")
 	serverutil.MinifyWriter(writer, []byte(jsonStr), "application/json")
 }
 
 // ServeErrorPage shows a general error page if something goes wrong
-func ServeErrorPage(writer http.ResponseWriter, err string) {
+func ServeErrorPage(writer http.ResponseWriter, err any) {
+	if se, ok := err.(*serverError); ok {
+		writer.WriteHeader(se.statusCode)
+	}
 	writer.Header().Set("Content-Type", "text/html; charset=utf-8")
-	serverutil.MinifyTemplate(gctemplates.ErrorPage, map[string]interface{}{
+	serverutil.MinifyTemplate(gctemplates.ErrorPage, map[string]any{
 		"systemCritical": config.GetSystemCriticalConfig(),
 		"siteConfig":     config.GetSiteConfig(),
 		"boardConfig":    config.GetBoardConfig(""),
@@ -37,14 +61,15 @@ func ServeErrorPage(writer http.ResponseWriter, err string) {
 
 // ServeError serves the given map as a JSON file (with the error string included) if wantsJSON is true,
 // otherwise it serves a regular HTML error page
-func ServeError(writer http.ResponseWriter, err string, wantsJSON bool, data map[string]interface{}) {
+func ServeError(writer http.ResponseWriter, err any, wantsJSON bool, data map[string]any) {
 	if wantsJSON {
 		servedMap := data
 		if servedMap == nil {
-			servedMap = make(map[string]interface{})
+			servedMap = make(map[string]any)
 		}
-		if _, ok := servedMap["error"]; !ok {
-			servedMap["error"] = err
+		servedMap["error"] = err
+		if se, ok := err.(*serverError); ok {
+			writer.WriteHeader(se.statusCode)
 		}
 		ServeJSON(writer, servedMap)
 	} else {

From b966604d1dadd7a83a1c1d63a57f7d2e823dac77 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:01:36 -0800
Subject: [PATCH 064/122] Avoid using Select * in SQL queries, normalize some
 view columns

---
 cmd/gochan/deleteposts.go      |  6 +++---
 pkg/building/building.go       |  4 ++--
 pkg/building/catalog.go        |  5 ++++-
 pkg/building/posts.go          | 15 ++++++++++++---
 pkg/gcsql/posts.go             | 35 ++++++++++++++++++++++++++++++++++
 pkg/manage/actionsAdminPerm.go |  3 ++-
 pkg/posting/post.go            | 27 ++++++++++++++++++++++++++
 sql/reset_views.sql            | 16 ++++++++++++----
 8 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/cmd/gochan/deleteposts.go b/cmd/gochan/deleteposts.go
index f00bda95..5aad2733 100644
--- a/cmd/gochan/deleteposts.go
+++ b/cmd/gochan/deleteposts.go
@@ -118,12 +118,12 @@ func getAllPostsToDelete(postIDs []any, fileOnly bool) ([]delPost, []any, error)
 	params := postIDs
 	if fileOnly {
 		// only deleting this post's file, not subfiles if it's an OP
-		query = "SELECT * FROM DBPREFIXv_posts_to_delete_file_only WHERE postid IN " + setPart
+		query = "SELECT post_id, thread_id, op_id, is_top_post, filename, dir FROM DBPREFIXv_posts_to_delete_file_only WHERE post_id IN " + setPart
 	} else {
 		// deleting everything, including subfiles
 		params = append(params, postIDs...)
-		query = "SELECT * FROM DBPREFIXv_posts_to_delete WHERE postid IN " + setPart +
-			` OR thread_id IN (SELECT thread_id from DBPREFIXposts op WHERE opid IN ` + setPart + ` AND is_top_post)`
+		query = "SELECT post_id, thread_id, op_id, is_top_post, filename, dir FROM DBPREFIXv_posts_to_delete WHERE post_id IN " +
+			setPart + " OR thread_id IN (SELECT thread_id from DBPREFIXposts op WHERE op_id IN " + setPart + " AND is_top_post)"
 	}
 	rows, err := gcsql.QuerySQL(query, params...)
 	if err != nil {
diff --git a/pkg/building/building.go b/pkg/building/building.go
index 5475ce6b..178264b0 100644
--- a/pkg/building/building.go
+++ b/pkg/building/building.go
@@ -35,9 +35,9 @@ func getFrontPagePosts() ([]frontPagePost, error) {
 
 	if siteCfg.RecentPostsWithNoFile {
 		// get recent posts, including those with no file
-		query = "SELECT * FROM DBPREFIXv_front_page_posts"
+		query = "SELECT id, message_raw, dir, filename, op_id FROM DBPREFIXv_front_page_posts"
 	} else {
-		query = "SELECT * FROM DBPREFIXv_front_page_posts_with_file"
+		query = "SELECT id, message_raw, dir, filename, op_id FROM DBPREFIXv_front_page_posts_with_file"
 	}
 	query += " ORDER BY id DESC LIMIT " + strconv.Itoa(siteCfg.MaxRecentPosts)
 
diff --git a/pkg/building/catalog.go b/pkg/building/catalog.go
index 6a7db0a4..e5001e72 100644
--- a/pkg/building/catalog.go
+++ b/pkg/building/catalog.go
@@ -63,7 +63,10 @@ func (catalog *boardCatalog) fillPages(threadsPerPage int, threads []catalogThre
 }
 
 func getBoardTopPosts(board string) ([]*Post, error) {
-	const query = "SELECT * FROM DBPREFIXv_building_posts WHERE id = parent_id AND dir = ?"
+	const query = `SELECT id, thread_id, ip, name, tripcode, email, subject, created_on, last_modified, parent_id,
+		last_bump, message, message_raw, board_id, dir, original_filename, filename, checksum, filesize, tw, th,
+		width, height, locked, stickied, cyclical, flag, country, is_deleted
+		FROM DBPREFIXv_building_posts WHERE id = parent_id AND dir = ?`
 	var posts []*Post
 
 	err := QueryPosts(query, []any{board}, func(p *Post) error {
diff --git a/pkg/building/posts.go b/pkg/building/posts.go
index 95038b2c..08a620f9 100644
--- a/pkg/building/posts.go
+++ b/pkg/building/posts.go
@@ -155,7 +155,10 @@ func QueryPosts(query string, params []any, cb func(*Post) error) error {
 }
 
 func GetBuildablePostsByIP(ip string, limit int) ([]*Post, error) {
-	query := "SELECT * FROM DBPREFIXv_building_posts WHERE ip = PARAM_ATON ORDER BY id DESC"
+	query := `SELECT id, thread_id, ip, name, tripcode, email, subject, created_on, last_modified, parent_id,
+		last_bump, message, message_raw, board_id, dir, original_filename, filename, checksum, filesize, tw, th,
+		width, height, locked, stickied, cyclical, flag, country, is_deleted
+		FROM DBPREFIXv_building_posts WHERE ip = PARAM_ATON ORDER BY id DESC`
 	if limit > 0 {
 		query += " LIMIT " + strconv.Itoa(limit)
 	}
@@ -169,7 +172,10 @@ func GetBuildablePostsByIP(ip string, limit int) ([]*Post, error) {
 }
 
 func getThreadPosts(thread *gcsql.Thread) ([]*Post, error) {
-	const query = "SELECT * FROM DBPREFIXv_building_posts WHERE thread_id = ? ORDER BY id ASC"
+	const query = `SELECT id, thread_id, ip, name, tripcode, email, subject, created_on, last_modified, parent_id,
+		last_bump, message, message_raw, board_id, dir, original_filename, filename, checksum, filesize, tw, th,
+		width, height, locked, stickied, cyclical, flag, country, is_deleted
+		FROM DBPREFIXv_building_posts WHERE thread_id = ? ORDER BY id ASC`
 	var posts []*Post
 	err := QueryPosts(query, []any{thread.ID}, func(p *Post) error {
 		posts = append(posts, p)
@@ -179,7 +185,10 @@ func getThreadPosts(thread *gcsql.Thread) ([]*Post, error) {
 }
 
 func GetRecentPosts(boardid int, limit int) ([]*Post, error) {
-	query := `SELECT * FROM DBPREFIXv_building_posts`
+	query := `SELECT id, thread_id, ip, name, tripcode, email, subject, created_on, last_modified, parent_id,
+		last_bump, message, message_raw, board_id, dir, original_filename, filename, checksum, filesize, tw, th,
+		width, height, locked, stickied, cyclical, flag, country, is_deleted
+		FROM DBPREFIXv_building_posts`
 	var args []any
 
 	if boardid > 0 {
diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 3fa1bc5d..2a1ebdd0 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -337,6 +337,16 @@ func (p *Post) UnlinkUploads(leaveDeletedBox bool) error {
 	return err
 }
 
+// InCyclicalThread returns true if the post is in a cyclical thread
+func (p *Post) InCyclicalThread() (bool, error) {
+	var cyclical bool
+	err := QueryRowTimeoutSQL(nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
+	if errors.Is(err, sql.ErrNoRows) {
+		return false, ErrThreadDoesNotExist
+	}
+	return cyclical, err
+}
+
 // Delete sets the post as deleted and sets the deleted_at timestamp to the current time
 func (p *Post) Delete() error {
 	if p.IsTopPost {
@@ -413,6 +423,31 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 	return tx.Commit()
 }
 
+type cyclicalThreadPost struct {
+	PostID int // sql: post_id
+
+}
+
+// returns post IDs that should be deleted in a cyclical thread
+// func (p *Post) postsToBeBumpedOff() ([]int, error) {
+// 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+// 	defer cancel()
+// 	tx, err := BeginContextTx(ctx)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+// 	var cyclical bool
+// 	if err = QueryRowContextSQL(ctx, tx, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical}); err != nil {
+// 		return nil, err
+// 	}
+
+// 	if !cyclical {
+// 		return nil, nil
+// 	}
+
+// 	QueryContextSQL(ctx, tx, "SELECT post_id, thread_id, op_id, is_top_post, filename, dir FROM DBPREFIXv_posts_to_delete WHERE thread_id = ?")
+// }
+
 func (p *Post) WebPath() string {
 	if p.opID > 0 && p.boardDir != "" {
 		return config.WebPath(p.boardDir, "res/", strconv.Itoa(p.opID)+".html#"+strconv.Itoa(p.ID))
diff --git a/pkg/manage/actionsAdminPerm.go b/pkg/manage/actionsAdminPerm.go
index 121380df..d2d0672c 100644
--- a/pkg/manage/actionsAdminPerm.go
+++ b/pkg/manage/actionsAdminPerm.go
@@ -356,7 +356,8 @@ func fixThumbnailsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsq
 	board := request.FormValue("board")
 	var uploads []uploadInfo
 	if board != "" {
-		const query = "SELECT * FROM DBPREFIXv_upload_info WHERE dir = ? ORDER BY created_on DESC"
+		const query = `SELECT id, op, filename, is_spoilered, width, height, thumbnail_width, thumbnail_height
+		FROM DBPREFIXv_upload_info WHERE dir = ? ORDER BY created_on DESC`
 		rows, err := gcsql.QuerySQL(query, board)
 		if err != nil {
 			return "", err
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 6d4d2dc8..6c21e674 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -335,6 +335,7 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 
 	isCyclical := request.PostFormValue("cyclical") == "on"
 	if isCyclical && boardConfig.CyclicalThreadNumPosts == 0 {
+		writer.WriteHeader(http.StatusBadRequest)
 		server.ServeError(writer, "Board does not support cyclical threads", wantsJSON, nil)
 		return
 	}
@@ -460,17 +461,43 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 		if err = config.TakeOwnership(filePath); err != nil {
 			errEv.Err(err).Caller().
 				Str("file", filePath).Send()
+			os.Remove(filePath)
+			os.Remove(thumbPath)
+			os.Remove(catalogThumbPath)
+			post.Delete()
+			server.ServeError(writer, err.Error(), wantsJSON, nil)
 		}
 		if err = config.TakeOwnership(thumbPath); err != nil {
 			errEv.Err(err).Caller().
 				Str("thumbnail", thumbPath).Send()
+			os.Remove(filePath)
+			os.Remove(thumbPath)
+			os.Remove(catalogThumbPath)
+			post.Delete()
+			server.ServeError(writer, err.Error(), wantsJSON, nil)
 		}
 		if err = config.TakeOwnership(catalogThumbPath); err != nil && !os.IsNotExist(err) {
 			errEv.Err(err).Caller().
 				Str("catalogThumbnail", catalogThumbPath).Send()
+			os.Remove(filePath)
+			os.Remove(thumbPath)
+			os.Remove(catalogThumbPath)
+			post.Delete()
+			server.ServeError(writer, err.Error(), wantsJSON, nil)
 		}
 	}
 
+	inCyclicalThread, err := post.InCyclicalThread()
+	if err != nil {
+		errEv.Err(err).Caller().Send()
+		server.ServeError(writer, "Unable to get thread info", wantsJSON, nil)
+		return
+	}
+	if inCyclicalThread {
+		// post is a cyclical thread
+		errEv.Bool("cyclical", inCyclicalThread)
+	}
+
 	// rebuild the board page
 	if err = building.BuildBoards(false, board.ID); err != nil {
 		server.ServeError(writer, "Unable to build boards", wantsJSON, nil)
diff --git a/sql/reset_views.sql b/sql/reset_views.sql
index 6495cf3b..31db9922 100644
--- a/sql/reset_views.sql
+++ b/sql/reset_views.sql
@@ -8,6 +8,7 @@ DROP VIEW IF EXISTS DBPREFIXv_front_page_posts_with_file;
 DROP VIEW IF EXISTS DBPREFIXv_front_page_posts;
 DROP VIEW IF EXISTS DBPREFIXv_posts_to_delete_file_only;
 DROP VIEW IF EXISTS DBPREFIXv_posts_to_delete;
+DROP VIEW IF EXISTS DBPREFIXv_posts_cyclical_check;
 DROP VIEW IF EXISTS DBPREFIXv_recent_posts;
 DROP VIEW IF EXISTS DBPREFIXv_building_posts;
 DROP VIEW IF EXISTS DBPREFIXv_top_post_thread_ids;
@@ -42,10 +43,10 @@ INNER JOIN DBPREFIXv_top_post_thread_ids op ON op.thread_id = p.thread_id
 WHERE p.is_deleted = FALSE;
 
 CREATE VIEW DBPREFIXv_posts_to_delete AS
-SELECT p.id AS postid, thread_id, (
-	SELECT op.id AS opid FROM DBPREFIXposts op
+SELECT p.id AS post_id, thread_id, (
+	SELECT op.id AS op_id FROM DBPREFIXposts op
 	WHERE op.thread_id = p.thread_id AND is_top_post LIMIT 1
-) as opid, is_top_post, COALESCE(filename, '') AS filename, dir
+) as op_id, is_top_post, COALESCE(filename, '') AS filename, dir
 FROM DBPREFIXboards b
 LEFT JOIN DBPREFIXthreads t ON t.board_id = b.id
 LEFT JOIN DBPREFIXposts p ON p.thread_id = t.id
@@ -55,10 +56,17 @@ CREATE VIEW DBPREFIXv_posts_to_delete_file_only AS
 SELECT * FROM DBPREFIXv_posts_to_delete
 WHERE filename IS NOT NULL;
 
+CREATE VIEW DBPREFIXv_posts_cyclical_check AS
+SELECT post_id, d.thread_id, op_id, d.is_top_post, filename, dir
+FROM DBPREFIXv_posts_to_delete d
+INNER JOIN DBPREFIXposts p ON p.id = post_id
+INNER JOIN DBPREFIXthreads t ON d.thread_id = t.id
+WHERE p.is_deleted = 0 AND d.is_top_post = 0 and t.cyclical = 1;
+
 CREATE VIEW DBPREFIXv_front_page_posts AS
 SELECT DBPREFIXposts.id, DBPREFIXposts.message_raw,
 (SELECT dir FROM DBPREFIXboards WHERE id = t.board_id) as dir,
-COALESCE(f.filename, '') as filename, op.id as opid
+COALESCE(f.filename, '') as filename, op.id as op_id
 FROM DBPREFIXposts
 LEFT JOIN DBPREFIXv_thread_board_ids t ON t.id = DBPREFIXposts.thread_id
 LEFT JOIN (SELECT post_id, filename FROM DBPREFIXfiles) f on f.post_id = DBPREFIXposts.id

From d0241f3a09405d488a2d5dad59583f4186472d16 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 14:52:06 -0800
Subject: [PATCH 065/122] Prune posts in cyclical threads

---
 pkg/gcsql/posts.go   | 101 ++++++++++++++++++++++++++++++++-----------
 pkg/gcsql/threads.go |  18 ++++++--
 pkg/posting/post.go  |  40 +++++++++++++----
 3 files changed, 122 insertions(+), 37 deletions(-)

diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 2a1ebdd0..0c963ea6 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -349,14 +349,33 @@ func (p *Post) InCyclicalThread() (bool, error) {
 
 // Delete sets the post as deleted and sets the deleted_at timestamp to the current time
 func (p *Post) Delete() error {
-	if p.IsTopPost {
-		return deleteThread(p.ThreadID)
+	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+	defer cancel()
+	tx, err := BeginContextTx(ctx)
+	if err != nil {
+		return err
 	}
-	const deleteSQL = `UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?`
-	_, err := ExecSQL(deleteSQL, p.ID)
-	return err
+	defer tx.Rollback()
+
+	var rowCount int
+	err = QueryRowContextSQL(ctx, tx, "SELECT COUNT(*) FROM DBPREFIXposts WHERE id = ?", []any{p.ID}, []any{&rowCount})
+	if errors.Is(err, sql.ErrNoRows) {
+		err = ErrPostDoesNotExist
+	}
+	if err != nil {
+		return err
+	}
+
+	if p.IsTopPost {
+		return deleteThread(ctx, tx, p.ThreadID)
+	}
+	if _, err = ExecContextSQL(ctx, tx, "UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?", p.ID); err != nil {
+		return err
+	}
+	return tx.Commit()
 }
 
+// InsertWithContext inserts the post into the database with the given context and transaction
 func (p *Post) InsertWithContext(ctx context.Context, tx *sql.Tx, bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
 	if p.ID > 0 {
 		// already inserted
@@ -423,30 +442,62 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 	return tx.Commit()
 }
 
-type cyclicalThreadPost struct {
-	PostID int // sql: post_id
-
+// CyclicalThreadPost represents a post that should be deleted in a cyclical thread
+type CyclicalThreadPost struct {
+	PostID    int    // sql: post_id
+	ThreadID  int    // sql: thread_id
+	OPID      int    // sql: op_id
+	IsTopPost bool   // sql: is_top_post
+	Filename  string // sql: filename
+	Dir       string // sql: dir
 }
 
-// returns post IDs that should be deleted in a cyclical thread
-// func (p *Post) postsToBeBumpedOff() ([]int, error) {
-// 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
-// 	defer cancel()
-// 	tx, err := BeginContextTx(ctx)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	var cyclical bool
-// 	if err = QueryRowContextSQL(ctx, tx, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical}); err != nil {
-// 		return nil, err
-// 	}
+// CyclicalPostsToBePruned returns posts that should be deleted in a cyclical thread that has reached its board's post limit
+func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+	defer cancel()
+	tx, err := BeginContextTx(ctx)
+	if err != nil {
+		return nil, err
+	}
+	var cyclical bool
+	err = QueryRowContextSQL(ctx, tx, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
+	if errors.Is(err, sql.ErrNoRows) {
+		err = ErrThreadDoesNotExist
+	}
+	if err != nil {
+		return nil, err
+	}
 
-// 	if !cyclical {
-// 		return nil, nil
-// 	}
+	if !cyclical {
+		return nil, nil
+	}
 
-// 	QueryContextSQL(ctx, tx, "SELECT post_id, thread_id, op_id, is_top_post, filename, dir FROM DBPREFIXv_posts_to_delete WHERE thread_id = ?")
-// }
+	rows, err := QueryContextSQL(ctx, tx, `SELECT post_id, thread_id, op_id, filename, dir
+		FROM DBPREFIXv_posts_to_delete WHERE thread_id = ? ORDER BY post_id DESC`, p.ThreadID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var posts []CyclicalThreadPost
+	for rows.Next() {
+		var post CyclicalThreadPost
+		if err = rows.Scan(&post.PostID, &post.ThreadID, &post.OPID, &post.Filename, &post.Dir); err != nil {
+			return nil, err
+		}
+		posts = append(posts, post)
+	}
+	if err = rows.Close(); err != nil {
+		return nil, err
+	}
+	cyclicalThreadMaxPosts := config.GetBoardConfig(posts[0].Dir).CyclicalThreadNumPosts
+
+	if len(posts) == 0 || len(posts) < cyclicalThreadMaxPosts {
+		return nil, nil
+	}
+
+	return posts[:cyclicalThreadMaxPosts], nil
+}
 
 func (p *Post) WebPath() string {
 	if p.opID > 0 && p.boardDir != "" {
diff --git a/pkg/gcsql/threads.go b/pkg/gcsql/threads.go
index b964f7ea..4796e4dc 100644
--- a/pkg/gcsql/threads.go
+++ b/pkg/gcsql/threads.go
@@ -1,6 +1,7 @@
 package gcsql
 
 import (
+	"context"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -227,13 +228,24 @@ func (t *Thread) UpdateAttribute(attribute string, value bool) error {
 }
 
 // deleteThread updates the thread and sets it as deleted, as well as the posts where thread_id = threadID
-func deleteThread(threadID int) error {
+func deleteThread(ctx context.Context, tx *sql.Tx, threadID int) error {
+	const checkPostExistsSQL = `SELECT COUNT(*) FROM DBPREFIXposts WHERE thread_id = ?`
 	const deletePostsSQL = `UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE thread_id = ?`
 	const deleteThreadSQL = `UPDATE DBPREFIXthreads SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?`
-	_, err := ExecSQL(deletePostsSQL, threadID)
+
+	var rowCount int
+	err := QueryRowContextSQL(ctx, tx, checkPostExistsSQL, []any{threadID}, []any{&rowCount})
 	if err != nil {
 		return err
 	}
-	_, err = ExecSQL(deleteThreadSQL, threadID)
+	if rowCount == 0 {
+		return ErrThreadDoesNotExist
+	}
+
+	_, err = ExecContextSQL(ctx, tx, deletePostsSQL, threadID)
+	if err != nil {
+		return err
+	}
+	_, err = ExecContextSQL(ctx, tx, deleteThreadSQL, threadID)
 	return err
 }
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 6c21e674..3c3a6149 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -487,15 +487,37 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 		}
 	}
 
-	inCyclicalThread, err := post.InCyclicalThread()
-	if err != nil {
-		errEv.Err(err).Caller().Send()
-		server.ServeError(writer, "Unable to get thread info", wantsJSON, nil)
-		return
-	}
-	if inCyclicalThread {
-		// post is a cyclical thread
-		errEv.Bool("cyclical", inCyclicalThread)
+	if !post.IsTopPost {
+		toBePruned, err := post.CyclicalPostsToBePruned()
+		if err != nil {
+			errEv.Err(err).Caller().Msg("Unable to get posts to be pruned from cyclical thread")
+			server.ServeError(writer, "Unable to get cyclical thread info", wantsJSON, nil)
+			return
+		}
+		gcutil.LogInt("toBePruned", len(toBePruned), infoEv, errEv)
+		// prune posts from cyclical thread
+		for _, prunePost := range toBePruned {
+			p := &gcsql.Post{ID: prunePost.PostID, ThreadID: prunePost.ThreadID}
+
+			if err = p.Delete(); err != nil {
+				errEv.Err(err).Caller().
+					Int("postID", prunePost.PostID).
+					Msg("Unable to prune post from cyclical thread")
+				server.ServeError(writer, "Unable to prune post from cyclical thread", wantsJSON, nil)
+				return
+			}
+			documentRoot := config.GetSystemCriticalConfig().DocumentRoot
+			prunePostThumb := path.Join(documentRoot, prunePost.Dir, "thumb", uploads.GetThumbnailExtension(prunePost.Filename))
+			prunePostFile := path.Join(documentRoot, prunePost.Dir, "src", prunePost.Filename)
+			if err = os.Remove(prunePostThumb); err != nil {
+				errEv.Err(err).Caller().
+					Str("pruneThumb", prunePostThumb).Send()
+			}
+			if err = os.Remove(prunePostFile); err != nil {
+				errEv.Err(err).Caller().
+					Str("pruneFile", prunePostFile).Send()
+			}
+		}
 	}
 
 	// rebuild the board page

From 0b175ef2e5b18162b825168d98f030030490ee09 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:26:49 -0800
Subject: [PATCH 066/122] Fully implement cyclical threads

---
 pkg/gcsql/posts.go  | 21 +++++++++++++--------
 pkg/posting/post.go | 27 ++++++++++++++++-----------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 0c963ea6..189e4bfb 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -454,14 +454,15 @@ type CyclicalThreadPost struct {
 
 // CyclicalPostsToBePruned returns posts that should be deleted in a cyclical thread that has reached its board's post limit
 func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
+	if p.IsTopPost {
+		// don't prune if this is the OP
+		return nil, nil
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
 	defer cancel()
-	tx, err := BeginContextTx(ctx)
-	if err != nil {
-		return nil, err
-	}
+
 	var cyclical bool
-	err = QueryRowContextSQL(ctx, tx, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
+	err := QueryRowContextSQL(ctx, nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
 	if errors.Is(err, sql.ErrNoRows) {
 		err = ErrThreadDoesNotExist
 	}
@@ -473,8 +474,8 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 		return nil, nil
 	}
 
-	rows, err := QueryContextSQL(ctx, tx, `SELECT post_id, thread_id, op_id, filename, dir
-		FROM DBPREFIXv_posts_to_delete WHERE thread_id = ? ORDER BY post_id DESC`, p.ThreadID)
+	rows, err := QueryContextSQL(ctx, nil, `SELECT post_id, thread_id, op_id, filename, dir
+		FROM DBPREFIXv_posts_cyclical_check WHERE thread_id = ? AND post_id <> op_id ORDER BY post_id ASC`, p.ThreadID)
 	if err != nil {
 		return nil, err
 	}
@@ -491,12 +492,16 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 		return nil, err
 	}
 	cyclicalThreadMaxPosts := config.GetBoardConfig(posts[0].Dir).CyclicalThreadNumPosts
+	if cyclicalThreadMaxPosts < 1 {
+		// no limit set
+		return nil, nil
+	}
 
 	if len(posts) == 0 || len(posts) < cyclicalThreadMaxPosts {
 		return nil, nil
 	}
 
-	return posts[:cyclicalThreadMaxPosts], nil
+	return posts[:len(posts)-cyclicalThreadMaxPosts], nil
 }
 
 func (p *Post) WebPath() string {
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 3c3a6149..f5c757b5 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -417,8 +417,8 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 		return
 	}
 	var filePath, thumbPath, catalogThumbPath string
+	documentRoot := config.GetSystemCriticalConfig().DocumentRoot
 	if upload != nil {
-		documentRoot := config.GetSystemCriticalConfig().DocumentRoot
 		filePath = path.Join(documentRoot, board.Dir, "src", upload.Filename)
 		thumbPath, catalogThumbPath = uploads.GetThumbnailFilenames(
 			path.Join(documentRoot, board.Dir, "thumb", upload.Filename))
@@ -495,8 +495,10 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 			return
 		}
 		gcutil.LogInt("toBePruned", len(toBePruned), infoEv, errEv)
+
 		// prune posts from cyclical thread
 		for _, prunePost := range toBePruned {
+			fmt.Printf("%#v\n", prunePost)
 			p := &gcsql.Post{ID: prunePost.PostID, ThreadID: prunePost.ThreadID}
 
 			if err = p.Delete(); err != nil {
@@ -506,16 +508,19 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 				server.ServeError(writer, "Unable to prune post from cyclical thread", wantsJSON, nil)
 				return
 			}
-			documentRoot := config.GetSystemCriticalConfig().DocumentRoot
-			prunePostThumb := path.Join(documentRoot, prunePost.Dir, "thumb", uploads.GetThumbnailExtension(prunePost.Filename))
-			prunePostFile := path.Join(documentRoot, prunePost.Dir, "src", prunePost.Filename)
-			if err = os.Remove(prunePostThumb); err != nil {
-				errEv.Err(err).Caller().
-					Str("pruneThumb", prunePostThumb).Send()
-			}
-			if err = os.Remove(prunePostFile); err != nil {
-				errEv.Err(err).Caller().
-					Str("pruneFile", prunePostFile).Send()
+			if prunePost.Filename != "" && prunePost.Filename != "deleted" {
+				prunePostFile := path.Join(documentRoot, prunePost.Dir, "src", prunePost.Filename)
+				prunePostThumbName, _ := uploads.GetThumbnailFilenames(prunePost.Filename)
+				prunePostThumb := path.Join(documentRoot, prunePost.Dir, "thumb", prunePostThumbName)
+				gcutil.LogStr("prunePostFile", prunePostFile, infoEv, errEv)
+				gcutil.LogStr("prunePostThumb", prunePostThumb, infoEv, errEv)
+
+				if err = os.Remove(prunePostFile); err != nil {
+					errEv.Err(err).Caller().Msg("Unable to delete post file")
+				}
+				if err = os.Remove(prunePostThumb); err != nil {
+					errEv.Err(err).Caller().Msg("Unable to delete post thumbnail")
+				}
 			}
 		}
 	}

From db2edb8638aad3153564f4a3fba76544767f69b4 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:30:47 -0800
Subject: [PATCH 067/122] Update test

---
 pkg/building/building_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/building/building_test.go b/pkg/building/building_test.go
index 7ff5f5b5..4744afac 100644
--- a/pkg/building/building_test.go
+++ b/pkg/building/building_test.go
@@ -109,7 +109,7 @@ func doFrontBuildingTest(t *testing.T, mock sqlmock.Sqlmock, expectOut string) {
 		WillReturnRows(sqlmock.NewRows([]string{"id", "name", "abbreviation", "position", "hidden"}).
 			AddRows([]driver.Value{1, "Main", "main", 1, false}))
 
-	mock.ExpectPrepare(`SELECT \* FROM v_front_page_posts_with_file ORDER BY id DESC LIMIT 15`).ExpectQuery().WillReturnRows(
+	mock.ExpectPrepare(`SELECT id, message_raw, dir, filename, op_id FROM v_front_page_posts_with_file ORDER BY id DESC LIMIT 15`).ExpectQuery().WillReturnRows(
 		sqlmock.NewRows([]string{"posts.id", "posts.message_raw", "dir", "filename", "op.id"}).
 			AddRows(
 				[]driver.Value{1, "message_raw", "test", "filename", 1},

From 0c48086ba04ea9fb07c1393425447d9436fe6955 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:33:11 -0800
Subject: [PATCH 068/122] Add config option for enabling/disabling cyclical
 thread creation

---
 pkg/config/config.go   | 1 +
 pkg/config/defaults.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 650dc544..189297d2 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -321,6 +321,7 @@ type PostConfig struct {
 	RepliesOnBoardPage       int
 	StickyRepliesOnBoardPage int
 	NewThreadsRequireUpload  bool
+	EnableCyclicThreads      bool
 	CyclicalThreadNumPosts   int
 
 	BanColors        []string
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index 404e2af2..847ec063 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -48,6 +48,7 @@ var (
 				ThreadsPerPage:           20,
 				RepliesOnBoardPage:       3,
 				StickyRepliesOnBoardPage: 1,
+				EnableCyclicThreads:      true,
 				CyclicalThreadNumPosts:   500,
 				BanMessage:               "USER WAS BANNED FOR THIS POST",
 				EmbedWidth:               200,

From 17fa8470c499217e2c60bf6183c219179f8fb0a4 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:33:43 -0800
Subject: [PATCH 069/122] Check if cyclical threads are enabled

---
 pkg/gcsql/posts.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 189e4bfb..11c71370 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -491,7 +491,11 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 	if err = rows.Close(); err != nil {
 		return nil, err
 	}
-	cyclicalThreadMaxPosts := config.GetBoardConfig(posts[0].Dir).CyclicalThreadNumPosts
+	boardCfg := config.GetBoardConfig(posts[0].Dir)
+	if !boardCfg.EnableCyclicThreads {
+		return nil, nil
+	}
+	cyclicalThreadMaxPosts := boardCfg.CyclicalThreadNumPosts
 	if cyclicalThreadMaxPosts < 1 {
 		// no limit set
 		return nil, nil

From 2af46eb9bea9e98c7d2fec787b7a8b5af77e249c Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 12 Jan 2025 21:30:23 -0800
Subject: [PATCH 070/122] Add some post tests

---
 pkg/gcsql/posts_test.go | 149 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 pkg/gcsql/posts_test.go

diff --git a/pkg/gcsql/posts_test.go b/pkg/gcsql/posts_test.go
new file mode 100644
index 00000000..82fdf8e3
--- /dev/null
+++ b/pkg/gcsql/posts_test.go
@@ -0,0 +1,149 @@
+package gcsql
+
+import (
+	"testing"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	insertIntoThreadsBase     = `INSERT INTO threads \(board_id, locked, stickied, anchored, cyclical\) VALUES `
+	insertIntoThreadsMySQL    = insertIntoThreadsBase + `\(\?,\?,\?,\?,\?\)`
+	insertIntoThreadsPostgres = insertIntoThreadsBase + `\(\$1,\$2,\$3,\$4,\$5\)`
+
+	insertIntoPostsBase = `INSERT INTO posts\s*` +
+		`\(thread_id, is_top_post, ip, created_on, name, tripcode, is_role_signature, email, subject,\s+` +
+		`message, message_raw, password, flag, country\)\s+VALUES`
+	insertIntoPostsMySQL    = insertIntoPostsBase + `\(\?,\?,INET6_ATON\(\?\),CURRENT_TIMESTAMP,\?,\?,\?,\?,\?,\?,\?,\?,\?,\?\)`
+	insertIntoPostsPostgres = insertIntoPostsBase + `\(\$1,\$2,\$3,CURRENT_TIMESTAMP,\$4,\$5,\$6,\$7,\$8,\$9,\$10,\$11,\$12,\$13\)`
+)
+
+func setupPostTest(t *testing.T, driver string) sqlmock.Sqlmock {
+	t.Helper()
+	_, err := testutil.GoToGochanRoot(t)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	config.SetVersion("4.0.0")
+	config.SetTestDBConfig(driver, "localhost", "gochan", "gochan", "gochan", "")
+
+	gcdb, err := setupDBConn(setupSqlTestConfig(driver, "gochan", ""))
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	var mock sqlmock.Sqlmock
+	gcdb.db, mock, err = sqlmock.New()
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	if !assert.NoError(t, SetTestingDB(driver, "gochan", "", gcdb.db)) {
+		t.FailNow()
+	}
+	if !assert.NoError(t, setupAndProvisionMockDB(t, mock, driver, "gochan")) {
+		t.FailNow()
+	}
+	return mock
+}
+
+func createThreadTestRun(t *testing.T, driver string) {
+	mock := setupPostTest(t, driver)
+	var query string
+	if driver == "mysql" {
+		query = `SELECT locked FROM boards WHERE id = \?`
+	} else {
+		query = `SELECT locked FROM boards WHERE id = \$1`
+	}
+	mock.ExpectPrepare(query).ExpectQuery().
+		WithArgs(1).WillReturnRows(mock.NewRows([]string{"locked"}).AddRow(false))
+
+	if driver == "mysql" {
+		query = insertIntoThreadsMySQL
+	} else {
+		query = insertIntoThreadsPostgres
+	}
+	mock.ExpectPrepare(query).
+		ExpectExec().WithArgs(1, false, false, false, false).WillReturnResult(sqlmock.NewResult(1, 1))
+
+	mock.ExpectPrepare(`SELECT MAX\(id\) FROM threads`).ExpectQuery().
+		WillReturnRows(mock.NewRows([]string{"MAX(id)"}).AddRow(1))
+
+	mock.ExpectBegin()
+	if driver == "mysql" {
+		query = `SELECT locked FROM threads WHERE id = \?`
+	} else {
+		query = `SELECT locked FROM threads WHERE id = \$1`
+	}
+	mock.ExpectPrepare(query).ExpectQuery().
+		WithArgs(1).WillReturnRows(mock.NewRows([]string{"locked"}).AddRow(false))
+
+	threadID, err := CreateThread(nil, 1, false, false, false, false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	p := Post{ThreadID: threadID, Message: "test", IP: "192.168.56.1", IsTopPost: true}
+
+	if driver == "mysql" {
+		query = insertIntoPostsMySQL
+	} else {
+		query = insertIntoPostsPostgres
+	}
+	mock.ExpectPrepare(query).
+		ExpectExec().WithArgs(p.ThreadID, p.IsTopPost, p.IP, "", p.Name, false, "", "", "test", "",
+		"", "", "").WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectPrepare(`SELECT MAX\(id\) FROM posts`).ExpectQuery().WithoutArgs().
+		WillReturnRows(mock.NewRows([]string{"MAX(id)"}).AddRow(1))
+	if driver == "mysql" {
+		query = `UPDATE threads SET last_bump = CURRENT_TIMESTAMP WHERE id = \?`
+	} else {
+		query = `UPDATE threads SET last_bump = CURRENT_TIMESTAMP WHERE id = \$1`
+	}
+	mock.ExpectPrepare(query).ExpectExec().
+		WithArgs(threadID).WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectCommit()
+	if !assert.NoError(t, p.Insert(true, 1, false, false, false, false)) {
+		t.FailNow()
+	}
+	assert.NoError(t, mock.ExpectationsWereMet())
+}
+
+func TestCreateThread(t *testing.T) {
+	for _, driver := range []string{"mysql", "postgres", "sqlite3"} {
+		t.Run(driver, func(t *testing.T) {
+			createThreadTestRun(t, driver)
+		})
+	}
+}
+
+func TestWebPath(t *testing.T) {
+	var query string
+	for _, driver := range []string{"mysql", "postgres", "sqlite3"} {
+		post := Post{ID: 1, IsTopPost: true}
+		t.Run(driver, func(t *testing.T) {
+			mock := setupPostTest(t, driver)
+			if driver == "mysql" {
+				query = `SELECT op_id, dir FROM v_top_post_board_dir WHERE id = \?`
+			} else {
+				query = `SELECT op_id, dir FROM v_top_post_board_dir WHERE id = \$1`
+			}
+			mock.ExpectPrepare(query).ExpectQuery().WithArgs(1).
+				WillReturnRows(mock.NewRows([]string{"op_id", "dir"}).AddRow(1, "test"))
+			assert.Equal(t, "/test/res/1.html#1", post.WebPath())
+			assert.Equal(t, 1, post.opID)
+			assert.Equal(t, "test", post.boardDir)
+			assert.Equal(t, "/test/res/1.html#1", post.WebPath())
+			assert.NoError(t, mock.ExpectationsWereMet())
+
+			post.opID = 0
+			post.boardDir = ""
+			mock.ExpectPrepare(query).ExpectQuery().WithArgs(1).
+				WillReturnRows(mock.NewRows([]string{"op_id", "dir"}).AddRow(1, "test")).
+				WillReturnError(ErrBoardDoesNotExist)
+			assert.Equal(t, "/", post.WebPath())
+			assert.NoError(t, mock.ExpectationsWereMet())
+		})
+	}
+}

From 72afa2ac83d6198f1a5c59024e135dd7a2b02d65 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 18 Jan 2025 12:58:03 -0800
Subject: [PATCH 071/122] Hide options box if cyclical threads aren't enabled

---
 templates/postbox.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/postbox.html b/templates/postbox.html
index 91acd6ab..8f4243d5 100644
--- a/templates/postbox.html
+++ b/templates/postbox.html
@@ -31,10 +31,11 @@
 			</tr>
 			{{- end -}}
 			{{with $.op}}{{else -}}
-			<tr id="threadoptions" {{if eq $.boardConfig.CyclicalThreadNumPosts 0}}style="display: none;"{{end}}>
+			{{$noCyclicalThreads := or (eq $.boardConfig.CyclicalThreadNumPosts 0) (not $.boardConfig.EnableCyclicThreads)}}
+			<tr id="threadoptions" {{if $noCyclicalThreads}}style="display: none;"{{end}}>
 				<th class="postblock">Options</th>
 				<td>
-					{{if gt $.boardConfig.CyclicalThreadNumPosts 0}}
+					{{if not $noCyclicalThreads}}
 					<label for="cyclical"><input type="checkbox" name="cyclical" id="cyclical"> Cyclical thread</label>
 					{{end}}
 				</td>

From 3c33792284f2e553d649794e9e6cd0d42d1a9d56 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 11:41:11 -0800
Subject: [PATCH 072/122] Add cyclic thread Selenium test

---
 tools/selenium_testing/options.py            |  6 ++++
 tools/selenium_testing/tests/test_posting.py | 34 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/tools/selenium_testing/options.py b/tools/selenium_testing/options.py
index 36f37721..ae26cec1 100644
--- a/tools/selenium_testing/options.py
+++ b/tools/selenium_testing/options.py
@@ -18,6 +18,8 @@ default_post_password = "12345"
 default_board1 = "test"
 default_board2 = "test2"
 default_staff_board = "selenium"
+default_cyclical_board = "cyclicaltest"
+default_cyclical_count = 5
 default_admin_username = "selenium_admin"
 default_admin_password = "password"
 default_moderator_username = "selenium_moderator"
@@ -35,6 +37,8 @@ class TestingOptions:
 	board1: str
 	board2: str
 	staff_board: str
+	cyclical_board: str
+	cyclical_count: int
 	name: str
 	email: str
 	subject: str
@@ -65,6 +69,8 @@ class TestingOptions:
 		options.board1 = src_dict.get("board1", default_board1)
 		options.board2 = src_dict.get("board2", default_board2)
 		options.staff_board = src_dict.get("staff_board", default_staff_board)
+		options.cyclical_board = src_dict.get("cyclical_board", default_cyclical_board)
+		options.cyclical_count = src_dict.get("cyclical_count", default_cyclical_count)
 		options.name = src_dict.get("name", default_name)
 		options.email = src_dict.get("email", default_email)
 		options.subject = src_dict.get("subject", default_subject)
diff --git a/tools/selenium_testing/tests/test_posting.py b/tools/selenium_testing/tests/test_posting.py
index a1a5233b..eef6fad0 100644
--- a/tools/selenium_testing/tests/test_posting.py
+++ b/tools/selenium_testing/tests/test_posting.py
@@ -94,3 +94,37 @@ class TestPosting(SeleniumTestCase):
 		WebDriverWait(self.driver, 10).until(EC.url_changes(cur_url))
 		self.assertNotIn("Error :c", self.driver.title, "No errors when we try to delete the moved thread")
 
+	def test_cyclical(self):
+		self.assertTrue(self.options.board_exists(self.options.cyclical_board), f"Confirming that /{self.options.cyclical_board}/ exists")
+
+		self.options.goto_page(self.options.cyclical_board)
+		WebDriverWait(self.driver, 10).until(
+			EC.element_to_be_clickable((By.CSS_SELECTOR, "form#postform input[type=submit]")))
+		form = self.driver.find_element(by=By.CSS_SELECTOR, value="form#postform")
+		send_post(form,
+			self.options.name,
+			"noko",
+			"Cyclical thread test",
+			"Cyclical thread OP",
+			path.abspath(self.options.upload_path),
+			self.options.post_password)
+		WebDriverWait(self.driver, 10).until(EC.url_matches(threadRE))
+
+		for r in range(self.options.cyclical_count + 2):
+			form = self.driver.find_element(by=By.CSS_SELECTOR, value="form#postform")
+			send_post(form,
+				self.options.name,
+				"noko",
+				"",
+				f"Reply {r+1}",
+				path.abspath(self.options.upload_path),
+				self.options.post_password)
+			WebDriverWait(self.driver, 10).until(EC.url_matches(threadRE))
+
+		# go to the thread and make sure that the first two replies are pruned
+		cur_url = self.driver.current_url
+		threadID = threadRE.findall(cur_url)[0][1]
+		replies = self.driver.find_elements(by=By.CSS_SELECTOR, value="div.reply")
+		self.assertEqual(len(replies), self.options.cyclical_count, "Verify that the cyclical thread has the correct number of replies")
+		self.assertEqual(replies[0].find_element(by=By.CSS_SELECTOR, value="div.post-text").text, "3", "Verify that the first reply is the third post")
+		delete_post(self.options, int(threadID), self.options.post_password)

From 09c059edd2c0db69c86ceaad6dff47a1f20ea3e5 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 11:58:18 -0800
Subject: [PATCH 073/122] Change naming convention from cyclical to cyclic, as
 the latter is more acurate

---
 README.md                                    |   3 +-
 html/static/{cyclical.png => cyclic.png}     | Bin
 html/static/{cyclical.svg => cyclic.svg}     |   4 +--
 pkg/building/posts.go                        |   6 ++--
 pkg/config/config.go                         |   2 +-
 pkg/config/defaults.go                       |   2 +-
 pkg/gcsql/boards.go                          |   2 +-
 pkg/gcsql/posts.go                           |  36 +++++++++----------
 pkg/gcsql/tables.go                          |   2 +-
 pkg/gcsql/threads.go                         |  16 ++++-----
 pkg/manage/actionsModPerm.go                 |  12 +++----
 pkg/posting/post.go                          |  20 +++++------
 templates/manage_threadattrs.html            |   4 +--
 templates/post.html                          |   2 +-
 templates/postbox.html                       |   8 ++---
 tools/selenium_testing/options.py            |  12 +++----
 tools/selenium_testing/tests/test_posting.py |  14 ++++----
 17 files changed, 72 insertions(+), 73 deletions(-)
 rename html/static/{cyclical.png => cyclic.png} (100%)
 rename html/static/{cyclical.svg => cyclic.svg} (97%)

diff --git a/README.md b/README.md
index 90f00c94..f627cdac 100644
--- a/README.md
+++ b/README.md
@@ -60,11 +60,10 @@ See [`frontend/README.md`](frontend/README.md) for information on working with S
 ## Roadmap
 
 ### Near future
-* Fully implement cyclical threads
 * Implement +50
 * Add more banners
 * Add more plugin support (more event triggers)
 
 ### Lower priority
 * RSS feeds from boards/specific threads/specific usernames+tripcodes (such as newsanon)
-* Pinning a post within a thread even if its not the OP, to prevent its deletion in a cyclical thread.
+* Pinning a post within a thread even if its not the OP, to prevent its deletion in a cyclic thread.
diff --git a/html/static/cyclical.png b/html/static/cyclic.png
similarity index 100%
rename from html/static/cyclical.png
rename to html/static/cyclic.png
diff --git a/html/static/cyclical.svg b/html/static/cyclic.svg
similarity index 97%
rename from html/static/cyclical.svg
rename to html/static/cyclic.svg
index 183c0670..4dc4f328 100644
--- a/html/static/cyclical.svg
+++ b/html/static/cyclic.svg
@@ -7,11 +7,11 @@
    viewBox="0 0 120 120"
    version="1.1"
    id="svg5"
-   inkscape:export-filename="cyclical.png"
+   inkscape:export-filename="cyclic.png"
    inkscape:export-xdpi="12.8"
    inkscape:export-ydpi="12.8"
    inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
-   sodipodi:docname="cyclical.svg"
+   sodipodi:docname="cyclic.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
diff --git a/pkg/building/posts.go b/pkg/building/posts.go
index 08a620f9..b32a7528 100644
--- a/pkg/building/posts.go
+++ b/pkg/building/posts.go
@@ -99,8 +99,8 @@ func (p *Post) Stickied() bool {
 	return p.thread.Stickied
 }
 
-func (p *Post) Cyclical() bool {
-	return p.thread.Cyclical
+func (p *Post) Cyclic() bool {
+	return p.thread.Cyclic
 }
 
 // Select all from v_building_posts (and queries with the same columns) and call the callback function on each Post
@@ -131,7 +131,7 @@ func QueryPosts(query string, params []any, cb func(*Post) error) error {
 			&post.LastModified, &post.ParentID, &lastBump, &post.Message, &post.MessageRaw, &post.BoardID,
 			&post.BoardDir, &post.OriginalFilename, &post.Filename, &post.Checksum, &post.Filesize,
 			&post.ThumbnailWidth, &post.ThumbnailHeight, &post.UploadWidth, &post.UploadHeight,
-			&post.thread.Locked, &post.thread.Stickied, &post.thread.Cyclical, &post.Country.Flag, &post.Country.Name,
+			&post.thread.Locked, &post.thread.Stickied, &post.thread.Cyclic, &post.Country.Flag, &post.Country.Name,
 			&post.IsDeleted)
 
 		if err = rows.Scan(dest...); err != nil {
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 189297d2..f823b669 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -322,7 +322,7 @@ type PostConfig struct {
 	StickyRepliesOnBoardPage int
 	NewThreadsRequireUpload  bool
 	EnableCyclicThreads      bool
-	CyclicalThreadNumPosts   int
+	CyclicThreadNumPosts     int
 
 	BanColors        []string
 	BanMessage       string
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index 847ec063..bf68eb91 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -49,7 +49,7 @@ var (
 				RepliesOnBoardPage:       3,
 				StickyRepliesOnBoardPage: 1,
 				EnableCyclicThreads:      true,
-				CyclicalThreadNumPosts:   500,
+				CyclicThreadNumPosts:     500,
 				BanMessage:               "USER WAS BANNED FOR THIS POST",
 				EmbedWidth:               200,
 				EmbedHeight:              164,
diff --git a/pkg/gcsql/boards.go b/pkg/gcsql/boards.go
index 3404a386..744a29d2 100644
--- a/pkg/gcsql/boards.go
+++ b/pkg/gcsql/boards.go
@@ -415,7 +415,7 @@ func (board *Board) GetThreads(onlyNotDeleted bool, orderLastByBump bool, sticki
 		var thread Thread
 		err = rows.Scan(
 			&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored,
-			&thread.Cyclical, &thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
+			&thread.Cyclic, &thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 		)
 		if err != nil {
 			return threads, err
diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index 11c71370..a8493d97 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -337,14 +337,14 @@ func (p *Post) UnlinkUploads(leaveDeletedBox bool) error {
 	return err
 }
 
-// InCyclicalThread returns true if the post is in a cyclical thread
-func (p *Post) InCyclicalThread() (bool, error) {
-	var cyclical bool
-	err := QueryRowTimeoutSQL(nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
+// InCyclicThread returns true if the post is in a cyclic thread
+func (p *Post) InCyclicThread() (bool, error) {
+	var cyclic bool
+	err := QueryRowTimeoutSQL(nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclic})
 	if errors.Is(err, sql.ErrNoRows) {
 		return false, ErrThreadDoesNotExist
 	}
-	return cyclical, err
+	return cyclic, err
 }
 
 // Delete sets the post as deleted and sets the deleted_at timestamp to the current time
@@ -442,8 +442,8 @@ func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool,
 	return tx.Commit()
 }
 
-// CyclicalThreadPost represents a post that should be deleted in a cyclical thread
-type CyclicalThreadPost struct {
+// CyclicThreadPost represents a post that should be deleted in a cyclic thread
+type CyclicThreadPost struct {
 	PostID    int    // sql: post_id
 	ThreadID  int    // sql: thread_id
 	OPID      int    // sql: op_id
@@ -452,8 +452,8 @@ type CyclicalThreadPost struct {
 	Dir       string // sql: dir
 }
 
-// CyclicalPostsToBePruned returns posts that should be deleted in a cyclical thread that has reached its board's post limit
-func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
+// CyclicPostsToBePruned returns posts that should be deleted in a cyclic thread that has reached its board's post limit
+func (p *Post) CyclicPostsToBePruned() ([]CyclicThreadPost, error) {
 	if p.IsTopPost {
 		// don't prune if this is the OP
 		return nil, nil
@@ -461,8 +461,8 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
 	defer cancel()
 
-	var cyclical bool
-	err := QueryRowContextSQL(ctx, nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclical})
+	var cyclic bool
+	err := QueryRowContextSQL(ctx, nil, "SELECT cyclical FROM DBPREFIXthreads WHERE id = ?", []any{p.ThreadID}, []any{&cyclic})
 	if errors.Is(err, sql.ErrNoRows) {
 		err = ErrThreadDoesNotExist
 	}
@@ -470,7 +470,7 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 		return nil, err
 	}
 
-	if !cyclical {
+	if !cyclic {
 		return nil, nil
 	}
 
@@ -480,9 +480,9 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 		return nil, err
 	}
 	defer rows.Close()
-	var posts []CyclicalThreadPost
+	var posts []CyclicThreadPost
 	for rows.Next() {
-		var post CyclicalThreadPost
+		var post CyclicThreadPost
 		if err = rows.Scan(&post.PostID, &post.ThreadID, &post.OPID, &post.Filename, &post.Dir); err != nil {
 			return nil, err
 		}
@@ -495,17 +495,17 @@ func (p *Post) CyclicalPostsToBePruned() ([]CyclicalThreadPost, error) {
 	if !boardCfg.EnableCyclicThreads {
 		return nil, nil
 	}
-	cyclicalThreadMaxPosts := boardCfg.CyclicalThreadNumPosts
-	if cyclicalThreadMaxPosts < 1 {
+	cyclicThreadMaxPosts := boardCfg.CyclicThreadNumPosts
+	if cyclicThreadMaxPosts < 1 {
 		// no limit set
 		return nil, nil
 	}
 
-	if len(posts) == 0 || len(posts) < cyclicalThreadMaxPosts {
+	if len(posts) == 0 || len(posts) < cyclicThreadMaxPosts {
 		return nil, nil
 	}
 
-	return posts[:len(posts)-cyclicalThreadMaxPosts], nil
+	return posts[:len(posts)-cyclicThreadMaxPosts], nil
 }
 
 func (p *Post) WebPath() string {
diff --git a/pkg/gcsql/tables.go b/pkg/gcsql/tables.go
index 3c6ae7fb..c0b06a28 100644
--- a/pkg/gcsql/tables.go
+++ b/pkg/gcsql/tables.go
@@ -272,7 +272,7 @@ type Thread struct {
 	Locked    bool      // sql: locked
 	Stickied  bool      // sql: stickied
 	Anchored  bool      // sql: anchored
-	Cyclical  bool      // sql: cyclical
+	Cyclic    bool      // sql: cyclical
 	LastBump  time.Time // sql: last_bump
 	DeletedAt time.Time // sql: deleted_at
 	IsDeleted bool      // sql: is_deleted
diff --git a/pkg/gcsql/threads.go b/pkg/gcsql/threads.go
index 4796e4dc..ae02a980 100644
--- a/pkg/gcsql/threads.go
+++ b/pkg/gcsql/threads.go
@@ -21,7 +21,7 @@ var (
 )
 
 // CreateThread creates a new thread in the database with the given board ID and statuses
-func CreateThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) (threadID int, err error) {
+func CreateThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored bool, cyclic bool) (threadID int, err error) {
 	const lockedQuery = `SELECT locked FROM DBPREFIXboards WHERE id = ?`
 	const insertQuery = `INSERT INTO DBPREFIXthreads (board_id, locked, stickied, anchored, cyclical) VALUES (?,?,?,?,?)`
 	var boardIsLocked bool
@@ -31,7 +31,7 @@ func CreateThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored
 	if boardIsLocked {
 		return 0, ErrBoardIsLocked
 	}
-	if _, err = ExecTxSQL(tx, insertQuery, boardID, locked, stickied, anchored, cyclical); err != nil {
+	if _, err = ExecTxSQL(tx, insertQuery, boardID, locked, stickied, anchored, cyclic); err != nil {
 		return 0, err
 	}
 	return threadID, QueryRowTxSQL(tx, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
@@ -42,7 +42,7 @@ func GetThread(threadID int) (*Thread, error) {
 	const query = selectThreadsBaseSQL + `WHERE id = ?`
 	thread := new(Thread)
 	err := QueryRowSQL(query, []any{threadID}, []any{
-		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclical,
+		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclic,
 		&thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 	})
 	return thread, err
@@ -53,7 +53,7 @@ func GetPostThread(opID int) (*Thread, error) {
 	const query = selectThreadsBaseSQL + `WHERE id = (SELECT thread_id FROM DBPREFIXposts WHERE id = ? LIMIT 1)`
 	thread := new(Thread)
 	err := QueryRowSQL(query, []any{opID}, []any{
-		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclical,
+		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclic,
 		&thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 	})
 	if errors.Is(err, sql.ErrNoRows) {
@@ -91,7 +91,7 @@ func GetThreadsWithBoardID(boardID int, onlyNotDeleted bool) ([]Thread, error) {
 		var thread Thread
 		if err = rows.Scan(
 			&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored,
-			&thread.Cyclical, &thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
+			&thread.Cyclic, &thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 		); err != nil {
 			return threads, err
 		}
@@ -207,7 +207,7 @@ func (t *Thread) GetUploads() ([]Upload, error) {
 }
 
 // UpdateAttribute updates the given attribute (valid attribute values are "locked", "stickied, "anchored",
-// or "cyclical") for the thread
+// or "cyclic") for the thread
 func (t *Thread) UpdateAttribute(attribute string, value bool) error {
 	updateSQL := "UPDATE DBPREFIXthreads SET "
 	switch attribute {
@@ -217,8 +217,8 @@ func (t *Thread) UpdateAttribute(attribute string, value bool) error {
 		t.Stickied = value
 	case "anchored":
 		t.Anchored = value
-	case "cyclical":
-		t.Cyclical = value
+	case "cyclic":
+		t.Cyclic = value
 	default:
 		return fmt.Errorf("invalid thread attribute %q", attribute)
 	}
diff --git a/pkg/manage/actionsModPerm.go b/pkg/manage/actionsModPerm.go
index f0da8d2b..75331ca9 100644
--- a/pkg/manage/actionsModPerm.go
+++ b/pkg/manage/actionsModPerm.go
@@ -534,14 +534,14 @@ func threadAttrsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.
 			attr = "anchored"
 			newVal = true
 			doChange = thread.Anchored != newVal
-		} else if request.FormValue("uncyclical") != "" {
-			attr = "cyclical"
+		} else if request.FormValue("uncyclic") != "" {
+			attr = "cyclic"
 			newVal = false
-			doChange = thread.Cyclical != newVal
-		} else if request.FormValue("cyclical") != "" {
-			attr = "cyclical"
+			doChange = thread.Cyclic != newVal
+		} else if request.FormValue("cyclic") != "" {
+			attr = "cyclic"
 			newVal = true
-			doChange = thread.Cyclical != newVal
+			doChange = thread.Cyclic != newVal
 		}
 
 		if attr != "" && doChange {
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index f5c757b5..714019d0 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -333,10 +333,10 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 		}
 	}
 
-	isCyclical := request.PostFormValue("cyclical") == "on"
-	if isCyclical && boardConfig.CyclicalThreadNumPosts == 0 {
+	isCyclic := request.PostFormValue("cyclic") == "on"
+	if isCyclic && boardConfig.CyclicThreadNumPosts == 0 {
 		writer.WriteHeader(http.StatusBadRequest)
-		server.ServeError(writer, "Board does not support cyclical threads", wantsJSON, nil)
+		server.ServeError(writer, "Board does not support cyclic threads", wantsJSON, nil)
 		return
 	}
 
@@ -431,7 +431,7 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 		return
 	}
 	_, emailCommand := getEmailAndCommand(request)
-	if err = post.Insert(emailCommand != "sage", board.ID, isLocked, isSticky, false, isCyclical); err != nil {
+	if err = post.Insert(emailCommand != "sage", board.ID, isLocked, isSticky, false, isCyclic); err != nil {
 		errEv.Err(err).Caller().
 			Str("sql", "postInsertion").
 			Msg("Unable to insert post")
@@ -488,15 +488,15 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 	}
 
 	if !post.IsTopPost {
-		toBePruned, err := post.CyclicalPostsToBePruned()
+		toBePruned, err := post.CyclicPostsToBePruned()
 		if err != nil {
-			errEv.Err(err).Caller().Msg("Unable to get posts to be pruned from cyclical thread")
-			server.ServeError(writer, "Unable to get cyclical thread info", wantsJSON, nil)
+			errEv.Err(err).Caller().Msg("Unable to get posts to be pruned from cyclic thread")
+			server.ServeError(writer, "Unable to get cyclic thread info", wantsJSON, nil)
 			return
 		}
 		gcutil.LogInt("toBePruned", len(toBePruned), infoEv, errEv)
 
-		// prune posts from cyclical thread
+		// prune posts from cyclic thread
 		for _, prunePost := range toBePruned {
 			fmt.Printf("%#v\n", prunePost)
 			p := &gcsql.Post{ID: prunePost.PostID, ThreadID: prunePost.ThreadID}
@@ -504,8 +504,8 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 			if err = p.Delete(); err != nil {
 				errEv.Err(err).Caller().
 					Int("postID", prunePost.PostID).
-					Msg("Unable to prune post from cyclical thread")
-				server.ServeError(writer, "Unable to prune post from cyclical thread", wantsJSON, nil)
+					Msg("Unable to prune post from cyclic thread")
+				server.ServeError(writer, "Unable to prune post from cyclic thread", wantsJSON, nil)
 				return
 			}
 			if prunePost.Filename != "" && prunePost.Filename != "deleted" {
diff --git a/templates/manage_threadattrs.html b/templates/manage_threadattrs.html
index e1e9d99c..ba8c7d66 100644
--- a/templates/manage_threadattrs.html
+++ b/templates/manage_threadattrs.html
@@ -48,8 +48,8 @@
 		<td><input type="submit" name="{{if $.thread.Anchored}}unanchor{{else}}anchor{{end}}" value="{{if $.thread.Anchored}}Anchored{{else}}Not anchored{{end}}" /></td>
 	</tr>
 	<tr>
-		<th>Cyclical</th>
-		<td><input type="submit" name="{{if $.thread.Cyclical}}uncyclical{{else}}cyclical{{end}}" value="{{if $.thread.Cyclical}}Cyclical{{else}}Not cyclical{{end}}" /></td>
+		<th>Cyclic</th>
+		<td><input type="submit" name="{{if $.thread.Cyclic}}uncyclic{{else}}cyclic{{end}}" value="{{if $.thread.Cyclic}}Cyclic{{else}}Not cyclic{{end}}" /></td>
 	</tr>
 </table>
 </form>
diff --git a/templates/post.html b/templates/post.html
index 670cbc4b..3dcbbacc 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -20,7 +20,7 @@
 <span class="status-icons">
 	{{- if $.thread.Locked}}<img src="{{webPath `/static/lock.png`}}" class="locked-icon" alt="Thread locked" title="Thread locked">{{end -}}
 	{{- if $.thread.Stickied}}<img src="{{webPath `/static/sticky.png`}}" class="sticky-icon" alt="Sticky" title="Sticky">{{end -}}
-	{{- if $.thread.Cyclical}}<img src="{{webPath `/static/cyclical.png`}}" class="cyclical-icon" alt="Cyclical thread" title="Cyclical thread">{{end -}}
+	{{- if $.thread.Cyclic}}<img src="{{webPath `/static/cyclic.png`}}" class="cyclic-icon" alt="Cyclic thread" title="Cyclic thread">{{end -}}
 </span>
 {{if $.is_board_page -}}
 [<a href="{{.post.ThreadPath}}">View</a>]
diff --git a/templates/postbox.html b/templates/postbox.html
index 8f4243d5..e13a3a4d 100644
--- a/templates/postbox.html
+++ b/templates/postbox.html
@@ -31,12 +31,12 @@
 			</tr>
 			{{- end -}}
 			{{with $.op}}{{else -}}
-			{{$noCyclicalThreads := or (eq $.boardConfig.CyclicalThreadNumPosts 0) (not $.boardConfig.EnableCyclicThreads)}}
-			<tr id="threadoptions" {{if $noCyclicalThreads}}style="display: none;"{{end}}>
+			{{$noCyclicThreads := or (eq $.boardConfig.CyclicThreadNumPosts 0) (not $.boardConfig.EnableCyclicThreads)}}
+			<tr id="threadoptions" {{if $noCyclicThreads}}style="display: none;"{{end}}>
 				<th class="postblock">Options</th>
 				<td>
-					{{if not $noCyclicalThreads}}
-					<label for="cyclical"><input type="checkbox" name="cyclical" id="cyclical"> Cyclical thread</label>
+					{{if not $noCyclicThreads}}
+					<label for="cyclic"><input type="checkbox" name="cyclic" id="cyclic"> Cyclic thread</label>
 					{{end}}
 				</td>
 			</tr>{{end}}
diff --git a/tools/selenium_testing/options.py b/tools/selenium_testing/options.py
index ae26cec1..35a14687 100644
--- a/tools/selenium_testing/options.py
+++ b/tools/selenium_testing/options.py
@@ -18,8 +18,8 @@ default_post_password = "12345"
 default_board1 = "test"
 default_board2 = "test2"
 default_staff_board = "selenium"
-default_cyclical_board = "cyclicaltest"
-default_cyclical_count = 5
+default_cyclic_board = "cyclictest"
+default_cyclic_count = 5
 default_admin_username = "selenium_admin"
 default_admin_password = "password"
 default_moderator_username = "selenium_moderator"
@@ -37,8 +37,8 @@ class TestingOptions:
 	board1: str
 	board2: str
 	staff_board: str
-	cyclical_board: str
-	cyclical_count: int
+	cyclic_board: str
+	cyclic_count: int
 	name: str
 	email: str
 	subject: str
@@ -69,8 +69,8 @@ class TestingOptions:
 		options.board1 = src_dict.get("board1", default_board1)
 		options.board2 = src_dict.get("board2", default_board2)
 		options.staff_board = src_dict.get("staff_board", default_staff_board)
-		options.cyclical_board = src_dict.get("cyclical_board", default_cyclical_board)
-		options.cyclical_count = src_dict.get("cyclical_count", default_cyclical_count)
+		options.cyclic_board = src_dict.get("cyclic_board", default_cyclic_board)
+		options.cyclic_count = src_dict.get("cyclic_count", default_cyclic_count)
 		options.name = src_dict.get("name", default_name)
 		options.email = src_dict.get("email", default_email)
 		options.subject = src_dict.get("subject", default_subject)
diff --git a/tools/selenium_testing/tests/test_posting.py b/tools/selenium_testing/tests/test_posting.py
index eef6fad0..d1be2f8c 100644
--- a/tools/selenium_testing/tests/test_posting.py
+++ b/tools/selenium_testing/tests/test_posting.py
@@ -94,23 +94,23 @@ class TestPosting(SeleniumTestCase):
 		WebDriverWait(self.driver, 10).until(EC.url_changes(cur_url))
 		self.assertNotIn("Error :c", self.driver.title, "No errors when we try to delete the moved thread")
 
-	def test_cyclical(self):
-		self.assertTrue(self.options.board_exists(self.options.cyclical_board), f"Confirming that /{self.options.cyclical_board}/ exists")
+	def test_cyclic(self):
+		self.assertTrue(self.options.board_exists(self.options.cyclic_board), f"Confirming that /{self.options.cyclic_board}/ exists")
 
-		self.options.goto_page(self.options.cyclical_board)
+		self.options.goto_page(self.options.cyclic_board)
 		WebDriverWait(self.driver, 10).until(
 			EC.element_to_be_clickable((By.CSS_SELECTOR, "form#postform input[type=submit]")))
 		form = self.driver.find_element(by=By.CSS_SELECTOR, value="form#postform")
 		send_post(form,
 			self.options.name,
 			"noko",
-			"Cyclical thread test",
-			"Cyclical thread OP",
+			"Cyclic thread test",
+			"Cyclic thread OP",
 			path.abspath(self.options.upload_path),
 			self.options.post_password)
 		WebDriverWait(self.driver, 10).until(EC.url_matches(threadRE))
 
-		for r in range(self.options.cyclical_count + 2):
+		for r in range(self.options.cyclic_count + 2):
 			form = self.driver.find_element(by=By.CSS_SELECTOR, value="form#postform")
 			send_post(form,
 				self.options.name,
@@ -125,6 +125,6 @@ class TestPosting(SeleniumTestCase):
 		cur_url = self.driver.current_url
 		threadID = threadRE.findall(cur_url)[0][1]
 		replies = self.driver.find_elements(by=By.CSS_SELECTOR, value="div.reply")
-		self.assertEqual(len(replies), self.options.cyclical_count, "Verify that the cyclical thread has the correct number of replies")
+		self.assertEqual(len(replies), self.options.cyclic_count, "Verify that the cyclic thread has the correct number of replies")
 		self.assertEqual(replies[0].find_element(by=By.CSS_SELECTOR, value="div.post-text").text, "3", "Verify that the first reply is the third post")
 		delete_post(self.options, int(threadID), self.options.post_password)

From 6fee340532c6b230b97730322d284c506d3544cc Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:06:50 -0800
Subject: [PATCH 074/122] Fix failing test cases

---
 pkg/gctemplates/templatetests/templatecases_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/gctemplates/templatetests/templatecases_test.go b/pkg/gctemplates/templatetests/templatecases_test.go
index 25f233bb..3206fcbe 100644
--- a/pkg/gctemplates/templatetests/templatecases_test.go
+++ b/pkg/gctemplates/templatetests/templatecases_test.go
@@ -472,7 +472,7 @@ const (
 		`<tr><th class="postblock">Message</th><td><textarea rows="5" cols="35" name="postmsg" id="postmsg"></textarea></td></tr>` +
 		`<tr><th class="postblock">File</th><td><input name="imagefile" type="file" accept="image/jpeg,image/png,image/gif,video/webm,video/mp4">` +
 		`<input type="checkbox" id="spoiler" name="spoiler"/><label for="spoiler">Spoiler</label></td></tr>` +
-		`<tr id="threadoptions" style="display:none;"><th class="postblock">Options</th><td></td></tr>` +
+		`<tr id="threadoptions"style="display: none;"><th class="postblock">Options</th><td></td></tr>` +
 		`<tr><th class="postblock">Password</th><td><input type="password" id="postpassword" name="postpassword" size="14" />(for post/file deletion)</td></tr></table>` +
 		`<input type="password" name="dummy2" style="display:none"/></form></div><hr />`
 )

From 88f645e017c8ce19e9bc232809262397374aadda Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:12:31 -0800
Subject: [PATCH 075/122] Fix Selenium cyclic thread test

---
 tools/selenium_testing/tests/test_posting.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/selenium_testing/tests/test_posting.py b/tools/selenium_testing/tests/test_posting.py
index d1be2f8c..12d6264d 100644
--- a/tools/selenium_testing/tests/test_posting.py
+++ b/tools/selenium_testing/tests/test_posting.py
@@ -101,6 +101,7 @@ class TestPosting(SeleniumTestCase):
 		WebDriverWait(self.driver, 10).until(
 			EC.element_to_be_clickable((By.CSS_SELECTOR, "form#postform input[type=submit]")))
 		form = self.driver.find_element(by=By.CSS_SELECTOR, value="form#postform")
+		form.find_element(by=By.NAME, value="cyclic").click()
 		send_post(form,
 			self.options.name,
 			"noko",
@@ -126,5 +127,5 @@ class TestPosting(SeleniumTestCase):
 		threadID = threadRE.findall(cur_url)[0][1]
 		replies = self.driver.find_elements(by=By.CSS_SELECTOR, value="div.reply")
 		self.assertEqual(len(replies), self.options.cyclic_count, "Verify that the cyclic thread has the correct number of replies")
-		self.assertEqual(replies[0].find_element(by=By.CSS_SELECTOR, value="div.post-text").text, "3", "Verify that the first reply is the third post")
+		self.assertEqual(replies[0].find_element(by=By.CSS_SELECTOR, value="div.post-text").text, "Reply 3", "Verify that the first reply is the third post")
 		delete_post(self.options, int(threadID), self.options.post_password)

From 07cf2e58bc12187320abc4f5ee18a1a20b2602a1 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:18:05 -0800
Subject: [PATCH 076/122] Add clarification to failing cyclic test message

---
 tools/selenium_testing/tests/test_posting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/selenium_testing/tests/test_posting.py b/tools/selenium_testing/tests/test_posting.py
index 12d6264d..73aad076 100644
--- a/tools/selenium_testing/tests/test_posting.py
+++ b/tools/selenium_testing/tests/test_posting.py
@@ -126,6 +126,6 @@ class TestPosting(SeleniumTestCase):
 		cur_url = self.driver.current_url
 		threadID = threadRE.findall(cur_url)[0][1]
 		replies = self.driver.find_elements(by=By.CSS_SELECTOR, value="div.reply")
-		self.assertEqual(len(replies), self.options.cyclic_count, "Verify that the cyclic thread has the correct number of replies")
+		self.assertEqual(len(replies), self.options.cyclic_count, f"Verify that the cyclic thread has the correct number of replies (CyclicThreadNumPosts in /{self.options.cyclic_board}/board.json must be set to {self.options.cyclic_count})")
 		self.assertEqual(replies[0].find_element(by=By.CSS_SELECTOR, value="div.post-text").text, "Reply 3", "Verify that the first reply is the third post")
 		delete_post(self.options, int(threadID), self.options.post_password)

From 1463bbaa63c6b790ee0978791a3db8c82f2ddf0d Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 12:27:24 -0800
Subject: [PATCH 077/122] Update post handler, use EnableCyclicThreads instead
 of CyclicThreadNumPosts for validation

---
 pkg/posting/post.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 714019d0..8bb0a483 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -334,7 +334,7 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 	}
 
 	isCyclic := request.PostFormValue("cyclic") == "on"
-	if isCyclic && boardConfig.CyclicThreadNumPosts == 0 {
+	if isCyclic && !boardConfig.EnableCyclicThreads {
 		writer.WriteHeader(http.StatusBadRequest)
 		server.ServeError(writer, "Board does not support cyclic threads", wantsJSON, nil)
 		return

From e2b5883e514f1f014b309aae84fa0b7a16151952 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 15:04:03 -0800
Subject: [PATCH 078/122] Start implementing in-place migration for pre2021

---
 cmd/gochan-migration/internal/pre2021/boards.go       | 6 ++++--
 cmd/gochan-migration/internal/pre2021/boards_test.go  | 2 +-
 cmd/gochan-migration/internal/pre2021/pre2021_test.go | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index b16b2981..3f203021 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -22,8 +22,10 @@ type migrationSection struct {
 }
 
 func (m *Pre2021Migrator) migrateSectionsInPlace() error {
-	err := common.NewMigrationError("pre2021", "migrateSectionsInPlace not implemented")
-	common.LogError().Err(err).Caller().Msg("Failed to migrate sections")
+	_, err := m.db.ExecSQL(`ALTER TABLE DBPREFIXsections RENAME COLUMN list_order TO position`)
+	if err != nil {
+		common.LogError().Caller().Msg("Failed to rename list_order column to position")
+	}
 	return err
 }
 
diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
index 2f06e282..dcb78e1d 100644
--- a/cmd/gochan-migration/internal/pre2021/boards_test.go
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -73,7 +73,7 @@ func TestMigrateBoardsInPlace(t *testing.T) {
 		t.FailNow()
 	}
 
-	if !assert.Error(t, migrator.MigrateBoards(), "Not yet implemented") {
+	if !assert.NoError(t, migrator.MigrateBoards()) {
 		t.FailNow()
 	}
 }
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index 02e23733..3ab74379 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -50,8 +50,8 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 		}
 		assert.NoError(t, oldDbFile.Close())
 		assert.NoError(t, newDbFile.Close())
-		migratedDBHost = dbHost
-		migratedDBName = dbName
+		dbHost = migratedDBHost
+		dbName = migratedDBName
 	}
 
 	oldSQLConfig := config.SQLConfig{

From baa4a10389e3fd3e8131fd6b612c3b80f023fad4 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 21:16:16 -0800
Subject: [PATCH 079/122] Add option to increase line height

---
 LICENSE                   |  2 +-
 frontend/sass/global.scss | 36 ++++++++++++++++++++----------------
 frontend/ts/settings.ts   | 13 ++++++++++++-
 html/css/global.css       |  4 ++++
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/LICENSE b/LICENSE
index 007de94e..d05f0774 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2024, Gochan development group
+Copyright (c) 2013-2025, Gochan development group
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/frontend/sass/global.scss b/frontend/sass/global.scss
index 1fcd8c6e..339ebd48 100644
--- a/frontend/sass/global.scss
+++ b/frontend/sass/global.scss
@@ -6,20 +6,24 @@
 @import "global/watcher";
 @import 'global/bans';
 
+.increase-line-height {
+	line-height: 1.5;
+}
+
 header {
-	margin-top:50px;
-	text-align:center;
+	margin-top: 50px;
+	text-align: center;
 	h1 {
 		margin: 0px;
 	}
 }
 
 div#topbar {
-	left:0;
-	position:fixed;
-	top:0;
-	width:100%;
-	margin-top:0px;
+	left: 0;
+	position: fixed;
+	top: 0;
+	width: 100%;
+	margin-top: 0px;
 
 	* {
 		padding: 4px;
@@ -63,15 +67,15 @@ div#staffmenu {
 div.section-block {
 	margin-bottom: 8px;
 	div.section-title-block {
-		display:block;
-		padding:4px 8px 4px 8px;
+		display: block;
+		padding: 4px 8px 4px 8px;
 	}
 	div.section-body {
 		overflow-y: hidden;
 		margin-right: 0px;
 		margin-bottom:8px;
 		min-height: 48px;
-		padding:8px;
+		padding: 8px;
 	}
 }
 
@@ -81,12 +85,12 @@ div.section-block {
 }
 
 #footer {
-	bottom:0px;
-	clear:both;
-	left:0px;
-	position:static;
-	text-align:center;
-	width:100%;
+	bottom: 0px;
+	clear: both;
+	left: 0px;
+	position: static;
+	text-align: center;
+	width: 100%;
 }
 
 select.post-actions {
diff --git a/frontend/ts/settings.ts b/frontend/ts/settings.ts
index 190f8927..26ef4961 100755
--- a/frontend/ts/settings.ts
+++ b/frontend/ts/settings.ts
@@ -107,6 +107,7 @@ interface MinMax {
 	min?: number;
 	max?: number;
 }
+
 class NumberSetting extends Setting<number, HTMLInputElement> {
 	constructor(key: string, title: string, defaultVal = 0, minMax: MinMax = {min: null, max: null}, onSave?:()=>any) {
 		super(key, title, defaultVal, onSave);
@@ -205,6 +206,15 @@ export function setTheme() {
 		else
 			themeElem.setAttribute("href", path.join(webroot ?? "/", "css", style));
 	}
+	setLineHeight();
+}
+
+function setLineHeight() {
+	if(getBooleanStorageVal("increaselineheight", false)) {
+		document.body.classList.add("increase-line-height");
+	} else {
+		document.body.classList.remove("increase-line-height");
+	}
 }
 
 /**
@@ -249,16 +259,17 @@ $(() => {
 		}
 	}) as Setting);
 	settings.set("pintopbar", new BooleanSetting("pintopbar", "Pin top bar", true, initTopBar));
+	settings.set("increaselineheight", new BooleanSetting("increaselineheight", "Increase line height", false, setLineHeight));
 	settings.set("enableposthover", new BooleanSetting("enableposthover", "Preview post on hover", true, initPostPreviews));
 	settings.set("enablepostclick", new BooleanSetting("enablepostclick", "Preview post on click", true, initPostPreviews));
 	settings.set("useqr", new BooleanSetting("useqr", "Use Quick Reply box", true, () => {
 		if(getBooleanStorageVal("useqr", true)) initQR();
 		else closeQR();
 	}));
+	settings.set("persistentqr", new BooleanSetting("persistentqr", "Persistent Quick Reply", false));
 	settings.set("watcherseconds", new NumberSetting("watcherseconds", "Check watched threads every # seconds", 15, {
 		min: 2
 	}, initWatcher));
-	settings.set("persistentqr", new BooleanSetting("persistentqr", "Persistent Quick Reply", false));
 	settings.set("newuploader", new BooleanSetting("newuploader", "Use new upload element", true, updateBrowseButton));
 
 	settings.set("customjs", new TextSetting("customjs", "Custom JavaScript", ""));
diff --git a/html/css/global.css b/html/css/global.css
index ada31b9b..e2da2500 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -597,6 +597,10 @@ img#banpage-image {
   margin: 4px 8px 8px 4px;
 }
 
+.increase-line-height {
+  line-height: 1.5;
+}
+
 header {
   margin-top: 50px;
   text-align: center;

From 3dc6f3494e2161894a4b7c598fa0748d62f8d336 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 22:40:13 -0800
Subject: [PATCH 080/122] Adjust theme colors

---
 examples/configs/gochan.example.json |  3 +++
 frontend/sass/_util.scss             | 12 +++++++++
 frontend/sass/_yotsubacommon.scss    |  4 ++-
 frontend/sass/burichan.scss          | 26 ++++++++++++-------
 frontend/sass/burichan/_img.scss     | 16 +++++++-----
 frontend/sass/dark.scss              |  5 ----
 html/css/burichan.css                | 39 +++++++++++++++++++++-------
 html/css/yotsuba.css                 | 10 +++++++
 html/css/yotsubab.css                | 10 +++++++
 9 files changed, 92 insertions(+), 33 deletions(-)

diff --git a/examples/configs/gochan.example.json b/examples/configs/gochan.example.json
index b07c1972..9107fd21 100644
--- a/examples/configs/gochan.example.json
+++ b/examples/configs/gochan.example.json
@@ -91,6 +91,9 @@
 		"somemod:blue"
 	],
 	"BanMessage": "USER WAS BANNED FOR THIS POST",
+
+	"EnableCyclicThreads": true,
+	"CyclicThreadNumPosts": 500,
 	"EnableEmbeds": true,
 	"EnableNoFlag": true,
 	"EmbedWidth": 200,
diff --git a/frontend/sass/_util.scss b/frontend/sass/_util.scss
index 3cff3e41..f42e5333 100644
--- a/frontend/sass/_util.scss
+++ b/frontend/sass/_util.scss
@@ -18,4 +18,16 @@
 	-ms-border-radius: $properties;
 	-webkit-border-radius: $properties;
 	border-radius: $properties;
+}
+
+@mixin upload-box($bg, $a, $a-visited) {
+	div#upload-box {
+		background: $bg;
+		a {
+			color: $a;
+		}
+		a:hover, a:target, a:focus {
+			color: $a-visited;
+		}
+	}
 }
\ No newline at end of file
diff --git a/frontend/sass/_yotsubacommon.scss b/frontend/sass/_yotsubacommon.scss
index a959ce59..3fee917b 100644
--- a/frontend/sass/_yotsubacommon.scss
+++ b/frontend/sass/_yotsubacommon.scss
@@ -1,4 +1,4 @@
-
+@import 'util';
 
 @mixin yotsuba(
 	$fadepath,
@@ -101,4 +101,6 @@
 		color: $subjectcol;
 		font-weight: 700;
 	}
+
+	@include upload-box(#aaa, #444, #666);
 }
\ No newline at end of file
diff --git a/frontend/sass/burichan.scss b/frontend/sass/burichan.scss
index c2e504a2..a1b6d7af 100644
--- a/frontend/sass/burichan.scss
+++ b/frontend/sass/burichan.scss
@@ -36,8 +36,7 @@ h3 {
 	font-size: medium;
 }
 
-h1,h2 {
-	// background:#D6DAF0;
+h1, h2 {
 	font-family: $hfont-family;
 }
 
@@ -47,21 +46,28 @@ h1, h2, h3 {
 }
 
 div#topbar {
-	// @include box-shadow(3px 3px 5px 6px $shadowcol);
 	@include shadow-filter(3px 5px 6px $shadowcol);
-	height: 30px;
+	min-height: 1.5em;
 }
 
 div#topbar,
-.topbar-item,
-.topbar-item:visited,
+a.topbar-item,
+a.topbar-item:visited,
 .dropdown-button,
-.dropdown-menu/* ,
-.dropdown-menu a  */{
-	background: #000A89;
+div.dropdown-menu {
+	background: #080e5e;
 	color: $bgcol;
 }
 
+div.dropdown-menu a,
+div.dropdown-menu a:visited {
+	color: $bgcol;
+}
+
+a.topbar-item:hover, a.topbar-item:active {
+	background: #0a127b;
+}
+
 div#footer {
-	font-size: 8pt;
+	font-size: 0.75em;
 }
\ No newline at end of file
diff --git a/frontend/sass/burichan/_img.scss b/frontend/sass/burichan/_img.scss
index be894261..1d9af926 100644
--- a/frontend/sass/burichan/_img.scss
+++ b/frontend/sass/burichan/_img.scss
@@ -3,7 +3,7 @@
 
 h1#board-title {
 	font-family: serif;
-	font-size: 24pt;
+	font-size: 2em;
 	color: $headercol;
 }
 
@@ -12,15 +12,15 @@ h1#board-title {
 }
 
 div.file-info {
-	font-size:12px;
-	font-family:sans-serif;
+	font-size: 1em;
+	font-family: sans-serif;
 }
 
 span.postername {
-	font-size:12px;
-	font-family:serif;
+	font-size: 1em;
+	font-family: serif;
 	color: $namecol;
-	font-weight:800;
+	font-weight: 800;
 }
 
 div.reply,
@@ -34,4 +34,6 @@ select.post-actions,
 div.postprev,
 div.inlinepostprev {
 	border: 1px solid $bordercol;
-}
\ No newline at end of file
+}
+
+@include upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/dark.scss b/frontend/sass/dark.scss
index 00bc411c..8c0185ce 100644
--- a/frontend/sass/dark.scss
+++ b/frontend/sass/dark.scss
@@ -25,7 +25,6 @@ header {
 }
 
 div#content {
-	// input:not([type=submit]):not([type=button]),
 	input:not(div#qrbuttons input),
 	textarea, select {
 		background: $inputbg;
@@ -41,10 +40,6 @@ th.postblock, table.mgmt-table tr:first-of-type th {
 	text-align: left;
 }
 
-// select.post-actions {
-// 	color: $color;
-// }
-
 div.reply,
 div.postprev,
 div.inlinepostprev {
diff --git a/html/css/burichan.css b/html/css/burichan.css
index 47f20708..a22e1235 100644
--- a/html/css/burichan.css
+++ b/html/css/burichan.css
@@ -1,6 +1,6 @@
 h1#board-title {
   font-family: serif;
-  font-size: 24pt;
+  font-size: 2em;
   color: #AF0A0F;
 }
 
@@ -9,12 +9,12 @@ h1#board-title {
 }
 
 div.file-info {
-  font-size: 12px;
+  font-size: 1em;
   font-family: sans-serif;
 }
 
 span.postername {
-  font-size: 12px;
+  font-size: 1em;
   font-family: serif;
   color: #117743;
   font-weight: 800;
@@ -33,6 +33,16 @@ div.inlinepostprev {
   border: 1px solid #9295a4;
 }
 
+div#upload-box {
+  background: #aaa;
+}
+div#upload-box a {
+  color: #444;
+}
+div#upload-box a:hover, div#upload-box a:target, div#upload-box a:focus {
+  color: #666;
+}
+
 #site-title {
   font-family: sans-serif;
   padding-top: 88px;
@@ -114,18 +124,27 @@ h1, h2, h3 {
 div#topbar {
   -webkit-filter: drop-shadow(3px 5px 6px #555555);
   filter: drop-shadow(3px 5px 6px #555555);
-  height: 30px;
+  min-height: 1.5em;
 }
 
 div#topbar,
-.topbar-item,
-.topbar-item:visited,
+a.topbar-item,
+a.topbar-item:visited,
 .dropdown-button,
-.dropdown-menu {
-  background: #000A89;
+div.dropdown-menu {
+  background: #080e5e;
   color: #EEF2FF;
 }
 
-div#footer {
-  font-size: 8pt;
+div.dropdown-menu a,
+div.dropdown-menu a:visited {
+  color: #EEF2FF;
+}
+
+a.topbar-item:hover, a.topbar-item:active {
+  background: #0a127b;
+}
+
+div#footer {
+  font-size: 0.75em;
 }
diff --git a/html/css/yotsuba.css b/html/css/yotsuba.css
index 193bd3c4..37cb8bf8 100644
--- a/html/css/yotsuba.css
+++ b/html/css/yotsuba.css
@@ -93,3 +93,13 @@ span.subject {
   color: #CC1105;
   font-weight: 700;
 }
+
+div#upload-box {
+  background: #aaa;
+}
+div#upload-box a {
+  color: #444;
+}
+div#upload-box a:hover, div#upload-box a:target, div#upload-box a:focus {
+  color: #666;
+}
diff --git a/html/css/yotsubab.css b/html/css/yotsubab.css
index b8952f4f..80793e16 100644
--- a/html/css/yotsubab.css
+++ b/html/css/yotsubab.css
@@ -93,3 +93,13 @@ span.subject {
   color: #0F0C5D;
   font-weight: 700;
 }
+
+div#upload-box {
+  background: #aaa;
+}
+div#upload-box a {
+  color: #444;
+}
+div#upload-box a:hover, div#upload-box a:target, div#upload-box a:focus {
+  color: #666;
+}

From d48cec2f2be38d62fb22bce93577d086dad5a4e0 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 19 Jan 2025 23:49:01 -0800
Subject: [PATCH 081/122] More CSS style adjustments

---
 frontend/sass/bunkerchan.scss    | 12 +++++++++++-
 frontend/sass/burichan.scss      | 13 ++++++++-----
 frontend/sass/burichan/_img.scss |  1 +
 frontend/sass/clear.scss         |  6 ++++--
 frontend/sass/dark.scss          |  9 ++++++++-
 frontend/sass/photon.scss        |  4 +++-
 html/css/bunkerchan.css          | 12 +++++++++++-
 html/css/burichan.css            | 13 +++++++++----
 html/css/clear.css               | 12 +++++++++++-
 html/css/dark.css                |  8 +++++++-
 html/css/photon.css              | 10 ++++++++++
 11 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/frontend/sass/bunkerchan.scss b/frontend/sass/bunkerchan.scss
index c26b5447..73dde2d3 100644
--- a/frontend/sass/bunkerchan.scss
+++ b/frontend/sass/bunkerchan.scss
@@ -30,11 +30,21 @@ div#staff, select.post-actions {
 
 div#topbar,
 div#topbar a,
-div#topbar a:visited {
+div#topbar a:visited,
+div.dropdown-menu {
 	background: $topbarbg;
 	border-bottom: 1px solid $topborder;
 }
 
+div.dropdown-menu {
+	border-left: 1px solid $topborder;
+	border-right: 1px solid $topborder;
+}
+
+div.dropdown-menu a:hover, div.dropdown-menu a:active {
+	background: $bgcol;
+}
+
 table#pages, table#pages * {
 	border: none;
 }
\ No newline at end of file
diff --git a/frontend/sass/burichan.scss b/frontend/sass/burichan.scss
index a1b6d7af..871c8774 100644
--- a/frontend/sass/burichan.scss
+++ b/frontend/sass/burichan.scss
@@ -32,7 +32,6 @@ h2 a {
 
 h3 {
 	margin: 0px;
-	text-align: center;
 	font-size: medium;
 }
 
@@ -59,12 +58,16 @@ div.dropdown-menu {
 	color: $bgcol;
 }
 
-div.dropdown-menu a,
-div.dropdown-menu a:visited {
-	color: $bgcol;
+div.dropdown-menu {
+	@include shadow-filter(3px 5px 6px $shadowcol);
+	a, h3 {
+		color: $bgcol;
+	}
 }
 
-a.topbar-item:hover, a.topbar-item:active {
+a.topbar-item:hover,
+a.topbar-item:active,
+div.dropdown-menu a:hover {
 	background: #0a127b;
 }
 
diff --git a/frontend/sass/burichan/_img.scss b/frontend/sass/burichan/_img.scss
index 1d9af926..32a20350 100644
--- a/frontend/sass/burichan/_img.scss
+++ b/frontend/sass/burichan/_img.scss
@@ -31,6 +31,7 @@ div.inlinepostprev {
 }
 
 select.post-actions,
+div.reply,
 div.postprev,
 div.inlinepostprev {
 	border: 1px solid $bordercol;
diff --git a/frontend/sass/clear.scss b/frontend/sass/clear.scss
index 84fb9d5d..356b173f 100644
--- a/frontend/sass/clear.scss
+++ b/frontend/sass/clear.scss
@@ -64,7 +64,7 @@ table.mgmt-table tr:first-of-type th {
 }
 
 span.subject {
-	font-weight: bold;
+	font-weight: 800;
 	color: $subjectcol;
 }
 
@@ -75,4 +75,6 @@ table#pages, table#pages * {
 div.section-title-block {
 	background: #A7A7A7;
 	border-bottom: 1px solid $replyborder;
-}
\ No newline at end of file
+}
+
+@include upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/dark.scss b/frontend/sass/dark.scss
index 8c0185ce..c28c2078 100644
--- a/frontend/sass/dark.scss
+++ b/frontend/sass/dark.scss
@@ -4,7 +4,7 @@ body {
 	background: $bgcol;
 	font-family: $font-family;
 	color: $color;
-	font-size: 80%;
+	// font-size: 80%;
 }
 
 a {
@@ -60,6 +60,13 @@ span.tripcode {
 	color: $headercol;
 }
 
+.dropdown-menu {
+	background: $topbarbg!important;
+	b {
+		color: black;
+	}
+}
+
 span.subject {
 	color: $subjectcol;
 }
diff --git a/frontend/sass/photon.scss b/frontend/sass/photon.scss
index c4dfa7d1..18a16682 100644
--- a/frontend/sass/photon.scss
+++ b/frontend/sass/photon.scss
@@ -37,4 +37,6 @@ header, div#top-pane, a {
 
 #site-title, #board-title {
 	font-weight: 800;
-}
\ No newline at end of file
+}
+
+@include upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/html/css/bunkerchan.css b/html/css/bunkerchan.css
index edd4f384..783c27c4 100644
--- a/html/css/bunkerchan.css
+++ b/html/css/bunkerchan.css
@@ -83,11 +83,21 @@ div#staff, select.post-actions {
 
 div#topbar,
 div#topbar a,
-div#topbar a:visited {
+div#topbar a:visited,
+div.dropdown-menu {
   background: #151515;
   border-bottom: 1px solid #B0790A;
 }
 
+div.dropdown-menu {
+  border-left: 1px solid #B0790A;
+  border-right: 1px solid #B0790A;
+}
+
+div.dropdown-menu a:hover, div.dropdown-menu a:active {
+  background: #1D1F21;
+}
+
 table#pages, table#pages * {
   border: none;
 }
diff --git a/html/css/burichan.css b/html/css/burichan.css
index a22e1235..66ab6993 100644
--- a/html/css/burichan.css
+++ b/html/css/burichan.css
@@ -28,6 +28,7 @@ div.inlinepostprev {
 }
 
 select.post-actions,
+div.reply,
 div.postprev,
 div.inlinepostprev {
   border: 1px solid #9295a4;
@@ -108,7 +109,6 @@ h2 a {
 
 h3 {
   margin: 0px;
-  text-align: center;
   font-size: medium;
 }
 
@@ -136,12 +136,17 @@ div.dropdown-menu {
   color: #EEF2FF;
 }
 
-div.dropdown-menu a,
-div.dropdown-menu a:visited {
+div.dropdown-menu {
+  -webkit-filter: drop-shadow(3px 5px 6px #555555);
+  filter: drop-shadow(3px 5px 6px #555555);
+}
+div.dropdown-menu a, div.dropdown-menu h3 {
   color: #EEF2FF;
 }
 
-a.topbar-item:hover, a.topbar-item:active {
+a.topbar-item:hover,
+a.topbar-item:active,
+div.dropdown-menu a:hover {
   background: #0a127b;
 }
 
diff --git a/html/css/clear.css b/html/css/clear.css
index a6e38551..a86e763a 100644
--- a/html/css/clear.css
+++ b/html/css/clear.css
@@ -59,7 +59,7 @@ table.mgmt-table tr:first-of-type th {
 }
 
 span.subject {
-  font-weight: bold;
+  font-weight: 800;
   color: #34ED3A;
 }
 
@@ -71,3 +71,13 @@ div.section-title-block {
   background: #A7A7A7;
   border-bottom: 1px solid #117743;
 }
+
+div#upload-box {
+  background: #aaa;
+}
+div#upload-box a {
+  color: #444;
+}
+div#upload-box a:hover, div#upload-box a:target, div#upload-box a:focus {
+  color: #666;
+}
diff --git a/html/css/dark.css b/html/css/dark.css
index 3cb99307..c634ba95 100644
--- a/html/css/dark.css
+++ b/html/css/dark.css
@@ -2,7 +2,6 @@ body {
   background: #1E1E1E;
   font-family: sans-serif;
   color: #999;
-  font-size: 80%;
 }
 
 a {
@@ -56,6 +55,13 @@ span.tripcode {
   color: #32DD72;
 }
 
+.dropdown-menu {
+  background: #666 !important;
+}
+.dropdown-menu b {
+  color: black;
+}
+
 span.subject {
   color: #446655;
 }
diff --git a/html/css/photon.css b/html/css/photon.css
index edc67205..d727af11 100644
--- a/html/css/photon.css
+++ b/html/css/photon.css
@@ -65,3 +65,13 @@ header, div#top-pane, a {
 #site-title, #board-title {
   font-weight: 800;
 }
+
+div#upload-box {
+  background: #aaa;
+}
+div#upload-box a {
+  color: #444;
+}
+div#upload-box a:hover, div#upload-box a:target, div#upload-box a:focus {
+  color: #666;
+}

From 65d4dee6734b7a7281ff2c73b00dfb710ddaf287 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 25 Jan 2025 11:41:26 -0800
Subject: [PATCH 082/122] Add alter statements for in-place board migration

---
 .../internal/pre2021/boards.go                | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 3f203021..6398c8c0 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -10,6 +10,28 @@ import (
 	"github.com/rs/zerolog"
 )
 
+var (
+	alterStatements = []string{
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN section TO section_id",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN list_order TO navbar_position",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN created_on TO created_at",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN anonymous TO anonymous_name",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN forced_anon TO force_anonymous",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN embeds_allowed TO allow_embeds",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN uri VARCHAR(45) NOT NULL",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN min_message_length SMALLINT NOT NULL",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN max_threads SMALLINT NOT NULL",
+		"ALTER TABLE DBPREFIXboards DROP COLUMN type",
+		"ALTER TABLE DBPREFIXboards DROP COLUMN upload_type",
+		"ALTER TABLE DBPREFIXboards DROP COLUMN max_age",
+		// the following statements don't work in SQLite since it doesn't support adding foreign keys after table creation.
+		// "in-place" migration support for SQLite may be removed
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_section_id_fk FOREIGN KEY (section_id) REFERENCES DBPREFIXsections(id)",
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
+	}
+)
+
 type migrationBoard struct {
 	oldSectionID int
 	oldID        int

From 12350cc33f631392d9d7b0710d497ca38ad346be Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 25 Jan 2025 13:01:52 -0800
Subject: [PATCH 083/122] Add warning when migrating a SQLite database in-place

---
 cmd/gochan-migration/main.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/gochan-migration/main.go b/cmd/gochan-migration/main.go
index e9941f73..78c287e1 100644
--- a/cmd/gochan-migration/main.go
+++ b/cmd/gochan-migration/main.go
@@ -95,8 +95,14 @@ func main() {
 		Msg("Starting database migration")
 
 	config.InitConfig(versionStr)
+	sqlCfg := config.GetSQLConfig()
+	if migratingInPlace && sqlCfg.DBtype == "sqlite3" && !updateDB {
+		common.LogWarning().
+			Str("dbType", sqlCfg.DBtype).
+			Bool("migrateInPlace", migratingInPlace).
+			Msg("SQLite has limitations with table column changes")
+	}
 	if !migratingInPlace {
-		sqlCfg := config.GetSQLConfig()
 		err = gcsql.ConnectToDB(&sqlCfg)
 		if err != nil {
 			fatalEv.Err(err).Caller().Msg("Failed to connect to the database")

From cec68cb29beb961a95344b8efd75bbb6ffe382a8 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 25 Jan 2025 13:34:33 -0800
Subject: [PATCH 084/122] Implement in-place board migration

---
 .../internal/pre2021/boards.go                | 41 ++++++++-----------
 .../internal/pre2021/boards_test.go           | 11 +++++
 .../internal/pre2021/queries.go               | 19 +++++++++
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 6398c8c0..5c4ef912 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -10,28 +10,6 @@ import (
 	"github.com/rs/zerolog"
 )
 
-var (
-	alterStatements = []string{
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN section TO section_id",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN list_order TO navbar_position",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN created_on TO created_at",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN anonymous TO anonymous_name",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN forced_anon TO force_anonymous",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN embeds_allowed TO allow_embeds",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN uri VARCHAR(45) NOT NULL",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN min_message_length SMALLINT NOT NULL",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN max_threads SMALLINT NOT NULL",
-		"ALTER TABLE DBPREFIXboards DROP COLUMN type",
-		"ALTER TABLE DBPREFIXboards DROP COLUMN upload_type",
-		"ALTER TABLE DBPREFIXboards DROP COLUMN max_age",
-		// the following statements don't work in SQLite since it doesn't support adding foreign keys after table creation.
-		// "in-place" migration support for SQLite may be removed
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_section_id_fk FOREIGN KEY (section_id) REFERENCES DBPREFIXsections(id)",
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
-	}
-)
-
 type migrationBoard struct {
 	oldSectionID int
 	oldID        int
@@ -59,9 +37,22 @@ func (m *Pre2021Migrator) migrateBoardsInPlace() error {
 		errEv.Err(err).Caller().Msg("Failed to migrate sections")
 		return err
 	}
-	err = common.NewMigrationError("pre2021", "migrateBoardsInPlace not implemented")
-	errEv.Err(err).Caller().Msg("Failed to migrate boards")
-	return err
+
+	for _, statement := range alterStatements {
+		if strings.Contains(statement, "CONSTRAINT") && m.db.SQLDriver() == "sqlite3" {
+			// skip constraints in SQLite since they can't be added after table creation
+			continue
+		}
+		_, err = m.db.ExecSQL(statement)
+		if err != nil {
+			errEv.Err(err).Caller().
+				Str("statement", statement).
+				Msg("Failed to execute alter statement")
+			return err
+		}
+	}
+
+	return nil
 }
 
 func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
index dcb78e1d..13909f74 100644
--- a/cmd/gochan-migration/internal/pre2021/boards_test.go
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -1,7 +1,9 @@
 package pre2021
 
 import (
+	"context"
 	"testing"
+	"time"
 
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/stretchr/testify/assert"
@@ -76,4 +78,13 @@ func TestMigrateBoardsInPlace(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateBoards()) {
 		t.FailNow()
 	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(migrator.config.DBTimeoutSeconds))
+	defer cancel()
+	var uri string
+	var sectionID int
+	assert.NoError(t, migrator.db.QueryRowContextSQL(ctx, nil, "SELECT uri FROM DBPREFIXboards WHERE dir = ?", []any{"test"}, []any{&uri}))
+	assert.NoError(t, migrator.db.QueryRowContextSQL(ctx, nil, "SELECT section_id FROM DBPREFIXboards WHERE dir = ?", []any{"test"}, []any{&sectionID}))
+	assert.Equal(t, "", uri)
+	assert.Greater(t, sectionID, 0)
 }
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index b8fbbc68..bb12f15b 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -21,3 +21,22 @@ timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FR
 
 	announcementsQuery = "SELECT id, subject, message, poster, timestamp FROM DBPREFIXannouncements"
 )
+
+var (
+	alterStatements = []string{
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN section TO section_id",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN list_order TO navbar_position",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN created_on TO created_at",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN anonymous TO anonymous_name",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN forced_anon TO force_anonymous",
+		"ALTER TABLE DBPREFIXboards RENAME COLUMN embeds_allowed TO allow_embeds",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN uri VARCHAR(45) NOT NULL DEFAULT ''",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN min_message_length SMALLINT NOT NULL DEFAULT 0",
+		"ALTER TABLE DBPREFIXboards ADD COLUMN max_threads SMALLINT NOT NULL DEFAULT 65535",
+		// the following statements don't work in SQLite since it doesn't support adding foreign keys after table creation.
+		// "in-place" migration support for SQLite may be removed
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_section_id_fk FOREIGN KEY (section_id) REFERENCES DBPREFIXsections(id)",
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
+		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
+	}
+)

From f0f0f055da1fda420d47cdb81afcbf3da292a105 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 25 Jan 2025 17:46:55 -0800
Subject: [PATCH 085/122] Add post migration in place

---
 .../internal/pre2021/boards.go                |   2 +-
 .../internal/pre2021/posts.go                 | 152 +++++++++++++++++-
 .../internal/pre2021/posts_test.go            |  29 ++++
 .../internal/pre2021/pre2021_test.go          |  15 +-
 .../internal/pre2021/queries.go               |  15 +-
 .../internal/pre2021/staff.go                 |   4 +-
 6 files changed, 210 insertions(+), 7 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 5c4ef912..ce1f2e83 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -38,7 +38,7 @@ func (m *Pre2021Migrator) migrateBoardsInPlace() error {
 		return err
 	}
 
-	for _, statement := range alterStatements {
+	for _, statement := range boardAlterStatements {
 		if strings.Contains(statement, "CONSTRAINT") && m.db.SQLDriver() == "sqlite3" {
 			// skip constraints in SQLite since they can't be added after table creation
 			continue
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 1f786a3b..ea8b8f96 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -3,6 +3,8 @@ package pre2021
 import (
 	"context"
 	"database/sql"
+	"os"
+	"strings"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
@@ -195,5 +197,153 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 }
 
 func (m *Pre2021Migrator) migratePostsInPlace() error {
-	return common.NewMigrationError("pre2021", "not yet implemented")
+	errEv := common.LogError()
+	defer errEv.Discard()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(m.config.DBTimeoutSeconds))
+	defer cancel()
+
+	ba, err := os.ReadFile(gcutil.FindResource("sql/initdb_" + m.db.SQLDriver() + ".sql"))
+	if err != nil {
+		errEv.Err(err).Caller().
+			Msg("Failed to read initdb SQL file")
+		return err
+	}
+	statements := strings.Split(string(ba), ";")
+	for _, statement := range statements {
+		statement = strings.TrimSpace(statement)
+		if strings.HasPrefix(statement, "CREATE TABLE DBPREFIXthreads") || strings.HasPrefix(statement, "CREATE TABLE DBPREFIXfiles") {
+			if _, err = m.db.ExecContextSQL(ctx, nil, statement); err != nil {
+				errEv.Err(err).Caller().Msg("Failed to create threads table")
+				return err
+			}
+		}
+	}
+
+	rows, err := m.db.QueryContextSQL(ctx, nil, threadsQuery+" AND parentid = 0")
+	if err != nil {
+		errEv.Err(err).Caller().
+			Msg("Failed to get threads")
+		return err
+	}
+	defer rows.Close()
+
+	var threads []migrationPost
+	for rows.Next() {
+		var post migrationPost
+		if err = rows.Scan(
+			&post.ID, &post.oldBoardID, &post.oldParentID, &post.Name, &post.Tripcode, &post.Email,
+			&post.Subject, &post.Message, &post.MessageRaw, &post.Password, &post.filename,
+			&post.filenameOriginal, &post.fileChecksum, &post.filesize, &post.imageW, &post.imageH,
+			&post.thumbW, &post.thumbH, &post.IP, &post.CreatedOn, &post.autosage,
+			&post.bumped, &post.stickied, &post.locked,
+		); err != nil {
+			errEv.Err(err).Caller().
+				Msg("Failed to scan thread")
+			return err
+		}
+		threads = append(threads, post)
+	}
+	if err = rows.Close(); err != nil {
+		errEv.Caller().Msg("Failed to close thread rows")
+		return err
+	}
+
+	for _, statements := range postAlterStatements {
+		if _, err = m.db.ExecContextSQL(ctx, nil, statements); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to alter posts table")
+			return err
+		}
+	}
+
+	switch m.db.SQLDriver() {
+	case "mysql":
+		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new VARBINARY(16) NOT NULL")
+	case "postgres", "postgresql":
+		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new INET NOT NULL")
+	case "sqlite3":
+		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new VARCHAR(45) NOT NULL DEFAULT '0.0.0.0'")
+	}
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to update IP column")
+		return err
+	}
+	if _, err = m.db.ExecContextSQL(ctx, nil, "UPDATE DBPREFIXposts SET ip_new = IP_ATON"); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to update IP column")
+		return err
+	}
+	if _, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts RENAME COLUMN ip TO ip_old"); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to rename old IP column")
+		return err
+	}
+	if _, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts RENAME COLUMN ip_new TO ip"); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to rename new IP column")
+		return err
+	}
+
+	for _, op := range threads {
+		if _, err = m.db.ExecContextSQL(ctx, nil,
+			`INSERT INTO DBPREFIXthreads(board_id,locked,stickied,anchored,cyclical,last_bump,is_deleted) VALUES(?,?,?,?,?,?,?)`,
+			op.oldBoardID, op.locked, op.stickied, op.autosage, false, op.bumped, false,
+		); err != nil {
+			errEv.Err(err).Caller().
+				Int("postID", op.ID).
+				Msg("Failed to insert thread")
+			return err
+		}
+		if err = m.db.QueryRowContextSQL(ctx, nil, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&op.ThreadID}); err != nil {
+			errEv.Err(err).Caller().
+				Int("postID", op.ID).
+				Msg("Failed to get thread ID")
+			return err
+		}
+
+		if _, err = m.db.ExecContextSQL(ctx, nil,
+			"UPDATE DBPREFIXposts SET thread_id = ? WHERE (id = ? and is_top_post) or thread_id = ?", op.ThreadID, op.oldID, op.oldID,
+		); err != nil {
+			errEv.Err(err).Caller().
+				Int("postID", op.ID).
+				Int("threadID", op.ThreadID).
+				Msg("Failed to set thread ID")
+			return err
+		}
+	}
+	if rows, err = m.db.QueryContextSQL(ctx, nil,
+		"SELECT id,filename,filename_original,file_checksum,filesize,image_w,image_h,thumb_w,thumb_h FROM DBPREFIXposts WHERE filename <> ''",
+	); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get uploads")
+		return err
+	}
+	defer rows.Close()
+
+	var uploads []gcsql.Upload
+	for rows.Next() {
+		var upload gcsql.Upload
+		if err = rows.Scan(&upload.PostID, &upload.Filename, &upload.OriginalFilename, &upload.Checksum, &upload.FileSize, &upload.Width,
+			&upload.Height, &upload.ThumbnailWidth, &upload.ThumbnailHeight,
+		); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan upload")
+			return err
+		}
+		uploads = append(uploads, upload)
+	}
+	if err = rows.Close(); err != nil {
+		errEv.Caller().Msg("Failed to close upload rows")
+		return err
+	}
+
+	for _, upload := range uploads {
+		if _, err = m.db.ExecContextSQL(ctx, nil,
+			`INSERT INTO DBPREFIXfiles(post_id,file_order,filename,original_filename,checksum,file_size,width,height,thumbnail_width,thumbnail_height,is_spoilered) VALUES
+			(?,0,?,?,?,?,?,?,?,?,0)`,
+			upload.PostID, upload.Filename, upload.OriginalFilename, upload.Checksum, upload.FileSize, upload.Width, upload.Height,
+			upload.ThumbnailWidth, upload.ThumbnailHeight,
+		); err != nil {
+			errEv.Err(err).Caller().
+				Int("postID", upload.PostID).
+				Msg("Failed to insert upload")
+			return err
+		}
+	}
+
+	return nil
 }
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index d55d8d4e..34f38624 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -49,3 +49,32 @@ func TestMigratePostsToNewDB(t *testing.T) {
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
 	assert.Equal(t, 1, numUploadPosts, "Expected to have 1 upload post")
 }
+
+func TestMigratePostsInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigratePosts()) {
+		t.FailNow()
+	}
+	var numThreads int
+	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numThreads}), "Failed to get number of threads") {
+		t.FailNow()
+	}
+	assert.Equal(t, 2, numThreads, "Expected to have two threads pre-migration")
+
+	var numUploadPosts int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
+	assert.Equal(t, 1, numUploadPosts, "Expected to have 1 upload post")
+
+	var ip string
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT IP_NTOA FROM DBPREFIXposts WHERE id = 1", nil, []any{&ip}))
+	assert.Equal(t, "192.168.56.1", ip, "Expected to have the correct IP address")
+}
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index 3ab74379..338b0c31 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -90,13 +90,24 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 	return migrator
 }
 
-func TestPre2021Migration(t *testing.T) {
+func TestPre2021MigrationToNewDB(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
 		t.FailNow()
 	}
 	migrated, err := migrator.MigrateDB()
-	assert.False(t, migrated)
 	assert.NoError(t, err)
+	assert.False(t, migrated)
+}
+
+func TestPre2021MigrationInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+	migrated, err := migrator.MigrateDB()
+	assert.NoError(t, err)
+	assert.False(t, migrated)
 }
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index bb12f15b..438510ee 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -23,7 +23,7 @@ timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FR
 )
 
 var (
-	alterStatements = []string{
+	boardAlterStatements = []string{
 		"ALTER TABLE DBPREFIXboards RENAME COLUMN section TO section_id",
 		"ALTER TABLE DBPREFIXboards RENAME COLUMN list_order TO navbar_position",
 		"ALTER TABLE DBPREFIXboards RENAME COLUMN created_on TO created_at",
@@ -39,4 +39,17 @@ var (
 		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
 		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
 	}
+	postAlterStatements = []string{
+		"ALTER TABLE DBPREFIXposts RENAME COLUMN parentid TO thread_id",
+		"ALTER TABLE DBPREFIXposts RENAME COLUMN timestamp TO created_on",
+		"ALTER TABLE DBPREFIXposts RENAME COLUMN deleted_timestamp TO deleted_at",
+		// "ALTER TABLE DBPREFIXposts RENAME COLUMN ip TO ip_old",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN is_top_post BOOL NOT NULL DEFAULT FALSE",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN is_role_signature BOOL NOT NULL DEFAULT FALSE",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN is_deleted BOOL NOT NULL DEFAULT FALSE",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN banned_message TEXT",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN flag VARCHAR(45) NOT NULL DEFAULT ''",
+		"ALTER TABLE DBPREFIXposts ADD COLUMN country VARCHAR(80) NOT NULL DEFAULT ''",
+		"UPDATE DBPREFIXposts SET is_top_post = TRUE WHERE thread_id = 0",
+	}
 )
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
index d2fb79df..114bacdb 100644
--- a/cmd/gochan-migration/internal/pre2021/staff.go
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -12,8 +12,8 @@ import (
 )
 
 func (*Pre2021Migrator) migrateStaffInPlace() error {
-	err := common.NewMigrationError("pre2021", "migrateSectionsInPlace not yet implemented")
-	common.LogError().Err(err).Caller().Msg("Failed to migrate sections")
+	err := common.NewMigrationError("pre2021", "migrateStaff not yet implemented")
+	common.LogError().Err(err).Caller().Msg("Failed to migrate staff")
 	return err
 }
 

From d3c985bd508c75e3e68a865d166bd50ec7e3d5a0 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 26 Jan 2025 16:24:45 -0800
Subject: [PATCH 086/122] Implement staff and ban migration in place, and the
 respective tests

---
 cmd/gochan-migration/internal/pre2021/bans.go | 27 ++++++++++-
 .../internal/pre2021/bans_test.go             | 45 +++++++++++++++++++
 .../internal/pre2021/queries.go               |  5 +++
 .../internal/pre2021/staff.go                 | 21 +++++++--
 .../internal/pre2021/staff_test.go            | 17 +++++++
 5 files changed, 110 insertions(+), 5 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index 1fbfdfdb..a7cb25da 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"net"
+	"os"
 	"strings"
 	"time"
 
@@ -38,7 +39,31 @@ type migrationBan struct {
 }
 
 func (m *Pre2021Migrator) migrateBansInPlace() error {
-	return common.NewMigrationError("pre2021", "migrateBansInPlace not yet implemented")
+	errEv := common.LogError()
+	defer errEv.Discard()
+	initSQLPath := gcutil.FindResource("sql/initdb_" + m.db.SQLDriver() + ".sql")
+	ba, err := os.ReadFile(initSQLPath)
+	if err != nil {
+		errEv.Err(err).Caller().
+			Str("initDBFile", initSQLPath).
+			Msg("Failed to read initdb file")
+		return err
+	}
+	statements := strings.Split(string(ba), ";")
+	for _, stmt := range statements {
+		stmt = strings.TrimSpace(stmt)
+		if strings.HasPrefix(stmt, "CREATE TABLE DBPREFIXip_ban") || strings.HasPrefix(stmt, "CREATE TABLE DBPREFIXfilter") {
+			_, err = gcsql.ExecSQL(stmt)
+			if err != nil {
+				errEv.Err(err).Caller().
+					Str("statement", stmt).
+					Msg("Failed to create table")
+				return err
+			}
+		}
+	}
+	// since the table names are different, migrateBansToNewDB can be called directly to migrate bans
+	return m.migrateBansToNewDB()
 }
 
 func (m *Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int, errEv *zerolog.Event) error {
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index f527894c..da32d85d 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -51,3 +51,48 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	}
 	assert.Equal(t, 3, len(conditions), "Expected filter to have three conditions")
 }
+
+func TestMigrateBansInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigratePosts()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBans()) {
+		t.FailNow()
+	}
+	bans, err := gcsql.GetIPBans(0, 200, false)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 6, len(bans), "Expected to have 4 valid bans")
+	assert.NotZero(t, bans[0].StaffID, "Expected ban staff ID field to be set")
+
+	var numInvalidBans int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
+	assert.Equal(t, 0, numInvalidBans, "Expected the invalid test to not be migrated")
+
+	filters, err := gcsql.GetAllFilters(gcsql.TrueOrFalse)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 1, len(filters))
+	conditions, err := filters[0].Conditions()
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 3, len(conditions), "Expected filter to have three conditions")
+}
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 438510ee..73a4ac89 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -52,4 +52,9 @@ var (
 		"ALTER TABLE DBPREFIXposts ADD COLUMN country VARCHAR(80) NOT NULL DEFAULT ''",
 		"UPDATE DBPREFIXposts SET is_top_post = TRUE WHERE thread_id = 0",
 	}
+	staffAlterStatements = []string{
+		"ALTER TABLE DBPREFIXstaff RENAME COLUMN rank TO global_rank",
+		"ALTER TABLE DBPREFIXstaff RENAME COLUMN last_active TO last_login",
+		"ALTER TABLE DBPREFIXstaff ADD COLUMN is_active BOOL NOT NULL DEFAULT TRUE",
+	}
 )
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
index 114bacdb..cca7d9cd 100644
--- a/cmd/gochan-migration/internal/pre2021/staff.go
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -11,10 +11,23 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func (*Pre2021Migrator) migrateStaffInPlace() error {
-	err := common.NewMigrationError("pre2021", "migrateStaff not yet implemented")
-	common.LogError().Err(err).Caller().Msg("Failed to migrate staff")
-	return err
+func (m *Pre2021Migrator) migrateStaffInPlace() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
+
+	for _, stmt := range staffAlterStatements {
+		if _, err := gcsql.ExecSQL(stmt); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to alter staff table")
+			return err
+		}
+	}
+
+	_, err := m.getMigrationUser(errEv)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
 func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff, error) {
diff --git a/cmd/gochan-migration/internal/pre2021/staff_test.go b/cmd/gochan-migration/internal/pre2021/staff_test.go
index 5c81dea3..90c4efbf 100644
--- a/cmd/gochan-migration/internal/pre2021/staff_test.go
+++ b/cmd/gochan-migration/internal/pre2021/staff_test.go
@@ -27,3 +27,20 @@ func TestMigrateStaffToNewDB(t *testing.T) {
 	}
 	assert.Equal(t, 3, migratedAdmin.Rank)
 }
+
+func TestMigrateStaffInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+	migratedAdmin, err := gcsql.GetStaffByUsername("migratedadmin", true)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	assert.Equal(t, 3, migratedAdmin.Rank)
+}

From 5c4e2006312f6236ffa47b089cb4258b033d4441 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 26 Jan 2025 17:01:27 -0800
Subject: [PATCH 087/122] Implement in-place announcement migration

---
 .../internal/pre2021/announcements.go         | 77 ++++++++++++++++++-
 .../internal/pre2021/queries.go               |  2 +
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
index e885e296..2f8ae52e 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -8,12 +8,85 @@ import (
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
-func (*Pre2021Migrator) migrateAnnouncementsInPlace() error {
-	return common.NewMigrationError("pre2021", "migrateAnnouncementsInPlace not implemented")
+func (m *Pre2021Migrator) migrateAnnouncementsInPlace() error {
+	errEv := common.LogError()
+	defer errEv.Discard()
+
+	if _, err := gcsql.ExecSQL(announcementsAlterStatement); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to alter announcements table")
+		return err
+	}
+
+	var staffIDs []int
+	rows, err := m.db.QuerySQL("SELECT id FROM DBPREFIXstaff")
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get staff IDs")
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var id int
+		if err = rows.Scan(&id); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan staff ID")
+			return err
+		}
+		staffIDs = append(staffIDs, id)
+	}
+	if err = rows.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to close staff ID rows")
+		return err
+	}
+
+	m.migrationUser, err = m.getMigrationUser(errEv)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get migration user")
+		return err
+	}
+
+	rows, err = m.db.QuerySQL("SELECT poster FROM DBPREFIXannouncements")
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Failed to get announcements")
+		return err
+	}
+	defer rows.Close()
+
+	var announcementPosters []string
+	for rows.Next() {
+		var poster string
+		if err = rows.Scan(&poster); err != nil {
+			errEv.Err(err).Caller().Msg("Failed to scan announcement row")
+			return err
+		}
+		announcementPosters = append(announcementPosters, poster)
+	}
+	if err = rows.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Failed to close announcement rows")
+		return err
+	}
+	for _, poster := range announcementPosters {
+		id, err := gcsql.GetStaffID(poster)
+		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
+			// user doesn't exist, use migration user
+			common.LogWarning().Str("staff", poster).Msg("Staff username not found in database")
+			id = m.migrationUser.ID
+		} else if err != nil {
+			errEv.Err(err).Caller().Str("staff", poster).Msg("Failed to get staff ID")
+			return err
+		}
+
+		if _, err = gcsql.ExecSQL("UPDATE DBPREFIXannouncements SET staff_id = ? WHERE poster = ?", id, poster); err != nil {
+			errEv.Err(err).Caller().Str("staff", poster).Msg("Failed to update announcement poster")
+			return err
+		}
+	}
+
+	return nil
 }
 
 func (m *Pre2021Migrator) migrateAnnouncementsToNewDB() error {
 	errEv := common.LogError()
+	defer errEv.Discard()
+
 	rows, err := m.db.QuerySQL(announcementsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get announcements")
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 73a4ac89..4342446b 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -20,6 +20,8 @@ bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
 timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FROM DBPREFIXbanlist`
 
 	announcementsQuery = "SELECT id, subject, message, poster, timestamp FROM DBPREFIXannouncements"
+
+	announcementsAlterStatement = "ALTER TABLE DBPREFIXannouncements ADD COLUMN staff_id INT NOT NULL DEFAULT 1"
 )
 
 var (

From 2f39e9d7cceb0b68964fb353518cff2378121c53 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 26 Jan 2025 17:12:23 -0800
Subject: [PATCH 088/122] Add tests for announcement migration

---
 .../internal/pre2021/announcements.go         |  24 +-------
 .../internal/pre2021/announcements_test.go    |  56 ++++++++++++++++++
 tools/gochan-pre2021.sqlite3db                | Bin 81920 -> 81920 bytes
 3 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 cmd/gochan-migration/internal/pre2021/announcements_test.go

diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
index 2f8ae52e..e015f934 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -17,33 +17,14 @@ func (m *Pre2021Migrator) migrateAnnouncementsInPlace() error {
 		return err
 	}
 
-	var staffIDs []int
-	rows, err := m.db.QuerySQL("SELECT id FROM DBPREFIXstaff")
-	if err != nil {
-		errEv.Err(err).Caller().Msg("Failed to get staff IDs")
-		return err
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var id int
-		if err = rows.Scan(&id); err != nil {
-			errEv.Err(err).Caller().Msg("Failed to scan staff ID")
-			return err
-		}
-		staffIDs = append(staffIDs, id)
-	}
-	if err = rows.Close(); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to close staff ID rows")
-		return err
-	}
-
+	var err error
 	m.migrationUser, err = m.getMigrationUser(errEv)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get migration user")
 		return err
 	}
 
-	rows, err = m.db.QuerySQL("SELECT poster FROM DBPREFIXannouncements")
+	rows, err := m.db.QuerySQL("SELECT poster FROM DBPREFIXannouncements")
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get announcements")
 		return err
@@ -111,6 +92,7 @@ func (m *Pre2021Migrator) migrateAnnouncementsToNewDB() error {
 			// user doesn't exist, use migration user
 			common.LogWarning().Str("staff", staff).Msg("Staff username not found in database")
 			message += "\n(originally by " + staff + ")"
+			staffID = m.migrationUser.ID
 		} else if err != nil {
 			errEv.Err(err).Caller().Str("staff", staff).Msg("Failed to get staff ID")
 			return err
diff --git a/cmd/gochan-migration/internal/pre2021/announcements_test.go b/cmd/gochan-migration/internal/pre2021/announcements_test.go
new file mode 100644
index 00000000..b303b40c
--- /dev/null
+++ b/cmd/gochan-migration/internal/pre2021/announcements_test.go
@@ -0,0 +1,56 @@
+package pre2021
+
+import (
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMigrateAnnouncementsToNewDB(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, false)
+	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateAnnouncements()) {
+		t.FailNow()
+	}
+
+	var numAnnouncements int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
+	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
+}
+
+func TestMigrateAnnouncementsInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateStaff()) {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateAnnouncements()) {
+		t.FailNow()
+	}
+
+	var numAnnouncements int
+	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
+	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
+}
diff --git a/tools/gochan-pre2021.sqlite3db b/tools/gochan-pre2021.sqlite3db
index 9c99c2aba1ac978c25bc47d4d5982d02f3015c20..d4dc0035b247919e0cb157f9afa39819ad3c8418 100644
GIT binary patch
delta 229
zcmZo@U~On%ogmGqHBrWyRf|Eds&He<0)7rA{tyQK4g4V+8$I}AqL|nivZa-cgG-aL
zQj<#*^3xO&^YZdb^O93@Q}ap`$}>wc6iV}oQj_!3^D?VaQxu9z64TOrQ;Ule(^FIO
zQ;YLTQY$ixON<PROmz(mb&bpw3=FLdEUk=8CvT7slE`J?<o9IYf6pJ!e~y1Y|3>~r
z{FC^b_&ql^>hoKQa5C#MrYFZETUpG+!^A8L5(V4D#Q%svlmQ(yH|cM0(r2s_006B!
BLD&EQ

delta 113
zcmZo@U~On%ogmGqIZ?)$Rg*!ltb1e10)93|{tXQL8#W6jEaRWNK|V<05d$ZGJOlrG
z{&@a#{QLPg@-O0_#NWi9yRp%gUzvxAS(Y(9Ilj0gF)fWrn3GwT6Ua-<%gZm#OHR#A
R%_}KxZqnc0q|aC<004}hBIp1B


From fcb61cac577d4146cb9b7a92253d5d3bafbe6296 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:35:35 -0800
Subject: [PATCH 089/122] Use separate function to validate pre2021 migration
 results

---
 .../internal/pre2021/announcements_test.go    |  7 ++--
 .../internal/pre2021/bans_test.go             | 26 +++---------
 .../internal/pre2021/boards_test.go           | 41 ++++++++-----------
 .../internal/pre2021/posts_test.go            | 38 ++++++++---------
 .../internal/pre2021/pre2021_test.go          | 10 +++++
 .../internal/pre2021/staff_test.go            | 10 ++---
 6 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/announcements_test.go b/cmd/gochan-migration/internal/pre2021/announcements_test.go
index b303b40c..6cb4b2da 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements_test.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements_test.go
@@ -26,9 +26,7 @@ func TestMigrateAnnouncementsToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 
-	var numAnnouncements int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
-	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
+	validateAnnouncementMigration(t)
 }
 
 func TestMigrateAnnouncementsInPlace(t *testing.T) {
@@ -49,7 +47,10 @@ func TestMigrateAnnouncementsInPlace(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateAnnouncements()) {
 		t.FailNow()
 	}
+	validateAnnouncementMigration(t)
+}
 
+func validateAnnouncementMigration(t *testing.T) {
 	var numAnnouncements int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
 	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index da32d85d..3efa9412 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -29,27 +29,8 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateBans()) {
 		t.FailNow()
 	}
-	bans, err := gcsql.GetIPBans(0, 200, false)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, 6, len(bans), "Expected to have 4 valid bans")
-	assert.NotZero(t, bans[0].StaffID, "Expected ban staff ID field to be set")
 
-	var numInvalidBans int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
-	assert.Equal(t, 0, numInvalidBans, "Expected the invalid test to not be migrated")
-
-	filters, err := gcsql.GetAllFilters(gcsql.TrueOrFalse)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, 1, len(filters))
-	conditions, err := filters[0].Conditions()
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, 3, len(conditions), "Expected filter to have three conditions")
+	validateBanMigration(t)
 }
 
 func TestMigrateBansInPlace(t *testing.T) {
@@ -74,6 +55,11 @@ func TestMigrateBansInPlace(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateBans()) {
 		t.FailNow()
 	}
+
+	validateBanMigration(t)
+}
+
+func validateBanMigration(t *testing.T) {
 	bans, err := gcsql.GetIPBans(0, 200, false)
 	if !assert.NoError(t, err) {
 		t.FailNow()
diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
index 13909f74..d42152b1 100644
--- a/cmd/gochan-migration/internal/pre2021/boards_test.go
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -1,9 +1,7 @@
 package pre2021
 
 import (
-	"context"
 	"testing"
-	"time"
 
 	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/stretchr/testify/assert"
@@ -26,7 +24,23 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateBoards()) {
 		t.FailNow()
 	}
+	validateBoardMigration(t)
+}
 
+func TestMigrateBoardsInPlace(t *testing.T) {
+	outDir := t.TempDir()
+	migrator := setupMigrationTest(t, outDir, true)
+	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
+		t.FailNow()
+	}
+
+	if !assert.NoError(t, migrator.MigrateBoards()) {
+		t.FailNow()
+	}
+	validateBoardMigration(t)
+}
+
+func validateBoardMigration(t *testing.T) {
 	migratedBoards, err := gcsql.GetAllBoards(false)
 	if !assert.NoError(t, err) {
 		t.FailNow()
@@ -51,7 +65,7 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	assert.Equal(t, 1, testBoard.ID)
+	assert.Greater(t, testBoard.ID, 0)
 	assert.Equal(t, "Testing Board", testBoard.Title)
 	assert.Equal(t, "Board for testing pre-2021 migration", testBoard.Subtitle)
 	assert.Equal(t, "Board for testing pre-2021 migration description", testBoard.Description)
@@ -67,24 +81,3 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	}
 	assert.Equal(t, "Hidden Board", hiddenBoard.Title)
 }
-
-func TestMigrateBoardsInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(migrator.config.DBTimeoutSeconds))
-	defer cancel()
-	var uri string
-	var sectionID int
-	assert.NoError(t, migrator.db.QueryRowContextSQL(ctx, nil, "SELECT uri FROM DBPREFIXboards WHERE dir = ?", []any{"test"}, []any{&uri}))
-	assert.NoError(t, migrator.db.QueryRowContextSQL(ctx, nil, "SELECT section_id FROM DBPREFIXboards WHERE dir = ?", []any{"test"}, []any{&sectionID}))
-	assert.Equal(t, "", uri)
-	assert.Greater(t, sectionID, 0)
-}
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index 34f38624..160a5dae 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -27,27 +27,7 @@ func TestMigratePostsToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigratePosts()) {
 		t.FailNow()
 	}
-
-	var numMigratedThreads int
-	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numMigratedThreads}), "Failed to get number of migrated threads") {
-		t.FailNow()
-	}
-	assert.Equal(t, 2, numMigratedThreads, "Expected to have three migrated threads")
-
-	var locked bool
-	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT locked FROM DBPREFIXthreads WHERE id = 1", nil, []any{&locked})) {
-		t.FailNow()
-	}
-	assert.True(t, locked, "Expected thread ID 1 to be locked")
-
-	// make sure deleted posts and threads weren't migrated
-	var numDeleted int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXposts WHERE message_raw LIKE '%deleted%' OR is_deleted", nil, []any{&numDeleted}))
-	assert.Zero(t, numDeleted, "Expected no deleted threads to be migrated")
-
-	var numUploadPosts int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
-	assert.Equal(t, 1, numUploadPosts, "Expected to have 1 upload post")
+	validatePostMigration(t)
 }
 
 func TestMigratePostsInPlace(t *testing.T) {
@@ -64,6 +44,10 @@ func TestMigratePostsInPlace(t *testing.T) {
 	if !assert.NoError(t, migrator.MigratePosts()) {
 		t.FailNow()
 	}
+	validatePostMigration(t)
+}
+
+func validatePostMigration(t *testing.T) {
 	var numThreads int
 	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numThreads}), "Failed to get number of threads") {
 		t.FailNow()
@@ -77,4 +61,16 @@ func TestMigratePostsInPlace(t *testing.T) {
 	var ip string
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT IP_NTOA FROM DBPREFIXposts WHERE id = 1", nil, []any{&ip}))
 	assert.Equal(t, "192.168.56.1", ip, "Expected to have the correct IP address")
+
+	var numMigratedThreads int
+	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numMigratedThreads}), "Failed to get number of migrated threads") {
+		t.FailNow()
+	}
+	assert.Equal(t, 2, numMigratedThreads, "Expected to have three migrated threads")
+
+	var locked bool
+	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT locked FROM DBPREFIXthreads WHERE id = 1", nil, []any{&locked})) {
+		t.FailNow()
+	}
+	assert.True(t, locked, "Expected thread ID 1 to be locked")
 }
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index 338b0c31..e7537157 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -99,6 +99,11 @@ func TestPre2021MigrationToNewDB(t *testing.T) {
 	migrated, err := migrator.MigrateDB()
 	assert.NoError(t, err)
 	assert.False(t, migrated)
+
+	validateBoardMigration(t)
+	validatePostMigration(t)
+	validateBanMigration(t)
+	validateStaffMigration(t)
 }
 
 func TestPre2021MigrationInPlace(t *testing.T) {
@@ -110,4 +115,9 @@ func TestPre2021MigrationInPlace(t *testing.T) {
 	migrated, err := migrator.MigrateDB()
 	assert.NoError(t, err)
 	assert.False(t, migrated)
+
+	validateBoardMigration(t)
+	validatePostMigration(t)
+	validateBanMigration(t)
+	validateStaffMigration(t)
 }
diff --git a/cmd/gochan-migration/internal/pre2021/staff_test.go b/cmd/gochan-migration/internal/pre2021/staff_test.go
index 90c4efbf..22061a2a 100644
--- a/cmd/gochan-migration/internal/pre2021/staff_test.go
+++ b/cmd/gochan-migration/internal/pre2021/staff_test.go
@@ -21,11 +21,7 @@ func TestMigrateStaffToNewDB(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateStaff()) {
 		t.FailNow()
 	}
-	migratedAdmin, err := gcsql.GetStaffByUsername("migratedadmin", true)
-	if !assert.NoError(t, err) {
-		t.FailNow()
-	}
-	assert.Equal(t, 3, migratedAdmin.Rank)
+	validateStaffMigration(t)
 }
 
 func TestMigrateStaffInPlace(t *testing.T) {
@@ -38,6 +34,10 @@ func TestMigrateStaffInPlace(t *testing.T) {
 	if !assert.NoError(t, migrator.MigrateStaff()) {
 		t.FailNow()
 	}
+	validateStaffMigration(t)
+}
+
+func validateStaffMigration(t *testing.T) {
 	migratedAdmin, err := gcsql.GetStaffByUsername("migratedadmin", true)
 	if !assert.NoError(t, err) {
 		t.FailNow()

From 9298aa42c30d6fffb76d751548230e0f2e752c1b Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 2 Feb 2025 15:07:47 -0800
Subject: [PATCH 090/122] Return error if section doesn't exist while updating

---
 pkg/gcsql/sections.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/gcsql/sections.go b/pkg/gcsql/sections.go
index 18ab4037..1a82a74b 100644
--- a/pkg/gcsql/sections.go
+++ b/pkg/gcsql/sections.go
@@ -148,7 +148,15 @@ func NewSection(name string, abbreviation string, hidden bool, position int) (*S
 }
 
 func (s *Section) UpdateValues() error {
+	var count int
+	err := QueryRowTimeoutSQL(nil, `SELECT COUNT(*) FROM DBPREFIXsections WHERE id = ?`, []any{s.ID}, []any{&count})
+	if errors.Is(err, sql.ErrNoRows) {
+		return ErrSectionDoesNotExist
+	}
+	if err != nil {
+		return err
+	}
 	const query = `UPDATE DBPREFIXsections set name = ?, abbreviation = ?, position = ?, hidden = ? WHERE id = ?`
-	_, err := ExecTimeoutSQL(nil, query, s.Name, s.Abbreviation, s.Position, s.Hidden, s.ID)
+	_, err = ExecTimeoutSQL(nil, query, s.Name, s.Abbreviation, s.Position, s.Hidden, s.ID)
 	return err
 }

From cbd1dd8a99c2499610a4973ce206d8936601b010 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 2 Feb 2025 15:26:33 -0800
Subject: [PATCH 091/122] Start changing migrating to have "in-place" migration
 rename boards to be recreated and populated

---
 .../internal/pre2021/announcements.go         |  65 +------
 .../internal/pre2021/announcements_test.go    |  27 +--
 .../internal/pre2021/bans_test.go             |  28 +--
 .../internal/pre2021/boards.go                | 103 +++--------
 .../internal/pre2021/boards_test.go           |  15 +-
 .../internal/pre2021/posts.go                 | 163 +-----------------
 .../internal/pre2021/posts_test.go            |  19 +-
 .../internal/pre2021/pre2021.go               |  47 ++++-
 .../internal/pre2021/pre2021_test.go          |   8 +-
 .../internal/pre2021/queries.go               |  26 +--
 .../internal/pre2021/staff.go                 |  88 ++++------
 .../internal/pre2021/staff_test.go            |  15 +-
 12 files changed, 127 insertions(+), 477 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
index e015f934..ab6ce9bc 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -8,63 +8,7 @@ import (
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
-func (m *Pre2021Migrator) migrateAnnouncementsInPlace() error {
-	errEv := common.LogError()
-	defer errEv.Discard()
-
-	if _, err := gcsql.ExecSQL(announcementsAlterStatement); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to alter announcements table")
-		return err
-	}
-
-	var err error
-	m.migrationUser, err = m.getMigrationUser(errEv)
-	if err != nil {
-		errEv.Err(err).Caller().Msg("Failed to get migration user")
-		return err
-	}
-
-	rows, err := m.db.QuerySQL("SELECT poster FROM DBPREFIXannouncements")
-	if err != nil {
-		errEv.Err(err).Caller().Msg("Failed to get announcements")
-		return err
-	}
-	defer rows.Close()
-
-	var announcementPosters []string
-	for rows.Next() {
-		var poster string
-		if err = rows.Scan(&poster); err != nil {
-			errEv.Err(err).Caller().Msg("Failed to scan announcement row")
-			return err
-		}
-		announcementPosters = append(announcementPosters, poster)
-	}
-	if err = rows.Close(); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to close announcement rows")
-		return err
-	}
-	for _, poster := range announcementPosters {
-		id, err := gcsql.GetStaffID(poster)
-		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
-			// user doesn't exist, use migration user
-			common.LogWarning().Str("staff", poster).Msg("Staff username not found in database")
-			id = m.migrationUser.ID
-		} else if err != nil {
-			errEv.Err(err).Caller().Str("staff", poster).Msg("Failed to get staff ID")
-			return err
-		}
-
-		if _, err = gcsql.ExecSQL("UPDATE DBPREFIXannouncements SET staff_id = ? WHERE poster = ?", id, poster); err != nil {
-			errEv.Err(err).Caller().Str("staff", poster).Msg("Failed to update announcement poster")
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Pre2021Migrator) migrateAnnouncementsToNewDB() error {
+func (m *Pre2021Migrator) MigrateAnnouncements() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
@@ -112,10 +56,3 @@ func (m *Pre2021Migrator) migrateAnnouncementsToNewDB() error {
 	}
 	return nil
 }
-
-func (m *Pre2021Migrator) MigrateAnnouncements() error {
-	if m.IsMigratingInPlace() {
-		return m.migrateAnnouncementsInPlace()
-	}
-	return m.migrateAnnouncementsToNewDB()
-}
diff --git a/cmd/gochan-migration/internal/pre2021/announcements_test.go b/cmd/gochan-migration/internal/pre2021/announcements_test.go
index 6cb4b2da..99684351 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements_test.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMigrateAnnouncementsToNewDB(t *testing.T) {
+func TestMigrateAnnouncements(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
@@ -26,31 +26,6 @@ func TestMigrateAnnouncementsToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 
-	validateAnnouncementMigration(t)
-}
-
-func TestMigrateAnnouncementsInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateStaff()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateAnnouncements()) {
-		t.FailNow()
-	}
-	validateAnnouncementMigration(t)
-}
-
-func validateAnnouncementMigration(t *testing.T) {
 	var numAnnouncements int
 	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
 	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 3efa9412..43f0a737 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMigrateBansToNewDB(t *testing.T) {
+func TestMigrateBans(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
@@ -33,32 +33,6 @@ func TestMigrateBansToNewDB(t *testing.T) {
 	validateBanMigration(t)
 }
 
-func TestMigrateBansInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigratePosts()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateStaff()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBans()) {
-		t.FailNow()
-	}
-
-	validateBanMigration(t)
-}
-
 func validateBanMigration(t *testing.T) {
 	bans, err := gcsql.GetIPBans(0, 200, false)
 	if !assert.NoError(t, err) {
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index ce1f2e83..6b204ad8 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -1,13 +1,9 @@
 package pre2021
 
 import (
-	"runtime/debug"
-	"strings"
-
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcsql"
-	"github.com/rs/zerolog"
 )
 
 type migrationBoard struct {
@@ -21,41 +17,7 @@ type migrationSection struct {
 	gcsql.Section
 }
 
-func (m *Pre2021Migrator) migrateSectionsInPlace() error {
-	_, err := m.db.ExecSQL(`ALTER TABLE DBPREFIXsections RENAME COLUMN list_order TO position`)
-	if err != nil {
-		common.LogError().Caller().Msg("Failed to rename list_order column to position")
-	}
-	return err
-}
-
-func (m *Pre2021Migrator) migrateBoardsInPlace() error {
-	errEv := common.LogError()
-	defer errEv.Discard()
-	err := m.migrateSectionsInPlace()
-	if err != nil {
-		errEv.Err(err).Caller().Msg("Failed to migrate sections")
-		return err
-	}
-
-	for _, statement := range boardAlterStatements {
-		if strings.Contains(statement, "CONSTRAINT") && m.db.SQLDriver() == "sqlite3" {
-			// skip constraints in SQLite since they can't be added after table creation
-			continue
-		}
-		_, err = m.db.ExecSQL(statement)
-		if err != nil {
-			errEv.Err(err).Caller().
-				Str("statement", statement).
-				Msg("Failed to execute alter statement")
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
+func (m *Pre2021Migrator) migrateSections() error {
 	// creates sections in the new db if they don't exist, and also creates a migration section that
 	// boards will be set to, to be moved to the correct section by the admin after migration
 	errEv := common.LogError()
@@ -74,6 +36,7 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 		})
 	}
 
+	var sectionsToBeCreated []gcsql.Section
 	rows, err := m.db.QuerySQL(sectionsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to query old database sections")
@@ -99,33 +62,40 @@ func (m *Pre2021Migrator) migrateSectionsToNewDB() error {
 					Int("oldSectionID", m.sections[s].oldID).
 					Str("sectionName", section.Name).
 					Str("sectionAbbreviation", section.Abbreviation).
-					Msg("Section already exists in new db, updating values")
-				if err = m.sections[s].UpdateValues(); err != nil {
-					errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to update pre-existing section values")
-				}
+					Msg("Section already exists in new db, values will be updated")
 				found = true
 				break
 			}
 		}
 		if !found {
-			migratedSection, err := gcsql.NewSection(section.Name, section.Abbreviation, section.Hidden, section.Position)
-			if err != nil {
-				errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to migrate section")
-				return err
-			}
-			m.sections = append(m.sections, migrationSection{
-				Section: *migratedSection,
-			})
+			sectionsToBeCreated = append(sectionsToBeCreated, section)
 		}
 	}
 	if err = rows.Close(); err != nil {
 		errEv.Caller().Msg("Failed to close section rows")
 		return err
 	}
+	for _, section := range sectionsToBeCreated {
+		migratedSection, err := gcsql.NewSection(section.Name, section.Abbreviation, section.Hidden, section.Position)
+		if err != nil {
+			errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to migrate section")
+			return err
+		}
+		m.sections = append(m.sections, migrationSection{
+			Section: *migratedSection,
+		})
+	}
+
+	for s, section := range m.sections {
+		if err = m.sections[s].UpdateValues(); err != nil {
+			errEv.Err(err).Caller().Str("sectionName", section.Name).Msg("Failed to update pre-existing section values")
+		}
+	}
+
 	return nil
 }
 
-func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
+func (m *Pre2021Migrator) MigrateBoards() error {
 	m.boards = nil
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -137,7 +107,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		return nil
 	}
 
-	if err = m.migrateSectionsToNewDB(); err != nil {
+	if err = m.migrateSections(); err != nil {
 		// error should already be logged by migrateSectionsToNewDB
 		return err
 	}
@@ -162,6 +132,7 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 		return err
 	}
 	defer rows.Close()
+	var boardsTmp []migrationBoard
 
 	for rows.Next() {
 		var board migrationBoard
@@ -176,8 +147,11 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 			return err
 		}
 		board.MaxThreads = maxPages * config.GetBoardConfig(board.Dir).ThreadsPerPage
-		found := false
+		boardsTmp = append(boardsTmp, board)
+	}
 
+	for _, board := range boardsTmp {
+		found := false
 		for b, newBoard := range m.boards {
 			if newBoard.Dir == board.Dir {
 				m.boards[b].oldID = board.oldID
@@ -229,24 +203,3 @@ func (m *Pre2021Migrator) migrateBoardsToNewDB() error {
 	}
 	return nil
 }
-
-func (m *Pre2021Migrator) MigrateBoards() error {
-	defer func() {
-		if r := recover(); r != nil {
-			stackTrace := debug.Stack()
-			traceLines := strings.Split(string(stackTrace), "\n")
-			zlArr := zerolog.Arr()
-			for _, line := range traceLines {
-				zlArr.Str(line)
-			}
-			common.LogFatal().Caller().
-				Interface("recover", r).
-				Array("stackTrace", zlArr).
-				Msg("Recovered from panic in MigrateBoards")
-		}
-	}()
-	if m.IsMigratingInPlace() {
-		return m.migrateBoardsInPlace()
-	}
-	return m.migrateBoardsToNewDB()
-}
diff --git a/cmd/gochan-migration/internal/pre2021/boards_test.go b/cmd/gochan-migration/internal/pre2021/boards_test.go
index d42152b1..d636a58b 100644
--- a/cmd/gochan-migration/internal/pre2021/boards_test.go
+++ b/cmd/gochan-migration/internal/pre2021/boards_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMigrateBoardsToNewDB(t *testing.T) {
+func TestMigrateBoards(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
@@ -27,19 +27,6 @@ func TestMigrateBoardsToNewDB(t *testing.T) {
 	validateBoardMigration(t)
 }
 
-func TestMigrateBoardsInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-	validateBoardMigration(t)
-}
-
 func validateBoardMigration(t *testing.T) {
 	migratedBoards, err := gcsql.GetAllBoards(false)
 	if !assert.NoError(t, err) {
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index ea8b8f96..bd4bfa56 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -3,8 +3,6 @@ package pre2021
 import (
 	"context"
 	"database/sql"
-	"os"
-	"strings"
 	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
@@ -35,13 +33,6 @@ type migrationPost struct {
 	oldParentID int
 }
 
-func (m *Pre2021Migrator) MigratePosts() error {
-	if m.IsMigratingInPlace() {
-		return m.migratePostsInPlace()
-	}
-	return m.migratePostsToNewDB()
-}
-
 func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *zerolog.Event) error {
 	var err error
 
@@ -83,7 +74,7 @@ func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *ze
 	return nil
 }
 
-func (m *Pre2021Migrator) migratePostsToNewDB() error {
+func (m *Pre2021Migrator) MigratePosts() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
@@ -195,155 +186,3 @@ func (m *Pre2021Migrator) migratePostsToNewDB() error {
 		Msg("Migrated threads successfully")
 	return nil
 }
-
-func (m *Pre2021Migrator) migratePostsInPlace() error {
-	errEv := common.LogError()
-	defer errEv.Discard()
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(m.config.DBTimeoutSeconds))
-	defer cancel()
-
-	ba, err := os.ReadFile(gcutil.FindResource("sql/initdb_" + m.db.SQLDriver() + ".sql"))
-	if err != nil {
-		errEv.Err(err).Caller().
-			Msg("Failed to read initdb SQL file")
-		return err
-	}
-	statements := strings.Split(string(ba), ";")
-	for _, statement := range statements {
-		statement = strings.TrimSpace(statement)
-		if strings.HasPrefix(statement, "CREATE TABLE DBPREFIXthreads") || strings.HasPrefix(statement, "CREATE TABLE DBPREFIXfiles") {
-			if _, err = m.db.ExecContextSQL(ctx, nil, statement); err != nil {
-				errEv.Err(err).Caller().Msg("Failed to create threads table")
-				return err
-			}
-		}
-	}
-
-	rows, err := m.db.QueryContextSQL(ctx, nil, threadsQuery+" AND parentid = 0")
-	if err != nil {
-		errEv.Err(err).Caller().
-			Msg("Failed to get threads")
-		return err
-	}
-	defer rows.Close()
-
-	var threads []migrationPost
-	for rows.Next() {
-		var post migrationPost
-		if err = rows.Scan(
-			&post.ID, &post.oldBoardID, &post.oldParentID, &post.Name, &post.Tripcode, &post.Email,
-			&post.Subject, &post.Message, &post.MessageRaw, &post.Password, &post.filename,
-			&post.filenameOriginal, &post.fileChecksum, &post.filesize, &post.imageW, &post.imageH,
-			&post.thumbW, &post.thumbH, &post.IP, &post.CreatedOn, &post.autosage,
-			&post.bumped, &post.stickied, &post.locked,
-		); err != nil {
-			errEv.Err(err).Caller().
-				Msg("Failed to scan thread")
-			return err
-		}
-		threads = append(threads, post)
-	}
-	if err = rows.Close(); err != nil {
-		errEv.Caller().Msg("Failed to close thread rows")
-		return err
-	}
-
-	for _, statements := range postAlterStatements {
-		if _, err = m.db.ExecContextSQL(ctx, nil, statements); err != nil {
-			errEv.Err(err).Caller().Msg("Failed to alter posts table")
-			return err
-		}
-	}
-
-	switch m.db.SQLDriver() {
-	case "mysql":
-		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new VARBINARY(16) NOT NULL")
-	case "postgres", "postgresql":
-		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new INET NOT NULL")
-	case "sqlite3":
-		_, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts ADD COLUMN ip_new VARCHAR(45) NOT NULL DEFAULT '0.0.0.0'")
-	}
-	if err != nil {
-		errEv.Err(err).Caller().Msg("Failed to update IP column")
-		return err
-	}
-	if _, err = m.db.ExecContextSQL(ctx, nil, "UPDATE DBPREFIXposts SET ip_new = IP_ATON"); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to update IP column")
-		return err
-	}
-	if _, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts RENAME COLUMN ip TO ip_old"); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to rename old IP column")
-		return err
-	}
-	if _, err = m.db.ExecContextSQL(ctx, nil, "ALTER TABLE DBPREFIXposts RENAME COLUMN ip_new TO ip"); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to rename new IP column")
-		return err
-	}
-
-	for _, op := range threads {
-		if _, err = m.db.ExecContextSQL(ctx, nil,
-			`INSERT INTO DBPREFIXthreads(board_id,locked,stickied,anchored,cyclical,last_bump,is_deleted) VALUES(?,?,?,?,?,?,?)`,
-			op.oldBoardID, op.locked, op.stickied, op.autosage, false, op.bumped, false,
-		); err != nil {
-			errEv.Err(err).Caller().
-				Int("postID", op.ID).
-				Msg("Failed to insert thread")
-			return err
-		}
-		if err = m.db.QueryRowContextSQL(ctx, nil, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&op.ThreadID}); err != nil {
-			errEv.Err(err).Caller().
-				Int("postID", op.ID).
-				Msg("Failed to get thread ID")
-			return err
-		}
-
-		if _, err = m.db.ExecContextSQL(ctx, nil,
-			"UPDATE DBPREFIXposts SET thread_id = ? WHERE (id = ? and is_top_post) or thread_id = ?", op.ThreadID, op.oldID, op.oldID,
-		); err != nil {
-			errEv.Err(err).Caller().
-				Int("postID", op.ID).
-				Int("threadID", op.ThreadID).
-				Msg("Failed to set thread ID")
-			return err
-		}
-	}
-	if rows, err = m.db.QueryContextSQL(ctx, nil,
-		"SELECT id,filename,filename_original,file_checksum,filesize,image_w,image_h,thumb_w,thumb_h FROM DBPREFIXposts WHERE filename <> ''",
-	); err != nil {
-		errEv.Err(err).Caller().Msg("Failed to get uploads")
-		return err
-	}
-	defer rows.Close()
-
-	var uploads []gcsql.Upload
-	for rows.Next() {
-		var upload gcsql.Upload
-		if err = rows.Scan(&upload.PostID, &upload.Filename, &upload.OriginalFilename, &upload.Checksum, &upload.FileSize, &upload.Width,
-			&upload.Height, &upload.ThumbnailWidth, &upload.ThumbnailHeight,
-		); err != nil {
-			errEv.Err(err).Caller().Msg("Failed to scan upload")
-			return err
-		}
-		uploads = append(uploads, upload)
-	}
-	if err = rows.Close(); err != nil {
-		errEv.Caller().Msg("Failed to close upload rows")
-		return err
-	}
-
-	for _, upload := range uploads {
-		if _, err = m.db.ExecContextSQL(ctx, nil,
-			`INSERT INTO DBPREFIXfiles(post_id,file_order,filename,original_filename,checksum,file_size,width,height,thumbnail_width,thumbnail_height,is_spoilered) VALUES
-			(?,0,?,?,?,?,?,?,?,?,0)`,
-			upload.PostID, upload.Filename, upload.OriginalFilename, upload.Checksum, upload.FileSize, upload.Width, upload.Height,
-			upload.ThumbnailWidth, upload.ThumbnailHeight,
-		); err != nil {
-			errEv.Err(err).Caller().
-				Int("postID", upload.PostID).
-				Msg("Failed to insert upload")
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index 160a5dae..f4b605b2 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMigratePostsToNewDB(t *testing.T) {
+func TestMigratePosts(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
@@ -30,23 +30,6 @@ func TestMigratePostsToNewDB(t *testing.T) {
 	validatePostMigration(t)
 }
 
-func TestMigratePostsInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateBoards()) {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigratePosts()) {
-		t.FailNow()
-	}
-	validatePostMigration(t)
-}
-
 func validatePostMigration(t *testing.T) {
 	var numThreads int
 	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numThreads}), "Failed to get number of threads") {
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index d548f875..8562569e 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -4,6 +4,7 @@ package pre2021
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"os"
 	"time"
 
@@ -25,6 +26,7 @@ type Pre2021Migrator struct {
 	migrationUser *gcsql.Staff
 	boards        []migrationBoard
 	sections      []migrationSection
+	staff         []migrationStaff
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
@@ -45,7 +47,7 @@ func (m *Pre2021Migrator) readConfig() error {
 func (m *Pre2021Migrator) Init(options *common.MigrationOptions) error {
 	m.options = options
 	var err error
-	m.config.SQLConfig = config.GetSQLConfig()
+
 	if err = m.readConfig(); err != nil {
 		return err
 	}
@@ -66,6 +68,43 @@ func (m *Pre2021Migrator) IsMigrated() (bool, error) {
 	return common.TableExists(ctx, m.db, nil, "DBPREFIXdatabase_version", &sqlConfig)
 }
 
+func (m *Pre2021Migrator) renameTablesForInPlace() error {
+	var err error
+	errEv := common.LogError()
+	defer errEv.Discard()
+	if _, err = m.db.ExecSQL("DROP TABLE DBPREFIXinfo"); err != nil {
+		errEv.Err(err).Caller().Msg("Error dropping info table")
+		return err
+	}
+	for _, table := range renameTables {
+		if _, err = m.db.ExecSQL(fmt.Sprintf(renameTableStatementTemplate, table, table)); err != nil {
+			errEv.Caller().Err(err).
+				Str("table", table).
+				Msg("Error renaming table")
+			return err
+		}
+	}
+
+	if err = gcsql.CheckAndInitializeDatabase(m.config.DBtype, "4"); err != nil {
+		errEv.Caller().Err(err).Msg("Error checking and initializing database")
+		return err
+	}
+
+	if err = m.Close(); err != nil {
+		errEv.Err(err).Caller().Msg("Error closing database")
+		return err
+	}
+	m.config.SQLConfig.DBprefix = "_tmp_" + m.config.DBprefix
+	m.db, err = gcsql.Open(&m.config.SQLConfig)
+	if err != nil {
+		errEv.Err(err).Caller().Msg("Error reopening database with new prefix")
+		return err
+	}
+
+	common.LogInfo().Msg("Renamed tables for in-place migration")
+	return err
+}
+
 func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -78,6 +117,12 @@ func (m *Pre2021Migrator) MigrateDB() (bool, error) {
 		return true, nil
 	}
 
+	if m.IsMigratingInPlace() {
+		if err = m.renameTablesForInPlace(); err != nil {
+			return false, err
+		}
+	}
+
 	if err := m.MigrateBoards(); err != nil {
 		return false, err
 	}
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index e7537157..d424eb53 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -97,7 +97,9 @@ func TestPre2021MigrationToNewDB(t *testing.T) {
 		t.FailNow()
 	}
 	migrated, err := migrator.MigrateDB()
-	assert.NoError(t, err)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
 	assert.False(t, migrated)
 
 	validateBoardMigration(t)
@@ -113,7 +115,9 @@ func TestPre2021MigrationInPlace(t *testing.T) {
 		t.FailNow()
 	}
 	migrated, err := migrator.MigrateDB()
-	assert.NoError(t, err)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
 	assert.False(t, migrated)
 
 	validateBoardMigration(t)
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index 4342446b..d233d01d 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -14,14 +14,14 @@ bumped, stickied, locked FROM DBPREFIXposts WHERE deleted_timestamp IS NULL`
 
 	threadsQuery = postsQuery + " AND parentid = 0"
 
-	staffQuery = `SELECT username, rank, boards, added_on, last_active FROM DBPREFIXstaff`
+	staffQuery = `SELECT id, username, rank, boards, added_on, last_active FROM DBPREFIXstaff`
 
 	bansQuery = `SELECT  id, allow_read, COALESCE(ip, '') as ip, name, name_is_regex, filename, file_checksum, boards, staff,
 timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FROM DBPREFIXbanlist`
 
 	announcementsQuery = "SELECT id, subject, message, poster, timestamp FROM DBPREFIXannouncements"
 
-	announcementsAlterStatement = "ALTER TABLE DBPREFIXannouncements ADD COLUMN staff_id INT NOT NULL DEFAULT 1"
+	renameTableStatementTemplate = "ALTER TABLE %s RENAME TO _tmp_%s"
 )
 
 var (
@@ -41,22 +41,10 @@ var (
 		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
 		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
 	}
-	postAlterStatements = []string{
-		"ALTER TABLE DBPREFIXposts RENAME COLUMN parentid TO thread_id",
-		"ALTER TABLE DBPREFIXposts RENAME COLUMN timestamp TO created_on",
-		"ALTER TABLE DBPREFIXposts RENAME COLUMN deleted_timestamp TO deleted_at",
-		// "ALTER TABLE DBPREFIXposts RENAME COLUMN ip TO ip_old",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN is_top_post BOOL NOT NULL DEFAULT FALSE",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN is_role_signature BOOL NOT NULL DEFAULT FALSE",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN is_deleted BOOL NOT NULL DEFAULT FALSE",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN banned_message TEXT",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN flag VARCHAR(45) NOT NULL DEFAULT ''",
-		"ALTER TABLE DBPREFIXposts ADD COLUMN country VARCHAR(80) NOT NULL DEFAULT ''",
-		"UPDATE DBPREFIXposts SET is_top_post = TRUE WHERE thread_id = 0",
-	}
-	staffAlterStatements = []string{
-		"ALTER TABLE DBPREFIXstaff RENAME COLUMN rank TO global_rank",
-		"ALTER TABLE DBPREFIXstaff RENAME COLUMN last_active TO last_login",
-		"ALTER TABLE DBPREFIXstaff ADD COLUMN is_active BOOL NOT NULL DEFAULT TRUE",
+
+	// tables to be renamed to _tmp_DBPREFIX* to work around SQLite's lack of support for changing/removing columns
+	renameTables = []string{
+		"DBPREFIXannouncements", "DBPREFIXappeals", "DBPREFIXbanlist", "DBPREFIXboards", "DBPREFIXembeds", "DBPREFIXlinks",
+		"DBPREFIXposts", "DBPREFIXreports", "DBPREFIXsections", "DBPREFIXsessions", "DBPREFIXstaff", "DBPREFIXwordfilters",
 	}
 )
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
index cca7d9cd..f1333743 100644
--- a/cmd/gochan-migration/internal/pre2021/staff.go
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -11,23 +11,10 @@ import (
 	"github.com/rs/zerolog"
 )
 
-func (m *Pre2021Migrator) migrateStaffInPlace() error {
-	errEv := common.LogError()
-	defer errEv.Discard()
-
-	for _, stmt := range staffAlterStatements {
-		if _, err := gcsql.ExecSQL(stmt); err != nil {
-			errEv.Err(err).Caller().Msg("Failed to alter staff table")
-			return err
-		}
-	}
-
-	_, err := m.getMigrationUser(errEv)
-	if err != nil {
-		return err
-	}
-
-	return nil
+type migrationStaff struct {
+	gcsql.Staff
+	boards string
+	oldID  int
 }
 
 func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff, error) {
@@ -36,7 +23,7 @@ func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff,
 	}
 
 	user := &gcsql.Staff{
-		Username: "pre2021-migration" + gcutil.RandomString(15),
+		Username: "pre2021-migration" + gcutil.RandomString(8),
 		AddedOn:  time.Now(),
 	}
 	_, err := gcsql.ExecSQL("INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,is_active) values(?,'',0,0)", user.Username)
@@ -50,10 +37,11 @@ func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff,
 		return nil, err
 	}
 	m.migrationUser = user
+	m.staff = append(m.staff, migrationStaff{Staff: *user})
 	return user, nil
 }
 
-func (m *Pre2021Migrator) migrateStaffToNewDB() error {
+func (m *Pre2021Migrator) MigrateStaff() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
@@ -70,56 +58,53 @@ func (m *Pre2021Migrator) migrateStaffToNewDB() error {
 	defer rows.Close()
 
 	for rows.Next() {
-		var username string
-		var rank int
-		var boards string
-		var addedOn, lastActive time.Time
-
-		if err = rows.Scan(&username, &rank, &boards, &addedOn, &lastActive); err != nil {
+		var staff migrationStaff
+		if err = rows.Scan(&staff.oldID, &staff.Username, &staff.Rank, &staff.boards, &staff.AddedOn, &staff.LastLogin); err != nil {
 			errEv.Err(err).Caller().Msg("Failed to scan staff row")
 			return err
 		}
-		_, err = gcsql.GetStaffByUsername(username, false)
+		m.staff = append(m.staff, staff)
+	}
+	for _, staff := range m.staff {
+		newStaff, err := gcsql.GetStaffByUsername(staff.Username, false)
 		if err == nil {
 			// found staff
-			gcutil.LogInfo().Str("username", username).Int("rank", rank).Msg("Found matching staff account")
-		}
-		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
+			gcutil.LogInfo().Str("username", staff.Username).Int("rank", staff.Rank).Msg("Found matching staff account")
+			staff.ID = newStaff.ID
+		} else if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
 			// staff doesn't exist, create it (with invalid checksum to be updated by the admin)
-			if _, err2 := gcsql.ExecSQL(
+			if _, err := gcsql.ExecSQL(
 				"INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,added_on,last_login,is_active) values(?,'',?,?,?,1)",
-				username, rank, addedOn, lastActive,
-			); err2 != nil {
-				errEv.Err(err2).Caller().
-					Str("username", username).Int("rank", rank).
-					Msg("Failed to migrate staff account")
+				staff.Username, staff.Rank, staff.AddedOn, staff.LastLogin,
+			); err != nil {
+				errEv.Err(err).Caller().Str("username", staff.Username).Int("rank", staff.Rank).Msg("Failed to migrate staff account")
 				return err
 			}
-			gcutil.LogInfo().Str("username", username).Int("rank", rank).Msg("Successfully migrated staff account")
-		} else if err != nil {
-			errEv.Err(err).Caller().Str("username", username).Msg("Failed to get staff account info")
+			if staff.ID, err = gcsql.GetStaffID(staff.Username); err != nil {
+				errEv.Err(err).Caller().Str("username", staff.Username).Msg("Failed to get staff account ID")
+				return err
+			}
+			gcutil.LogInfo().Str("username", staff.Username).Int("rank", staff.Rank).Msg("Successfully migrated staff account")
+		} else {
+			errEv.Err(err).Caller().Str("username", staff.Username).Msg("Failed to get staff account info")
 			return err
 		}
-		staffID, err := gcsql.GetStaffID(username)
-		if err != nil {
-			errEv.Err(err).Caller().Str("username", username).Msg("Failed to get staff account ID")
-			return err
-		}
-		if boards != "" && boards != "*" {
-			boardsArr := strings.Split(boards, ",")
+
+		if staff.boards != "" && staff.boards != "*" {
+			boardsArr := strings.Split(staff.boards, ",")
 			for _, board := range boardsArr {
 				board = strings.TrimSpace(board)
 				boardID, err := gcsql.GetBoardIDFromDir(board)
 				if err != nil {
 					errEv.Err(err).Caller().
-						Str("username", username).
+						Str("username", staff.Username).
 						Str("board", board).
 						Msg("Failed to get board ID")
 					return err
 				}
-				if _, err = gcsql.ExecSQL("INSERT INTO DBPREFIXboard_staff(board_id,staff_id) VALUES(?,?)", boardID, staffID); err != nil {
+				if _, err = gcsql.ExecSQL("INSERT INTO DBPREFIXboard_staff(board_id,staff_id) VALUES(?,?)", boardID, staff.ID); err != nil {
 					errEv.Err(err).Caller().
-						Str("username", username).
+						Str("username", staff.Username).
 						Str("board", board).
 						Msg("Failed to apply staff board info")
 					return err
@@ -134,10 +119,3 @@ func (m *Pre2021Migrator) migrateStaffToNewDB() error {
 	}
 	return nil
 }
-
-func (m *Pre2021Migrator) MigrateStaff() error {
-	if m.IsMigratingInPlace() {
-		return m.migrateStaffInPlace()
-	}
-	return m.migrateStaffToNewDB()
-}
diff --git a/cmd/gochan-migration/internal/pre2021/staff_test.go b/cmd/gochan-migration/internal/pre2021/staff_test.go
index 22061a2a..24a5913b 100644
--- a/cmd/gochan-migration/internal/pre2021/staff_test.go
+++ b/cmd/gochan-migration/internal/pre2021/staff_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestMigrateStaffToNewDB(t *testing.T) {
+func TestMigrateStaff(t *testing.T) {
 	outDir := t.TempDir()
 	migrator := setupMigrationTest(t, outDir, false)
 	if !assert.False(t, migrator.IsMigratingInPlace(), "This test should not be migrating in place") {
@@ -24,19 +24,6 @@ func TestMigrateStaffToNewDB(t *testing.T) {
 	validateStaffMigration(t)
 }
 
-func TestMigrateStaffInPlace(t *testing.T) {
-	outDir := t.TempDir()
-	migrator := setupMigrationTest(t, outDir, true)
-	if !assert.True(t, migrator.IsMigratingInPlace(), "This test should be migrating in place") {
-		t.FailNow()
-	}
-
-	if !assert.NoError(t, migrator.MigrateStaff()) {
-		t.FailNow()
-	}
-	validateStaffMigration(t)
-}
-
 func validateStaffMigration(t *testing.T) {
 	migratedAdmin, err := gcsql.GetStaffByUsername("migratedadmin", true)
 	if !assert.NoError(t, err) {

From a38a519e4e22a323e81a3cd13d47588d2b40f90d Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 2 Feb 2025 15:35:57 -0800
Subject: [PATCH 092/122] Fix database locked error in announcement migration

---
 .../internal/pre2021/announcements.go         | 32 ++++++++++++-------
 .../internal/pre2021/queries.go               | 17 ----------
 pkg/gcsql/tables.go                           |  4 +--
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
index ab6ce9bc..aecbf909 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -2,12 +2,16 @@ package pre2021
 
 import (
 	"errors"
-	"time"
 
 	"github.com/gochan-org/gochan/cmd/gochan-migration/internal/common"
 	"github.com/gochan-org/gochan/pkg/gcsql"
 )
 
+type migrationAnnouncement struct {
+	gcsql.Announcement
+	oldPoster string
+}
+
 func (m *Pre2021Migrator) MigrateAnnouncements() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
@@ -23,29 +27,33 @@ func (m *Pre2021Migrator) MigrateAnnouncements() error {
 		return err
 	}
 
+	var oldAnnouncements []migrationAnnouncement
+
 	for rows.Next() {
-		var id int
-		var subject, message, staff string
-		var timestamp time.Time
-		if err = rows.Scan(&id, &subject, &message, &staff, &timestamp); err != nil {
+		var announcement migrationAnnouncement
+
+		if err = rows.Scan(&announcement.ID, &announcement.Subject, &announcement.Message, &announcement.oldPoster, &announcement.Timestamp); err != nil {
 			errEv.Err(err).Caller().Msg("Failed to scan announcement row")
 			return err
 		}
-		staffID, err := gcsql.GetStaffID(staff)
+		oldAnnouncements = append(oldAnnouncements, announcement)
+	}
+	for _, announcement := range oldAnnouncements {
+		announcement.StaffID, err = gcsql.GetStaffID(announcement.oldPoster)
 		if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
 			// user doesn't exist, use migration user
-			common.LogWarning().Str("staff", staff).Msg("Staff username not found in database")
-			message += "\n(originally by " + staff + ")"
-			staffID = m.migrationUser.ID
+			common.LogWarning().Str("staff", announcement.oldPoster).Msg("Staff username not found in database")
+			announcement.Message += "\n(originally by " + announcement.oldPoster + ")"
+			announcement.StaffID = m.migrationUser.ID
 		} else if err != nil {
-			errEv.Err(err).Caller().Str("staff", staff).Msg("Failed to get staff ID")
+			errEv.Err(err).Caller().Str("staff", announcement.oldPoster).Msg("Failed to get staff ID")
 			return err
 		}
 		if _, err = gcsql.ExecSQL(
 			"INSERT INTO DBPREFIXannouncements(staff_id,subject,message,timestamp) values(?,?,?,?)",
-			staffID, subject, message, timestamp,
+			announcement.StaffID, announcement.Subject, announcement.Message, announcement.Timestamp,
 		); err != nil {
-			errEv.Err(err).Caller().Str("staff", staff).Msg("Failed to migrate announcement")
+			errEv.Err(err).Caller().Str("staff", announcement.oldPoster).Msg("Failed to migrate announcement")
 			return err
 		}
 	}
diff --git a/cmd/gochan-migration/internal/pre2021/queries.go b/cmd/gochan-migration/internal/pre2021/queries.go
index d233d01d..8456dad7 100644
--- a/cmd/gochan-migration/internal/pre2021/queries.go
+++ b/cmd/gochan-migration/internal/pre2021/queries.go
@@ -25,23 +25,6 @@ timestamp, expires, permaban, reason, type, staff_note, appeal_at, can_appeal FR
 )
 
 var (
-	boardAlterStatements = []string{
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN section TO section_id",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN list_order TO navbar_position",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN created_on TO created_at",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN anonymous TO anonymous_name",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN forced_anon TO force_anonymous",
-		"ALTER TABLE DBPREFIXboards RENAME COLUMN embeds_allowed TO allow_embeds",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN uri VARCHAR(45) NOT NULL DEFAULT ''",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN min_message_length SMALLINT NOT NULL DEFAULT 0",
-		"ALTER TABLE DBPREFIXboards ADD COLUMN max_threads SMALLINT NOT NULL DEFAULT 65535",
-		// the following statements don't work in SQLite since it doesn't support adding foreign keys after table creation.
-		// "in-place" migration support for SQLite may be removed
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_section_id_fk FOREIGN KEY (section_id) REFERENCES DBPREFIXsections(id)",
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_dir_unique UNIQUE (dir)",
-		"ALTER TABLE DBPREFIXboards ADD CONSTRAINT boards_uri_unique UNIQUE (uri)",
-	}
-
 	// tables to be renamed to _tmp_DBPREFIX* to work around SQLite's lack of support for changing/removing columns
 	renameTables = []string{
 		"DBPREFIXannouncements", "DBPREFIXappeals", "DBPREFIXbanlist", "DBPREFIXboards", "DBPREFIXembeds", "DBPREFIXlinks",
diff --git a/pkg/gcsql/tables.go b/pkg/gcsql/tables.go
index c0b06a28..12562822 100644
--- a/pkg/gcsql/tables.go
+++ b/pkg/gcsql/tables.go
@@ -13,8 +13,8 @@ import (
 
 // table: DBPREFIXannouncements
 type Announcement struct {
-	ID        uint      // sql: id
-	StaffID   uint      // sql: staff_id
+	ID        int       // sql: id
+	StaffID   int       // sql: staff_id
 	Subject   string    // sql: subject
 	Message   string    // sql: message
 	Timestamp time.Time // sql: timestamp

From 10e0da4492b0cc3746edaef5e375a68eeb33da83 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:32:10 -0800
Subject: [PATCH 093/122] Add future-proof functions using struct for context,
 tx, etc

---
 cmd/gochan-migration/internal/pre2021/bans.go |   2 +-
 .../internal/pre2021/boards.go                |   6 +-
 .../internal/pre2021/posts.go                 |  17 +-
 pkg/gcsql/bans.go                             |  56 ++++---
 pkg/gcsql/boards.go                           |   2 +-
 pkg/gcsql/database.go                         | 158 ++++++++----------
 pkg/gcsql/posts.go                            | 142 +++++++++-------
 pkg/gcsql/preload.go                          |   4 +-
 pkg/gcsql/sections.go                         |  53 +++---
 pkg/gcsql/setup_test.go                       |   2 +-
 pkg/gcsql/threads.go                          |  41 +++--
 pkg/gcsql/uploads.go                          |  43 ++---
 pkg/gcsql/util.go                             |  92 ++++++----
 13 files changed, 332 insertions(+), 286 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index a7cb25da..40d8bd5c 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -80,7 +80,7 @@ func (m *Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int
 	migratedBan.Message = ban.reason
 	migratedBan.StaffID = ban.staffID
 	migratedBan.StaffNote = ban.staffNote
-	if err := gcsql.NewIPBanTx(tx, migratedBan); err != nil {
+	if err := gcsql.NewIPBan(migratedBan, &gcsql.RequestOptions{Tx: tx}); err != nil {
 		errEv.Err(err).Caller().
 			Int("oldID", ban.oldID).Msg("Failed to migrate ban")
 		return err
diff --git a/cmd/gochan-migration/internal/pre2021/boards.go b/cmd/gochan-migration/internal/pre2021/boards.go
index 6b204ad8..8328bad1 100644
--- a/cmd/gochan-migration/internal/pre2021/boards.go
+++ b/cmd/gochan-migration/internal/pre2021/boards.go
@@ -37,7 +37,7 @@ func (m *Pre2021Migrator) migrateSections() error {
 	}
 
 	var sectionsToBeCreated []gcsql.Section
-	rows, err := m.db.QuerySQL(sectionsQuery)
+	rows, err := m.db.Query(nil, sectionsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to query old database sections")
 		return err
@@ -126,7 +126,7 @@ func (m *Pre2021Migrator) MigrateBoards() error {
 	}
 
 	// get boards from old db
-	rows, err := m.db.QuerySQL(boardsQuery)
+	rows, err := m.db.Query(nil, boardsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to query old database boards")
 		return err
@@ -162,7 +162,7 @@ func (m *Pre2021Migrator) MigrateBoards() error {
 					Int("migratedBoardID", newBoard.ID).
 					Msg("Board already exists in new db, updating values")
 				// don't update other values in the array since they don't affect migrating threads or posts
-				if _, err = gcsql.ExecSQL(`UPDATE DBPREFIXboards
+				if _, err = gcsql.Exec(nil, `UPDATE DBPREFIXboards
 					SET uri = ?, navbar_position = ?, title = ?, subtitle = ?, description = ?,
 					max_file_size = ?, max_threads = ?, default_style = ?, locked = ?,
 					anonymous_name = ?, force_anonymous = ?, autosage_after = ?, no_images_after = ?, max_message_length = ?,
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index bd4bfa56..3fa474fc 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -1,7 +1,6 @@
 package pre2021
 
 import (
-	"context"
 	"database/sql"
 	"time"
 
@@ -35,10 +34,10 @@ type migrationPost struct {
 
 func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *zerolog.Event) error {
 	var err error
-
+	opts := &gcsql.RequestOptions{Tx: tx}
 	if post.oldParentID == 0 {
 		// migrating post was a thread OP, create the row in the threads table
-		if post.ThreadID, err = gcsql.CreateThread(tx, post.boardID, false, post.stickied, post.autosage, false); err != nil {
+		if post.ThreadID, err = gcsql.CreateThread(opts, post.boardID, false, post.stickied, post.autosage, false); err != nil {
 			errEv.Err(err).Caller().
 				Int("boardID", post.boardID).
 				Msg("Failed to create thread")
@@ -46,7 +45,7 @@ func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *ze
 	}
 
 	// insert thread top post
-	if err = post.InsertWithContext(context.Background(), tx, true, post.boardID, false, post.stickied, post.autosage, false); err != nil {
+	if err = post.Insert(true, post.boardID, false, post.stickied, post.autosage, false, opts); err != nil {
 		errEv.Err(err).Caller().
 			Int("boardID", post.boardID).
 			Int("threadID", post.ThreadID).
@@ -54,7 +53,7 @@ func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *ze
 	}
 
 	if post.filename != "" {
-		if err = post.AttachFileTx(tx, &gcsql.Upload{
+		if err = post.AttachFile(&gcsql.Upload{
 			PostID:           post.ID,
 			OriginalFilename: post.filenameOriginal,
 			Filename:         post.filename,
@@ -64,7 +63,7 @@ func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *ze
 			ThumbnailHeight:  post.thumbH,
 			Width:            post.imageW,
 			Height:           post.imageH,
-		}); err != nil {
+		}, opts); err != nil {
 			errEv.Err(err).Caller().
 				Int("oldPostID", post.oldID).
 				Msg("Failed to attach upload to migrated post")
@@ -85,7 +84,7 @@ func (m *Pre2021Migrator) MigratePosts() error {
 	}
 	defer tx.Rollback()
 
-	rows, err := m.db.QuerySQL(threadsQuery)
+	rows, err := m.db.Query(nil, threadsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get threads")
 		return err
@@ -126,7 +125,7 @@ func (m *Pre2021Migrator) MigratePosts() error {
 		}
 
 		// get and insert replies
-		replyRows, err := m.db.QuerySQL(postsQuery+" AND parentid = ?", thread.oldID)
+		replyRows, err := m.db.Query(nil, postsQuery+" AND parentid = ?", thread.oldID)
 		if err != nil {
 			errEv.Err(err).Caller().
 				Int("parentID", thread.oldID).
@@ -156,7 +155,7 @@ func (m *Pre2021Migrator) MigratePosts() error {
 		}
 
 		if thread.locked {
-			if _, err = gcsql.ExecTxSQL(tx, "UPDATE DBPREFIXthreads SET locked = TRUE WHERE id = ?", thread.ThreadID); err != nil {
+			if _, err = gcsql.Exec(&gcsql.RequestOptions{Tx: tx}, "UPDATE DBPREFIXthreads SET locked = TRUE WHERE id = ?", thread.ThreadID); err != nil {
 				errEv.Err(err).Caller().
 					Int("threadID", thread.ThreadID).
 					Msg("Unable to re-lock migrated thread")
diff --git a/pkg/gcsql/bans.go b/pkg/gcsql/bans.go
index 2632fcd3..6bb1f086 100644
--- a/pkg/gcsql/bans.go
+++ b/pkg/gcsql/bans.go
@@ -25,38 +25,42 @@ type Ban interface {
 	Deactivate(int) error
 }
 
-func NewIPBanTx(tx *sql.Tx, ban *IPBan) error {
+func NewIPBan(ban *IPBan, requestOpts ...*RequestOptions) error {
 	const query = `INSERT INTO DBPREFIXip_ban
 	(staff_id, board_id, banned_for_post_id, copy_post_text, is_thread_ban,
 		is_active, range_start, range_end, appeal_at, expires_at,
 		permanent, staff_note, message, can_appeal)
 	VALUES(?, ?, ?, ?, ?, ?, PARAM_ATON, PARAM_ATON, ?, ?, ?, ?, ?, ?)`
+	opts := setupOptions(requestOpts...)
+	shouldCommit := opts.Tx == nil
+	var err error
+	if shouldCommit {
+		opts.Tx, err = BeginTx()
+		if err != nil {
+			return err
+		}
+		defer opts.Tx.Rollback()
+	}
+
 	if ban.ID > 0 {
 		return ErrBanAlreadyInserted
 	}
-	_, err := ExecTxSQL(tx, query, ban.StaffID, ban.BoardID, ban.BannedForPostID, ban.CopyPostText,
+	if _, err = Exec(opts, query, ban.StaffID, ban.BoardID, ban.BannedForPostID, ban.CopyPostText,
 		ban.IsThreadBan, ban.IsActive, ban.RangeStart, ban.RangeEnd, ban.AppealAt,
-		ban.ExpiresAt, ban.Permanent, ban.StaffNote, ban.Message, ban.CanAppeal)
+		ban.ExpiresAt, ban.Permanent, ban.StaffNote, ban.Message, ban.CanAppeal,
+	); err != nil {
+		return err
+	}
+
+	ban.ID, err = getLatestID(opts, "DBPREFIXip_ban")
 	if err != nil {
 		return err
 	}
-
-	ban.ID, err = getLatestID("DBPREFIXip_ban", tx)
-	return err
-}
-
-func NewIPBan(ban *IPBan) error {
-	tx, err := BeginTx()
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	if err = NewIPBanTx(tx, ban); err != nil {
-		return err
+	if shouldCommit {
+		return opts.Tx.Commit()
 	}
 
-	return tx.Commit()
+	return nil
 }
 
 // CheckIPBan returns the latest active IP ban for the given IP, as well as any
@@ -74,7 +78,7 @@ func CheckIPBan(ip string, boardID int) (*IPBan, error) {
 		(expires_at > CURRENT_TIMESTAMP OR permanent)
 	ORDER BY id DESC LIMIT 1`
 	var ban IPBan
-	err := QueryRowSQL(query, []any{ip, ip, boardID}, []any{
+	err := QueryRow(nil, query, []any{ip, ip, boardID}, []any{
 		&ban.ID, &ban.StaffID, &ban.BoardID, &ban.BannedForPostID, &ban.CopyPostText,
 		&ban.IsThreadBan, &ban.IsActive, &ban.RangeStart, &ban.RangeEnd, &ban.IssuedAt,
 		&ban.AppealAt, &ban.ExpiresAt, &ban.Permanent, &ban.StaffNote, &ban.Message,
@@ -90,7 +94,7 @@ func CheckIPBan(ip string, boardID int) (*IPBan, error) {
 func GetIPBanByID(id int) (*IPBan, error) {
 	const query = ipBanQueryBase + " WHERE id = ?"
 	var ban IPBan
-	err := QueryRowSQL(query, []any{id}, []any{
+	err := QueryRow(nil, query, []any{id}, []any{
 		&ban.ID, &ban.StaffID, &ban.BoardID, &ban.BannedForPostID, &ban.CopyPostText,
 		&ban.IsThreadBan, &ban.IsActive, &ban.RangeStart, &ban.RangeEnd, &ban.IssuedAt,
 		&ban.AppealAt, &ban.ExpiresAt, &ban.Permanent, &ban.StaffNote, &ban.Message,
@@ -110,14 +114,15 @@ func GetIPBans(boardID int, limit int, onlyActive bool) ([]IPBan, error) {
 	var rows *sql.Rows
 	var err error
 	if boardID > 0 {
-		rows, err = QuerySQL(query, boardID)
+		rows, err = Query(nil, query, boardID)
 	} else {
-		rows, err = QuerySQL(query)
+		rows, err = Query(nil, query)
 	}
 	if err != nil {
 		return nil, err
 	}
 	var bans []IPBan
+	defer rows.Close()
 	for rows.Next() {
 		var ban IPBan
 		if err = rows.Scan(
@@ -125,7 +130,6 @@ func GetIPBans(boardID int, limit int, onlyActive bool) ([]IPBan, error) {
 			&ban.IsActive, &ban.RangeStart, &ban.RangeEnd, &ban.IssuedAt, &ban.AppealAt, &ban.ExpiresAt,
 			&ban.Permanent, &ban.StaffNote, &ban.Message, &ban.CanAppeal,
 		); err != nil {
-			rows.Close()
 			return nil, err
 		}
 		if onlyActive && !ban.IsActive {
@@ -138,7 +142,7 @@ func GetIPBans(boardID int, limit int, onlyActive bool) ([]IPBan, error) {
 
 func (ipb *IPBan) Appeal(msg string) error {
 	const query = `INSERT INTO DBPREFIXip_ban_appeals (ip_ban_id, appeal_text, is_denied) VALUES(?, ?, FALSE)`
-	_, err := ExecSQL(query, ipb.ID, msg)
+	_, err := Exec(nil, query, ipb.ID, msg)
 	return err
 }
 
@@ -163,10 +167,10 @@ func (ipb *IPBan) Deactivate(_ int) error {
 		return err
 	}
 	defer tx.Rollback()
-	if _, err = ExecTxSQL(tx, deactivateQuery, ipb.ID); err != nil {
+	if _, err = Exec(&RequestOptions{Tx: tx}, deactivateQuery, ipb.ID); err != nil {
 		return err
 	}
-	if _, err = ExecTxSQL(tx, auditInsertQuery, ipb.ID); err != nil {
+	if _, err = Exec(&RequestOptions{Tx: tx}, auditInsertQuery, ipb.ID); err != nil {
 		return err
 	}
 	return tx.Commit()
diff --git a/pkg/gcsql/boards.go b/pkg/gcsql/boards.go
index 744a29d2..87cbb281 100644
--- a/pkg/gcsql/boards.go
+++ b/pkg/gcsql/boards.go
@@ -459,7 +459,7 @@ func (board *Board) ModifyInDB() error {
 		require_file = ?,
 		enable_catalog = ?
 		WHERE id = ?`
-	_, err := ExecSQL(query,
+	_, err := Exec(nil, query,
 		board.SectionID, board.NavbarPosition, board.Title, board.Subtitle, board.Description,
 		board.MaxFilesize, board.MaxThreads, board.DefaultStyle, board.Locked, board.AnonymousName,
 		board.ForceAnonymous, board.AutosageAfter, board.NoImagesAfter, board.MaxMessageLength,
diff --git a/pkg/gcsql/database.go b/pkg/gcsql/database.go
index f9cdb51a..50d633f0 100644
--- a/pkg/gcsql/database.go
+++ b/pkg/gcsql/database.go
@@ -118,21 +118,16 @@ func (db *GCDB) PrepareContextSQL(ctx context.Context, query string, tx *sql.Tx)
 	return stmt, sqlVersionError(err, db.driver, &prepared)
 }
 
-/*
-ExecSQL executes the given SQL statement with the given parameters
-Example:
-
-	var intVal int
-	var stringVal string
-	result, err := db.ExecSQL("INSERT INTO tablename (intval,stringval) VALUES(?,?)", intVal, stringVal)
-*/
-func (db *GCDB) ExecSQL(query string, values ...any) (sql.Result, error) {
-	stmt, err := db.PrepareSQL(query, nil)
+// Exec executes the given SQL statement with the given parameters, optionally with the given RequestOptions struct
+// or a background context and transaction if nil
+func (db *GCDB) Exec(opts *RequestOptions, query string, values ...any) (sql.Result, error) {
+	opts = setupOptions(opts)
+	stmt, err := db.PrepareContextSQL(opts.Context, query, opts.Tx)
 	if err != nil {
 		return nil, err
 	}
 	defer stmt.Close()
-	result, err := stmt.Exec(values...)
+	result, err := stmt.ExecContext(opts.Context, values...)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +135,22 @@ func (db *GCDB) ExecSQL(query string, values ...any) (sql.Result, error) {
 }
 
 /*
-ExecContextSQL executes the given SQL statement with the given context, optionally with the given transaction (if non-nil)
+ExecSQL executes the given SQL statement with the given parameters.
+Deprecated: Use Exec instead
+
+Example:
+
+	var intVal int
+	var stringVal string
+	result, err := db.ExecSQL("INSERT INTO tablename (intval,stringval) VALUES(?,?)", intVal, stringVal)
+*/
+func (db *GCDB) ExecSQL(query string, values ...any) (sql.Result, error) {
+	return db.Exec(nil, query, values...)
+}
+
+/*
+ExecContextSQL executes the given SQL statement with the given context, optionally with the given transaction (if non-nil).
+Deprecated: Use Exec instead, with a RequestOptions struct for the context and transaction
 
 Example:
 
@@ -152,21 +162,12 @@ Example:
 		intVal, stringVal)
 */
 func (db *GCDB) ExecContextSQL(ctx context.Context, tx *sql.Tx, sqlStr string, values ...any) (sql.Result, error) {
-	stmt, err := db.PrepareContextSQL(ctx, sqlStr, tx)
-	if err != nil {
-		return nil, err
-	}
-	defer stmt.Close()
-
-	result, err := stmt.ExecContext(ctx, values...)
-	if err != nil {
-		return nil, err
-	}
-	return result, stmt.Close()
+	return db.Exec(&RequestOptions{Context: ctx, Tx: tx}, sqlStr, values...)
 }
 
 /*
-ExecTxSQL executes the given SQL statemtnt, optionally with the given transaction (if non-nil)
+ExecTxSQL executes the given SQL statemtnt, optionally with the given transaction (if non-nil).
+Deprecated: Use Exec instead, with a RequestOptions struct for the transaction
 
 Example:
 
@@ -179,16 +180,7 @@ Example:
 		intVal, stringVal)
 */
 func (db *GCDB) ExecTxSQL(tx *sql.Tx, query string, values ...any) (sql.Result, error) {
-	stmt, err := db.PrepareSQL(query, tx)
-	if err != nil {
-		return nil, err
-	}
-	defer stmt.Close()
-	res, err := stmt.Exec(values...)
-	if err != nil {
-		return res, err
-	}
-	return res, stmt.Close()
+	return db.Exec(&RequestOptions{Tx: tx}, query, values...)
 }
 
 /*
@@ -209,9 +201,25 @@ func (db *GCDB) BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, erro
 	return db.db.BeginTx(ctx, opts)
 }
 
+// QueryRow gets a row from the db with the values in values[] and fills the respective pointers in out[],
+// with an optional RequestOptions struct for the context and transaction
+func (db *GCDB) QueryRow(opts *RequestOptions, query string, values []any, out []any) error {
+	opts = setupOptions(opts)
+	stmt, err := db.PrepareContextSQL(opts.Context, query, opts.Tx)
+	if err != nil {
+		return err
+	}
+	defer stmt.Close()
+	if err = stmt.QueryRowContext(opts.Context, values...).Scan(out...); err != nil {
+		return err
+	}
+	return stmt.Close()
+}
+
 /*
-QueryRowSQL gets a row from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QueryRowSQL gets a row from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use QueryRow instead
+
 Example:
 
 	id := 32
@@ -222,12 +230,7 @@ Example:
 		[]any{&intVal, &stringVal})
 */
 func (db *GCDB) QueryRowSQL(query string, values, out []any) error {
-	stmt, err := db.PrepareSQL(query, nil)
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-	return stmt.QueryRow(values...).Scan(out...)
+	return db.QueryRow(nil, query, values, out)
 }
 
 /*
@@ -244,16 +247,7 @@ Example:
 		[]any{id}, []any{&name})
 */
 func (db *GCDB) QueryRowContextSQL(ctx context.Context, tx *sql.Tx, query string, values, out []any) error {
-	stmt, err := db.PrepareContextSQL(ctx, query, tx)
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-
-	if err = stmt.QueryRowContext(ctx, values...).Scan(out...); err != nil {
-		return err
-	}
-	return stmt.Close()
+	return db.QueryRow(&RequestOptions{Context: ctx, Tx: tx}, query, values, out)
 }
 
 /*
@@ -273,21 +267,29 @@ Example:
 		[]any{&intVal, &stringVal})
 */
 func (db *GCDB) QueryRowTxSQL(tx *sql.Tx, query string, values, out []any) error {
-	stmt, err := db.PrepareSQL(query, tx)
+	return db.QueryRow(&RequestOptions{Tx: tx}, query, values, out)
+}
+
+// Query sends the query to the database with the given options (or a background context if nil), and the given parameters
+func (db *GCDB) Query(opts *RequestOptions, query string, a ...any) (*sql.Rows, error) {
+	opts = setupOptions(opts)
+	stmt, err := db.PrepareContextSQL(opts.Context, query, opts.Tx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer stmt.Close()
 
-	if err = stmt.QueryRow(values...).Scan(out...); err != nil {
-		return err
+	rows, err := stmt.QueryContext(opts.Context, a...)
+	if err != nil {
+		return rows, err
 	}
-	return stmt.Close()
+
+	return rows, stmt.Close()
 }
 
 /*
-QuerySQL gets all rows from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QuerySQL gets all rows from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use Query instead
 Example:
 
 	rows, err := db.QuerySQL("SELECT * FROM table")
@@ -301,17 +303,13 @@ Example:
 	}
 */
 func (db *GCDB) QuerySQL(query string, a ...any) (*sql.Rows, error) {
-	stmt, err := db.PrepareSQL(query, nil)
-	if err != nil {
-		return nil, err
-	}
-	defer stmt.Close()
-	return stmt.Query(a...)
+	return db.Query(nil, query, a...)
 }
 
 /*
 QueryContextSQL queries the database with a prepared statement and the given parameters, using the given context
-for a deadline
+for a deadline.
+Deprecated: Use Query instead, with a RequestOptions struct for the context and transaction
 
 Example:
 
@@ -320,22 +318,12 @@ Example:
 	rows, err := db.QueryContextSQL(ctx, nil, "SELECT name from posts where NOT is_deleted")
 */
 func (db *GCDB) QueryContextSQL(ctx context.Context, tx *sql.Tx, query string, a ...any) (*sql.Rows, error) {
-	stmt, err := db.PrepareContextSQL(ctx, query, tx)
-	if err != nil {
-		return nil, err
-	}
-	defer stmt.Close()
-
-	rows, err := stmt.QueryContext(ctx, a...)
-	if err != nil {
-		return rows, err
-	}
-	return rows, stmt.Close()
+	return db.Query(&RequestOptions{Context: ctx, Tx: tx}, query, a...)
 }
 
 /*
-QueryTxSQL gets all rows from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QueryTxSQL gets all rows from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use Query instead, with a RequestOptions struct for the transaction
 Example:
 
 	tx, _ := db.Begin()
@@ -350,16 +338,7 @@ Example:
 	}
 */
 func (db *GCDB) QueryTxSQL(tx *sql.Tx, query string, a ...any) (*sql.Rows, error) {
-	stmt, err := db.PrepareSQL(query, tx)
-	if err != nil {
-		return nil, err
-	}
-	defer stmt.Close()
-	rows, err := stmt.Query(a...)
-	if err != nil {
-		return nil, err
-	}
-	return rows, stmt.Close()
+	return db.Query(&RequestOptions{Tx: tx}, query, a...)
 }
 
 func setupDBConn(cfg *config.SQLConfig) (db *GCDB, err error) {
@@ -404,6 +383,7 @@ func setupSqlTestConfig(dbDriver string, dbName string, dbPrefix string) *config
 	}
 }
 
+// SetupMockDB sets up a mock database connection for testing
 func SetupMockDB(driver string) (sqlmock.Sqlmock, error) {
 	var err error
 	gcdb, err = setupDBConn(setupSqlTestConfig(driver, "gochan", ""))
diff --git a/pkg/gcsql/posts.go b/pkg/gcsql/posts.go
index a8493d97..96479c1c 100644
--- a/pkg/gcsql/posts.go
+++ b/pkg/gcsql/posts.go
@@ -39,23 +39,24 @@ func GetPostFromID(id int, onlyNotDeleted bool) (*Post, error) {
 		query += " AND is_deleted = FALSE"
 	}
 	post := new(Post)
-	err := QueryRowSQL(query, []any{id}, []any{
+	err := QueryRow(nil, query, []any{id}, []any{
 		&post.ID, &post.ThreadID, &post.IsTopPost, &post.IP, &post.CreatedOn, &post.Name,
 		&post.Tripcode, &post.IsRoleSignature, &post.Email, &post.Subject, &post.Message,
 		&post.MessageRaw, &post.Password, &post.DeletedAt, &post.IsDeleted,
 		&post.BannedMessage, &post.Flag, &post.Country,
 	})
-	if err == sql.ErrNoRows {
+	if errors.Is(err, sql.ErrNoRows) {
 		return nil, ErrPostDoesNotExist
-
+	} else if err != nil {
+		return nil, err
 	}
-	return post, err
+	return post, nil
 }
 
 func GetPostIP(postID int) (string, error) {
 	sql := "SELECT IP_NTOA FROM DBPREFIXposts WHERE id = ?"
 	var ip string
-	err := QueryRowSQL(sql, []any{postID}, []any{&ip})
+	err := QueryRow(nil, sql, []any{postID}, []any{&ip})
 	return ip, err
 }
 
@@ -68,7 +69,7 @@ func GetPostsFromIP(ip string, limit int, onlyNotDeleted bool) ([]Post, error) {
 	}
 
 	sql += " ORDER BY id DESC LIMIT ?"
-	rows, err := QuerySQL(sql, ip, limit)
+	rows, err := Query(nil, sql, ip, limit)
 	if err != nil {
 		return nil, err
 	}
@@ -109,7 +110,7 @@ func GetTopPostIDsInThreadIDs(threads ...any) (map[any]int, error) {
 	}
 	params := createArrayPlaceholder(threads)
 	query := `SELECT id FROM DBPREFIXposts WHERE thread_id in ` + params + " AND is_top_post"
-	rows, err := QuerySQL(query, threads...)
+	rows, err := Query(nil, query, threads...)
 	if err != nil {
 		return nil, err
 	}
@@ -130,7 +131,7 @@ func GetTopPostIDsInThreadIDs(threads ...any) (map[any]int, error) {
 func GetThreadTopPost(threadID int) (*Post, error) {
 	const query = selectPostsBaseSQL + "WHERE thread_id = ? AND is_top_post = TRUE LIMIT 1"
 	post := new(Post)
-	err := QueryRowSQL(query, []any{threadID}, []any{
+	err := QueryRow(nil, query, []any{threadID}, []any{
 		&post.ID, &post.ThreadID, &post.IsTopPost, &post.IP, &post.CreatedOn, &post.Name,
 		&post.Tripcode, &post.IsRoleSignature, &post.Email, &post.Subject, &post.Message,
 		&post.MessageRaw, &post.Password, &post.DeletedAt, &post.IsDeleted,
@@ -180,19 +181,23 @@ func GetBoardTopPosts[B intOrStringConstraint](board B) ([]*Post, error) {
 func GetPostPassword(id int) (string, error) {
 	const query = `SELECT password FROM DBPREFIXposts WHERE id = ?`
 	var passwordChecksum string
-	err := QueryRowSQL(query, []any{id}, []any{&passwordChecksum})
+	err := QueryRow(nil, query, []any{id}, []any{&passwordChecksum})
 	return passwordChecksum, err
 }
 
 // PermanentlyRemoveDeletedPosts removes all posts and files marked as deleted from the database
-func PermanentlyRemoveDeletedPosts() error {
+func PermanentlyRemoveDeletedPosts(opts ...*RequestOptions) error {
 	const sql1 = `DELETE FROM DBPREFIXposts WHERE is_deleted`
 	const sql2 = `DELETE FROM DBPREFIXthreads WHERE is_deleted`
-	_, err := ExecSQL(sql1)
+	var useOpts *RequestOptions
+	if len(opts) > 0 {
+		useOpts = opts[0]
+	}
+	_, err := Exec(useOpts, sql1)
 	if err != nil {
 		return err
 	}
-	_, err = ExecSQL(sql2)
+	_, err = Exec(useOpts, sql2)
 	return err
 }
 
@@ -201,7 +206,7 @@ func PermanentlyRemoveDeletedPosts() error {
 func SinceLastPost(postIP string) (int, error) {
 	const query = `SELECT COALESCE(MAX(created_on), '1970-01-01 00:00:00') FROM DBPREFIXposts WHERE ip = ?`
 	var whenStr string
-	err := QueryRowSQL(query, []any{postIP}, []any{&whenStr})
+	err := QueryRow(nil, query, []any{postIP}, []any{&whenStr})
 	if err != nil {
 		return -1, err
 	}
@@ -219,7 +224,7 @@ func SinceLastThread(postIP string) (int, error) {
 	const query = `SELECT COALESCE(MAX(created_on), '1970-01-01 00:00:00') FROM DBPREFIXposts WHERE ip = ? AND is_top_post`
 	var whenStr string
 
-	err := QueryRowSQL(query, []any{postIP}, []any{&whenStr})
+	err := QueryRow(nil, query, []any{postIP}, []any{&whenStr})
 	if err != nil {
 		return -1, err
 	}
@@ -233,7 +238,7 @@ func SinceLastThread(postIP string) (int, error) {
 // UpdateContents updates the email, subject, and message text of the post
 func (p *Post) UpdateContents(email string, subject string, message template.HTML, messageRaw string) error {
 	const sqlUpdate = `UPDATE DBPREFIXposts SET email = ?, subject = ?, message = ?, message_raw = ? WHERE ID = ?`
-	_, err := ExecSQL(sqlUpdate, email, subject, message, messageRaw, p.ID)
+	_, err := Exec(nil, sqlUpdate, email, subject, message, messageRaw, p.ID)
 	if err != nil {
 		return err
 	}
@@ -244,27 +249,27 @@ func (p *Post) UpdateContents(email string, subject string, message template.HTM
 	return nil
 }
 
-func (p *Post) GetBoardID() (int, error) {
+func (p *Post) GetBoardID(opts ...*RequestOptions) (int, error) {
 	const query = `SELECT board_id FROM DBPREFIXthreads where id = ?`
 	var boardID int
-	err := QueryRowSQL(query, []any{p.ThreadID}, []any{&boardID})
+	err := QueryRow(setupOptions(opts...), query, []any{p.ThreadID}, []any{&boardID})
 	if errors.Is(err, sql.ErrNoRows) {
 		err = ErrBoardDoesNotExist
 	}
 	return boardID, err
 }
 
-func (p *Post) GetBoardDir() (string, error) {
+func (p *Post) GetBoardDir(opts ...*RequestOptions) (string, error) {
 	const query = "SELECT dir FROM DBPREFIXboards" + boardFromPostIdSuffixSQL
 	var dir string
-	err := QueryRowSQL(query, []any{p.ID}, []any{&dir})
+	err := QueryRow(setupOptions(opts...), query, []any{p.ID}, []any{&dir})
 	return dir, err
 }
 
-func (p *Post) GetBoard() (*Board, error) {
+func (p *Post) GetBoard(opts ...*RequestOptions) (*Board, error) {
 	const query = selectBoardsBaseSQL + boardFromPostIdSuffixSQL
 	board := new(Board)
-	err := QueryRowSQL(query, []any{p.ID}, []any{
+	err := QueryRow(setupOptions(opts...), query, []any{p.ID}, []any{
 		&board.ID, &board.SectionID, &board.URI, &board.Dir, &board.NavbarPosition, &board.Title, &board.Subtitle,
 		&board.Description, &board.MaxFilesize, &board.MaxThreads, &board.DefaultStyle, &board.Locked,
 		&board.CreatedAt, &board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter,
@@ -284,13 +289,13 @@ func (p *Post) ChangeBoardID(newBoardID int) error {
 }
 
 // TopPostID returns the OP post ID of the thread that p is in
-func (p *Post) TopPostID() (int, error) {
+func (p *Post) TopPostID(opts ...*RequestOptions) (int, error) {
 	if p.IsTopPost {
 		return p.ID, nil
 	}
 	const query = `SELECT id FROM DBPREFIXposts WHERE thread_id = ? and is_top_post = TRUE ORDER BY id ASC LIMIT 1`
 	var topPostID int
-	err := QueryRowSQL(query, []any{p.ThreadID}, []any{&topPostID})
+	err := QueryRow(setupOptions(opts...), query, []any{p.ThreadID}, []any{&topPostID})
 	return topPostID, err
 }
 
@@ -306,13 +311,13 @@ func (p *Post) GetTopPost() (*Post, error) {
 // GetPostUpload returns the upload info associated with the file as well as any errors encountered.
 // If the file has no uploads, then *Upload is nil. If the file was removed from the post, then Filename
 // and OriginalFilename = "deleted"
-func (p *Post) GetUpload() (*Upload, error) {
+func (p *Post) GetUpload(opts ...*RequestOptions) (*Upload, error) {
 	const query = `SELECT
 	id, post_id, file_order, original_filename, filename, checksum,
 	file_size, is_spoilered, thumbnail_width, thumbnail_height, width, height
 	FROM DBPREFIXfiles WHERE post_id = ?`
 	upload := new(Upload)
-	err := QueryRowSQL(query, []any{p.ID}, []any{
+	err := QueryRow(setupOptions(opts...), query, []any{p.ID}, []any{
 		&upload.ID, &upload.PostID, &upload.FileOrder, &upload.OriginalFilename, &upload.Filename, &upload.Checksum,
 		&upload.FileSize, &upload.IsSpoilered, &upload.ThumbnailWidth, &upload.ThumbnailHeight, &upload.Width, &upload.Height,
 	})
@@ -325,7 +330,7 @@ func (p *Post) GetUpload() (*Upload, error) {
 // UnlinkUploads disassociates the post with any uploads in DBPREFIXfiles
 // that may have been uploaded with it, optionally leaving behind a "File Deleted"
 // frame where the thumbnail appeared
-func (p *Post) UnlinkUploads(leaveDeletedBox bool) error {
+func (p *Post) UnlinkUploads(leaveDeletedBox bool, requestOpts ...*RequestOptions) error {
 	var sqlStr string
 	if leaveDeletedBox {
 		// leave a "File Deleted" box
@@ -333,7 +338,7 @@ func (p *Post) UnlinkUploads(leaveDeletedBox bool) error {
 	} else {
 		sqlStr = `DELETE FROM DBPREFIXfiles WHERE post_id = ?`
 	}
-	_, err := ExecSQL(sqlStr, p.ID)
+	_, err := Exec(setupOptions(requestOpts...), sqlStr, p.ID)
 	return err
 }
 
@@ -348,17 +353,24 @@ func (p *Post) InCyclicThread() (bool, error) {
 }
 
 // Delete sets the post as deleted and sets the deleted_at timestamp to the current time
-func (p *Post) Delete() error {
-	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
-	defer cancel()
-	tx, err := BeginContextTx(ctx)
-	if err != nil {
-		return err
+func (p *Post) Delete(requestOptions ...*RequestOptions) error {
+	shouldCommit := len(requestOptions) == 0
+	opts := setupOptions(requestOptions...)
+	if opts.Context == context.Background() {
+		opts.Context, opts.Cancel = context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+		defer opts.Cancel()
+	}
+	var err error
+	if opts.Tx == nil {
+		opts.Tx, err = BeginContextTx(opts.Context)
+		if err != nil {
+			return err
+		}
+		defer opts.Tx.Rollback()
 	}
-	defer tx.Rollback()
 
 	var rowCount int
-	err = QueryRowContextSQL(ctx, tx, "SELECT COUNT(*) FROM DBPREFIXposts WHERE id = ?", []any{p.ID}, []any{&rowCount})
+	err = QueryRow(opts, "SELECT COUNT(*) FROM DBPREFIXposts WHERE id = ?", []any{p.ID}, []any{&rowCount})
 	if errors.Is(err, sql.ErrNoRows) {
 		err = ErrPostDoesNotExist
 	}
@@ -367,16 +379,33 @@ func (p *Post) Delete() error {
 	}
 
 	if p.IsTopPost {
-		return deleteThread(ctx, tx, p.ThreadID)
+		return deleteThread(opts, p.ThreadID)
 	}
-	if _, err = ExecContextSQL(ctx, tx, "UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?", p.ID); err != nil {
+	if _, err = Exec(opts, "UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?", p.ID); err != nil {
 		return err
 	}
-	return tx.Commit()
+	if shouldCommit {
+		return opts.Tx.Commit()
+	}
+	return nil
 }
 
-// InsertWithContext inserts the post into the database with the given context and transaction
-func (p *Post) InsertWithContext(ctx context.Context, tx *sql.Tx, bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
+// Insert inserts the post into the database with the optional given options
+func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool, requestOptions ...*RequestOptions) error {
+	opts := setupOptions(requestOptions...)
+	if len(requestOptions) == 0 {
+		opts.Context, opts.Cancel = context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+		defer opts.Cancel()
+	}
+	var err error
+	if opts.Tx == nil {
+		opts.Tx, err = BeginContextTx(opts.Context)
+		if err != nil {
+			return err
+		}
+		defer opts.Tx.Rollback()
+	}
+
 	if p.ID > 0 {
 		// already inserted
 		return ErrorPostAlreadySent
@@ -387,19 +416,18 @@ func (p *Post) InsertWithContext(ctx context.Context, tx *sql.Tx, bumpThread boo
 	VALUES(?,?,PARAM_ATON,CURRENT_TIMESTAMP,?,?,?,?,?,?,?,?,?,?)`
 	bumpSQL := `UPDATE DBPREFIXthreads SET last_bump = CURRENT_TIMESTAMP WHERE id = ?`
 
-	var err error
 	if p.ThreadID == 0 {
 		// thread doesn't exist yet, this is a new post
 		p.IsTopPost = true
 		var threadID int
-		threadID, err = CreateThread(tx, boardID, locked, stickied, anchored, cyclical)
+		threadID, err = CreateThread(opts, boardID, locked, stickied, anchored, cyclical)
 		if err != nil {
 			return err
 		}
 		p.ThreadID = threadID
 	} else {
 		var threadIsLocked bool
-		if err = QueryRowTxSQL(tx, "SELECT locked FROM DBPREFIXthreads WHERE id = ?",
+		if err = QueryRow(opts, "SELECT locked FROM DBPREFIXthreads WHERE id = ?",
 			[]any{p.ThreadID}, []any{&threadIsLocked}); err != nil {
 			return err
 		}
@@ -408,40 +436,26 @@ func (p *Post) InsertWithContext(ctx context.Context, tx *sql.Tx, bumpThread boo
 		}
 	}
 
-	if _, err = ExecContextSQL(ctx, tx, insertSQL,
+	if _, err = Exec(opts, insertSQL,
 		p.ThreadID, p.IsTopPost, p.IP, p.Name, p.Tripcode, p.IsRoleSignature, p.Email, p.Subject,
 		p.Message, p.MessageRaw, p.Password, p.Flag, p.Country,
 	); err != nil {
 		return err
 	}
-	if p.ID, err = getLatestID("DBPREFIXposts", tx); err != nil {
+	if p.ID, err = getLatestID(opts, "DBPREFIXposts"); err != nil {
 		return err
 	}
 	if bumpThread {
-		if _, err = ExecContextSQL(ctx, tx, bumpSQL, p.ThreadID); err != nil {
+		if _, err = Exec(opts, bumpSQL, p.ThreadID); err != nil {
 			return err
 		}
 	}
+	if len(requestOptions) == 0 {
+		return opts.Tx.Commit()
+	}
 	return nil
 }
 
-func (p *Post) Insert(bumpThread bool, boardID int, locked bool, stickied bool, anchored bool, cyclical bool) error {
-	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
-	defer cancel()
-
-	tx, err := BeginContextTx(ctx)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	if err = p.InsertWithContext(ctx, tx, bumpThread, boardID, locked, stickied, anchored, cyclical); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
 // CyclicThreadPost represents a post that should be deleted in a cyclic thread
 type CyclicThreadPost struct {
 	PostID    int    // sql: post_id
@@ -515,7 +529,7 @@ func (p *Post) WebPath() string {
 	webRoot := config.GetSystemCriticalConfig().WebRoot
 
 	const query = "SELECT op_id, dir FROM DBPREFIXv_top_post_board_dir WHERE id = ?"
-	err := QueryRowSQL(query, []any{p.ID}, []any{&p.opID, &p.boardDir})
+	err := QueryRow(nil, query, []any{p.ID}, []any{&p.opID, &p.boardDir})
 	if err != nil {
 		return webRoot
 	}
diff --git a/pkg/gcsql/preload.go b/pkg/gcsql/preload.go
index 401851a4..3312577b 100644
--- a/pkg/gcsql/preload.go
+++ b/pkg/gcsql/preload.go
@@ -39,7 +39,7 @@ func PreloadModule(l *lua.LState) int {
 				})
 			}
 
-			rows, err := QuerySQL(queryStr, queryArgs...)
+			rows, err := Query(nil, queryStr, queryArgs...)
 
 			l.Push(luar.New(l, rows))
 			l.Push(luar.New(l, err))
@@ -57,7 +57,7 @@ func PreloadModule(l *lua.LState) int {
 					execArgs = append(execArgs, arg)
 				})
 			}
-			result, err := ExecSQL(execStr)
+			result, err := Exec(nil, execStr)
 
 			l.Push(luar.New(l, result))
 			l.Push(luar.New(l, err))
diff --git a/pkg/gcsql/sections.go b/pkg/gcsql/sections.go
index 1a82a74b..ccfa9a0e 100644
--- a/pkg/gcsql/sections.go
+++ b/pkg/gcsql/sections.go
@@ -96,7 +96,7 @@ func GetSectionFromName(name string) (*Section, error) {
 // DeleteSection deletes a section from the database and resets the AllSections array
 func DeleteSection(id int) error {
 	const query = `DELETE FROM DBPREFIXsections WHERE id = ?`
-	_, err := ExecSQL(query, id)
+	_, err := Exec(nil, query, id)
 	if err != nil {
 		return err
 	}
@@ -105,38 +105,47 @@ func DeleteSection(id int) error {
 
 // NewSection creates a new board section in the database and returns a *Section struct pointer.
 // If position < 0, it will use the ID
-func NewSection(name string, abbreviation string, hidden bool, position int) (*Section, error) {
+func NewSection(name string, abbreviation string, hidden bool, position int, requestOpts ...*RequestOptions) (*Section, error) {
 	const sqlINSERT = `INSERT INTO DBPREFIXsections (name, abbreviation, hidden, position) VALUES (?,?,?,?)`
 	const sqlPosition = `SELECT COALESCE(MAX(position) + 1, 1) FROM DBPREFIXsections`
-
-	tx, err := BeginTx()
-	if err != nil {
-		return nil, err
+	var opts *RequestOptions
+	var err error
+	shouldCommit := len(requestOpts) == 0
+	if shouldCommit {
+		opts = &RequestOptions{}
+		opts.Tx, err = BeginTx()
+		if err != nil {
+			return nil, err
+		}
+		opts.Context, opts.Cancel = context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+		defer func() {
+			opts.Cancel()
+			opts.Tx.Rollback()
+		}()
+	} else {
+		opts = requestOpts[0]
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
-	defer func() {
-		cancel()
-		tx.Rollback()
-	}()
 
 	if position < 0 {
 		// position not specified
-		err = QueryRowContextSQL(ctx, tx, sqlPosition, nil, []any{&position})
+		err = QueryRow(opts, sqlPosition, nil, []any{&position})
 		if errors.Is(err, sql.ErrNoRows) {
 			position = 1
 		} else if err != nil {
 			return nil, err
 		}
 	}
-	if _, err = ExecContextSQL(ctx, tx, sqlINSERT, name, abbreviation, hidden, position); err != nil {
+	if _, err = Exec(opts, sqlINSERT, name, abbreviation, hidden, position); err != nil {
 		return nil, err
 	}
-	id, err := getLatestID("DBPREFIXsections", tx)
+	id, err := getLatestID(opts, "DBPREFIXsections")
 	if err != nil {
 		return nil, err
 	}
-	if err = tx.Commit(); err != nil {
-		return nil, err
+	if shouldCommit {
+		if err = opts.Tx.Commit(); err != nil {
+			return nil, err
+		}
 	}
 	return &Section{
 		ID:           id,
@@ -147,9 +156,15 @@ func NewSection(name string, abbreviation string, hidden bool, position int) (*S
 	}, nil
 }
 
-func (s *Section) UpdateValues() error {
+func (s *Section) UpdateValues(requestOpts ...*RequestOptions) error {
+	opts := setupOptions(requestOpts...)
+	if opts.Context == context.Background() {
+		opts.Context, opts.Cancel = context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+		defer opts.Cancel()
+	}
+
 	var count int
-	err := QueryRowTimeoutSQL(nil, `SELECT COUNT(*) FROM DBPREFIXsections WHERE id = ?`, []any{s.ID}, []any{&count})
+	err := QueryRow(opts, `SELECT COUNT(*) FROM DBPREFIXsections WHERE id = ?`, []any{s.ID}, []any{&count})
 	if errors.Is(err, sql.ErrNoRows) {
 		return ErrSectionDoesNotExist
 	}
@@ -157,6 +172,6 @@ func (s *Section) UpdateValues() error {
 		return err
 	}
 	const query = `UPDATE DBPREFIXsections set name = ?, abbreviation = ?, position = ?, hidden = ? WHERE id = ?`
-	_, err = ExecTimeoutSQL(nil, query, s.Name, s.Abbreviation, s.Position, s.Hidden, s.ID)
+	_, err = Exec(opts, query, s.Name, s.Abbreviation, s.Position, s.Hidden, s.ID)
 	return err
 }
diff --git a/pkg/gcsql/setup_test.go b/pkg/gcsql/setup_test.go
index 2ecb059c..9bef7237 100644
--- a/pkg/gcsql/setup_test.go
+++ b/pkg/gcsql/setup_test.go
@@ -171,7 +171,7 @@ func setupAndProvisionMockDB(t *testing.T, mock sqlmock.Sqlmock, dbType string,
 		ExpectQuery().WithArgs("test").
 		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(1))
 
-	_, err := ExecSQL("CREATE DATABASE gochan")
+	_, err := Exec(nil, "CREATE DATABASE gochan")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/gcsql/threads.go b/pkg/gcsql/threads.go
index ae02a980..99f65446 100644
--- a/pkg/gcsql/threads.go
+++ b/pkg/gcsql/threads.go
@@ -1,7 +1,6 @@
 package gcsql
 
 import (
-	"context"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -21,27 +20,27 @@ var (
 )
 
 // CreateThread creates a new thread in the database with the given board ID and statuses
-func CreateThread(tx *sql.Tx, boardID int, locked bool, stickied bool, anchored bool, cyclic bool) (threadID int, err error) {
+func CreateThread(requestOptions *RequestOptions, boardID int, locked bool, stickied bool, anchored bool, cyclic bool) (threadID int, err error) {
 	const lockedQuery = `SELECT locked FROM DBPREFIXboards WHERE id = ?`
 	const insertQuery = `INSERT INTO DBPREFIXthreads (board_id, locked, stickied, anchored, cyclical) VALUES (?,?,?,?,?)`
 	var boardIsLocked bool
-	if err = QueryRowTxSQL(tx, lockedQuery, []any{boardID}, []any{&boardIsLocked}); err != nil {
+	if err = QueryRow(requestOptions, lockedQuery, []any{boardID}, []any{&boardIsLocked}); err != nil {
 		return 0, err
 	}
 	if boardIsLocked {
 		return 0, ErrBoardIsLocked
 	}
-	if _, err = ExecTxSQL(tx, insertQuery, boardID, locked, stickied, anchored, cyclic); err != nil {
+	if _, err = Exec(requestOptions, insertQuery, boardID, locked, stickied, anchored, cyclic); err != nil {
 		return 0, err
 	}
-	return threadID, QueryRowTxSQL(tx, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
+	return threadID, QueryRow(requestOptions, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
 }
 
 // GetThread returns a a thread object from the database, given its ID
 func GetThread(threadID int) (*Thread, error) {
 	const query = selectThreadsBaseSQL + `WHERE id = ?`
 	thread := new(Thread)
-	err := QueryRowSQL(query, []any{threadID}, []any{
+	err := QueryRow(nil, query, []any{threadID}, []any{
 		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclic,
 		&thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 	})
@@ -52,7 +51,7 @@ func GetThread(threadID int) (*Thread, error) {
 func GetPostThread(opID int) (*Thread, error) {
 	const query = selectThreadsBaseSQL + `WHERE id = (SELECT thread_id FROM DBPREFIXposts WHERE id = ? LIMIT 1)`
 	thread := new(Thread)
-	err := QueryRowSQL(query, []any{opID}, []any{
+	err := QueryRow(nil, query, []any{opID}, []any{
 		&thread.ID, &thread.BoardID, &thread.Locked, &thread.Stickied, &thread.Anchored, &thread.Cyclic,
 		&thread.LastBump, &thread.DeletedAt, &thread.IsDeleted,
 	})
@@ -66,7 +65,7 @@ func GetPostThread(opID int) (*Thread, error) {
 func GetTopPostThreadID(opID int) (int, error) {
 	const query = `SELECT thread_id FROM DBPREFIXposts WHERE id = ? and is_top_post`
 	var threadID int
-	err := QueryRowSQL(query, []any{opID}, []any{&threadID})
+	err := QueryRow(nil, query, []any{opID}, []any{&threadID})
 	if err == sql.ErrNoRows {
 		err = ErrThreadDoesNotExist
 	}
@@ -81,7 +80,7 @@ func GetThreadsWithBoardID(boardID int, onlyNotDeleted bool) ([]Thread, error) {
 	if onlyNotDeleted {
 		query += " AND  is_deleted = FALSE"
 	}
-	rows, err := QuerySQL(query, boardID)
+	rows, err := Query(nil, query, boardID)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +103,7 @@ func GetThreadReplyCountFromOP(opID int) (int, error) {
 	const query = `SELECT COUNT(*) FROM DBPREFIXposts WHERE thread_id = (
 		SELECT thread_id FROM DBPREFIXposts WHERE id = ?) AND is_deleted = FALSE AND is_top_post = FALSE`
 	var num int
-	err := QueryRowSQL(query, []any{opID}, []any{&num})
+	err := QueryRow(nil, query, []any{opID}, []any{&num})
 	return num, err
 }
 
@@ -113,7 +112,7 @@ func ChangeThreadBoardID(threadID int, newBoardID int) error {
 	if !DoesBoardExistByID(newBoardID) {
 		return ErrBoardDoesNotExist
 	}
-	_, err := ExecSQL(`UPDATE DBPREFIXthreads SET board_id = ? WHERE id = ?`, newBoardID, threadID)
+	_, err := Exec(nil, "UPDATE DBPREFIXthreads SET board_id = ? WHERE id = ?", newBoardID, threadID)
 	return err
 }
 
@@ -135,15 +134,15 @@ func (t *Thread) GetReplyFileCount() (int, error) {
 	const query = `SELECT COUNT(filename) FROM DBPREFIXfiles WHERE post_id IN (
 		SELECT id FROM DBPREFIXposts WHERE thread_id = ? AND is_deleted = FALSE)`
 	var fileCount int
-	err := QueryRowSQL(query, []any{t.ID}, []any{&fileCount})
+	err := QueryRow(nil, query, []any{t.ID}, []any{&fileCount})
 	return fileCount, err
 }
 
 // GetReplyCount returns the number of posts in the thread, not including the top post or any deleted posts
 func (t *Thread) GetReplyCount() (int, error) {
-	const query = `SELECT COUNT(*) FROM DBPREFIXposts WHERE thread_id = ? AND is_top_post = FALSE AND is_deleted = FALSE`
+	const query = "SELECT COUNT(*) FROM DBPREFIXposts WHERE thread_id = ? AND is_top_post = FALSE AND is_deleted = FALSE"
 	var numReplies int
-	err := QueryRowSQL(query, []any{t.ID}, []any{&numReplies})
+	err := QueryRow(nil, query, []any{t.ID}, []any{&numReplies})
 	return numReplies, err
 }
 
@@ -161,7 +160,7 @@ func (t *Thread) GetPosts(repliesOnly bool, boardPage bool, limit int) ([]Post,
 		query += " LIMIT " + strconv.Itoa(limit)
 	}
 
-	rows, err := QuerySQL(query, t.ID)
+	rows, err := Query(nil, query, t.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -185,7 +184,7 @@ func (t *Thread) GetPosts(repliesOnly bool, boardPage bool, limit int) ([]Post,
 func (t *Thread) GetUploads() ([]Upload, error) {
 	const query = selectFilesBaseSQL + ` WHERE post_id IN (
 		SELECT id FROM DBPREFIXposts WHERE thread_id = ? and is_deleted = FALSE) AND filename != 'deleted'`
-	rows, err := QuerySQL(query, t.ID)
+	rows, err := Query(nil, query, t.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -223,18 +222,18 @@ func (t *Thread) UpdateAttribute(attribute string, value bool) error {
 		return fmt.Errorf("invalid thread attribute %q", attribute)
 	}
 	updateSQL += attribute + " = ? WHERE id = ?"
-	_, err := ExecSQL(updateSQL, value, t.ID)
+	_, err := Exec(nil, updateSQL, value, t.ID)
 	return err
 }
 
 // deleteThread updates the thread and sets it as deleted, as well as the posts where thread_id = threadID
-func deleteThread(ctx context.Context, tx *sql.Tx, threadID int) error {
+func deleteThread(opts *RequestOptions, threadID int) error {
 	const checkPostExistsSQL = `SELECT COUNT(*) FROM DBPREFIXposts WHERE thread_id = ?`
 	const deletePostsSQL = `UPDATE DBPREFIXposts SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE thread_id = ?`
 	const deleteThreadSQL = `UPDATE DBPREFIXthreads SET is_deleted = TRUE, deleted_at = CURRENT_TIMESTAMP WHERE id = ?`
 
 	var rowCount int
-	err := QueryRowContextSQL(ctx, tx, checkPostExistsSQL, []any{threadID}, []any{&rowCount})
+	err := QueryRow(opts, checkPostExistsSQL, []any{threadID}, []any{&rowCount})
 	if err != nil {
 		return err
 	}
@@ -242,10 +241,10 @@ func deleteThread(ctx context.Context, tx *sql.Tx, threadID int) error {
 		return ErrThreadDoesNotExist
 	}
 
-	_, err = ExecContextSQL(ctx, tx, deletePostsSQL, threadID)
+	_, err = Exec(opts, deletePostsSQL, threadID)
 	if err != nil {
 		return err
 	}
-	_, err = ExecContextSQL(ctx, tx, deleteThreadSQL, threadID)
+	_, err = Exec(opts, deleteThreadSQL, threadID)
 	return err
 }
diff --git a/pkg/gcsql/uploads.go b/pkg/gcsql/uploads.go
index c6c8202b..9629889d 100644
--- a/pkg/gcsql/uploads.go
+++ b/pkg/gcsql/uploads.go
@@ -1,7 +1,6 @@
 package gcsql
 
 import (
-	"context"
 	"database/sql"
 	"errors"
 	"fmt"
@@ -25,7 +24,7 @@ func GetThreadFiles(post *Post) ([]Upload, error) {
 	query := selectFilesBaseSQL + `WHERE post_id IN (
 		SELECT id FROM DBPREFIXposts WHERE thread_id = (
 			SELECT thread_id FROM DBPREFIXposts WHERE id = ?)) AND filename != 'deleted'`
-	rows, err := QuerySQL(query, post.ID)
+	rows, err := Query(nil, query, post.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -45,17 +44,28 @@ func GetThreadFiles(post *Post) ([]Upload, error) {
 }
 
 // NextFileOrder gets what would be the next file_order value (not particularly useful until multi-file posting is implemented)
-func (p *Post) NextFileOrder(ctx context.Context, tx *sql.Tx) (int, error) {
+func (p *Post) NextFileOrder(requestOpts ...*RequestOptions) (int, error) {
+	opts := setupOptions(requestOpts...)
 	const query = `SELECT COALESCE(MAX(file_order) + 1, 0) FROM DBPREFIXfiles WHERE post_id = ?`
 	var next int
-	err := QueryRowContextSQL(ctx, tx, query, []any{p.ID}, []any{&next})
+	err := QueryRow(opts, query, []any{p.ID}, []any{&next})
 	return next, err
 }
 
-func (p *Post) AttachFileTx(tx *sql.Tx, upload *Upload) error {
+func (p *Post) AttachFile(upload *Upload, requestOpts ...*RequestOptions) error {
 	if upload == nil {
 		return nil // no upload to attach, so no error
 	}
+	opts := setupOptions(requestOpts...)
+	shouldCommit := opts.Tx == nil
+	var err error
+	if shouldCommit {
+		opts.Tx, err = BeginTx()
+		if err != nil {
+			return err
+		}
+		defer opts.Tx.Rollback()
+	}
 
 	_, err, recovered := events.TriggerEvent("incoming-upload", upload)
 	if recovered {
@@ -72,35 +82,30 @@ func (p *Post) AttachFileTx(tx *sql.Tx, upload *Upload) error {
 	if upload.ID > 0 {
 		return ErrAlreadyAttached
 	}
-
 	if upload.FileOrder < 1 {
-		upload.FileOrder, err = p.NextFileOrder(context.Background(), tx)
+		upload.FileOrder, err = p.NextFileOrder(opts)
 		if err != nil {
 			return err
 		}
 	}
 	upload.PostID = p.ID
-	if _, err = ExecTxSQL(tx, insertSQL,
+	if _, err = Exec(opts, insertSQL,
 		&upload.PostID, &upload.FileOrder, &upload.OriginalFilename, &upload.Filename, &upload.Checksum, &upload.FileSize,
 		&upload.IsSpoilered, &upload.ThumbnailWidth, &upload.ThumbnailHeight, &upload.Width, &upload.Height,
 	); err != nil {
 		return err
 	}
 
-	upload.ID, err = getLatestID("DBPREFIXfiles", tx)
-	return err
-}
-
-func (p *Post) AttachFile(upload *Upload) error {
-	tx, err := BeginTx()
+	upload.ID, err = getLatestID(opts, "DBPREFIXfiles")
 	if err != nil {
 		return err
 	}
-	defer tx.Rollback()
-	if err = p.AttachFileTx(tx, upload); err != nil {
-		return err
+	if shouldCommit {
+		if err = opts.Tx.Commit(); err != nil {
+			return err
+		}
 	}
-	return tx.Commit()
+	return nil
 }
 
 // GetUploadFilenameAndBoard returns the filename (or an empty string) and
@@ -112,7 +117,7 @@ func GetUploadFilenameAndBoard(postID int) (string, string, error) {
 		JOIN DBPREFIXboards ON DBPREFIXboards.id = board_id
 		WHERE DBPREFIXposts.id = ?`
 	var filename, dir string
-	err := QueryRowSQL(query, []any{postID}, []any{&filename, &dir})
+	err := QueryRow(nil, query, []any{postID}, []any{&filename, &dir})
 	if errors.Is(err, sql.ErrNoRows) {
 		return "", "", nil
 	} else if err != nil {
diff --git a/pkg/gcsql/util.go b/pkg/gcsql/util.go
index 872b286d..a82ad968 100644
--- a/pkg/gcsql/util.go
+++ b/pkg/gcsql/util.go
@@ -51,6 +51,39 @@ type intOrStringConstraint interface {
 	int | string
 }
 
+// RequestOptions is used to pass an optional context, transaction, and any other things to the various SQL functions
+// in a future-proof way
+type RequestOptions struct {
+	Context context.Context
+	Tx      *sql.Tx
+	Cancel  context.CancelFunc
+}
+
+func setupOptions(opts ...*RequestOptions) *RequestOptions {
+	if len(opts) == 0 || opts[0] == nil {
+		return &RequestOptions{Context: context.Background()}
+	}
+	if opts[0].Context == nil {
+		opts[0].Context = context.Background()
+	}
+	return opts[0]
+}
+
+// Query is a wrapper for QueryContextSQL that uses the given options, or defaults to a background context if nil
+func Query(opts *RequestOptions, query string, a ...any) (*sql.Rows, error) {
+	return gcdb.Query(opts, query, a...)
+}
+
+// QueryRow is a wrapper for QueryRowContextSQL that uses the given options, or defaults to a background context if nil
+func QueryRow(opts *RequestOptions, query string, values, out []any) error {
+	return gcdb.QueryRow(opts, query, values, out)
+}
+
+// Exec is a wrapper for ExecContextSQL that uses the given options, or defaults to a background context if nil
+func Exec(opts *RequestOptions, query string, values ...any) (sql.Result, error) {
+	return gcdb.Exec(opts, query, values...)
+}
+
 // BeginTx begins a new transaction for the gochan database. It uses a background context
 func BeginTx() (*sql.Tx, error) {
 	return BeginContextTx(context.Background())
@@ -111,7 +144,7 @@ func SetupSQLString(query string, dbConn *GCDB) (string, error) {
 	return prepared, err
 }
 
-// Close closes the connection to the SQL database
+// Close closes the connection to the SQL database if it is open
 func Close() error {
 	if gcdb != nil {
 		return gcdb.Close()
@@ -121,6 +154,7 @@ func Close() error {
 
 /*
 ExecSQL executes the given SQL statement with the given parameters
+
 Example:
 
 	var intVal int
@@ -136,8 +170,8 @@ func ExecSQL(query string, values ...any) (sql.Result, error) {
 }
 
 /*
-ExecContextSQL executes the given SQL statement with the given context, optionally with the given transaction (if non-nil)
-
+ExecContextSQL executes the given SQL statement with the given context, optionally with the given transaction (if non-nil).
+Deprecated: Use Exec instead
 Example:
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(sqlCfg.DBTimeoutSeconds) * time.Second)
@@ -154,6 +188,7 @@ func ExecContextSQL(ctx context.Context, tx *sql.Tx, sqlStr string, values ...an
 	return gcdb.ExecContextSQL(ctx, tx, sqlStr, values...)
 }
 
+// ExecTimeoutSQL is a helper function for executing a SQL statement with the configured timeout in seconds
 func ExecTimeoutSQL(tx *sql.Tx, sqlStr string, values ...any) (sql.Result, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
 	defer cancel()
@@ -162,7 +197,9 @@ func ExecTimeoutSQL(tx *sql.Tx, sqlStr string, values ...any) (sql.Result, error
 }
 
 /*
-ExecTxSQL automatically escapes the given values and caches the statement
+ExecTxSQL executes the given SQL statement with the given transaction and parameters.
+Deprecated: Use Exec instead with a transaction in the RequestOptions
+
 Example:
 
 	tx, err := BeginTx()
@@ -190,8 +227,8 @@ func ExecTxSQL(tx *sql.Tx, sqlStr string, values ...any) (sql.Result, error) {
 }
 
 /*
-QueryRowSQL gets a row from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QueryRowSQL gets a row from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use QueryRow instead
 
 Example:
 
@@ -211,7 +248,8 @@ func QueryRowSQL(query string, values, out []any) error {
 
 /*
 QueryRowContextSQL gets a row from the database with the values in values[] and fills the respective pointers in out[]
-using the given context as a deadline, and the given transaction (if non-nil)
+using the given context as a deadline, and the given transaction (if non-nil).
+Deprecated: Use QueryRow instead with an optional context and/or tx in the RequestOptions
 
 Example:
 
@@ -239,8 +277,8 @@ func QueryRowTimeoutSQL(tx *sql.Tx, query string, values, out []any) error {
 }
 
 /*
-QueryRowTxSQL gets a row from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QueryRowTxSQL gets a row from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use QueryRow instead with a transaction in the RequestOptions
 
 Example:
 
@@ -261,8 +299,8 @@ func QueryRowTxSQL(tx *sql.Tx, query string, values, out []any) error {
 }
 
 /*
-QuerySQL gets all rows from the db with the values in values[] and fills the respective pointers in out[]
-Automatically escapes the given values and caches the query
+QuerySQL gets all rows from the db with the values in values[] and fills the respective pointers in out[].
+Deprecated: Use Query instead
 
 Example:
 
@@ -285,7 +323,8 @@ func QuerySQL(query string, a ...any) (*sql.Rows, error) {
 
 /*
 QueryContextSQL queries the database with a prepared statement and the given parameters, using the given context
-for a deadline
+for a deadline.
+Deprecated: Use Query instead with an optional context/transaction in the RequestOptions
 
 Example:
 
@@ -317,7 +356,9 @@ func QueryTimeoutSQL(tx *sql.Tx, query string, a ...any) (*sql.Rows, context.Can
 
 /*
 QueryTxSQL gets all rows from the db using the transaction tx with the values in values[] and fills the
-respective pointers in out[]. Automatically escapes the given values and caches the query
+respective pointers in out[].
+Deprecated: Use Query instead with a transaction in the RequestOptions
+
 Example:
 
 	tx, err := BeginTx()
@@ -347,6 +388,7 @@ func QueryTxSQL(tx *sql.Tx, query string, a ...any) (*sql.Rows, error) {
 	return rows, stmt.Close()
 }
 
+// ParseSQLTimeString attempts to parse a string into a time.Time object using the known SQL date/time formats
 func ParseSQLTimeString(str string) (time.Time, error) {
 	var t time.Time
 	var err error
@@ -359,22 +401,10 @@ func ParseSQLTimeString(str string) (time.Time, error) {
 }
 
 // getLatestID returns the latest inserted id column value from the given table
-func getLatestID(tableName string, tx *sql.Tx) (id int, err error) {
+func getLatestID(opts *RequestOptions, tableName string) (id int, err error) {
+	opts = setupOptions(opts)
 	query := `SELECT MAX(id) FROM ` + tableName
-	if tx != nil {
-		var stmt *sql.Stmt
-		stmt, err = PrepareSQL(query, tx)
-		if err != nil {
-			return 0, err
-		}
-		defer stmt.Close()
-		if err = stmt.QueryRow().Scan(&id); err != nil {
-			return
-		}
-		err = stmt.Close()
-	} else {
-		err = QueryRowSQL(query, nil, []any{&id})
-	}
+	QueryRow(opts, query, nil, []any{&id})
 	return
 }
 
@@ -393,7 +423,7 @@ func doesTableExist(tableName string) (bool, error) {
 	}
 
 	var count int
-	err := QueryRowSQL(existQuery, []any{config.GetSystemCriticalConfig().DBprefix + tableName}, []any{&count})
+	err := QueryRow(nil, existQuery, []any{config.GetSystemCriticalConfig().DBprefix + tableName}, []any{&count})
 	if err != nil {
 		return false, err
 	}
@@ -404,7 +434,7 @@ func doesTableExist(tableName string) (bool, error) {
 func GetComponentVersion(componentKey string) (int, error) {
 	const sql = `SELECT version FROM DBPREFIXdatabase_version WHERE component = ?`
 	var version int
-	err := QueryRowSQL(sql, []any{componentKey}, []any{&version})
+	err := QueryRow(nil, sql, []any{componentKey}, []any{&version})
 	return version, err
 }
 
@@ -434,7 +464,7 @@ func doesGochanPrefixTableExist() (bool, error) {
 	}
 
 	var count int
-	err := QueryRowSQL(prefixTableExist, []any{}, []any{&count})
+	err := QueryRow(nil, prefixTableExist, []any{}, []any{&count})
 	if err != nil && err != sql.ErrNoRows {
 		return false, err
 	}

From 7ceda2b218ab158312f2e74103398792e369a6ad Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 5 Feb 2025 23:32:12 -0800
Subject: [PATCH 094/122] Fully refactor all (or at least most) uses of
 ExecSQL, QuerySQL, and QueryRowSQL, QueryContextSQL, etc with their
 replacement functions

---
 .../internal/common/sqlutil.go                |  2 +-
 .../internal/gcupdate/gcupdate.go             |  2 +-
 .../internal/pre2021/announcements.go         |  4 +--
 .../internal/pre2021/announcements_test.go    |  2 +-
 cmd/gochan-migration/internal/pre2021/bans.go |  4 +--
 .../internal/pre2021/bans_test.go             |  2 +-
 .../internal/pre2021/posts_test.go            | 12 ++++-----
 .../internal/pre2021/pre2021.go               |  4 +--
 .../internal/pre2021/staff.go                 | 10 +++----
 cmd/gochan/deleteposts.go                     | 22 ++++++++++------
 pkg/gcsql/boards.go                           | 26 ++++++++++---------
 pkg/gcsql/initsql/init.go                     |  2 +-
 pkg/gcsql/threads.go                          |  5 +++-
 pkg/gcsql/util.go                             | 17 +++++++++---
 pkg/manage/actionsAdminPerm.go                |  2 +-
 pkg/manage/actionsModPerm.go                  |  3 +--
 pkg/manage/util.go                            | 12 +++++++--
 17 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/cmd/gochan-migration/internal/common/sqlutil.go b/cmd/gochan-migration/internal/common/sqlutil.go
index bfacccce..255a42fd 100644
--- a/cmd/gochan-migration/internal/common/sqlutil.go
+++ b/cmd/gochan-migration/internal/common/sqlutil.go
@@ -88,7 +88,7 @@ func RunSQLFile(path string, db *gcsql.GCDB) error {
 	for _, statement := range sqlArr {
 		statement = strings.TrimSpace(statement)
 		if len(statement) > 0 {
-			if _, err = db.ExecSQL(statement); err != nil {
+			if _, err = db.Exec(nil, statement); err != nil {
 				return err
 			}
 		}
diff --git a/cmd/gochan-migration/internal/gcupdate/gcupdate.go b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
index 1059cc40..faaf69b8 100644
--- a/cmd/gochan-migration/internal/gcupdate/gcupdate.go
+++ b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
@@ -36,7 +36,7 @@ func (dbu *GCDatabaseUpdater) Init(options *common.MigrationOptions) error {
 
 func (dbu *GCDatabaseUpdater) IsMigrated() (bool, error) {
 	var currentDatabaseVersion int
-	err := dbu.db.QueryRowSQL(`SELECT version FROM DBPREFIXdatabase_version WHERE component = 'gochan'`, nil,
+	err := dbu.db.QueryRow(nil, "SELECT version FROM DBPREFIXdatabase_version WHERE component = 'gochan'", nil,
 		[]any{&currentDatabaseVersion})
 	if err != nil {
 		return false, err
diff --git a/cmd/gochan-migration/internal/pre2021/announcements.go b/cmd/gochan-migration/internal/pre2021/announcements.go
index aecbf909..705d7595 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements.go
@@ -16,7 +16,7 @@ func (m *Pre2021Migrator) MigrateAnnouncements() error {
 	errEv := common.LogError()
 	defer errEv.Discard()
 
-	rows, err := m.db.QuerySQL(announcementsQuery)
+	rows, err := m.db.Query(nil, announcementsQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get announcements")
 		return err
@@ -49,7 +49,7 @@ func (m *Pre2021Migrator) MigrateAnnouncements() error {
 			errEv.Err(err).Caller().Str("staff", announcement.oldPoster).Msg("Failed to get staff ID")
 			return err
 		}
-		if _, err = gcsql.ExecSQL(
+		if _, err = gcsql.Exec(nil,
 			"INSERT INTO DBPREFIXannouncements(staff_id,subject,message,timestamp) values(?,?,?,?)",
 			announcement.StaffID, announcement.Subject, announcement.Message, announcement.Timestamp,
 		); err != nil {
diff --git a/cmd/gochan-migration/internal/pre2021/announcements_test.go b/cmd/gochan-migration/internal/pre2021/announcements_test.go
index 99684351..f91c2393 100644
--- a/cmd/gochan-migration/internal/pre2021/announcements_test.go
+++ b/cmd/gochan-migration/internal/pre2021/announcements_test.go
@@ -27,6 +27,6 @@ func TestMigrateAnnouncements(t *testing.T) {
 	}
 
 	var numAnnouncements int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
+	assert.NoError(t, gcsql.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXannouncements WHERE staff_id > 0", nil, []any{&numAnnouncements}))
 	assert.Equal(t, 2, numAnnouncements, "Expected to have two announcement")
 }
diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index 40d8bd5c..5a0bfd10 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -53,7 +53,7 @@ func (m *Pre2021Migrator) migrateBansInPlace() error {
 	for _, stmt := range statements {
 		stmt = strings.TrimSpace(stmt)
 		if strings.HasPrefix(stmt, "CREATE TABLE DBPREFIXip_ban") || strings.HasPrefix(stmt, "CREATE TABLE DBPREFIXfilter") {
-			_, err = gcsql.ExecSQL(stmt)
+			_, err = gcsql.Exec(nil, stmt)
 			if err != nil {
 				errEv.Err(err).Caller().
 					Str("statement", stmt).
@@ -99,7 +99,7 @@ func (m *Pre2021Migrator) migrateBansToNewDB() error {
 	}
 	defer tx.Rollback()
 
-	rows, err := m.db.QuerySQL(bansQuery)
+	rows, err := m.db.Query(nil, bansQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get bans")
 		return err
diff --git a/cmd/gochan-migration/internal/pre2021/bans_test.go b/cmd/gochan-migration/internal/pre2021/bans_test.go
index 43f0a737..dceeeeb9 100644
--- a/cmd/gochan-migration/internal/pre2021/bans_test.go
+++ b/cmd/gochan-migration/internal/pre2021/bans_test.go
@@ -42,7 +42,7 @@ func validateBanMigration(t *testing.T) {
 	assert.NotZero(t, bans[0].StaffID, "Expected ban staff ID field to be set")
 
 	var numInvalidBans int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
+	assert.NoError(t, gcsql.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXip_ban WHERE message = ?", []any{"Full ban on 8.8.0.0/16"}, []any{&numInvalidBans}))
 	assert.Equal(t, 0, numInvalidBans, "Expected the invalid test to not be migrated")
 
 	filters, err := gcsql.GetAllFilters(gcsql.TrueOrFalse)
diff --git a/cmd/gochan-migration/internal/pre2021/posts_test.go b/cmd/gochan-migration/internal/pre2021/posts_test.go
index f4b605b2..af08de97 100644
--- a/cmd/gochan-migration/internal/pre2021/posts_test.go
+++ b/cmd/gochan-migration/internal/pre2021/posts_test.go
@@ -19,7 +19,7 @@ func TestMigratePosts(t *testing.T) {
 	}
 
 	var numThreads int
-	if !assert.NoError(t, migrator.db.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXposts WHERE parentid = 0 AND deleted_timestamp IS NULL", nil, []any{&numThreads}), "Failed to get number of threads") {
+	if !assert.NoError(t, migrator.db.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXposts WHERE parentid = 0 AND deleted_timestamp IS NULL", nil, []any{&numThreads}), "Failed to get number of threads") {
 		t.FailNow()
 	}
 	assert.Equal(t, 2, numThreads, "Expected to have two threads pre-migration")
@@ -32,27 +32,27 @@ func TestMigratePosts(t *testing.T) {
 
 func validatePostMigration(t *testing.T) {
 	var numThreads int
-	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numThreads}), "Failed to get number of threads") {
+	if !assert.NoError(t, gcsql.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numThreads}), "Failed to get number of threads") {
 		t.FailNow()
 	}
 	assert.Equal(t, 2, numThreads, "Expected to have two threads pre-migration")
 
 	var numUploadPosts int
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
+	assert.NoError(t, gcsql.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXfiles", nil, []any{&numUploadPosts}))
 	assert.Equal(t, 1, numUploadPosts, "Expected to have 1 upload post")
 
 	var ip string
-	assert.NoError(t, gcsql.QueryRowSQL("SELECT IP_NTOA FROM DBPREFIXposts WHERE id = 1", nil, []any{&ip}))
+	assert.NoError(t, gcsql.QueryRow(nil, "SELECT IP_NTOA FROM DBPREFIXposts WHERE id = 1", nil, []any{&ip}))
 	assert.Equal(t, "192.168.56.1", ip, "Expected to have the correct IP address")
 
 	var numMigratedThreads int
-	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numMigratedThreads}), "Failed to get number of migrated threads") {
+	if !assert.NoError(t, gcsql.QueryRow(nil, "SELECT COUNT(*) FROM DBPREFIXthreads", nil, []any{&numMigratedThreads}), "Failed to get number of migrated threads") {
 		t.FailNow()
 	}
 	assert.Equal(t, 2, numMigratedThreads, "Expected to have three migrated threads")
 
 	var locked bool
-	if !assert.NoError(t, gcsql.QueryRowSQL("SELECT locked FROM DBPREFIXthreads WHERE id = 1", nil, []any{&locked})) {
+	if !assert.NoError(t, gcsql.QueryRow(nil, "SELECT locked FROM DBPREFIXthreads WHERE id = 1", nil, []any{&locked})) {
 		t.FailNow()
 	}
 	assert.True(t, locked, "Expected thread ID 1 to be locked")
diff --git a/cmd/gochan-migration/internal/pre2021/pre2021.go b/cmd/gochan-migration/internal/pre2021/pre2021.go
index 8562569e..296f5a1a 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021.go
@@ -72,12 +72,12 @@ func (m *Pre2021Migrator) renameTablesForInPlace() error {
 	var err error
 	errEv := common.LogError()
 	defer errEv.Discard()
-	if _, err = m.db.ExecSQL("DROP TABLE DBPREFIXinfo"); err != nil {
+	if _, err = m.db.Exec(nil, "DROP TABLE DBPREFIXinfo"); err != nil {
 		errEv.Err(err).Caller().Msg("Error dropping info table")
 		return err
 	}
 	for _, table := range renameTables {
-		if _, err = m.db.ExecSQL(fmt.Sprintf(renameTableStatementTemplate, table, table)); err != nil {
+		if _, err = m.db.Exec(nil, fmt.Sprintf(renameTableStatementTemplate, table, table)); err != nil {
 			errEv.Caller().Err(err).
 				Str("table", table).
 				Msg("Error renaming table")
diff --git a/cmd/gochan-migration/internal/pre2021/staff.go b/cmd/gochan-migration/internal/pre2021/staff.go
index f1333743..65379936 100644
--- a/cmd/gochan-migration/internal/pre2021/staff.go
+++ b/cmd/gochan-migration/internal/pre2021/staff.go
@@ -26,13 +26,13 @@ func (m *Pre2021Migrator) getMigrationUser(errEv *zerolog.Event) (*gcsql.Staff,
 		Username: "pre2021-migration" + gcutil.RandomString(8),
 		AddedOn:  time.Now(),
 	}
-	_, err := gcsql.ExecSQL("INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,is_active) values(?,'',0,0)", user.Username)
+	_, err := gcsql.Exec(nil, "INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,is_active) values(?,'',0,0)", user.Username)
 	if err != nil {
 		errEv.Err(err).Caller().Str("username", user.Username).Msg("Failed to create migration user")
 		return nil, err
 	}
 
-	if err = gcsql.QueryRowSQL("SELECT id FROM DBPREFIXstaff WHERE username = ?", []any{user.Username}, []any{&user.ID}); err != nil {
+	if err = gcsql.QueryRow(nil, "SELECT id FROM DBPREFIXstaff WHERE username = ?", []any{user.Username}, []any{&user.ID}); err != nil {
 		errEv.Err(err).Caller().Str("username", user.Username).Msg("Failed to get migration user ID")
 		return nil, err
 	}
@@ -50,7 +50,7 @@ func (m *Pre2021Migrator) MigrateStaff() error {
 		return err
 	}
 
-	rows, err := m.db.QuerySQL(staffQuery)
+	rows, err := m.db.Query(nil, staffQuery)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Failed to get ban rows")
 		return err
@@ -73,7 +73,7 @@ func (m *Pre2021Migrator) MigrateStaff() error {
 			staff.ID = newStaff.ID
 		} else if errors.Is(err, gcsql.ErrUnrecognizedUsername) {
 			// staff doesn't exist, create it (with invalid checksum to be updated by the admin)
-			if _, err := gcsql.ExecSQL(
+			if _, err := gcsql.Exec(nil,
 				"INSERT INTO DBPREFIXstaff(username,password_checksum,global_rank,added_on,last_login,is_active) values(?,'',?,?,?,1)",
 				staff.Username, staff.Rank, staff.AddedOn, staff.LastLogin,
 			); err != nil {
@@ -102,7 +102,7 @@ func (m *Pre2021Migrator) MigrateStaff() error {
 						Msg("Failed to get board ID")
 					return err
 				}
-				if _, err = gcsql.ExecSQL("INSERT INTO DBPREFIXboard_staff(board_id,staff_id) VALUES(?,?)", boardID, staff.ID); err != nil {
+				if _, err = gcsql.Exec(nil, "INSERT INTO DBPREFIXboard_staff(board_id,staff_id) VALUES(?,?)", boardID, staff.ID); err != nil {
 					errEv.Err(err).Caller().
 						Str("username", staff.Username).
 						Str("board", board).
diff --git a/cmd/gochan/deleteposts.go b/cmd/gochan/deleteposts.go
index 5aad2733..01506cef 100644
--- a/cmd/gochan/deleteposts.go
+++ b/cmd/gochan/deleteposts.go
@@ -125,16 +125,19 @@ func getAllPostsToDelete(postIDs []any, fileOnly bool) ([]delPost, []any, error)
 		query = "SELECT post_id, thread_id, op_id, is_top_post, filename, dir FROM DBPREFIXv_posts_to_delete WHERE post_id IN " +
 			setPart + " OR thread_id IN (SELECT thread_id from DBPREFIXposts op WHERE op_id IN " + setPart + " AND is_top_post)"
 	}
-	rows, err := gcsql.QuerySQL(query, params...)
+	rows, cancel, err := gcsql.QueryTimeoutSQL(nil, query, params...)
 	if err != nil {
 		return nil, nil, err
 	}
+	defer func() {
+		rows.Close()
+		cancel()
+	}()
 	var posts []delPost
 	var postIDsAny []any
 	for rows.Next() {
 		var post delPost
 		if err = rows.Scan(&post.postID, &post.threadID, &post.opID, &post.isOP, &post.filename, &post.boardDir); err != nil {
-			rows.Close()
 			return nil, nil, err
 		}
 		posts = append(posts, post)
@@ -258,7 +261,7 @@ func validatePostPasswords(posts []any, passwordMD5 string) (bool, error) {
 		params = append(params, posts[p])
 	}
 
-	err := gcsql.QueryRowSQL(queryPosts, params, []any{&count})
+	err := gcsql.QueryRow(nil, queryPosts, params, []any{&count})
 	return count == len(posts), err
 }
 
@@ -281,21 +284,24 @@ func markPostsAsDeleted(posts []any, request *http.Request, writer http.Response
 	defer cancel()
 
 	tx, err := gcsql.BeginContextTx(ctx)
+	opts := &gcsql.RequestOptions{Context: ctx, Tx: tx, Cancel: cancel}
 
 	wantsJSON := serverutil.IsRequestingJSON(request)
 	if err != nil {
+		errEv.Err(err).Caller().Msg("Unable to start deletion transaction")
 		serveError(writer, "Unable to delete posts", http.StatusInternalServerError, wantsJSON, errEv.Err(err).Caller())
 		return false
 	}
 	defer tx.Rollback()
-	const postsError = "Unable to mark post(s) as deleted"
-	const threadsError = "Unable to mark thread(s) as deleted"
-	if _, err = gcsql.ExecTxSQL(tx, deletePostsSQL, posts...); err != nil {
+	const postsError = "Unable to delete post(s)"
+	const threadsError = "Unable to delete thread(s)"
+	if _, err = gcsql.Exec(opts, deletePostsSQL, posts...); err != nil {
 		serveError(writer, postsError, http.StatusInternalServerError, wantsJSON, errEv.Err(err).Caller())
 		return false
 	}
 
-	if _, err = gcsql.ExecTxSQL(tx, deleteThreadSQL, posts...); err != nil {
+	if _, err = gcsql.Exec(opts, deleteThreadSQL, posts...); err != nil {
+		errEv.Err(err).Caller().Msg("Unable to mark thread(s) as deleted")
 		serveError(writer, threadsError, http.StatusInternalServerError, wantsJSON, errEv.Err(err).Caller())
 		return false
 	}
@@ -351,7 +357,7 @@ func deletePostFiles(posts []delPost, deleteIDs []any, permDelete bool, request
 			http.StatusInternalServerError, wantsJSON, errEv.Array("errors", errArr))
 		return false
 	}
-	_, err = gcsql.ExecSQL(deleteFilesSQL, deleteIDs...)
+	_, err = gcsql.ExecTimeoutSQL(nil, deleteFilesSQL, deleteIDs...)
 	if err != nil {
 		serveError(writer, "Unable to delete file entries from database",
 			http.StatusInternalServerError, wantsJSON, errEv.Err(err).Caller())
diff --git a/pkg/gcsql/boards.go b/pkg/gcsql/boards.go
index 87cbb281..3f325b6d 100644
--- a/pkg/gcsql/boards.go
+++ b/pkg/gcsql/boards.go
@@ -36,18 +36,18 @@ var (
 )
 
 // DoesBoardExistByID returns a bool indicating whether a board with a given id exists
-func DoesBoardExistByID(ID int) bool {
-	const query = `SELECT COUNT(id) FROM DBPREFIXboards WHERE id = ?`
+func DoesBoardExistByID(ID int, requestOptions ...*RequestOptions) bool {
+	opts := setupOptionsWithTimeout(requestOptions...)
 	var count int
-	QueryRowSQL(query, []any{ID}, []any{&count})
+	QueryRow(opts, "SELECT COUNT(id) FROM DBPREFIXboards WHERE id = ?", []any{ID}, []any{&count})
 	return count > 0
 }
 
 // DoesBoardExistByDir returns a bool indicating whether a board with a given directory exists
-func DoesBoardExistByDir(dir string) bool {
-	const query = `SELECT COUNT(dir) FROM DBPREFIXboards WHERE dir = ?`
+func DoesBoardExistByDir(dir string, requestOpts ...*RequestOptions) bool {
+	opts := setupOptionsWithTimeout(requestOpts...)
 	var count int
-	QueryRowSQL(query, []any{dir}, []any{&count})
+	QueryRow(opts, "SELECT COUNT(dir) FROM DBPREFIXboards WHERE dir = ?", []any{dir}, []any{&count})
 	return count > 0
 }
 
@@ -108,10 +108,10 @@ func GetBoardDirFromPostID(postID int) (string, error) {
 	return boardURI, err
 }
 
-func getBoardBase(where string, whereParameters []interface{}) (*Board, error) {
+func getBoardBase(requestOptions *RequestOptions, where string, whereParameters ...any) (*Board, error) {
 	query := selectBoardsBaseSQL + where
 	board := new(Board)
-	err := QueryRowTimeoutSQL(nil, query, whereParameters, []any{
+	err := QueryRow(requestOptions, query, whereParameters, []any{
 		&board.ID, &board.SectionID, &board.URI, &board.Dir, &board.NavbarPosition, &board.Title, &board.Subtitle,
 		&board.Description, &board.MaxFilesize, &board.MaxThreads, &board.DefaultStyle, &board.Locked,
 		&board.CreatedAt, &board.AnonymousName, &board.ForceAnonymous, &board.AutosageAfter, &board.NoImagesAfter,
@@ -124,13 +124,15 @@ func getBoardBase(where string, whereParameters []interface{}) (*Board, error) {
 }
 
 // GetBoardFromID returns the board corresponding to a given id
-func GetBoardFromID(id int) (*Board, error) {
-	return getBoardBase("WHERE DBPREFIXboards.id = ?", []any{id})
+func GetBoardFromID(id int, requestOptions ...*RequestOptions) (*Board, error) {
+	opts := setupOptionsWithTimeout(requestOptions...)
+	return getBoardBase(opts, "WHERE DBPREFIXboards.id = ?", id)
 }
 
 // GetBoardFromDir returns the board corresponding to a given dir
-func GetBoardFromDir(dir string) (*Board, error) {
-	return getBoardBase("WHERE DBPREFIXboards.dir = ?", []any{dir})
+func GetBoardFromDir(dir string, requestOptions ...*RequestOptions) (*Board, error) {
+	opts := setupOptionsWithTimeout(requestOptions...)
+	return getBoardBase(opts, "WHERE DBPREFIXboards.dir = ?", dir)
 }
 
 // GetIDFromDir returns the id of the board with the given dir value
diff --git a/pkg/gcsql/initsql/init.go b/pkg/gcsql/initsql/init.go
index ccbbbef6..a1434cb4 100644
--- a/pkg/gcsql/initsql/init.go
+++ b/pkg/gcsql/initsql/init.go
@@ -97,7 +97,7 @@ func getBoardDefaultStyleTmplFunc(dir string) string {
 		return boardCfg.DefaultStyle
 	}
 	var defaultStyle string
-	err := gcsql.QueryRowSQL(`SELECT default_style FROM DBPREFIXboards WHERE dir = ?`,
+	err := gcsql.QueryRowTimeoutSQL(nil, "SELECT default_style FROM DBPREFIXboards WHERE dir = ?",
 		[]any{dir}, []any{&defaultStyle})
 	if err != nil || defaultStyle == "" {
 		gcutil.LogError(err).Caller().
diff --git a/pkg/gcsql/threads.go b/pkg/gcsql/threads.go
index 99f65446..6e66e6dc 100644
--- a/pkg/gcsql/threads.go
+++ b/pkg/gcsql/threads.go
@@ -33,7 +33,10 @@ func CreateThread(requestOptions *RequestOptions, boardID int, locked bool, stic
 	if _, err = Exec(requestOptions, insertQuery, boardID, locked, stickied, anchored, cyclic); err != nil {
 		return 0, err
 	}
-	return threadID, QueryRow(requestOptions, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID})
+	if err = QueryRow(requestOptions, "SELECT MAX(id) FROM DBPREFIXthreads", nil, []any{&threadID}); err != nil {
+		return 0, err
+	}
+	return threadID, nil
 }
 
 // GetThread returns a a thread object from the database, given its ID
diff --git a/pkg/gcsql/util.go b/pkg/gcsql/util.go
index a82ad968..871008dd 100644
--- a/pkg/gcsql/util.go
+++ b/pkg/gcsql/util.go
@@ -69,17 +69,26 @@ func setupOptions(opts ...*RequestOptions) *RequestOptions {
 	return opts[0]
 }
 
-// Query is a wrapper for QueryContextSQL that uses the given options, or defaults to a background context if nil
+func setupOptionsWithTimeout(opts ...*RequestOptions) *RequestOptions {
+	withoutContext := len(opts) == 0 || opts[0] == nil || opts[0].Context == nil
+	requestOptions := setupOptions(opts...)
+	if withoutContext {
+		requestOptions.Context, requestOptions.Cancel = context.WithTimeout(context.Background(), gcdb.defaultTimeout)
+	}
+	return requestOptions
+}
+
+// Query is a function for querying rows from the configured database, using the given options, or defaults to a background context if nil
 func Query(opts *RequestOptions, query string, a ...any) (*sql.Rows, error) {
 	return gcdb.Query(opts, query, a...)
 }
 
-// QueryRow is a wrapper for QueryRowContextSQL that uses the given options, or defaults to a background context if nil
+// QueryRow is a function for querying a single row from the configured database, using the given options, or defaults to a background context if nil
 func QueryRow(opts *RequestOptions, query string, values, out []any) error {
 	return gcdb.QueryRow(opts, query, values, out)
 }
 
-// Exec is a wrapper for ExecContextSQL that uses the given options, or defaults to a background context if nil
+// Exec is a function for executing a statement with the configured database, using the given options, or defaults to a background context if nil
 func Exec(opts *RequestOptions, query string, values ...any) (sql.Result, error) {
 	return gcdb.Exec(opts, query, values...)
 }
@@ -269,7 +278,7 @@ func QueryRowContextSQL(ctx context.Context, tx *sql.Tx, query string, values, o
 
 // QueryRowTimeoutSQL is a helper function for querying a single row with the configured default timeout.
 // It creates a context with the default timeout to only be used for this query and then disposed.
-// It should only be used by a function that does a single SQL query, otherwise use QueryRowContextSQL
+// It should only be used by a function that does a single SQL query, otherwise use QueryRow with a context.
 func QueryRowTimeoutSQL(tx *sql.Tx, query string, values, out []any) error {
 	ctx, cancel := context.WithTimeout(context.Background(), gcdb.defaultTimeout)
 	defer cancel()
diff --git a/pkg/manage/actionsAdminPerm.go b/pkg/manage/actionsAdminPerm.go
index d2d0672c..d8d51260 100644
--- a/pkg/manage/actionsAdminPerm.go
+++ b/pkg/manage/actionsAdminPerm.go
@@ -358,7 +358,7 @@ func fixThumbnailsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsq
 	if board != "" {
 		const query = `SELECT id, op, filename, is_spoilered, width, height, thumbnail_width, thumbnail_height
 		FROM DBPREFIXv_upload_info WHERE dir = ? ORDER BY created_on DESC`
-		rows, err := gcsql.QuerySQL(query, board)
+		rows, err := gcsql.Query(nil, query, board)
 		if err != nil {
 			return "", err
 		}
diff --git a/pkg/manage/actionsModPerm.go b/pkg/manage/actionsModPerm.go
index 75331ca9..8a096770 100644
--- a/pkg/manage/actionsModPerm.go
+++ b/pkg/manage/actionsModPerm.go
@@ -415,8 +415,7 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 			Bool("blocked", block != "").
 			Msg("Report cleared")
 	}
-	rows, err := gcsql.QuerySQL(`SELECT id,
-		handled_by_staff_id as staff_id,
+	rows, err := gcsql.Query(nil, `SELECT id, handled_by_staff_id as staff_id,
 		(SELECT username FROM DBPREFIXstaff WHERE id = DBPREFIXreports.handled_by_staff_id) as staff_user,
 		post_id, IP_NTOA, reason, is_cleared from DBPREFIXreports WHERE is_cleared = FALSE`)
 	if err != nil {
diff --git a/pkg/manage/util.go b/pkg/manage/util.go
index 47d1f70e..63135579 100644
--- a/pkg/manage/util.go
+++ b/pkg/manage/util.go
@@ -2,6 +2,7 @@ package manage
 
 import (
 	"bytes"
+	"context"
 	"database/sql"
 	"errors"
 	"net/http"
@@ -191,11 +192,15 @@ func getAllStaffNopass(activeOnly bool) ([]gcsql.Staff, error) {
 	if activeOnly {
 		query += " WHERE is_active"
 	}
-	rows, err := gcsql.QuerySQL(query)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(config.GetSQLConfig().DBTimeoutSeconds)*time.Second)
+	rows, err := gcsql.Query(&gcsql.RequestOptions{Context: ctx, Cancel: cancel}, query)
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() {
+		rows.Close()
+		cancel()
+	}()
 	var staff []gcsql.Staff
 	for rows.Next() {
 		var s gcsql.Staff
@@ -205,6 +210,9 @@ func getAllStaffNopass(activeOnly bool) ([]gcsql.Staff, error) {
 		}
 		staff = append(staff, s)
 	}
+	if err = rows.Close(); err != nil {
+		return nil, err
+	}
 	return staff, nil
 }
 

From a31a00176401ec17236b65f2742df04640bfa16a Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:14:04 -0800
Subject: [PATCH 095/122] Add spoiler bbcode tag

---
 pkg/posting/formatting.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 52c66eab..90701646 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -14,8 +14,9 @@ import (
 )
 
 var (
-	msgfmtr *MessageFormatter
-	urlRE   = regexp.MustCompile(`https?://(\S+)`)
+	msgfmtr         *MessageFormatter
+	urlRE           = regexp.MustCompile(`https?://(\S+)`)
+	unsetBBcodeTags = []string{"center", "color", "img", "quote", "size"}
 )
 
 // InitPosting prepares the formatter and the temp post pruner
@@ -35,12 +36,12 @@ type MessageFormatter struct {
 
 func (mf *MessageFormatter) Init() {
 	mf.bbCompiler = bbcode.NewCompiler(true, true)
-	mf.bbCompiler.SetTag("center", nil)
-	// mf.bbCompiler.SetTag("code", nil)
-	mf.bbCompiler.SetTag("color", nil)
-	mf.bbCompiler.SetTag("img", nil)
-	mf.bbCompiler.SetTag("quote", nil)
-	mf.bbCompiler.SetTag("size", nil)
+	for _, tag := range unsetBBcodeTags {
+		mf.bbCompiler.SetTag(tag, nil)
+	}
+	mf.bbCompiler.SetTag("?", func(bn *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
+		return &bbcode.HTMLTag{Name: "span", Attrs: map[string]string{"class": "spoiler"}}, true
+	})
 	mf.linkFixer = strings.NewReplacer(
 		"[url=[url]", "[url=",
 		"[/url][/url]", "[/url]",

From 5d98639daadbb986de68d0918d79356943aa40aa Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:26:35 -0800
Subject: [PATCH 096/122] Add hide block bbcode

---
 frontend/sass/global/_img.scss | 7 +++++++
 html/css/global.css            | 8 ++++++++
 pkg/posting/formatting.go      | 3 +++
 3 files changed, 18 insertions(+)

diff --git a/frontend/sass/global/_img.scss b/frontend/sass/global/_img.scss
index 7cb30546..c5175db0 100755
--- a/frontend/sass/global/_img.scss
+++ b/frontend/sass/global/_img.scss
@@ -218,4 +218,11 @@ div.inlinepostprev {
 	overflow: hidden;
 	margin:8px;
 	padding: 4px 8px;
+}
+
+.hideblock {
+	border: 2px solid black;
+}
+.hideblock.hidden {
+	display: none;
 }
\ No newline at end of file
diff --git a/html/css/global.css b/html/css/global.css
index e2da2500..2e46cd01 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -220,6 +220,14 @@ div.inlinepostprev {
   padding: 4px 8px;
 }
 
+.hideblock {
+  border: 2px solid black;
+}
+
+.hideblock.hidden {
+  display: none;
+}
+
 div.section-block {
   margin-bottom: 8px;
 }
diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 90701646..cdc0e725 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -42,6 +42,9 @@ func (mf *MessageFormatter) Init() {
 	mf.bbCompiler.SetTag("?", func(bn *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
 		return &bbcode.HTMLTag{Name: "span", Attrs: map[string]string{"class": "spoiler"}}, true
 	})
+	mf.bbCompiler.SetTag("hide", func(bn *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
+		return &bbcode.HTMLTag{Name: "div", Attrs: map[string]string{"class": "hideblock hidden"}}, true
+	})
 	mf.linkFixer = strings.NewReplacer(
 		"[url=[url]", "[url=",
 		"[/url][/url]", "[/url]",

From 21a05e5d2518fdfb4b8a7abb0b2b1bee6bbac5e8 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:35:12 -0800
Subject: [PATCH 097/122] Add hidden block toggling button

---
 frontend/sass/global/_img.scss |  3 +++
 frontend/ts/gochan.ts          |  2 ++
 frontend/ts/postutil.ts        | 13 +++++++++++++
 html/css/global.css            |  4 ++++
 4 files changed, 22 insertions(+)

diff --git a/frontend/sass/global/_img.scss b/frontend/sass/global/_img.scss
index c5175db0..bd30be6d 100755
--- a/frontend/sass/global/_img.scss
+++ b/frontend/sass/global/_img.scss
@@ -225,4 +225,7 @@ div.inlinepostprev {
 }
 .hideblock.hidden {
 	display: none;
+}
+.hideblock-button {
+	display: block;
 }
\ No newline at end of file
diff --git a/frontend/ts/gochan.ts b/frontend/ts/gochan.ts
index 88508774..5d49040d 100755
--- a/frontend/ts/gochan.ts
+++ b/frontend/ts/gochan.ts
@@ -14,6 +14,7 @@ import { initFlags } from "./dom/flags";
 import { initQR } from "./dom/qr";
 import { getBooleanStorageVal } from "./storage";
 import { updateBrowseButton } from "./dom/uploaddata";
+import { prepareHideBlocks } from "./postutil";
 import "./management/filters";
 
 export function toTop() {
@@ -43,6 +44,7 @@ $(() => {
 
 	const passwordText = $("input#postpassword").val();
 	$("input#delete-password").val(passwordText);
+	prepareHideBlocks();
 
 	setPageBanner();
 	if(pageThread.board !== "") {
diff --git a/frontend/ts/postutil.ts b/frontend/ts/postutil.ts
index d089bdd3..0afa32a8 100755
--- a/frontend/ts/postutil.ts
+++ b/frontend/ts/postutil.ts
@@ -227,6 +227,19 @@ function selectedText() {
 	return window.getSelection().toString();
 }
 
+export function prepareHideBlocks() {
+	$("div.hideblock").each((_i,el) => {
+		const $el = $(el);
+		const $button = $("<button />").prop({
+			class: "hideblock-button",
+		}).text($el.hasClass("hidden") ? "Show" : "Hide").on("click", e => {
+			e.preventDefault();
+			$el.toggleClass("hidden");
+			$button.text($el.hasClass("hidden") ? "Show" : "Hide");
+		}).insertBefore($el);
+	});
+}
+
 export function quote(no: number) {
 	if(getBooleanStorageVal("useqr", true)) {
 		openQR();
diff --git a/html/css/global.css b/html/css/global.css
index 2e46cd01..7132453e 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -228,6 +228,10 @@ div.inlinepostprev {
   display: none;
 }
 
+.hideblock-button {
+  display: block;
+}
+
 div.section-block {
   margin-bottom: 8px;
 }

From 83c82cba414b1dfecec91356686f4772309eb624 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:56:29 -0800
Subject: [PATCH 098/122] Fix bunkerchan dropdown colors

---
 frontend/sass/bunkerchan/_colors.scss |  1 +
 frontend/sass/bunkerchan/_img.scss    | 23 ++++++++++++-----
 html/css/bunkerchan.css               | 36 +++++++++++++++------------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/frontend/sass/bunkerchan/_colors.scss b/frontend/sass/bunkerchan/_colors.scss
index e35bbaaf..a97539ae 100644
--- a/frontend/sass/bunkerchan/_colors.scss
+++ b/frontend/sass/bunkerchan/_colors.scss
@@ -2,6 +2,7 @@ $bgcol: #1D1F21;
 $color: #ACACAC;
 $hcol: #663E11;
 $inputbg: #282A2E;
+$inputbg2: #16171A;
 $topborder: #B0790A;
 $linkcol: #FFB300;
 $bordercol: #117743;
diff --git a/frontend/sass/bunkerchan/_img.scss b/frontend/sass/bunkerchan/_img.scss
index 6158b02c..df840890 100644
--- a/frontend/sass/bunkerchan/_img.scss
+++ b/frontend/sass/bunkerchan/_img.scss
@@ -6,6 +6,12 @@
 	color: $color;
 }
 
+%darkselect {
+	background: $inputbg2;
+	border-radius: 5px;
+	color: $color;
+	@extend %formstyle;
+}
 
 div.reply,
 th.postblock,
@@ -17,20 +23,25 @@ table.mgmt-table tr:first-of-type th {
 	border-radius: 5px;
 }
 
-table#postbox-static, div#report-delbox {
+table#postbox-static, div#report-delbox, form#filterform {
 	input,
-	select,
 	textarea,
 	input[type="file"]::file-selector-button,
 	input[type="file"]::-webkit-file-upload-button {
-		border-radius: 5px;
 		@extend %formstyle;
 	}
+	select {
+		@extend %darkselect;
+	}
 	button, input[type=submit] {
-		background:#16171A;
+		background: $inputbg2;
 	}
 }
 
-select#changepage {
-	@extend %formstyle;
+button.hideblock-button,
+select#changepage,
+select.post-actions,
+select#boardsearch,
+select[name="show"] {
+	@extend %darkselect;
 }
diff --git a/html/css/bunkerchan.css b/html/css/bunkerchan.css
index 783c27c4..f113e3a6 100644
--- a/html/css/bunkerchan.css
+++ b/html/css/bunkerchan.css
@@ -17,20 +17,35 @@ div.section-body {
   background: #282A2E;
 }
 
-select#changepage, table#postbox-static input,
-table#postbox-static select,
+table#postbox-static input,
 table#postbox-static textarea,
 table#postbox-static input[type=file]::file-selector-button,
 table#postbox-static input[type=file]::-webkit-file-upload-button, div#report-delbox input,
-div#report-delbox select,
 div#report-delbox textarea,
 div#report-delbox input[type=file]::file-selector-button,
-div#report-delbox input[type=file]::-webkit-file-upload-button {
+div#report-delbox input[type=file]::-webkit-file-upload-button, form#filterform input,
+form#filterform textarea,
+form#filterform input[type=file]::file-selector-button,
+form#filterform input[type=file]::-webkit-file-upload-button, button.hideblock-button,
+select#changepage,
+select.post-actions,
+select#boardsearch,
+select[name=show], table#postbox-static select, div#report-delbox select, form#filterform select {
   background: #282A2E;
   border: 1px double #07371F;
   color: #ACACAC;
 }
 
+button.hideblock-button,
+select#changepage,
+select.post-actions,
+select#boardsearch,
+select[name=show], table#postbox-static select, div#report-delbox select, form#filterform select {
+  background: #16171A;
+  border-radius: 5px;
+  color: #ACACAC;
+}
+
 div.reply,
 th.postblock,
 div.postprev,
@@ -41,18 +56,7 @@ table.mgmt-table tr:first-of-type th {
   border-radius: 5px;
 }
 
-table#postbox-static input,
-table#postbox-static select,
-table#postbox-static textarea,
-table#postbox-static input[type=file]::file-selector-button,
-table#postbox-static input[type=file]::-webkit-file-upload-button, div#report-delbox input,
-div#report-delbox select,
-div#report-delbox textarea,
-div#report-delbox input[type=file]::file-selector-button,
-div#report-delbox input[type=file]::-webkit-file-upload-button {
-  border-radius: 5px;
-}
-table#postbox-static button, table#postbox-static input[type=submit], div#report-delbox button, div#report-delbox input[type=submit] {
+table#postbox-static button, table#postbox-static input[type=submit], div#report-delbox button, div#report-delbox input[type=submit], form#filterform button, form#filterform input[type=submit] {
   background: #16171A;
 }
 

From eb59ef1f1eb853fa2c9685d65f76ad545240d3df Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 22:36:24 -0800
Subject: [PATCH 099/122] Add hide block open/close animations

---
 frontend/sass/global.scss             |  1 +
 frontend/sass/global/_animations.scss | 21 +++++++++++
 frontend/sass/global/_img.scss        | 15 +++++++-
 frontend/ts/postutil.ts               | 17 +++++++--
 html/css/global.css                   | 51 ++++++++++++++++++++++++++-
 5 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 frontend/sass/global/_animations.scss

diff --git a/frontend/sass/global.scss b/frontend/sass/global.scss
index 339ebd48..ea3e08e2 100644
--- a/frontend/sass/global.scss
+++ b/frontend/sass/global.scss
@@ -5,6 +5,7 @@
 @import 'global/qr';
 @import "global/watcher";
 @import 'global/bans';
+@import 'global/animations';
 
 .increase-line-height {
 	line-height: 1.5;
diff --git a/frontend/sass/global/_animations.scss b/frontend/sass/global/_animations.scss
new file mode 100644
index 00000000..f0b36777
--- /dev/null
+++ b/frontend/sass/global/_animations.scss
@@ -0,0 +1,21 @@
+@keyframes slideopen {
+	from {
+		transform: scale(1, 0);
+		transform-origin: top center;
+	}
+	to {
+	transform: scale(1, 1);
+	transform-origin: top center;
+	}
+}
+
+@keyframes slideclose {
+	from {
+		transform: scale(1, 1);
+		transform-origin: top center;
+	}
+	to {
+		transform: scale(1, 0);
+		transform-origin: top center;
+	}
+}
\ No newline at end of file
diff --git a/frontend/sass/global/_img.scss b/frontend/sass/global/_img.scss
index bd30be6d..c3849f83 100755
--- a/frontend/sass/global/_img.scss
+++ b/frontend/sass/global/_img.scss
@@ -1,3 +1,5 @@
+@import 'animations';
+
 #boardmenu-bottom {
 	margin-top: 16px;
 }
@@ -221,11 +223,22 @@ div.inlinepostprev {
 }
 
 .hideblock {
-	border: 2px solid black;
+	border: 1px solid black;
+	background: rgba(0, 0, 0, 0.1);
 }
+
+.hideblock.open {
+	animation: slideopen 0.25s;
+}
+
+.hideblock.close {
+	animation: slideclose 0.25s;
+}
+
 .hideblock.hidden {
 	display: none;
 }
+
 .hideblock-button {
 	display: block;
 }
\ No newline at end of file
diff --git a/frontend/ts/postutil.ts b/frontend/ts/postutil.ts
index 0afa32a8..d3e5a9c6 100755
--- a/frontend/ts/postutil.ts
+++ b/frontend/ts/postutil.ts
@@ -232,11 +232,22 @@ export function prepareHideBlocks() {
 		const $el = $(el);
 		const $button = $("<button />").prop({
 			class: "hideblock-button",
-		}).text($el.hasClass("hidden") ? "Show" : "Hide").on("click", e => {
+		}).text($el.hasClass("open") ? "Hide" : "Show").on("click", e => {
 			e.preventDefault();
-			$el.toggleClass("hidden");
-			$button.text($el.hasClass("hidden") ? "Show" : "Hide");
+			const hidden = $el.hasClass("hidden");
+			$el.removeClass("close");
+			$button.text(hidden ? "Hide" : "Show");
+			if(hidden) {
+				$el.removeClass("hidden").addClass("open");
+			} else {
+				$el.addClass("close").removeClass("open");
+			}
 		}).insertBefore($el);
+		$el.on("animationend", () => {
+			if($el.hasClass("close")) {
+				$el.addClass("hidden").removeClass("close");
+			}
+		});
 	});
 }
 
diff --git a/html/css/global.css b/html/css/global.css
index 7132453e..0b57bcc0 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -1,3 +1,23 @@
+@keyframes slideopen {
+  from {
+    transform: scale(1, 0);
+    transform-origin: top center;
+  }
+  to {
+    transform: scale(1, 1);
+    transform-origin: top center;
+  }
+}
+@keyframes slideclose {
+  from {
+    transform: scale(1, 1);
+    transform-origin: top center;
+  }
+  to {
+    transform: scale(1, 0);
+    transform-origin: top center;
+  }
+}
 #boardmenu-bottom {
   margin-top: 16px;
 }
@@ -221,7 +241,16 @@ div.inlinepostprev {
 }
 
 .hideblock {
-  border: 2px solid black;
+  border: 1px solid black;
+  background: rgba(0, 0, 0, 0.1);
+}
+
+.hideblock.open {
+  animation: slideopen 0.25s;
+}
+
+.hideblock.close {
+  animation: slideclose 0.25s;
 }
 
 .hideblock.hidden {
@@ -609,6 +638,26 @@ img#banpage-image {
   margin: 4px 8px 8px 4px;
 }
 
+@keyframes slideopen {
+  from {
+    transform: scale(1, 0);
+    transform-origin: top center;
+  }
+  to {
+    transform: scale(1, 1);
+    transform-origin: top center;
+  }
+}
+@keyframes slideclose {
+  from {
+    transform: scale(1, 1);
+    transform-origin: top center;
+  }
+  to {
+    transform: scale(1, 0);
+    transform-origin: top center;
+  }
+}
 .increase-line-height {
   line-height: 1.5;
 }

From e6afeeaf5b6a48d670d350d3093026b805369c3c Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:00:34 -0800
Subject: [PATCH 100/122] Add smooth hide block toggling, and the option to
 disable it

---
 frontend/ts/dom/postelement.ts | 29 +++++++++++++++++++++++++++++
 frontend/ts/gochan.ts          |  2 --
 frontend/ts/postutil.ts        | 24 ------------------------
 frontend/ts/settings.ts        |  1 +
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/frontend/ts/dom/postelement.ts b/frontend/ts/dom/postelement.ts
index ae68d1e4..63f74d14 100644
--- a/frontend/ts/dom/postelement.ts
+++ b/frontend/ts/dom/postelement.ts
@@ -2,6 +2,7 @@ import $ from "jquery";
 import { extname } from "path";
 import { formatDateString, formatFileSize } from "../formatting";
 import { getThumbFilename } from "../postinfo";
+import { getBooleanStorageVal } from "../storage";
 
 /**
  * creates an element from the given post data
@@ -117,7 +118,35 @@ export function shrinkOriginalFilenames(elem = $(document.body)) {
 	});
 }
 
+export function prepareHideBlocks() {
+	$("div.hideblock").each((_i,el) => {
+		const $el = $(el);
+		const $button = $("<button />").prop({
+			class: "hideblock-button",
+		}).text($el.hasClass("open") ? "Hide" : "Show").on("click", e => {
+			e.preventDefault();
+			const hidden = $el.hasClass("hidden");
+			$button.text(hidden ? "Hide" : "Show");
+			if(el.onanimationend === undefined || !getBooleanStorageVal("smoothhidetoggle", true)) {
+				$el.toggleClass("hidden");
+			} else {
+				$el.removeClass("close");
+				if(hidden) {
+					$el.removeClass("hidden").addClass("open");
+				} else {
+					$el.addClass("close").removeClass("open");
+				}
+			}
+		}).insertBefore($el);
+		$el.on("animationend", () => {
+			if($el.hasClass("close")) {
+				$el.addClass("hidden").removeClass("close");
+			}
+		});
+	});
+}
 
 $(() => {
+	prepareHideBlocks();
 	shrinkOriginalFilenames();
 });
\ No newline at end of file
diff --git a/frontend/ts/gochan.ts b/frontend/ts/gochan.ts
index 5d49040d..88508774 100755
--- a/frontend/ts/gochan.ts
+++ b/frontend/ts/gochan.ts
@@ -14,7 +14,6 @@ import { initFlags } from "./dom/flags";
 import { initQR } from "./dom/qr";
 import { getBooleanStorageVal } from "./storage";
 import { updateBrowseButton } from "./dom/uploaddata";
-import { prepareHideBlocks } from "./postutil";
 import "./management/filters";
 
 export function toTop() {
@@ -44,7 +43,6 @@ $(() => {
 
 	const passwordText = $("input#postpassword").val();
 	$("input#delete-password").val(passwordText);
-	prepareHideBlocks();
 
 	setPageBanner();
 	if(pageThread.board !== "") {
diff --git a/frontend/ts/postutil.ts b/frontend/ts/postutil.ts
index d3e5a9c6..d089bdd3 100755
--- a/frontend/ts/postutil.ts
+++ b/frontend/ts/postutil.ts
@@ -227,30 +227,6 @@ function selectedText() {
 	return window.getSelection().toString();
 }
 
-export function prepareHideBlocks() {
-	$("div.hideblock").each((_i,el) => {
-		const $el = $(el);
-		const $button = $("<button />").prop({
-			class: "hideblock-button",
-		}).text($el.hasClass("open") ? "Hide" : "Show").on("click", e => {
-			e.preventDefault();
-			const hidden = $el.hasClass("hidden");
-			$el.removeClass("close");
-			$button.text(hidden ? "Hide" : "Show");
-			if(hidden) {
-				$el.removeClass("hidden").addClass("open");
-			} else {
-				$el.addClass("close").removeClass("open");
-			}
-		}).insertBefore($el);
-		$el.on("animationend", () => {
-			if($el.hasClass("close")) {
-				$el.addClass("hidden").removeClass("close");
-			}
-		});
-	});
-}
-
 export function quote(no: number) {
 	if(getBooleanStorageVal("useqr", true)) {
 		openQR();
diff --git a/frontend/ts/settings.ts b/frontend/ts/settings.ts
index 26ef4961..b51d66c5 100755
--- a/frontend/ts/settings.ts
+++ b/frontend/ts/settings.ts
@@ -271,6 +271,7 @@ $(() => {
 		min: 2
 	}, initWatcher));
 	settings.set("newuploader", new BooleanSetting("newuploader", "Use new upload element", true, updateBrowseButton));
+	settings.set("smoothhidetoggle", new BooleanSetting("smoothhidetoggle", "Smooth hide block toggle", true));
 
 	settings.set("customjs", new TextSetting("customjs", "Custom JavaScript", ""));
 	settings.set("customcss", new TextSetting("customcss", "Custom CSS", "", setCustomCSS));

From f1a0e123f6365823f5adf62e84efc10c7ce954bc Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:01:20 -0800
Subject: [PATCH 101/122] Remove unused parameters in message formatter init
 function

---
 pkg/posting/formatting.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index cdc0e725..390c5117 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -39,10 +39,10 @@ func (mf *MessageFormatter) Init() {
 	for _, tag := range unsetBBcodeTags {
 		mf.bbCompiler.SetTag(tag, nil)
 	}
-	mf.bbCompiler.SetTag("?", func(bn *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
+	mf.bbCompiler.SetTag("?", func(_ *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
 		return &bbcode.HTMLTag{Name: "span", Attrs: map[string]string{"class": "spoiler"}}, true
 	})
-	mf.bbCompiler.SetTag("hide", func(bn *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
+	mf.bbCompiler.SetTag("hide", func(_ *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
 		return &bbcode.HTMLTag{Name: "div", Attrs: map[string]string{"class": "hideblock hidden"}}, true
 	})
 	mf.linkFixer = strings.NewReplacer(

From 4a9acae8a81d07137ce92e7150dfa563e76d22d4 Mon Sep 17 00:00:00 2001
From: Eggbertx <76852+Eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:07:08 -0800
Subject: [PATCH 102/122] Create go.yml

---
 .github/workflows/go.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/go.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
new file mode 100644
index 00000000..2f135f0b
--- /dev/null
+++ b/.github/workflows/go.yml
@@ -0,0 +1,27 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.22'
+
+    - name: Build
+      run: ./build.py
+
+    - name: Test
+      run: go test -v ./pkg/... ./cmd/...

From c944df2da1b51c9925c649034c55a97b6829644e Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Fri, 7 Feb 2025 23:19:35 -0800
Subject: [PATCH 103/122] Add cover flag and Go plugin building to Go workflow

---
 .github/workflows/go.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2f135f0b..4a39b217 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -22,6 +22,9 @@ jobs:
 
     - name: Build
       run: ./build.py
+    
+    - name: Build plugins
+      run: ./build.py build --plugin ./examples/plugins/geoip-legacy/ &&./build.py build --plugin ./examples/plugins/gochaninfo-mgmt-action/ && ./build.py build --plugin ./examples/plugins/ip2location/
 
     - name: Test
-      run: go test -v ./pkg/... ./cmd/...
+      run: go test -cover -v ./pkg/... ./cmd/...

From 30c1c1c0377ae877b07c3b414f4da4f27b0e17a6 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 12:47:37 -0800
Subject: [PATCH 104/122] Rename all preload.go to lua.go and preload_test.go
 to lua_test.go

---
 pkg/config/{preload.go => lua.go}            | 0
 pkg/config/{preload_test.go => lua_test.go}  | 0
 pkg/events/{preload.go => lua.go}            | 0
 pkg/events/{preload_test.go => lua_test.go}  | 0
 pkg/gcsql/{preload.go => lua.go}             | 0
 pkg/gctemplates/{preload.go => lua.go}       | 0
 pkg/gcutil/{preload.go => lua.go}            | 0
 pkg/manage/{preload.go => lua.go}            | 0
 pkg/posting/geoip/{preload.go => lua.go}     | 0
 pkg/posting/uploads/{preload.go => lua.go}   | 0
 pkg/server/serverutil/{preload.go => lua.go} | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename pkg/config/{preload.go => lua.go} (100%)
 rename pkg/config/{preload_test.go => lua_test.go} (100%)
 rename pkg/events/{preload.go => lua.go} (100%)
 rename pkg/events/{preload_test.go => lua_test.go} (100%)
 rename pkg/gcsql/{preload.go => lua.go} (100%)
 rename pkg/gctemplates/{preload.go => lua.go} (100%)
 rename pkg/gcutil/{preload.go => lua.go} (100%)
 rename pkg/manage/{preload.go => lua.go} (100%)
 rename pkg/posting/geoip/{preload.go => lua.go} (100%)
 rename pkg/posting/uploads/{preload.go => lua.go} (100%)
 rename pkg/server/serverutil/{preload.go => lua.go} (100%)

diff --git a/pkg/config/preload.go b/pkg/config/lua.go
similarity index 100%
rename from pkg/config/preload.go
rename to pkg/config/lua.go
diff --git a/pkg/config/preload_test.go b/pkg/config/lua_test.go
similarity index 100%
rename from pkg/config/preload_test.go
rename to pkg/config/lua_test.go
diff --git a/pkg/events/preload.go b/pkg/events/lua.go
similarity index 100%
rename from pkg/events/preload.go
rename to pkg/events/lua.go
diff --git a/pkg/events/preload_test.go b/pkg/events/lua_test.go
similarity index 100%
rename from pkg/events/preload_test.go
rename to pkg/events/lua_test.go
diff --git a/pkg/gcsql/preload.go b/pkg/gcsql/lua.go
similarity index 100%
rename from pkg/gcsql/preload.go
rename to pkg/gcsql/lua.go
diff --git a/pkg/gctemplates/preload.go b/pkg/gctemplates/lua.go
similarity index 100%
rename from pkg/gctemplates/preload.go
rename to pkg/gctemplates/lua.go
diff --git a/pkg/gcutil/preload.go b/pkg/gcutil/lua.go
similarity index 100%
rename from pkg/gcutil/preload.go
rename to pkg/gcutil/lua.go
diff --git a/pkg/manage/preload.go b/pkg/manage/lua.go
similarity index 100%
rename from pkg/manage/preload.go
rename to pkg/manage/lua.go
diff --git a/pkg/posting/geoip/preload.go b/pkg/posting/geoip/lua.go
similarity index 100%
rename from pkg/posting/geoip/preload.go
rename to pkg/posting/geoip/lua.go
diff --git a/pkg/posting/uploads/preload.go b/pkg/posting/uploads/lua.go
similarity index 100%
rename from pkg/posting/uploads/preload.go
rename to pkg/posting/uploads/lua.go
diff --git a/pkg/server/serverutil/preload.go b/pkg/server/serverutil/lua.go
similarity index 100%
rename from pkg/server/serverutil/preload.go
rename to pkg/server/serverutil/lua.go

From 5bc47e003df647732f9c69d5150e62d45bcd7adf Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 15:32:57 -0800
Subject: [PATCH 105/122] Add function to lua for setting custom bbcode tags

---
 examples/plugins/bbcode.lua    |  5 ++
 pkg/gcplugin/gcplugin.go       |  2 +
 pkg/posting/formatting.go      |  3 +-
 pkg/posting/formatting_test.go | 38 +++++++++----
 pkg/posting/lua.go             | 97 ++++++++++++++++++++++++++++++++++
 plugin_api.md                  |  5 ++
 6 files changed, 137 insertions(+), 13 deletions(-)
 create mode 100644 examples/plugins/bbcode.lua
 create mode 100644 pkg/posting/lua.go

diff --git a/examples/plugins/bbcode.lua b/examples/plugins/bbcode.lua
new file mode 100644
index 00000000..87d462ef
--- /dev/null
+++ b/examples/plugins/bbcode.lua
@@ -0,0 +1,5 @@
+local bbcode = require("bbcode")
+
+bbcode.set_tag("rcv", function(node)
+	return {name="span", attrs={class="rcv"}}
+end)
\ No newline at end of file
diff --git a/pkg/gcplugin/gcplugin.go b/pkg/gcplugin/gcplugin.go
index 1a8a8885..8ac01bce 100644
--- a/pkg/gcplugin/gcplugin.go
+++ b/pkg/gcplugin/gcplugin.go
@@ -14,6 +14,7 @@ import (
 	"github.com/gochan-org/gochan/pkg/gctemplates"
 	"github.com/gochan-org/gochan/pkg/gcutil"
 	"github.com/gochan-org/gochan/pkg/manage"
+	"github.com/gochan-org/gochan/pkg/posting"
 	"github.com/gochan-org/gochan/pkg/posting/geoip"
 	"github.com/gochan-org/gochan/pkg/posting/uploads"
 	"github.com/gochan-org/gochan/pkg/server/serverutil"
@@ -106,6 +107,7 @@ func preloadLua() {
 	lState.PreloadModule("manage", manage.PreloadModule)
 	lState.PreloadModule("uploads", uploads.PreloadModule)
 	lState.PreloadModule("serverutil", serverutil.PreloadModule)
+	lState.PreloadModule("bbcode", posting.PreloadBBCodeModule)
 
 	lState.SetGlobal("_GOCHAN_VERSION", lua.LString(config.GetVersion().String()))
 }
diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 390c5117..884e05ca 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -14,14 +14,13 @@ import (
 )
 
 var (
-	msgfmtr         *MessageFormatter
+	msgfmtr         MessageFormatter
 	urlRE           = regexp.MustCompile(`https?://(\S+)`)
 	unsetBBcodeTags = []string{"center", "color", "img", "quote", "size"}
 )
 
 // InitPosting prepares the formatter and the temp post pruner
 func InitPosting() {
-	msgfmtr = new(MessageFormatter)
 	msgfmtr.Init()
 	go tempCleaner()
 }
diff --git a/pkg/posting/formatting_test.go b/pkg/posting/formatting_test.go
index 1d7d831a..5bd44325 100644
--- a/pkg/posting/formatting_test.go
+++ b/pkg/posting/formatting_test.go
@@ -5,20 +5,17 @@ import (
 
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/stretchr/testify/assert"
+	lua "github.com/yuin/gopher-lua"
 )
 
 const (
 	versionStr         = "4.0.0"
-	bbcodeMsgPreRender = `[b]Bold[/b]
-[i]Italics[/i]
-[u]Underline[/u]
-[url=https://gochan.org]URL[/url]
-[code]Code[/code]`
-	bbcodeMsgExpected = `<b>Bold</b><br>` +
-		`<i>Italics</i><br>` +
-		`<u>Underline</u><br>` +
-		`<a href="https://gochan.org">URL</a><br>` +
-		`<pre>Code</pre>`
+	bbcodeMsgPreRender = `[b]Bold[/b] [i]Italics[/i] [u]Underline[/u] [url=https://gochan.org]URL[/url] [?]Spoiler[/?]
+[code]Code[/code]
+[hide]Hidden[/hide]`
+	bbcodeMsgExpected = `<b>Bold</b> <i>Italics</i> <u>Underline</u> <a href="https://gochan.org">URL</a> <span class="spoiler">Spoiler</span><br>` +
+		`<pre>Code</pre><br>` +
+		`<div class="hideblock hidden">Hidden</div>`
 
 	linkTestPreRender = `gochan.org: https://gochan.org
 gochan.org with path: https://gochan.org/a
@@ -29,6 +26,12 @@ gochan.org with bad link: https://gochan.org/a">:)</a>`
 
 	doubleTagPreRender = `[url=https://gochan.org]Gochan[/url] [url]https://gochan.org[/url]`
 	doubleTagExpected  = `<a href="https://gochan.org">Gochan</a> <a href="https://gochan.org">https://gochan.org</a>`
+	luaBBCodeTest      = `local bbcode = require("bbcode")
+local msg = "[lua]Lua test[/lua]"
+bbcode.set_tag("lua", function(node)
+	return {name="span", attrs={class="lua"}}
+end)`
+	luaBBCodeTestExpected = `<span class="lua">Lua test</span>`
 )
 
 func TestBBCode(t *testing.T) {
@@ -50,9 +53,22 @@ func TestLinks(t *testing.T) {
 
 func TestNoDoubleTags(t *testing.T) {
 	config.SetVersion(versionStr)
-	msgfmtr = new(MessageFormatter)
 	msgfmtr.Init()
 	rendered, err := FormatMessage(doubleTagPreRender, "")
 	assert.NoError(t, err)
 	assert.EqualValues(t, doubleTagExpected, rendered)
 }
+
+func TestLuaBBCode(t *testing.T) {
+	config.SetVersion(versionStr)
+	msgfmtr.Init()
+	l := lua.NewState()
+	defer l.Close()
+	l.PreloadModule("bbcode", PreloadBBCodeModule)
+	assert.NoError(t, l.DoString(luaBBCodeTest))
+	compiled := msgfmtr.bbCompiler.Compile("[lua]Lua test[/lua]")
+	assert.Equal(t, luaBBCodeTestExpected, compiled)
+	assert.NoError(t, l.DoString(`require("bbcode").set_tag("b", nil)`))
+	assert.Equal(t, "[b]Lua test[/b]", msgfmtr.bbCompiler.Compile("[b]Lua test[/b]"))
+	assert.Error(t, l.DoString(`bbcode.set_tag("lua", 1)`))
+}
diff --git a/pkg/posting/lua.go b/pkg/posting/lua.go
new file mode 100644
index 00000000..ff25c5b8
--- /dev/null
+++ b/pkg/posting/lua.go
@@ -0,0 +1,97 @@
+package posting
+
+import (
+	"fmt"
+
+	"github.com/frustra/bbcode"
+	"github.com/gochan-org/gochan/pkg/gcutil"
+	lua "github.com/yuin/gopher-lua"
+	luar "layeh.com/gopher-luar"
+)
+
+func luaTableToHTMLTag(l *lua.LState, table *lua.LTable) (*bbcode.HTMLTag, error) {
+	tag := &bbcode.HTMLTag{
+		Name: table.RawGetString("name").String(),
+	}
+	value := table.RawGetString("value")
+	if value.Type() != lua.LTNil {
+		tag.Value = value.String()
+	}
+	attrsLV := table.RawGetString("attrs")
+	switch attrsLV.Type() {
+	case lua.LTTable:
+		attrsLT := attrsLV.(*lua.LTable)
+		fmt.Println("attrs size:", attrsLT.Len())
+		attrsLT.ForEach(func(key, val lua.LValue) {
+			if tag.Attrs == nil {
+				tag.Attrs = make(map[string]string)
+			}
+			tag.Attrs[key.String()] = val.String()
+		})
+	case lua.LTNil:
+	default:
+		return nil, fmt.Errorf("expected table or nil for attrs value, got %s", attrsLV.Type().String())
+	}
+	childrenLV := table.RawGetString("children")
+	switch childrenLV.Type() {
+	case lua.LTTable:
+		childrenT := childrenLV.(*lua.LTable)
+		if childrenT.Len() > 0 {
+			tag.Children = make([]*bbcode.HTMLTag, childrenT.Len())
+			childrenT.ForEach(func(iLV, childLV lua.LValue) {
+				childT, err := luaTableToHTMLTag(l, childLV.(*lua.LTable))
+				if err != nil {
+					l.RaiseError("Error converting child table to HTMLTag: %v", err)
+					return
+				}
+				tag.Children[int(iLV.(lua.LNumber)-1)] = childT
+			})
+		}
+	case lua.LTNil:
+	default:
+		return nil, fmt.Errorf("expected table or nil for children value, got %s", childrenLV.Type().String())
+	}
+	return tag, nil
+}
+
+func PreloadBBCodeModule(l *lua.LState) int {
+	t := l.NewTable()
+	l.SetFuncs(t, map[string]lua.LGFunction{
+		"set_tag": func(l *lua.LState) int {
+			bbcodeTag := l.CheckString(1)
+			bbCodeLV := l.CheckAny(2)
+			if bbCodeLV.Type() == lua.LTNil {
+				msgfmtr.bbCompiler.SetTag(bbcodeTag, nil)
+				return 0
+			}
+			bbcodeFunc := l.CheckFunction(2)
+			msgfmtr.bbCompiler.SetTag(bbcodeTag, func(node *bbcode.BBCodeNode) (*bbcode.HTMLTag, bool) {
+				err := l.CallByParam(lua.P{
+					Fn:   bbcodeFunc,
+					NRet: 2,
+				}, luar.New(l, node))
+				if err != nil {
+					gcutil.LogError(err).Caller().Msg("Error calling bbcode function")
+					l.RaiseError("Error calling bbcode function: %v", err)
+					return nil, false
+				}
+				tagRet := l.CheckAny(-2)
+				if tagRet.Type() != lua.LTTable {
+					l.RaiseError("Invalid return value from bbcode function (expected table)")
+					return nil, false
+				}
+				tagTable := tagRet.(*lua.LTable)
+				tag, err := luaTableToHTMLTag(l, tagTable)
+				if err != nil {
+					gcutil.LogError(err).Caller().Msg("Error converting table to HTMLTag")
+					l.RaiseError("Error converting table to HTMLTag: %v", err)
+					return nil, false
+				}
+				return tag, true
+			})
+			return 0
+		},
+	})
+	l.Push(t)
+	return 1
+}
diff --git a/plugin_api.md b/plugin_api.md
index 78225f65..f17718fe 100644
--- a/plugin_api.md
+++ b/plugin_api.md
@@ -9,6 +9,11 @@ The following are modules that can be loaded via `require("modulename")`. See [.
 - [filepath](https://pkg.go.dev/github.com/vadv/gopher-lua-libs@v0.5.0/filepath)
 - [json](https://pkg.go.dev/layeh.com/gopher-json@v0.0.0-20201124131017-552bb3c4c3bf)
 - [strings](https://pkg.go.dev/github.com/vadv/gopher-lua-libs@v0.5.0/strings)
+
+## bbcode
+- **set_tag(tag string, handler [bbcode.TagCompilerFunc](https://pkg.go.dev/github.com/frustra/bbcode@v0.0.0-20201127003707-6ef347fbe1c8#TagCompilerFunc)))**
+	- Registers a new BBCode function to handle the given tag. Struct-table fields are expected to use snake case (e.g., name instead of Name)
+
 ## config
 - **config.system_critical_config()**
   - Returns the [SystemCriticalConfig](https://pkg.go.dev/github.com/gochan-org/gochan/pkg/config#SystemCriticalConfig)

From d5ac9bff11ea2b0be5d9ac9f1cf071fb0ab328bb Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 15:54:33 -0800
Subject: [PATCH 106/122] Refactor, replace use of interface{} with any, fix
 register_handler args not being usd

---
 cmd/gochan/editpost.go           | 16 +++++++-------
 cmd/gochan/main.go               |  2 +-
 cmd/gochan/movethread.go         | 36 ++++++++++++++++----------------
 pkg/building/boards.go           |  4 ++--
 pkg/building/building.go         |  6 +++---
 pkg/building/catalog.go          |  2 +-
 pkg/building/threads.go          |  2 +-
 pkg/events/events.go             |  6 +++---
 pkg/events/events_test.go        |  6 +++---
 pkg/events/lua.go                |  6 +++---
 pkg/gcplugin/luautil/util.go     |  2 +-
 pkg/gcsql/boards.go              |  2 +-
 pkg/gcsql/initsql/init.go        |  2 +-
 pkg/gcsql/reports.go             |  4 ++--
 pkg/gcutil/util.go               |  2 +-
 pkg/manage/actions.go            |  4 ++--
 pkg/manage/actionsAdminPerm.go   | 30 +++++++++++++-------------
 pkg/manage/actionsJanitorPerm.go | 12 +++++------
 pkg/manage/actionsModPerm.go     | 32 ++++++++++++++--------------
 pkg/manage/actionsNoPerm.go      |  6 +++---
 pkg/manage/lua.go                |  2 +-
 pkg/manage/util.go               |  4 ++--
 pkg/posting/bans.go              |  2 +-
 pkg/posting/captcha.go           |  2 +-
 pkg/posting/uploads/lua.go       |  2 +-
 pkg/server/server_test.go        | 10 ++++-----
 pkg/server/serverutil/lua.go     |  2 +-
 27 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/cmd/gochan/editpost.go b/cmd/gochan/editpost.go
index f2c67962..4a47a1c2 100644
--- a/cmd/gochan/editpost.go
+++ b/cmd/gochan/editpost.go
@@ -70,7 +70,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 			return
 		}
 
-		data := map[string]interface{}{
+		data := map[string]any{
 			"boards":         gcsql.AllBoards,
 			"systemCritical": config.GetSystemCriticalConfig(),
 			"siteConfig":     config.GetSiteConfig(),
@@ -101,7 +101,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		errEv.Err(err).Caller().
 			Str("postid", postIDstr).
 			Msg("Invalid form data")
-		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]interface{}{
+		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]any{
 			"postid": postid,
 		})
 		return
@@ -110,7 +110,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	post, err := gcsql.GetPostFromID(postid, true)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Unable to find post")
-		server.ServeError(writer, "Unable to find post", wantsJSON, map[string]interface{}{
+		server.ServeError(writer, "Unable to find post", wantsJSON, map[string]any{
 			"postid": postid,
 		})
 		return
@@ -135,7 +135,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 
 	board, err := gcsql.GetBoardFromID(boardid)
 	if err != nil {
-		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]interface{}{
+		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]any{
 			"boardid": boardid,
 		})
 		errEv.Err(err).Caller().Msg("Invalid form data")
@@ -184,7 +184,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 				Str("newFilename", upload.Filename).
 				Str("newOriginalFilename", upload.OriginalFilename).
 				Send()
-			server.ServeError(writer, "Error attaching new upload: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Error attaching new upload: "+err.Error(), wantsJSON, map[string]any{
 				"filename": upload.OriginalFilename,
 			})
 			filePath = path.Join(documentRoot, board.Dir, "src", upload.Filename)
@@ -201,7 +201,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		_, err, recovered = events.TriggerEvent("message-pre-format", post, request)
 		if recovered {
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Recovered from a panic in an event handler (message-pre-format)", wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Recovered from a panic in an event handler (message-pre-format)", wantsJSON, map[string]any{
 				"postid": post.ID,
 			})
 			return
@@ -210,7 +210,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 			errEv.Err(err).Caller().
 				Str("triggeredEvent", "message-pre-format").
 				Send()
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
 				"postid": post.ID,
 			})
 			return
@@ -259,7 +259,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		); err != nil {
 			errEv.Err(err).Caller().
 				Msg("Unable to edit post")
-			server.ServeError(writer, "Unable to edit post: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Unable to edit post: "+err.Error(), wantsJSON, map[string]any{
 				"postid": post.ID,
 			})
 			return
diff --git a/cmd/gochan/main.go b/cmd/gochan/main.go
index 4184dc90..10f44fb1 100644
--- a/cmd/gochan/main.go
+++ b/cmd/gochan/main.go
@@ -78,7 +78,7 @@ func main() {
 		gcutil.LogFatal().Err(err).Msg("Failed to initialize the database")
 	}
 	events.TriggerEvent("db-initialized")
-	events.RegisterEvent([]string{"db-views-reset"}, func(trigger string, i ...interface{}) error {
+	events.RegisterEvent([]string{"db-views-reset"}, func(trigger string, i ...any) error {
 		gcutil.LogInfo().Msg("SQL views reset")
 		return nil
 	})
diff --git a/cmd/gochan/movethread.go b/cmd/gochan/movethread.go
index 748725b3..f7a03ae8 100644
--- a/cmd/gochan/movethread.go
+++ b/cmd/gochan/movethread.go
@@ -59,7 +59,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			return
 		}
 		if !post.IsTopPost {
-			server.ServeError(writer, "You appear to be trying to move a post that is not the top post in the thread", wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "You appear to be trying to move a post that is not the top post in the thread", wantsJSON, map[string]any{
 				"postid": checkedPosts[0],
 			})
 			return
@@ -69,7 +69,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 		if err != nil {
 			errEv.Err(err).Caller().
 				Str("srcBoardIDstr", request.PostFormValue("boardid")).Send()
-			server.ServeError(writer, fmt.Sprintf("Invalid or missing boarid: %q", request.PostFormValue("boardid")), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, fmt.Sprintf("Invalid or missing boarid: %q", request.PostFormValue("boardid")), wantsJSON, map[string]any{
 				"boardid": srcBoardID,
 			})
 			return
@@ -85,7 +85,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 		}
 		gcutil.LogStr("srcBoard", srcBoard.Dir, errEv, infoEv)
 		buf := bytes.NewBufferString("")
-		if err = serverutil.MinifyTemplate(gctemplates.MoveThreadPage, map[string]interface{}{
+		if err = serverutil.MinifyTemplate(gctemplates.MoveThreadPage, map[string]any{
 			"boardConfig": config.GetBoardConfig(srcBoard.Dir),
 			"postid":      post.ID,
 			"destBoards":  destBoards,
@@ -106,7 +106,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Str("postIDstr", postIDstr).Send()
 			writer.WriteHeader(http.StatusBadRequest)
-			server.ServeError(writer, fmt.Sprintf("Error parsing postid value: %q: %s", postIDstr, err.Error()), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, fmt.Sprintf("Error parsing postid value: %q: %s", postIDstr, err.Error()), wantsJSON, map[string]any{
 				"postid": postIDstr,
 			})
 			return
@@ -119,7 +119,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Str("srcBoardIDstr", srcBoardIDstr).Send()
 			writer.WriteHeader(http.StatusBadRequest)
-			server.ServeError(writer, fmt.Sprintf("Error parsing srcboardid value: %q: %s", srcBoardIDstr, err.Error()), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, fmt.Sprintf("Error parsing srcboardid value: %q: %s", srcBoardIDstr, err.Error()), wantsJSON, map[string]any{
 				"srcboardid": srcBoardIDstr,
 			})
 			return
@@ -129,7 +129,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Int("srcBoardID", srcBoardID).Send()
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
 				"srcboardid": srcBoardID,
 			})
 			return
@@ -142,7 +142,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Str("destBoardIDstr", destBoardIDstr).Send()
 			writer.WriteHeader(http.StatusBadRequest)
-			server.ServeError(writer, fmt.Sprintf("Error parsing destboardid value: %q: %s", destBoardIDstr, err.Error()), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, fmt.Sprintf("Error parsing destboardid value: %q: %s", destBoardIDstr, err.Error()), wantsJSON, map[string]any{
 				"destboardid": destBoardIDstr,
 			})
 			return
@@ -153,7 +153,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Int("destBoardID", destBoardID).Send()
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
 				"destboardid": destBoardID,
 			})
 			return
@@ -164,7 +164,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 		if err != nil {
 			errEv.Err(err).Caller().Send()
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
 				"postid": postID,
 			})
 			return
@@ -178,7 +178,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 
 		if err = post.ChangeBoardID(destBoardID); err != nil {
 			errEv.Err(err).Caller().Msg("Failed changing thread board ID")
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
 				"postID":      postID,
 				"destBoardID": destBoardID,
 			})
@@ -189,7 +189,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Unable to get upload info")
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Error getting list of files in thread", wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Error getting list of files in thread", wantsJSON, map[string]any{
 				"postid": post.ID,
 			})
 		}
@@ -245,7 +245,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 		if err != nil {
 			// got at least one error while trying to move files (if there were any)
 			server.ServeError(writer, "Error while moving post upload: "+err.Error(), wantsJSON,
-				map[string]interface{}{
+				map[string]any{
 					"postID":    postID,
 					"srcBoard":  srcBoard.Dir,
 					"destBoard": destBoard.Dir,
@@ -258,7 +258,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Msg("Failed deleting thread page")
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Failed deleting thread page: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Failed deleting thread page: "+err.Error(), wantsJSON, map[string]any{
 				"postID":   postID,
 				"srcBoard": srcBoard.Dir,
 			})
@@ -269,7 +269,7 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 			errEv.Err(err).Caller().
 				Msg("Failed deleting thread JSON file")
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Failed deleting thread JSON file: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Failed deleting thread JSON file: "+err.Error(), wantsJSON, map[string]any{
 				"postID":   postID,
 				"srcBoard": srcBoard.Dir,
 			})
@@ -278,27 +278,27 @@ func moveThread(checkedPosts []int, moveBtn string, doMove string, writer http.R
 
 		if err = building.BuildThreadPages(post); err != nil {
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Failed building thread page: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Failed building thread page: "+err.Error(), wantsJSON, map[string]any{
 				"postid": postID,
 			})
 			return
 		}
 		if err = building.BuildBoardPages(srcBoard, errEv); err != nil {
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Failed building board page: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Failed building board page: "+err.Error(), wantsJSON, map[string]any{
 				"srcBoardID": srcBoardID,
 			})
 			return
 		}
 		if err = building.BuildBoardPages(destBoard, errEv); err != nil {
 			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Failed building destination board page: "+err.Error(), wantsJSON, map[string]interface{}{
+			server.ServeError(writer, "Failed building destination board page: "+err.Error(), wantsJSON, map[string]any{
 				"destBoardID": destBoardID,
 			})
 			return
 		}
 		if wantsJSON {
-			server.ServeJSON(writer, map[string]interface{}{
+			server.ServeJSON(writer, map[string]any{
 				"status":    "success",
 				"postID":    postID,
 				"srcBoard":  srcBoard.Dir,
diff --git a/pkg/building/boards.go b/pkg/building/boards.go
index 20152d60..09b200a5 100644
--- a/pkg/building/boards.go
+++ b/pkg/building/boards.go
@@ -169,7 +169,7 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 		// Render board page template to the file,
 		// packaging the board/section list, threads, and board info
 		captchaCfg := config.GetSiteConfig().Captcha
-		if err = serverutil.MinifyTemplate(gctemplates.BoardPage, map[string]interface{}{
+		if err = serverutil.MinifyTemplate(gctemplates.BoardPage, map[string]any{
 			"boards":      gcsql.AllBoards,
 			"sections":    gcsql.AllSections,
 			"threads":     threads,
@@ -243,7 +243,7 @@ func BuildBoardPages(board *gcsql.Board, errEv *zerolog.Event) error {
 		if (numThreads % boardConfig.ThreadsPerPage) > 0 {
 			numPages++
 		}
-		data := map[string]interface{}{
+		data := map[string]any{
 			"boards":      gcsql.AllBoards,
 			"sections":    gcsql.AllSections,
 			"threads":     page.Threads,
diff --git a/pkg/building/building.go b/pkg/building/building.go
index 178264b0..ebb735cf 100644
--- a/pkg/building/building.go
+++ b/pkg/building/building.go
@@ -104,7 +104,7 @@ func BuildFrontPage() error {
 		errEv.Err(err).Caller().Send()
 		return fmt.Errorf("failed loading recent posts: %w", err)
 	}
-	if err = serverutil.MinifyTemplate(gctemplates.FrontPage, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.FrontPage, map[string]any{
 		"siteConfig":  siteCfg,
 		"sections":    gcsql.AllSections,
 		"boards":      gcsql.AllBoards,
@@ -119,8 +119,8 @@ func BuildFrontPage() error {
 
 // BuildPageHeader is a convenience function for automatically generating the top part
 // of every normal HTML page
-func BuildPageHeader(writer io.Writer, pageTitle string, board string, misc map[string]interface{}) error {
-	phMap := map[string]interface{}{
+func BuildPageHeader(writer io.Writer, pageTitle string, board string, misc map[string]any) error {
+	phMap := map[string]any{
 		"pageTitle":     pageTitle,
 		"documentTitle": pageTitle + " - " + config.GetSiteConfig().SiteName,
 		"siteConfig":    config.GetSiteConfig(),
diff --git a/pkg/building/catalog.go b/pkg/building/catalog.go
index e5001e72..0495d87f 100644
--- a/pkg/building/catalog.go
+++ b/pkg/building/catalog.go
@@ -113,7 +113,7 @@ func BuildCatalog(boardID int) error {
 	}
 	boardConfig := config.GetBoardConfig(board.Dir)
 
-	if err = serverutil.MinifyTemplate(gctemplates.Catalog, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.Catalog, map[string]any{
 		"boards":      gcsql.AllBoards,
 		"board":       board,
 		"boardConfig": boardConfig,
diff --git a/pkg/building/threads.go b/pkg/building/threads.go
index 4d74d49b..e360df67 100644
--- a/pkg/building/threads.go
+++ b/pkg/building/threads.go
@@ -95,7 +95,7 @@ func BuildThreadPages(op *gcsql.Post) error {
 
 	// render thread page
 	captchaCfg := config.GetSiteConfig().Captcha
-	if err = serverutil.MinifyTemplate(gctemplates.ThreadPage, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.ThreadPage, map[string]any{
 		"boards":      gcsql.AllBoards,
 		"board":       board,
 		"boardConfig": config.GetBoardConfig(board.Dir),
diff --git a/pkg/events/events.go b/pkg/events/events.go
index e5b51bbf..a9b8423b 100644
--- a/pkg/events/events.go
+++ b/pkg/events/events.go
@@ -13,18 +13,18 @@ var (
 	InvalidArgumentErrorStr = "invalid argument(s) passed to event %q"
 )
 
-type EventHandler func(string, ...interface{}) error
+type EventHandler func(string, ...any) error
 
 // RegisterEvent registers a new event handler to be called when any of the elements of triggers are passed
 // to TriggerEvent
-func RegisterEvent(triggers []string, handler func(trigger string, i ...interface{}) error) {
+func RegisterEvent(triggers []string, handler func(trigger string, i ...any) error) {
 	for _, t := range triggers {
 		registeredEvents[t] = append(registeredEvents[t], handler)
 	}
 }
 
 // TriggerEvent triggers the event handler registered to trigger
-func TriggerEvent(trigger string, data ...interface{}) (handled bool, err error, recovered bool) {
+func TriggerEvent(trigger string, data ...any) (handled bool, err error, recovered bool) {
 	errEv := gcutil.LogError(nil).Caller(1)
 	defer func() {
 		if a := recover(); a != nil {
diff --git a/pkg/events/events_test.go b/pkg/events/events_test.go
index 2450e2d6..0673d656 100644
--- a/pkg/events/events_test.go
+++ b/pkg/events/events_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestPanicRecover(t *testing.T) {
-	RegisterEvent([]string{"TestPanicRecoverEvt"}, func(tr string, i ...interface{}) error {
+	RegisterEvent([]string{"TestPanicRecoverEvt"}, func(tr string, i ...any) error {
 		t.Log("Testing panic recover")
 		t.Log(i[0])
 		return nil
@@ -21,7 +21,7 @@ func TestPanicRecover(t *testing.T) {
 }
 
 func TestEventEditValue(t *testing.T) {
-	RegisterEvent([]string{"TestEventEditValue"}, func(tr string, i ...interface{}) error {
+	RegisterEvent([]string{"TestEventEditValue"}, func(tr string, i ...any) error {
 		p := i[0].(*int)
 		*p += 1
 		return nil
@@ -35,7 +35,7 @@ func TestEventEditValue(t *testing.T) {
 
 func TestMultipleEventTriggers(t *testing.T) {
 	triggered := map[string]bool{}
-	RegisterEvent([]string{"a", "b"}, func(tr string, i ...interface{}) error {
+	RegisterEvent([]string{"a", "b"}, func(tr string, i ...any) error {
 		triggered[tr] = true
 		return nil
 	})
diff --git a/pkg/events/lua.go b/pkg/events/lua.go
index 9d8a55dc..527cb566 100644
--- a/pkg/events/lua.go
+++ b/pkg/events/lua.go
@@ -9,7 +9,7 @@ import (
 )
 
 func luaEventRegisterHandlerAdapter(l *lua.LState, fn *lua.LFunction) EventHandler {
-	return func(trigger string, data ...interface{}) error {
+	return func(trigger string, data ...any) error {
 		args := []lua.LValue{
 			luar.New(l, trigger),
 		}
@@ -35,7 +35,7 @@ func PreloadModule(l *lua.LState) int {
 		"register_event": func(l *lua.LState) int {
 			table := l.CheckTable(-2)
 			var triggers []string
-			table.ForEach(func(i, val lua.LValue) {
+			table.ForEach(func(_, val lua.LValue) {
 				triggers = append(triggers, val.String())
 			})
 			fn := l.CheckFunction(-1)
@@ -45,7 +45,7 @@ func PreloadModule(l *lua.LState) int {
 		"trigger_event": func(l *lua.LState) int {
 			trigger := l.CheckString(1)
 			numArgs := l.GetTop()
-			var data []interface{}
+			var data []any
 			for i := 2; i <= numArgs; i++ {
 				v := l.CheckAny(i)
 				data = append(data, luautil.LValueToInterface(l, v))
diff --git a/pkg/gcplugin/luautil/util.go b/pkg/gcplugin/luautil/util.go
index e63174e9..9d726724 100644
--- a/pkg/gcplugin/luautil/util.go
+++ b/pkg/gcplugin/luautil/util.go
@@ -4,7 +4,7 @@ import (
 	lua "github.com/yuin/gopher-lua"
 )
 
-func LValueToInterface(l *lua.LState, v lua.LValue) interface{} {
+func LValueToInterface(l *lua.LState, v lua.LValue) any {
 	lt := v.Type()
 	switch lt {
 	case lua.LTNil:
diff --git a/pkg/gcsql/boards.go b/pkg/gcsql/boards.go
index 3f325b6d..256d94f6 100644
--- a/pkg/gcsql/boards.go
+++ b/pkg/gcsql/boards.go
@@ -339,7 +339,7 @@ func (board *Board) DeleteOldThreads() ([]int, error) {
 		rows.Close()
 	}()
 
-	var threadIDs []interface{}
+	var threadIDs []any
 	var id int
 	var threadsProccessed int
 	for rows.Next() {
diff --git a/pkg/gcsql/initsql/init.go b/pkg/gcsql/initsql/init.go
index a1434cb4..32940833 100644
--- a/pkg/gcsql/initsql/init.go
+++ b/pkg/gcsql/initsql/init.go
@@ -119,7 +119,7 @@ func sectionBoardsTmplFunc(sectionID int) []gcsql.Board {
 }
 
 func init() {
-	events.RegisterEvent([]string{"reset-boards-sections"}, func(_ string, _ ...interface{}) error {
+	events.RegisterEvent([]string{"reset-boards-sections"}, func(_ string, _ ...any) error {
 		return gcsql.ResetBoardSectionArrays()
 	})
 	gctemplates.AddTemplateFuncs(template.FuncMap{
diff --git a/pkg/gcsql/reports.go b/pkg/gcsql/reports.go
index be544497..ca4e023a 100644
--- a/pkg/gcsql/reports.go
+++ b/pkg/gcsql/reports.go
@@ -86,7 +86,7 @@ func CheckPostReports(postID int, reason string) (bool, bool, error) {
 	sql := `SELECT COUNT(*), MAX(is_cleared) FROM DBPREFIXreports
 		WHERE post_id = ? AND (reason = ? OR is_cleared = 2)`
 	var num int
-	var isCleared interface{}
+	var isCleared any
 	err := QueryRowTimeoutSQL(nil, sql, []any{postID, reason}, []any{&num, &isCleared})
 	isClearedInt, _ := isCleared.(int64)
 	return num > 0, isClearedInt == 2, err
@@ -111,7 +111,7 @@ func GetReports(includeCleared bool) ([]Report, error) {
 	var reports []Report
 	for rows.Next() {
 		var report Report
-		var staffID interface{}
+		var staffID any
 		err = rows.Scan(&report.ID, &staffID, &report.PostID, &report.IP, &report.Reason, &report.IsCleared)
 		if err != nil {
 			return nil, err
diff --git a/pkg/gcutil/util.go b/pkg/gcutil/util.go
index 70a27210..8c8437ae 100644
--- a/pkg/gcutil/util.go
+++ b/pkg/gcutil/util.go
@@ -131,7 +131,7 @@ func HackyStringToInt(text string) int {
 }
 
 // MarshalJSON creates a JSON string with the given data and returns the string and any errors
-func MarshalJSON(data interface{}, indent bool) (string, error) {
+func MarshalJSON(data any, indent bool) (string, error) {
 	var jsonBytes []byte
 	var err error
 
diff --git a/pkg/manage/actions.go b/pkg/manage/actions.go
index 2fdd66ca..463ae782 100644
--- a/pkg/manage/actions.go
+++ b/pkg/manage/actions.go
@@ -31,7 +31,7 @@ const (
 	AlwaysJSON
 )
 
-type CallbackFunction func(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error)
+type CallbackFunction func(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output any, err error)
 
 // Action represents the functions accessed by staff members at /manage/<functionname>.
 type Action struct {
@@ -105,7 +105,7 @@ func getPageTitle(actionID string, staff *gcsql.Staff) string {
 	return useAction.Title
 }
 
-func getStaffActions(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (interface{}, error) {
+func getStaffActions(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (any, error) {
 	availableActions := getAvailableActions(staff.Rank, false)
 	return availableActions, nil
 }
diff --git a/pkg/manage/actionsAdminPerm.go b/pkg/manage/actionsAdminPerm.go
index d8d51260..4d6f570c 100644
--- a/pkg/manage/actionsAdminPerm.go
+++ b/pkg/manage/actionsAdminPerm.go
@@ -37,7 +37,7 @@ type uploadInfo struct {
 
 // manage actions that require admin-level permission go here
 
-func updateAnnouncementsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (interface{}, error) {
+func updateAnnouncementsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (any, error) {
 	announcements, err := getAllAnnouncements()
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Unable to get staff announcements")
@@ -122,7 +122,7 @@ func updateAnnouncementsCallback(_ http.ResponseWriter, request *http.Request, s
 	return pageBuffer.String(), err
 }
 
-func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	board := &gcsql.Board{
 		MaxFilesize:      1000 * 1000 * 15,
 		AnonymousName:    "Anonymous",
@@ -212,7 +212,7 @@ func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.S
 	}
 	pageBuffer := bytes.NewBufferString("")
 	if err = serverutil.MinifyTemplate(gctemplates.ManageBoards,
-		map[string]interface{}{
+		map[string]any{
 			"siteConfig":  config.GetSiteConfig(),
 			"sections":    gcsql.AllSections,
 			"boards":      gcsql.AllBoards,
@@ -227,7 +227,7 @@ func boardsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.S
 	return pageBuffer.String(), nil
 }
 
-func boardSectionsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func boardSectionsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	section := &gcsql.Section{}
 	editID := request.Form.Get("edit")
 	updateID := request.Form.Get("updatesection")
@@ -308,7 +308,7 @@ func boardSectionsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsq
 		return "", err
 	}
 	pageBuffer := bytes.NewBufferString("")
-	pageMap := map[string]interface{}{
+	pageMap := map[string]any{
 		"siteConfig": config.GetSiteConfig(),
 		"sections":   sections,
 	}
@@ -323,7 +323,7 @@ func boardSectionsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsq
 	return
 }
 
-func cleanupCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func cleanupCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	outputStr := ""
 	if request.FormValue("run") == "Run Cleanup" {
 		outputStr += "Removing deleted posts from the database.<hr />"
@@ -352,7 +352,7 @@ func cleanupCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staf
 	return outputStr, nil
 }
 
-func fixThumbnailsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _, errEv *zerolog.Event) (output interface{}, err error) {
+func fixThumbnailsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _, errEv *zerolog.Event) (output any, err error) {
 	board := request.FormValue("board")
 	var uploads []uploadInfo
 	if board != "" {
@@ -388,7 +388,7 @@ func fixThumbnailsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsq
 	return buffer.String(), nil
 }
 
-func templatesCallback(writer http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, infoEv, errEv *zerolog.Event) (output interface{}, err error) {
+func templatesCallback(writer http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, infoEv, errEv *zerolog.Event) (output any, err error) {
 	buf := bytes.NewBufferString("")
 
 	selectedTemplate := request.FormValue("override")
@@ -513,7 +513,7 @@ func templatesCallback(writer http.ResponseWriter, request *http.Request, _ *gcs
 	return buf.String(), nil
 }
 
-func rebuildFrontCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, _ *zerolog.Event) (output interface{}, err error) {
+func rebuildFrontCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, _ *zerolog.Event) (output any, err error) {
 	if err = gctemplates.InitTemplates(); err != nil {
 		return "", err
 	}
@@ -526,7 +526,7 @@ func rebuildFrontCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff
 	return "Built front page successfully", err
 }
 
-func rebuildAllCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func rebuildAllCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	gctemplates.InitTemplates()
 	if err = gcsql.ResetBoardSectionArrays(); err != nil {
 		errEv.Err(err).Caller().Send()
@@ -581,7 +581,7 @@ func rebuildAllCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff,
 	return buildStr, nil
 }
 
-func rebuildBoardsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func rebuildBoardsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	if err = gctemplates.InitTemplates(); err != nil {
 		errEv.Err(err).Caller().Msg("Unable to initialize templates")
 		return "", err
@@ -592,7 +592,7 @@ func rebuildBoardsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staf
 		return "", err
 	}
 	if wantsJSON {
-		return map[string]interface{}{
+		return map[string]any{
 			"success": true,
 			"message": "Boards built successfully",
 		}, nil
@@ -600,7 +600,7 @@ func rebuildBoardsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staf
 	return "Boards built successfully", nil
 }
 
-func reparseHTMLCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func reparseHTMLCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	var outputStr string
 	tx, err := gcsql.BeginTx()
 	if err != nil {
@@ -662,7 +662,7 @@ func reparseHTMLCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff,
 }
 
 func viewLogCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event,
-	errEv *zerolog.Event) (output interface{}, err error) {
+	errEv *zerolog.Event) (output any, err error) {
 	logPath := path.Join(config.GetSystemCriticalConfig().LogDir, "gochan.log")
 	logBytes, err := os.ReadFile(logPath)
 	if err != nil {
@@ -670,7 +670,7 @@ func viewLogCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ b
 		return "", errors.New("unable to open log file")
 	}
 	buf := bytes.NewBufferString("")
-	err = serverutil.MinifyTemplate(gctemplates.ManageViewLog, map[string]interface{}{
+	err = serverutil.MinifyTemplate(gctemplates.ManageViewLog, map[string]any{
 		"logText": string(logBytes),
 	}, buf, "text/html")
 	return buf.String(), err
diff --git a/pkg/manage/actionsJanitorPerm.go b/pkg/manage/actionsJanitorPerm.go
index 6d086a83..c52b06bc 100644
--- a/pkg/manage/actionsJanitorPerm.go
+++ b/pkg/manage/actionsJanitorPerm.go
@@ -23,7 +23,7 @@ var (
 
 // manage actions that require at least janitor-level permission go here
 
-func logoutCallback(writer http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output interface{}, err error) {
+func logoutCallback(writer http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output any, err error) {
 	if err = gcsql.EndStaffSession(writer, request); err != nil {
 		return "", err
 	}
@@ -33,7 +33,7 @@ func logoutCallback(writer http.ResponseWriter, request *http.Request, _ *gcsql.
 	return "Logged out successfully", nil
 }
 
-func clearMySessionsCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, _ *zerolog.Event) (output interface{}, err error) {
+func clearMySessionsCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, _ *zerolog.Event) (output any, err error) {
 	session, err := request.Cookie("sessiondata")
 	if err != nil {
 		// doesn't have a login session cookie, return with no errors
@@ -74,7 +74,7 @@ func clearMySessionsCallback(writer http.ResponseWriter, request *http.Request,
 	return "Logged out successfully", nil
 }
 
-func recentPostsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, wantsJSON bool, _, errEv *zerolog.Event) (output interface{}, err error) {
+func recentPostsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, wantsJSON bool, _, errEv *zerolog.Event) (output any, err error) {
 	limit := 20
 	limitStr := request.FormValue("limit")
 	if limitStr != "" {
@@ -102,7 +102,7 @@ func recentPostsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.
 		return recentposts, nil
 	}
 	manageRecentsBuffer := bytes.NewBufferString("")
-	if err = serverutil.MinifyTemplate(gctemplates.ManageRecentPosts, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.ManageRecentPosts, map[string]any{
 		"recentposts": recentposts,
 		"allBoards":   gcsql.AllBoards,
 		"boardid":     boardid,
@@ -114,12 +114,12 @@ func recentPostsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.
 	return manageRecentsBuffer.String(), nil
 }
 
-func announcementsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output interface{}, err error) {
+func announcementsCallback(_ http.ResponseWriter, _ *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output any, err error) {
 	// return an array of announcements (with staff name instead of ID) and any errors
 	return getAllAnnouncements()
 }
 
-func staffCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func staffCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	do := request.FormValue("do")
 	allStaff, err := getAllStaffNopass(true)
 	if wantsJSON {
diff --git a/pkg/manage/actionsModPerm.go b/pkg/manage/actionsModPerm.go
index 8a096770..36047d1a 100644
--- a/pkg/manage/actionsModPerm.go
+++ b/pkg/manage/actionsModPerm.go
@@ -27,7 +27,7 @@ import (
 
 // manage actions that require moderator-level permission go here
 
-func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	var outputStr string
 	var ban gcsql.IPBan
 	ban.StaffID = staff.ID
@@ -108,7 +108,7 @@ func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Sta
 	}
 	manageBansBuffer := bytes.NewBufferString("")
 
-	if err = serverutil.MinifyTemplate(gctemplates.ManageBans, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.ManageBans, map[string]any{
 		"banlist":       banlist,
 		"allBoards":     gcsql.AllBoards,
 		"ban":           ban,
@@ -121,7 +121,7 @@ func bansCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Sta
 	return outputStr, nil
 }
 
-func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv, errEv *zerolog.Event) (output interface{}, err error) {
+func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv, errEv *zerolog.Event) (output any, err error) {
 	banIDstr := request.FormValue("banid")
 	var banID int
 	if banIDstr != "" {
@@ -165,7 +165,7 @@ func appealsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 		return appeals, nil
 	}
 	manageAppealsBuffer := bytes.NewBufferString("")
-	pageData := map[string]interface{}{}
+	pageData := map[string]any{}
 	if len(appeals) > 0 {
 		pageData["appeals"] = appeals
 	}
@@ -349,10 +349,10 @@ func filtersCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	return buf.String(), nil
 }
 
-func ipSearchCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func ipSearchCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	ipQuery := request.FormValue("ip")
 	limitStr := request.FormValue("limit")
-	data := map[string]interface{}{
+	data := map[string]any{
 		"ipQuery": ipQuery,
 		"limit":   20,
 	}
@@ -389,7 +389,7 @@ func ipSearchCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql
 	return manageIpBuffer.String(), nil
 }
 
-func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	dismissIDstr := request.FormValue("dismiss")
 	if dismissIDstr != "" {
 		// staff is dismissing a report
@@ -422,10 +422,10 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 		return nil, err
 	}
 	defer rows.Close()
-	reports := make([]map[string]interface{}, 0)
+	reports := make([]map[string]any, 0)
 	for rows.Next() {
 		var id int
-		var staff_id interface{}
+		var staff_id any
 		var staff_user []byte
 		var post_id int
 		var ip string
@@ -442,7 +442,7 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 		}
 
 		staff_id_int, _ := staff_id.(int64)
-		reports = append(reports, map[string]interface{}{
+		reports = append(reports, map[string]any{
 			"id":         id,
 			"staff_id":   int(staff_id_int),
 			"staff_user": string(staff_user),
@@ -457,7 +457,7 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	}
 	reportsBuffer := bytes.NewBufferString("")
 	err = serverutil.MinifyTemplate(gctemplates.ManageReports,
-		map[string]interface{}{
+		map[string]any{
 			"reports": reports,
 			"staff":   staff,
 		}, reportsBuffer, "text/html")
@@ -469,10 +469,10 @@ func reportsCallback(_ http.ResponseWriter, request *http.Request, staff *gcsql.
 	return
 }
 
-func threadAttrsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, wantsJSON bool, infoEv, errEv *zerolog.Event) (output interface{}, err error) {
+func threadAttrsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, wantsJSON bool, infoEv, errEv *zerolog.Event) (output any, err error) {
 	boardDir := request.FormValue("board")
 	attrBuffer := bytes.NewBufferString("")
-	data := map[string]interface{}{
+	data := map[string]any{
 		"boards": gcsql.AllBoards,
 	}
 	if boardDir == "" {
@@ -572,7 +572,7 @@ func threadAttrsCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.
 		return "", err
 	}
 	data["threads"] = threads
-	var threadIDs []interface{}
+	var threadIDs []any
 	for i := len(threads) - 1; i >= 0; i-- {
 		threadIDs = append(threadIDs, threads[i].ID)
 	}
@@ -617,7 +617,7 @@ type postInfoJSON struct {
 	Fingerprint      string `json:"fingerprint,omitempty"`
 }
 
-func postInfoCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func postInfoCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	postIDstr := request.FormValue("postid")
 	if postIDstr == "" {
 		return "", errors.New("invalid request (missing postid)")
@@ -670,7 +670,7 @@ type fingerprintJSON struct {
 	Fingerprint string `json:"fingerprint"`
 }
 
-func fingerprintCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+func fingerprintCallback(_ http.ResponseWriter, request *http.Request, _ *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 	postIDstr := request.Form.Get("post")
 	if postIDstr == "" {
 		return "", errors.New("missing 'post' field")
diff --git a/pkg/manage/actionsNoPerm.go b/pkg/manage/actionsNoPerm.go
index f1baac72..6c216b9c 100644
--- a/pkg/manage/actionsNoPerm.go
+++ b/pkg/manage/actionsNoPerm.go
@@ -19,7 +19,7 @@ const (
 	loginTitle = "Login"
 )
 
-func loginCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _, errEv *zerolog.Event) (output interface{}, err error) {
+func loginCallback(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, _ bool, _, errEv *zerolog.Event) (output any, err error) {
 	systemCritical := config.GetSystemCriticalConfig()
 	if staff.Rank > 0 {
 		http.Redirect(writer, request, path.Join(systemCritical.WebRoot, "manage"), http.StatusFound)
@@ -34,7 +34,7 @@ func loginCallback(writer http.ResponseWriter, request *http.Request, staff *gcs
 	if username == "" || password == "" {
 		//assume that they haven't logged in
 		manageLoginBuffer := bytes.NewBufferString("")
-		if err = serverutil.MinifyTemplate(gctemplates.ManageLogin, map[string]interface{}{
+		if err = serverutil.MinifyTemplate(gctemplates.ManageLogin, map[string]any{
 			"siteConfig":  config.GetSiteConfig(),
 			"sections":    gcsql.AllSections,
 			"boards":      gcsql.AllBoards,
@@ -64,7 +64,7 @@ type staffInfoJSON struct {
 	Actions  []Action `json:"actions,omitempty"`
 }
 
-func staffInfoCallback(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output interface{}, err error) {
+func staffInfoCallback(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, _ *zerolog.Event) (output any, err error) {
 	info := staffInfoJSON{
 		Username: staff.Username,
 		Rank:     staff.Rank,
diff --git a/pkg/manage/lua.go b/pkg/manage/lua.go
index a8be0b20..f84227d0 100644
--- a/pkg/manage/lua.go
+++ b/pkg/manage/lua.go
@@ -140,7 +140,7 @@ func PreloadModule(l *lua.LState) int {
 			actionPerms := l.CheckInt(3)
 			actionJSON := l.CheckInt(4)
 			fn := l.CheckFunction(5)
-			actionHandler := func(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output interface{}, err error) {
+			actionHandler := func(writer http.ResponseWriter, request *http.Request, staff *gcsql.Staff, wantsJSON bool, infoEv *zerolog.Event, errEv *zerolog.Event) (output any, err error) {
 				if err = l.CallByParam(lua.P{
 					Fn:   fn,
 					NRet: 2,
diff --git a/pkg/manage/util.go b/pkg/manage/util.go
index 63135579..35bf341e 100644
--- a/pkg/manage/util.go
+++ b/pkg/manage/util.go
@@ -131,7 +131,7 @@ func InitManagePages() {
 	registerAdminPages()
 }
 
-func dashboardCallback(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (interface{}, error) {
+func dashboardCallback(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staff, _ bool, _ *zerolog.Event, errEv *zerolog.Event) (any, error) {
 	dashBuffer := bytes.NewBufferString("")
 	announcements, err := getAllAnnouncements()
 	if err != nil {
@@ -148,7 +148,7 @@ func dashboardCallback(_ http.ResponseWriter, _ *http.Request, staff *gcsql.Staf
 	}
 
 	availableActions := getAvailableActions(staff.Rank, true)
-	if err = serverutil.MinifyTemplate(gctemplates.ManageDashboard, map[string]interface{}{
+	if err = serverutil.MinifyTemplate(gctemplates.ManageDashboard, map[string]any{
 		"actions":       availableActions,
 		"rank":          staff.Rank,
 		"rankString":    rankString,
diff --git a/pkg/posting/bans.go b/pkg/posting/bans.go
index 17c3defe..08f9b71e 100644
--- a/pkg/posting/bans.go
+++ b/pkg/posting/bans.go
@@ -18,7 +18,7 @@ import (
 
 func showBanpage(ban *gcsql.IPBan, post *gcsql.Post, postBoard *gcsql.Board, writer http.ResponseWriter, _ *http.Request) {
 	banPageBuffer := bytes.NewBufferString("")
-	err := serverutil.MinifyTemplate(gctemplates.BanPage, map[string]interface{}{
+	err := serverutil.MinifyTemplate(gctemplates.BanPage, map[string]any{
 		"systemCritical": config.GetSystemCriticalConfig(),
 		"siteConfig":     config.GetSiteConfig(),
 		"boardConfig":    config.GetBoardConfig(postBoard.Dir),
diff --git a/pkg/posting/captcha.go b/pkg/posting/captcha.go
index 9a21aa96..9763974c 100644
--- a/pkg/posting/captcha.go
+++ b/pkg/posting/captcha.go
@@ -111,7 +111,7 @@ func ServeCaptcha(writer http.ResponseWriter, request *http.Request) {
 		}
 		fmt.Println("Success:", result)
 	}
-	err := serverutil.MinifyTemplate(gctemplates.Captcha, map[string]interface{}{
+	err := serverutil.MinifyTemplate(gctemplates.Captcha, map[string]any{
 		"boardConfig": config.GetBoardConfig(""),
 		"boards":      gcsql.AllBoards,
 		"siteKey":     captchaCfg.SiteKey,
diff --git a/pkg/posting/uploads/lua.go b/pkg/posting/uploads/lua.go
index 13a94720..ebbeadae 100644
--- a/pkg/posting/uploads/lua.go
+++ b/pkg/posting/uploads/lua.go
@@ -21,7 +21,7 @@ func PreloadModule(l *lua.LState) int {
 					Fn:   handler,
 					NRet: 1,
 					// Protect: true,
-				}, luar.New(l, upload), luar.New(l, post), lua.LString(board), lua.LString(filePath), lua.LString(thumbPath), lua.LString(catalogThumbPath))
+				}, luar.New(l, upload), luar.New(l, post), lua.LString(board), lua.LString(filePath), lua.LString(thumbPath), lua.LString(catalogThumbPath), luar.New(l, infoEv), luar.New(l, accessEv), luar.New(l, errEv))
 
 				errRet := l.CheckAny(-1)
 				if errRet != nil && errRet.Type() != lua.LTNil {
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
index 70f8a2c9..af24f199 100644
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -26,7 +26,7 @@ func TestServeJSON(t *testing.T) {
 	config.SetRandomSeed("test")
 
 	writer := httptest.NewRecorder()
-	data := map[string]interface{}{
+	data := map[string]any{
 		"status":    "success",
 		"postID":    "777",
 		"srcBoard":  "srcBoard",
@@ -46,7 +46,7 @@ func TestServeJSON(t *testing.T) {
 	}
 
 	// Check the response body
-	var response map[string]interface{}
+	var response map[string]any
 	if err := json.Unmarshal(writer.Body.Bytes(), &response); err != nil {
 		t.Fatalf("failed to unmarshal response: %v", err)
 	}
@@ -105,7 +105,7 @@ func TestServeError(t *testing.T) {
 		name      string
 		err       string
 		wantsJSON bool
-		data      map[string]interface{}
+		data      map[string]any
 		expected  string
 	}{
 		{
@@ -119,7 +119,7 @@ func TestServeError(t *testing.T) {
 			name:      "JSON response with existing data",
 			err:       "another error occurred",
 			wantsJSON: true,
-			data:      map[string]interface{}{"info": "some info"},
+			data:      map[string]any{"info": "some info"},
 			expected:  `another error occurred`,
 		},
 		{
@@ -141,7 +141,7 @@ func TestServeError(t *testing.T) {
 			// Check the response
 			if tt.wantsJSON {
 				// Check if the response is JSON
-				var responseMap map[string]interface{}
+				var responseMap map[string]any
 				if err := json.NewDecoder(rr.Body).Decode(&responseMap); err != nil {
 					t.Fatalf("Failed to decode JSON response: %v", err)
 				}
diff --git a/pkg/server/serverutil/lua.go b/pkg/server/serverutil/lua.go
index 8e26389e..1b62d577 100644
--- a/pkg/server/serverutil/lua.go
+++ b/pkg/server/serverutil/lua.go
@@ -17,7 +17,7 @@ func PreloadModule(l *lua.LState) int {
 			tmplUD := l.CheckUserData(1)
 			tmpl := tmplUD.Value.(*template.Template)
 			dataTable := l.CheckTable(2)
-			data := map[string]interface{}{}
+			data := map[string]any{}
 			dataTable.ForEach(func(l1, l2 lua.LValue) {
 				data[l1.String()] = luautil.LValueToInterface(l, l2)
 			})

From e65d363a847e9bc4515f318e0b86970c2bd4405e Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:38:15 -0800
Subject: [PATCH 107/122] Implement dice rolling

---
 cmd/gochan/editpost.go               | 58 ++++++++++---------
 examples/configs/gochan.example.json |  6 +-
 pkg/config/config.go                 |  1 +
 pkg/posting/formatting.go            | 50 +++++++++++++++++
 pkg/posting/formatting_test.go       | 84 ++++++++++++++++++++++++++++
 pkg/posting/lua.go                   |  1 -
 pkg/posting/post.go                  |  4 ++
 7 files changed, 174 insertions(+), 30 deletions(-)

diff --git a/cmd/gochan/editpost.go b/cmd/gochan/editpost.go
index 4a47a1c2..1e2094f6 100644
--- a/cmd/gochan/editpost.go
+++ b/cmd/gochan/editpost.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
 
 	"github.com/gochan-org/gochan/pkg/building"
 	"github.com/gochan-org/gochan/pkg/config"
@@ -29,16 +30,16 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	if editBtn == "Edit post" {
 		var err error
 		if len(checkedPosts) == 0 {
-			server.ServeErrorPage(writer, "You need to select one post to edit.")
+			server.ServeError(writer, server.NewServerError("You need to select one post to edit", http.StatusBadRequest), wantsJSON, nil)
 			return
 		} else if len(checkedPosts) > 1 {
-			server.ServeErrorPage(writer, "You can only edit one post at a time.")
+			server.ServeError(writer, server.NewServerError("You can only edit one post at a time", http.StatusBadRequest), wantsJSON, nil)
 			return
 		}
 
 		rank := manage.GetStaffRank(request)
 		if password == "" && rank == 0 {
-			server.ServeErrorPage(writer, "Password required for post editing")
+			server.ServeError(writer, server.NewServerError("Password required for post editing", http.StatusUnauthorized), wantsJSON, nil)
 			return
 		}
 		passwordMD5 := gcutil.Md5Sum(password)
@@ -47,26 +48,32 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		if err != nil {
 			errEv.Err(err).Caller().
 				Msg("Error getting post information")
+			server.ServeError(writer, server.NewServerError("Error getting post information", http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 		errEv.Int("postID", post.ID)
 
 		if post.Password != passwordMD5 && rank == 0 {
-			server.ServeErrorPage(writer, "Wrong password")
+			server.ServeError(writer, server.NewServerError("Wrong password", http.StatusUnauthorized), wantsJSON, nil)
 			return
 		}
 
 		board, err := post.GetBoard()
 		if err != nil {
 			errEv.Err(err).Caller().Msg("Unable to get board ID from post")
-			server.ServeErrorPage(writer, "Unable to get board ID from post: "+err.Error())
+			server.ServeError(writer, server.NewServerError("Unable to get board ID from post", http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
+		if strings.Contains(string(post.Message), `<span class="dice-roll">`) && !config.GetBoardConfig(board.Dir).AllowDiceRerolls {
+			server.ServeError(writer, server.NewServerError("Dice rerolls are not allowed on this board", http.StatusBadRequest), wantsJSON, nil)
+			return
+		}
+
 		errEv.Str("board", board.Dir)
 		upload, err := post.GetUpload()
 		if err != nil {
 			errEv.Err(err).Caller().Send()
-			server.ServeErrorPage(writer, "Error getting post upload info: "+err.Error())
+			server.ServeError(writer, server.NewServerError("Error getting post upload info: "+err.Error(), http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 
@@ -87,7 +94,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		if err = serverutil.MinifyTemplate(gctemplates.PostEdit, data, &buf, "text/html"); err != nil {
 			errEv.Err(err).Caller().
 				Msg("Error executing edit post template")
-			server.ServeError(writer, "Error executing edit post template: "+err.Error(), wantsJSON, nil)
+			server.ServeError(writer, server.NewServerError("Error executing edit post template: "+err.Error(), http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 		writer.Write(buf.Bytes())
@@ -101,7 +108,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		errEv.Err(err).Caller().
 			Str("postid", postIDstr).
 			Msg("Invalid form data")
-		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]any{
+		server.ServeError(writer, server.NewServerError("Invalid form data: "+err.Error(), http.StatusBadRequest), wantsJSON, map[string]any{
 			"postid": postid,
 		})
 		return
@@ -110,7 +117,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	post, err := gcsql.GetPostFromID(postid, true)
 	if err != nil {
 		errEv.Err(err).Caller().Msg("Unable to find post")
-		server.ServeError(writer, "Unable to find post", wantsJSON, map[string]any{
+		server.ServeError(writer, server.NewServerError("Unable to find post", http.StatusBadRequest), wantsJSON, map[string]any{
 			"postid": postid,
 		})
 		return
@@ -121,7 +128,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		errEv.Err(err).Caller().
 			Str("boardID", boardIDstr).
 			Msg("Invalid form data")
-		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, nil)
+		server.ServeError(writer, server.NewServerError("Invalid form data: "+err.Error(), http.StatusBadRequest), wantsJSON, nil)
 		return
 	}
 	gcutil.LogInt("boardID", boardid, infoEv, errEv)
@@ -129,13 +136,13 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	rank := manage.GetStaffRank(request)
 	passwordMD5 := gcutil.Md5Sum(password)
 	if post.Password != passwordMD5 && rank == 0 {
-		server.ServeError(writer, "Wrong password", wantsJSON, nil)
+		server.ServeError(writer, server.NewServerError("Wrong password", http.StatusUnauthorized), wantsJSON, nil)
 		return
 	}
 
 	board, err := gcsql.GetBoardFromID(boardid)
 	if err != nil {
-		server.ServeError(writer, "Invalid form data: "+err.Error(), wantsJSON, map[string]any{
+		server.ServeError(writer, server.NewServerError("Invalid form data: "+err.Error(), http.StatusBadRequest), wantsJSON, map[string]any{
 			"boardid": boardid,
 		})
 		errEv.Err(err).Caller().Msg("Invalid form data")
@@ -145,18 +152,18 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	if doEdit == "upload" {
 		oldUpload, err := post.GetUpload()
 		if err != nil {
-			errEv.Err(err).Caller().Send()
-			server.ServeError(writer, err.Error(), wantsJSON, nil)
+			errEv.Err(err).Caller().Msg("Unable to get post upload")
+			server.ServeError(writer, server.NewServerError("Error getting post upload info: "+err.Error(), http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 
 		upload, err := uploads.AttachUploadFromRequest(request, writer, post, board, gcutil.LogInfo(), errEv)
 		if err != nil {
-			server.ServeError(writer, err.Error(), wantsJSON, nil)
+			server.ServeError(writer, server.NewServerError("Unable to attach upload:"+err.Error(), http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 		if upload == nil {
-			server.ServeError(writer, "Missing upload replacement", wantsJSON, nil)
+			server.ServeError(writer, server.NewServerError("Missing upload replacement", http.StatusBadRequest), wantsJSON, nil)
 			return
 		}
 		documentRoot := config.GetSystemCriticalConfig().DocumentRoot
@@ -167,7 +174,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 				path.Join(documentRoot, board.Dir, "thumb", oldUpload.Filename))
 			if err = post.UnlinkUploads(false); err != nil {
 				errEv.Err(err).Caller().Send()
-				server.ServeError(writer, "Error unlinking old upload from post: "+err.Error(), wantsJSON, nil)
+				server.ServeError(writer, server.NewServerError("Error unlinking old upload from post: "+err.Error(), http.StatusInternalServerError), wantsJSON, nil)
 				return
 			}
 			if oldUpload.Filename != "deleted" {
@@ -184,7 +191,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 				Str("newFilename", upload.Filename).
 				Str("newOriginalFilename", upload.OriginalFilename).
 				Send()
-			server.ServeError(writer, "Error attaching new upload: "+err.Error(), wantsJSON, map[string]any{
+			server.ServeError(writer, server.NewServerError("Error attaching new upload: "+err.Error(), http.StatusInternalServerError), wantsJSON, map[string]any{
 				"filename": upload.OriginalFilename,
 			})
 			filePath = path.Join(documentRoot, board.Dir, "src", upload.Filename)
@@ -200,17 +207,15 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		var recovered bool
 		_, err, recovered = events.TriggerEvent("message-pre-format", post, request)
 		if recovered {
-			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Recovered from a panic in an event handler (message-pre-format)", wantsJSON, map[string]any{
-				"postid": post.ID,
-			})
+			server.ServeError(writer, server.NewServerError("Recovered from a panic in an event handler (message-pre-format)",
+				http.StatusInternalServerError), wantsJSON, map[string]any{"postid": post.ID})
 			return
 		}
 		if err != nil {
 			errEv.Err(err).Caller().
 				Str("triggeredEvent", "message-pre-format").
 				Send()
-			server.ServeError(writer, err.Error(), wantsJSON, map[string]any{
+			server.ServeError(writer, server.NewServerError(err.Error(), http.StatusInternalServerError), wantsJSON, map[string]any{
 				"postid": post.ID,
 			})
 			return
@@ -219,8 +224,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 		// trigger the pre-format event
 		_, err, recovered := events.TriggerEvent("message-pre-format", post, request)
 		if recovered {
-			writer.WriteHeader(http.StatusInternalServerError)
-			server.ServeError(writer, "Recovered from a panic in an event handler (message-pre-format)", wantsJSON, nil)
+			server.ServeError(writer, server.NewServerError("Recovered from a panic in an event handler (message-pre-format)", http.StatusInternalServerError), wantsJSON, nil)
 			return
 		}
 		if err != nil {
@@ -285,9 +289,9 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 	}
 
 	if err = building.BuildBoards(false, boardid); err != nil {
-		server.ServeErrorPage(writer, "Error rebuilding boards: "+err.Error())
+		server.ServeError(writer, "Error rebuilding boards: "+err.Error(), wantsJSON, nil)
 	} else if err = building.BuildFrontPage(); err != nil {
-		server.ServeErrorPage(writer, "Error rebuilding front page: "+err.Error())
+		server.ServeError(writer, "Error rebuilding front page: "+err.Error(), wantsJSON, nil)
 	} else {
 		http.Redirect(writer, request, post.WebPath(), http.StatusFound)
 		infoEv.Msg("Post edited")
diff --git a/examples/configs/gochan.example.json b/examples/configs/gochan.example.json
index 9107fd21..45b107e7 100644
--- a/examples/configs/gochan.example.json
+++ b/examples/configs/gochan.example.json
@@ -100,6 +100,8 @@
 	"EmbedHeight": 164,
 	"ImagesOpenNewTab": true,
 	"NewTabOnOutlinks": true,
+	"DisableBBcode": false,
+	"AllowDiceRerolls": false,
 
 	"MinifyHTML": true,
 	"MinifyJS": true,
@@ -111,8 +113,8 @@
 		"SiteKey": "your site key goes here (if you want a captcha, make sure to replace '_Captcha' with 'Captcha'",
 		"AccountSecret": "your account secret key goes here"
 	},
-	"GeoIPType": "mmdb",
-	"GeoIPOptions": {
+	"_GeoIPType": "mmdb",
+	"_GeoIPOptions": {
 		"dbLocation": "/usr/share/geoip/GeoIP2.mmdb",
 		"isoCode": "en"
 	},
diff --git a/pkg/config/config.go b/pkg/config/config.go
index f823b669..49b0b22b 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -332,6 +332,7 @@ type PostConfig struct {
 	ImagesOpenNewTab bool
 	NewTabOnOutlinks bool
 	DisableBBcode    bool
+	AllowDiceRerolls bool
 }
 
 func WriteConfig() error {
diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 884e05ca..eabf78d0 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -3,6 +3,7 @@ package posting
 import (
 	"fmt"
 	"html/template"
+	"math/rand"
 	"regexp"
 	"strconv"
 	"strings"
@@ -17,6 +18,7 @@ var (
 	msgfmtr         MessageFormatter
 	urlRE           = regexp.MustCompile(`https?://(\S+)`)
 	unsetBBcodeTags = []string{"center", "color", "img", "quote", "size"}
+	diceRoller      = regexp.MustCompile(`(?i)\[(\d*)d(\d+)(?:([+-])(\d+))?\]`)
 )
 
 // InitPosting prepares the formatter and the temp post pruner
@@ -131,3 +133,51 @@ func FormatMessage(message string, boardDir string) (template.HTML, error) {
 	}
 	return template.HTML(strings.Join(postLines, "<br />")), nil // skipcq: GSC-G203
 }
+
+func ApplyDiceRoll(p *gcsql.Post) (rollSum int, err error) {
+	words := strings.Split(string(p.Message), " ")
+	for w, word := range words {
+		roll := diceRoller.FindStringSubmatch(word)
+		if len(roll) == 0 {
+			continue
+		}
+		numDice := 1
+		if roll[1] != "" {
+			numDice, err = strconv.Atoi(roll[1])
+			if err != nil {
+				return 0, err
+			}
+		}
+		dieSize, err := strconv.Atoi(roll[2])
+		if err != nil {
+			return 0, err
+		}
+		if numDice < 1 || dieSize < 1 {
+			return 0, fmt.Errorf("dice roll too small")
+		}
+		for i := 0; i < numDice; i++ {
+			rollSum += rand.Intn(dieSize) + 1
+			switch roll[3] {
+			case "+":
+				mod, err := strconv.Atoi(roll[4])
+				if err != nil {
+					return 0, err
+				}
+				rollSum += mod
+			case "-":
+				mod, err := strconv.Atoi(roll[4])
+				if err != nil {
+					return 0, err
+				}
+				rollSum -= mod
+			}
+		}
+		words[w] = fmt.Sprintf(`<span class="dice-roll">%dd%d`, numDice, dieSize)
+		if roll[3] != "" {
+			words[w] += roll[3] + roll[4]
+		}
+		words[w] += fmt.Sprintf(" = %d</span>", rollSum)
+	}
+	p.Message = template.HTML(strings.Join(words, " "))
+	return
+}
diff --git a/pkg/posting/formatting_test.go b/pkg/posting/formatting_test.go
index 5bd44325..9eedeb38 100644
--- a/pkg/posting/formatting_test.go
+++ b/pkg/posting/formatting_test.go
@@ -1,9 +1,11 @@
 package posting
 
 import (
+	"regexp"
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/gochan-org/gochan/pkg/gcsql"
 	"github.com/stretchr/testify/assert"
 	lua "github.com/yuin/gopher-lua"
 )
@@ -34,6 +36,56 @@ end)`
 	luaBBCodeTestExpected = `<span class="lua">Lua test</span>`
 )
 
+var (
+	diceTestCases = []diceRollerTestCase{
+		{
+			desc: "[1d6]",
+			post: gcsql.Post{
+				MessageRaw: "before [1d6] after",
+			},
+			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6 = \d</span> after`),
+			expectMin: 1,
+			expectMax: 6,
+		},
+		{
+			desc: "[1d6+1]",
+			post: gcsql.Post{
+				MessageRaw: "before [1d6+1] after",
+			},
+			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6\+1 = \d</span> after`),
+			expectMin: 2,
+			expectMax: 7,
+		},
+		{
+			desc: "[1d6-1]",
+			post: gcsql.Post{
+				MessageRaw: "before [1d6-1] after",
+			},
+			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6-1 = \d</span> after`),
+			expectMin: 0,
+			expectMax: 5,
+		},
+		{
+			desc: "[d8]",
+			post: gcsql.Post{
+				MessageRaw: "[d8]",
+			},
+			matcher:   regexp.MustCompile(`<span class="dice-roll">1d8 = \d</span>`),
+			expectMin: 1,
+			expectMax: 8,
+		},
+	}
+)
+
+type diceRollerTestCase struct {
+	desc        string
+	post        gcsql.Post
+	expectError bool
+	matcher     *regexp.Regexp
+	expectMin   int
+	expectMax   int
+}
+
 func TestBBCode(t *testing.T) {
 	config.SetVersion(versionStr)
 	var testFmtr MessageFormatter
@@ -72,3 +124,35 @@ func TestLuaBBCode(t *testing.T) {
 	assert.Equal(t, "[b]Lua test[/b]", msgfmtr.bbCompiler.Compile("[b]Lua test[/b]"))
 	assert.Error(t, l.DoString(`bbcode.set_tag("lua", 1)`))
 }
+
+func diceRollRunner(t *testing.T, tC *diceRollerTestCase) {
+	var err error
+	tC.post.Message, err = FormatMessage(tC.post.MessageRaw, "")
+	assert.NoError(t, err)
+	result, err := ApplyDiceRoll(&tC.post)
+	if tC.expectError {
+		assert.Error(t, err)
+		assert.Equal(t, 0, result)
+	} else {
+		assert.NoError(t, err)
+		assert.Regexp(t, tC.matcher, tC.post.Message)
+		assert.GreaterOrEqual(t, result, tC.expectMin)
+		assert.LessOrEqual(t, result, tC.expectMax)
+	}
+	if t.Failed() {
+		t.FailNow()
+	}
+}
+
+func TestDiceRoll(t *testing.T) {
+	config.SetVersion(versionStr)
+	msgfmtr.Init()
+	for _, tC := range diceTestCases {
+		t.Run(tC.desc, func(t *testing.T) {
+			for i := 0; i < 100; i++ {
+				// Run the test case multiple times to account for randomness
+				diceRollRunner(t, &tC)
+			}
+		})
+	}
+}
diff --git a/pkg/posting/lua.go b/pkg/posting/lua.go
index ff25c5b8..dd7542a6 100644
--- a/pkg/posting/lua.go
+++ b/pkg/posting/lua.go
@@ -21,7 +21,6 @@ func luaTableToHTMLTag(l *lua.LState, table *lua.LTable) (*bbcode.HTMLTag, error
 	switch attrsLV.Type() {
 	case lua.LTTable:
 		attrsLT := attrsLV.(*lua.LTable)
-		fmt.Println("attrs size:", attrsLT.Len())
 		attrsLT.ForEach(func(key, val lua.LValue) {
 			if tag.Attrs == nil {
 				tag.Attrs = make(map[string]string)
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 8bb0a483..e209bd34 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -226,6 +226,10 @@ func doFormatting(post *gcsql.Post, board *gcsql.Board, request *http.Request, e
 		errEv.Err(err).Caller().Msg("Unable to format message")
 		return errors.New("unable to format message")
 	}
+	if _, err = ApplyDiceRoll(post); err != nil {
+		errEv.Err(err).Caller().Msg("Error applying dice roll")
+		return err
+	}
 	return nil
 }
 

From dfb9fc045c4b7a3d353849274fac0607df7f1f82 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:45:43 -0800
Subject: [PATCH 108/122] Add dice roll styling

---
 cmd/gochan/editpost.go            | 2 +-
 frontend/sass/_yotsubacommon.scss | 4 ++++
 frontend/sass/burichan/_img.scss  | 4 ++++
 frontend/sass/global/_img.scss    | 5 +++++
 html/css/burichan.css             | 4 ++++
 html/css/global.css               | 5 +++++
 html/css/yotsuba.css              | 4 ++++
 html/css/yotsubab.css             | 4 ++++
 8 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/cmd/gochan/editpost.go b/cmd/gochan/editpost.go
index 1e2094f6..a34c668f 100644
--- a/cmd/gochan/editpost.go
+++ b/cmd/gochan/editpost.go
@@ -65,7 +65,7 @@ func editPost(checkedPosts []int, editBtn string, doEdit string, writer http.Res
 			return
 		}
 		if strings.Contains(string(post.Message), `<span class="dice-roll">`) && !config.GetBoardConfig(board.Dir).AllowDiceRerolls {
-			server.ServeError(writer, server.NewServerError("Dice rerolls are not allowed on this board", http.StatusBadRequest), wantsJSON, nil)
+			server.ServeError(writer, server.NewServerError("Unable to edit post, dice rerolls are not allowed on this board", http.StatusForbidden), wantsJSON, nil)
 			return
 		}
 
diff --git a/frontend/sass/_yotsubacommon.scss b/frontend/sass/_yotsubacommon.scss
index 3fee917b..b4ed4169 100644
--- a/frontend/sass/_yotsubacommon.scss
+++ b/frontend/sass/_yotsubacommon.scss
@@ -102,5 +102,9 @@
 		font-weight: 700;
 	}
 
+	.dice-roll {
+		border: 1px dashed #222;
+	}
+
 	@include upload-box(#aaa, #444, #666);
 }
\ No newline at end of file
diff --git a/frontend/sass/burichan/_img.scss b/frontend/sass/burichan/_img.scss
index 32a20350..9a94bb94 100644
--- a/frontend/sass/burichan/_img.scss
+++ b/frontend/sass/burichan/_img.scss
@@ -37,4 +37,8 @@ div.inlinepostprev {
 	border: 1px solid $bordercol;
 }
 
+.dice-roll {
+	border: 1px dashed #222;
+}
+
 @include upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/global/_img.scss b/frontend/sass/global/_img.scss
index c3849f83..694f1010 100755
--- a/frontend/sass/global/_img.scss
+++ b/frontend/sass/global/_img.scss
@@ -241,4 +241,9 @@ div.inlinepostprev {
 
 .hideblock-button {
 	display: block;
+}
+
+.dice-roll {
+	border: 1px dashed #aaa;
+	font-weight: bold;
 }
\ No newline at end of file
diff --git a/html/css/burichan.css b/html/css/burichan.css
index 66ab6993..241727b7 100644
--- a/html/css/burichan.css
+++ b/html/css/burichan.css
@@ -34,6 +34,10 @@ div.inlinepostprev {
   border: 1px solid #9295a4;
 }
 
+.dice-roll {
+  border: 1px dashed #222;
+}
+
 div#upload-box {
   background: #aaa;
 }
diff --git a/html/css/global.css b/html/css/global.css
index 0b57bcc0..cdceed40 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -261,6 +261,11 @@ div.inlinepostprev {
   display: block;
 }
 
+.dice-roll {
+  border: 1px dashed #aaa;
+  font-weight: bold;
+}
+
 div.section-block {
   margin-bottom: 8px;
 }
diff --git a/html/css/yotsuba.css b/html/css/yotsuba.css
index 37cb8bf8..10fd2162 100644
--- a/html/css/yotsuba.css
+++ b/html/css/yotsuba.css
@@ -94,6 +94,10 @@ span.subject {
   font-weight: 700;
 }
 
+.dice-roll {
+  border: 1px dashed #222;
+}
+
 div#upload-box {
   background: #aaa;
 }
diff --git a/html/css/yotsubab.css b/html/css/yotsubab.css
index 80793e16..e38aaf06 100644
--- a/html/css/yotsubab.css
+++ b/html/css/yotsubab.css
@@ -94,6 +94,10 @@ span.subject {
   font-weight: 700;
 }
 
+.dice-roll {
+  border: 1px dashed #222;
+}
+
 div#upload-box {
   background: #aaa;
 }

From d61e3c62c24abd8ff13014ef4bab462ceed217fc Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sun, 9 Feb 2025 17:53:08 -0800
Subject: [PATCH 109/122] Before showing delete lightbox, check if it was just
 the file

---
 frontend/ts/dom/postdropdown.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/ts/dom/postdropdown.ts b/frontend/ts/dom/postdropdown.ts
index 3da1c16d..551d5a6a 100644
--- a/frontend/ts/dom/postdropdown.ts
+++ b/frontend/ts/dom/postdropdown.ts
@@ -97,10 +97,10 @@ function deletePost(id: number, board: string, fileOnly = false) {
 				alertLightbox(`Delete failed: ${data.error}`, "Error");
 		}).done(data => {
 			if(data.error === undefined || data === "") {
-				if(location.href.indexOf(`/${board}/res/${id}.html`) > -1) {
-					alertLightbox("Thread deleted", "Success");
-				} else if(fileOnly) {
+				if(fileOnly) {
 					deletePostFile(id);
+				} else if(location.href.indexOf(`/${board}/res/${id}.html`) > -1) {
+					alertLightbox("Thread deleted", "Success");
 				} else {
 					deletePostElement(id);
 				}

From 5a7695e98f489575b24c2ac27d9d0c51cb10a9e6 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Mon, 10 Feb 2025 21:41:21 -0800
Subject: [PATCH 110/122] Fixed referer checking, added more testing for server
 and serverutil packages

---
 examples/configs/gochan.example.json   |  1 +
 pkg/config/config.go                   | 19 ++++--
 pkg/config/defaults.go                 |  1 +
 pkg/gcplugin/luautil/util.go           | 18 ++++-
 pkg/manage/util.go                     | 49 +++++++++-----
 pkg/posting/post.go                    |  8 ++-
 pkg/server/serverutil/antispam.go      | 48 ++++++++++----
 pkg/server/serverutil/antispam_test.go | 69 +++++++++++++++++++
 pkg/server/serverutil/lua.go           | 28 +++++---
 pkg/server/serverutil/lua_test.go      | 87 ++++++++++++++++++++++++
 pkg/server/serverutil/util.go          |  3 +
 pkg/server/serverutil/util_test.go     | 92 ++++++++++++++++++++++++++
 12 files changed, 375 insertions(+), 48 deletions(-)
 create mode 100644 pkg/server/serverutil/antispam_test.go
 create mode 100644 pkg/server/serverutil/lua_test.go
 create mode 100644 pkg/server/serverutil/util_test.go

diff --git a/examples/configs/gochan.example.json b/examples/configs/gochan.example.json
index 45b107e7..a50f9a5a 100644
--- a/examples/configs/gochan.example.json
+++ b/examples/configs/gochan.example.json
@@ -20,6 +20,7 @@
 	"DBprefix": "gc_",
 	"_DBprefix_info": "The prefix automataically applied to tables when the database is being provisioned and queried",
 
+	"CheckRequestReferer": true,
 	"Lockdown": false,
 	"LockdownMessage": "This imageboard has temporarily disabled posting. We apologize for the inconvenience",
 	"Modboard": "staff",
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 49b0b22b..94549168 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -41,11 +41,15 @@ type GochanConfig struct {
 // ValidateValues checks to make sure that the configuration options are usable
 // (e.g., ListenIP is a valid IP address, Port isn't a negative number, etc)
 func (gcfg *GochanConfig) ValidateValues() error {
-	// if net.ParseIP(gcfg.ListenIP) == nil {
-	// 	return &InvalidValueError{Field: "ListenIP", Value: gcfg.ListenIP}
-	// }
 	changed := false
 
+	if gcfg.SiteDomain == "" {
+		return &InvalidValueError{Field: "SiteDomain", Value: gcfg.SiteDomain, Details: "must be set"}
+	}
+	if strings.Contains(gcfg.SiteDomain, " ") || strings.Contains(gcfg.SiteDomain, "://") {
+		return &InvalidValueError{Field: "SiteDomain", Value: gcfg.SiteDomain, Details: "must be a host (port optional)"}
+	}
+
 	_, err := durationutil.ParseLongerDuration(gcfg.CookieMaxAge)
 	if errors.Is(err, durationutil.ErrInvalidDurationString) {
 		return &InvalidValueError{Field: "CookieMaxAge", Value: gcfg.CookieMaxAge, Details: err.Error() + cookieMaxAgeEx}
@@ -162,10 +166,11 @@ type SystemCriticalConfig struct {
 
 	SQLConfig
 
-	Verbose    bool `json:"DebugMode"`
-	RandomSeed string
-	Version    *GochanVersion `json:"-"`
-	TimeZone   int            `json:"-"`
+	CheckRequestReferer bool
+	Verbose             bool `json:"DebugMode"`
+	RandomSeed          string
+	Version             *GochanVersion `json:"-"`
+	TimeZone            int            `json:"-"`
 }
 
 // SiteConfig contains information about the site/community, e.g. the name of the site, the slogan (if set),
diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index bf68eb91..388d76ad 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -10,6 +10,7 @@ var (
 				DBMaxIdleConnections: DefaultSQLMaxConns,
 				DBConnMaxLifetimeMin: DefaultSQLConnMaxLifetimeMin,
 			},
+			CheckRequestReferer: true,
 		},
 		SiteConfig: SiteConfig{
 			FirstPage:            []string{"index.html", "firstrun.html", "1.html"},
diff --git a/pkg/gcplugin/luautil/util.go b/pkg/gcplugin/luautil/util.go
index 9d726724..dbc63b95 100644
--- a/pkg/gcplugin/luautil/util.go
+++ b/pkg/gcplugin/luautil/util.go
@@ -18,8 +18,24 @@ func LValueToInterface(l *lua.LState, v lua.LValue) any {
 	case lua.LTUserData:
 		l.Push(v)
 		return l.CheckUserData(l.GetTop()).Value
+	case lua.LTTable:
+		t := v.(*lua.LTable)
+		tableLength := t.Len()
+		if tableLength > 0 {
+			// Array
+			arr := make([]any, tableLength)
+			for i := 1; i <= tableLength; i++ {
+				arr[i-1] = LValueToInterface(l, t.RawGetInt(i))
+			}
+			return arr
+		}
+		m := make(map[string]any)
+		t.ForEach(func(k, v lua.LValue) {
+			m[k.String()] = LValueToInterface(l, v)
+		})
+		return m
 	default:
-		l.RaiseError("Incompatible Lua type")
+		l.ArgError(2, "Incompatible Lua type")
 	}
 	return nil
 }
diff --git a/pkg/manage/util.go b/pkg/manage/util.go
index 35bf341e..f0086365 100644
--- a/pkg/manage/util.go
+++ b/pkg/manage/util.go
@@ -5,9 +5,10 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"net"
 	"net/http"
-	"regexp"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/Eggbertx/durationutil"
@@ -22,8 +23,6 @@ import (
 )
 
 var (
-	chopPortNumRegex         = regexp.MustCompile(`(.+|\w+):(\d+)$`)
-	ErrSpambot               = errors.New("request looks like a spambot")
 	ErrBadCredentials        = errors.New("invalid username or password")
 	ErrUnableToCreateSession = errors.New("unable to create login session")
 	ErrInvalidSession        = errors.New("invalid staff session")
@@ -37,26 +36,42 @@ var (
 
 func createSession(key, username, password string, request *http.Request, writer http.ResponseWriter) error {
 	domain := request.Host
-	errEv := gcutil.LogError(nil).
-		Str("staff", username).
-		Str("IP", gcutil.GetRealIP(request))
-	defer errEv.Discard()
+	infoEv, errEv := gcutil.LogRequest(request)
+	defer func() {
+		infoEv.Discard()
+		errEv.Discard()
+	}()
 
-	domain = chopPortNumRegex.Split(domain, -1)[0]
-
-	if !serverutil.ValidReferer(request) {
-		gcutil.LogWarning().
-			Str("staff", username).
-			Str("IP", gcutil.GetRealIP(request)).
-			Str("remoteAddr", request.Response.Request.RemoteAddr).
-			Msg("Rejected login from possible spambot")
-		return ErrSpambot
+	if strings.Contains(domain, ":") {
+		domain, _, err := net.SplitHostPort(domain)
+		if err != nil {
+			errEv.Err(err).Caller().Str("host", domain).Send()
+			return server.NewServerError("Invalid request host", http.StatusBadRequest)
+		}
 	}
+
+	refererResult, err := serverutil.CheckReferer(request)
+	if err != nil {
+		errEv.Err(err).Caller().
+			Str("staff", username).
+			Str("referer", request.Referer()).
+			Msg("Error checking referer")
+		return err
+	}
+	if refererResult != serverutil.InternalReferer {
+		gcutil.LogWarning().
+			Int("refererResult", int(refererResult)).
+			Str("referer", request.Referer()).
+			Str("siteDomain", config.GetSystemCriticalConfig().SiteDomain).
+			Str("staff", username).
+			Msg("Rejected login from possible spambot")
+		return serverutil.ErrSpambot
+	}
+
 	staff, err := gcsql.GetStaffByUsername(username, true)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			errEv.Err(err).Caller().
-				Str("remoteAddr", request.RemoteAddr).
 				Msg("Unrecognized username")
 		}
 		return ErrBadCredentials
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index e209bd34..3e4999d0 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -253,7 +253,13 @@ func MakePost(writer http.ResponseWriter, request *http.Request) {
 
 	infoEv, errEv := gcutil.LogRequest(request)
 
-	if !serverutil.ValidReferer(request) {
+	refererResult, err := serverutil.CheckReferer(request)
+	if err != nil {
+		errEv.Err(err).Caller().Send()
+		server.ServeError(writer, "Error checking referer", wantsJSON, nil)
+		return
+	}
+	if refererResult != serverutil.InternalReferer {
 		// post has no referrer, or has a referrer from a different domain, probably a spambot
 		gcutil.LogWarning().
 			Str("spam", "badReferer").
diff --git a/pkg/server/serverutil/antispam.go b/pkg/server/serverutil/antispam.go
index bbc6d5ba..2ff08eb4 100644
--- a/pkg/server/serverutil/antispam.go
+++ b/pkg/server/serverutil/antispam.go
@@ -1,28 +1,48 @@
 package serverutil
 
 import (
+	"errors"
 	"net/http"
 	"net/url"
-	"strings"
 
 	"github.com/gochan-org/gochan/pkg/config"
-	"github.com/gochan-org/gochan/pkg/gcutil"
-	"github.com/rs/zerolog"
 )
 
-// ValidReferer checks to make sure that the incoming request is from the same domain (or if debug mode is enabled)
-func ValidReferer(request *http.Request, errEv ...*zerolog.Event) bool {
+var (
+	ErrSpambot = errors.New("request looks like spam")
+)
+
+const (
+	// NoReferer is returned when the request has no referer
+	NoReferer RefererResult = iota
+	// InvalidReferer is returned when the referer not a valid URL
+	InvalidReferer
+	// InternalReferer is returned when the request came from the same site as the server
+	InternalReferer
+	// ExternalReferer is returned when the request came from another site. It may or may not be be spam, depending on the context
+	ExternalReferer
+)
+
+type RefererResult int
+
+// CheckReferer checks to make sure that the incoming request is from the same domain
+func CheckReferer(request *http.Request) (RefererResult, error) {
 	referer := request.Referer()
+	if referer == "" {
+		return NoReferer, nil
+	}
+
 	rURL, err := url.ParseRequestURI(referer)
 	if err != nil {
-		var ev *zerolog.Event
-		if len(errEv) == 1 {
-			ev = gcutil.LogError(err).Caller()
-		} else {
-			ev = errEv[0].Err(err).Caller()
-		}
-		ev.Str("referer", referer).Msg("Error parsing referer URL")
-		return false
+		return InvalidReferer, err
 	}
-	return strings.Index(rURL.Path, config.GetSystemCriticalConfig().WebRoot) == 0
+	systemCriticalConfig := config.GetSystemCriticalConfig()
+	siteURLBase := url.URL{
+		Host: systemCriticalConfig.SiteDomain,
+	}
+	var result RefererResult = ExternalReferer
+	if rURL.Host == siteURLBase.Host {
+		result = InternalReferer
+	}
+	return result, nil
 }
diff --git a/pkg/server/serverutil/antispam_test.go b/pkg/server/serverutil/antispam_test.go
new file mode 100644
index 00000000..6c06984a
--- /dev/null
+++ b/pkg/server/serverutil/antispam_test.go
@@ -0,0 +1,69 @@
+package serverutil
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	checkRefererTestCases = []checkRefererTestCase{
+		{
+			desc:           "Internal referer",
+			referer:        "http://gochan.org",
+			siteDomain:     "gochan.org",
+			expectedResult: InternalReferer,
+		},
+		{
+			desc:           "External referer",
+			referer:        "http://somesketchysite.com",
+			siteDomain:     "gochan.com",
+			expectedResult: ExternalReferer,
+		},
+		{
+			desc:           "No referer",
+			siteDomain:     "gochan.org",
+			expectedResult: NoReferer,
+		},
+		{
+			desc:           "Internal referer with port",
+			referer:        "http://127.0.0.1:8080",
+			siteDomain:     "127.0.0.1:8080",
+			expectedResult: InternalReferer,
+		},
+		{
+			desc:           "Internal referer with port, IPv6",
+			referer:        "http://[::1]:8080",
+			siteDomain:     "[::1]:8080",
+			expectedResult: InternalReferer,
+		},
+	}
+)
+
+type checkRefererTestCase struct {
+	desc           string
+	referer        string
+	siteDomain     string
+	expectedResult RefererResult
+}
+
+func TestCheckReferer(t *testing.T) {
+	config.SetVersion("4.0.0")
+	systemCriticalConfig := config.GetSystemCriticalConfig()
+	req, err := http.NewRequest("GET", "http://gochan.org", nil)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	for _, tC := range checkRefererTestCases {
+		t.Run(tC.desc, func(t *testing.T) {
+			systemCriticalConfig.SiteDomain = tC.siteDomain
+			config.SetSystemCriticalConfig(systemCriticalConfig)
+			req.Header.Set("Referer", tC.referer)
+			result, err := CheckReferer(req)
+			assert.NoError(t, err)
+			assert.Equal(t, tC.expectedResult, result)
+		})
+	}
+}
diff --git a/pkg/server/serverutil/lua.go b/pkg/server/serverutil/lua.go
index 1b62d577..3c58b923 100644
--- a/pkg/server/serverutil/lua.go
+++ b/pkg/server/serverutil/lua.go
@@ -14,16 +14,28 @@ func PreloadModule(l *lua.LState) int {
 
 	l.SetFuncs(t, map[string]lua.LGFunction{
 		"minify_template": func(l *lua.LState) int {
-			tmplUD := l.CheckUserData(1)
-			tmpl := tmplUD.Value.(*template.Template)
-			dataTable := l.CheckTable(2)
-			data := map[string]any{}
-			dataTable.ForEach(func(l1, l2 lua.LValue) {
-				data[l1.String()] = luautil.LValueToInterface(l, l2)
-			})
+			tmplLV := l.CheckAny(1)
+			var tmpl *template.Template
+			var tmplStr string
+			switch tmplLV.Type() {
+			case lua.LTUserData:
+				tmpl = tmplLV.(*lua.LUserData).Value.(*template.Template)
+			case lua.LTString:
+				tmplStr = tmplLV.String()
+			default:
+				l.ArgError(1, "expected string or template")
+				return 0
+			}
+			data := luautil.LValueToInterface(l, l.CheckAny(2))
 			writer := l.CheckUserData(3).Value.(io.Writer)
 			mediaType := l.CheckString(4)
-			err := MinifyTemplate(tmpl, data, writer, mediaType)
+			var err error
+			switch tmplLV.Type() {
+			case lua.LTString:
+				err = MinifyTemplate(tmplStr, data, writer, mediaType)
+			case lua.LTUserData:
+				err = MinifyTemplate(tmpl, data, writer, mediaType)
+			}
 			l.Push(luar.New(l, err))
 			return 1
 		},
diff --git a/pkg/server/serverutil/lua_test.go b/pkg/server/serverutil/lua_test.go
new file mode 100644
index 00000000..421f0bcb
--- /dev/null
+++ b/pkg/server/serverutil/lua_test.go
@@ -0,0 +1,87 @@
+package serverutil
+
+import (
+	"bytes"
+	"testing"
+	"text/template"
+
+	"github.com/gochan-org/gochan/pkg/config"
+	"github.com/gochan-org/gochan/pkg/gctemplates"
+	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
+	"github.com/stretchr/testify/assert"
+	lua "github.com/yuin/gopher-lua"
+	luar "layeh.com/gopher-luar"
+)
+
+var (
+	buf  bytes.Buffer
+	data = map[string]any{
+		"logText": "text goes here",
+	}
+	luaStringTemplateTestCases = []luaTemplateTestCase[string]{
+		{
+			desc:     "minify HTML",
+			template: gctemplates.ErrorPage,
+			data:     data,
+			luaScript: `local serverutil = require("serverutil")
+				return serverutil.minify_template("manage_viewlog.html", data, buf, "text/html")`,
+			expectString: `<textarea class=viewlog rows=24 spellcheck=false readonly>text goes here</textarea>`,
+		},
+		{
+			desc:     "minify HTML with nil data",
+			template: gctemplates.ManageViewLog,
+			luaScript: `local serverutil = require("serverutil")
+			return serverutil.minify_template("manage_viewlog.html", nil, buf, "text/html")`,
+			expectString: `<textarea class=viewlog rows=24 spellcheck=false readonly></textarea>`,
+		},
+		{
+			desc:     "error, unrecognized template name",
+			template: "invalid_template",
+			luaScript: `local serverutil = require("serverutil")
+			return serverutil.minify_template("invalid_template", nil, buf, "text/html")`,
+			expectError: true,
+		},
+	}
+)
+
+type luaTemplateTestCase[T string | template.Template] struct {
+	desc         string
+	template     T
+	data         any
+	expectError  bool
+	expectString string
+	luaScript    string
+}
+
+func TestLuaTemplates(t *testing.T) {
+	testutil.GoToGochanRoot(t)
+	config.SetTestTemplateDir("templates")
+	siteConfig := config.GetSiteConfig()
+	siteConfig.MinifyJS = true
+	config.SetSiteConfig(siteConfig)
+
+	for _, tC := range luaStringTemplateTestCases {
+		t.Run(tC.desc, func(t *testing.T) {
+			buf.Reset()
+			l := lua.NewState()
+			defer l.Close()
+			l.PreloadModule("serverutil", PreloadModule)
+			l.SetGlobal("buf", luar.New(l, &buf))
+			l.SetGlobal("data", luar.New(l, tC.data))
+			if !assert.NoError(t, l.DoString(tC.luaScript)) {
+				t.FailNow()
+			}
+			errLV := l.Get(-1)
+			var err error
+			if errLV.Type() != lua.LTNil {
+				err = errLV.(*lua.LUserData).Value.(error)
+			}
+			if tC.expectError {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tC.expectString, buf.String())
+			}
+		})
+	}
+}
diff --git a/pkg/server/serverutil/util.go b/pkg/server/serverutil/util.go
index 4bfd5d55..004a5ae3 100644
--- a/pkg/server/serverutil/util.go
+++ b/pkg/server/serverutil/util.go
@@ -20,5 +20,8 @@ func DeleteCookie(writer http.ResponseWriter, request *http.Request, cookieName
 
 func IsRequestingJSON(request *http.Request) bool {
 	jsonField := request.FormValue("json")
+	if jsonField == "" {
+		jsonField = request.PostFormValue("json")
+	}
 	return jsonField == "1" || jsonField == "true"
 }
diff --git a/pkg/server/serverutil/util_test.go b/pkg/server/serverutil/util_test.go
new file mode 100644
index 00000000..903a04c2
--- /dev/null
+++ b/pkg/server/serverutil/util_test.go
@@ -0,0 +1,92 @@
+package serverutil
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+var (
+	isRequestingJSONTestCases = []isRequestingJSONTestCase{
+		{
+			val: "1",
+			exp: true,
+		},
+		{
+			val: "on",
+			exp: false,
+		},
+		{
+			val: "true",
+			exp: true,
+		},
+		{
+			val: "yes",
+			exp: false,
+		},
+	}
+)
+
+type isRequestingJSONTestCase struct {
+	val string
+	exp bool
+}
+
+func TestIsRequestingJSON(t *testing.T) {
+	req, _ := http.NewRequest("GET", "http://localhost:8080", nil)
+	assert.False(t, IsRequestingJSON(req))
+	for _, tc := range isRequestingJSONTestCases {
+		t.Run("GET "+tc.val, func(t *testing.T) {
+			req.Form.Set("json", tc.val)
+			assert.Equal(t, tc.exp, IsRequestingJSON(req))
+			req.Form.Del("json")
+		})
+		req.Method = "POST"
+		req.PostFormValue("_")
+		t.Run("POST "+tc.val, func(t *testing.T) {
+			req.PostForm.Set("json", tc.val)
+			assert.Equal(t, tc.exp, IsRequestingJSON(req))
+			req.PostForm.Del("json")
+		})
+	}
+}
+
+type testResponseWriter struct {
+	header http.Header
+	status int
+}
+
+func (w *testResponseWriter) Header() http.Header {
+	return w.header
+}
+func (w *testResponseWriter) Write([]byte) (int, error) {
+	return 0, nil
+}
+func (w *testResponseWriter) WriteHeader(s int) {
+	w.status = s
+}
+
+func TestDeleteCookie(t *testing.T) {
+	req, _ := http.NewRequest("GET", "http://localhost:8080", nil)
+	writer := testResponseWriter{
+		header: make(http.Header),
+	}
+	assert.False(t, DeleteCookie(&writer, req, "test"))
+	cookie := &http.Cookie{
+		Name:    "test",
+		Value:   "test",
+		MaxAge:  90,
+		Expires: time.Now().Add(7 * 24 * time.Hour),
+	}
+	req.AddCookie(cookie)
+
+	assert.True(t, DeleteCookie(&writer, req, "test"))
+	cookieExpireStr := writer.header.Get("Set-Cookie")
+
+	ct, err := time.ParseInLocation(time.RFC1123, cookieExpireStr[strings.Index(cookieExpireStr, "Expires=")+8:], time.Local)
+	assert.NoError(t, err)
+	assert.True(t, ct.Before(time.Now().Add(-7*time.Hour)))
+}

From e0ee76bce16c260d670d7b8870b8e79af1b38520 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 11:56:09 -0800
Subject: [PATCH 111/122] Add Lua tests for url module provider

---
 pkg/gcplugin/gcplugin.go |  2 +-
 pkg/gcplugin/lua_test.go | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkg/gcplugin/gcplugin.go b/pkg/gcplugin/gcplugin.go
index 8ac01bce..89438578 100644
--- a/pkg/gcplugin/gcplugin.go
+++ b/pkg/gcplugin/gcplugin.go
@@ -91,7 +91,7 @@ func preloadLua() {
 				result, err := url.QueryUnescape(query)
 				l.Push(lua.LString(result))
 				l.Push(luar.New(l, err))
-				return 1
+				return 2
 			},
 		})
 		l.Push(t)
diff --git a/pkg/gcplugin/lua_test.go b/pkg/gcplugin/lua_test.go
index 1813fa44..df9906f5 100644
--- a/pkg/gcplugin/lua_test.go
+++ b/pkg/gcplugin/lua_test.go
@@ -1,6 +1,7 @@
 package gcplugin
 
 import (
+	"html/template"
 	"testing"
 
 	"github.com/gochan-org/gochan/pkg/config"
@@ -61,9 +62,8 @@ func TestStructPassing(t *testing.T) {
 	err := lState.DoString(structPassingStr)
 	assert.NoError(t, err)
 	t.Logf("Modified message text after Lua: %q", p.MessageRaw)
-	if p.MessageRaw != "Message modified by a plugin\n" || p.Message != "Message modified by a plugin<br />" {
-		t.Fatal("message was not properly modified by plugin")
-	}
+	assert.Equal(t, "Message modified by a plugin\n", p.MessageRaw)
+	assert.Equal(t, template.HTML("Message modified by a plugin<br />"), p.Message)
 }
 
 func TestEventModule(t *testing.T) {
@@ -82,3 +82,28 @@ func TestConfigModule(t *testing.T) {
 	assert.Equal(t, "Gochan testing", returnTable.RawGetString("SiteSlogan").(lua.LString).String())
 	assert.Equal(t, "pipes.css", returnTable.RawGetString("DefaultStyle").(lua.LString).String())
 }
+
+func TestLuaURL(t *testing.T) {
+	initPluginTests()
+	err := lState.DoString(`local url = require("url")
+local joined = url.join_path("test", "path")
+local path_escaped = url.path_escape("test +/string")
+local path_unescaped = url.path_unescape(path_escaped)
+local query_escaped = url.query_escape("test +/string")
+local query_unescaped, err = url.query_unescape(query_escaped)
+return joined, query_escaped, query_unescaped, err`)
+	assert.NoError(t, err)
+	joined := lState.CheckString(-4)
+	pathEscaped := lState.CheckString(-3)
+	pathUnescaped := lState.CheckString(-2)
+	queryEscaped := lState.CheckString(-3)
+	queryUnescaped := lState.CheckString(-2)
+	errLV := lState.CheckAny(-1)
+	assert.Equal(t, "test/path", joined)
+	assert.Equal(t, "test+%2B%2Fstring", pathEscaped)
+	assert.Equal(t, "test +/string", pathUnescaped)
+	assert.Equal(t, "test+%2B%2Fstring", queryEscaped)
+	assert.Equal(t, "test +/string", queryUnescaped)
+	assert.Equal(t, errLV.Type(), lua.LTNil)
+	ClosePlugins()
+}

From 9bdf9d58d9b9d283b536d4f4e714a59bacfbff44 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 12:34:51 -0800
Subject: [PATCH 112/122] Update NPM packages

---
 frontend/package-lock.json    | 6386 +++++++++++++++------------------
 frontend/package.json         |   38 +-
 frontend/ts/dom/qr.ts         |    2 -
 frontend/ts/dom/uploaddata.ts |    2 +-
 frontend/ts/notifications.ts  |    5 +-
 5 files changed, 2846 insertions(+), 3587 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 8eed012d..40b8f3a3 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,100 +1,96 @@
 {
   "name": "gochan.js",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gochan.js",
-      "version": "4.0.1",
+      "version": "4.0.2",
       "license": "BSD-2-Clause",
       "dependencies": {
         "jquery": "^3.7.1",
-        "jquery-ui": "^1.13.2",
+        "jquery-ui": "^1.14.1",
         "path-browserify": "^1.0.1",
         "webstorage-polyfill": "^1.0.1"
       },
       "devDependencies": {
-        "@babel/preset-env": "^7.21.5",
-        "@babel/preset-typescript": "^7.21.5",
-        "@jest/globals": "^29.5.0",
-        "@types/jquery": "^3.5.29",
-        "@types/jqueryui": "^1.12.21",
-        "@types/path-browserify": "^1.0.2",
-        "@typescript-eslint/eslint-plugin": "^6.13.2",
-        "eslint": "^8.55.0",
-        "jest": "^29.5.0",
-        "jest-config": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
-        "sass": "^1.69.5",
-        "ts-jest": "^29.1.1",
-        "ts-loader": "^9.5.1",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.3.3",
-        "webpack": "^5.94.0",
-        "webpack-cli": "^5.1.4"
-      }
-    },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "@babel/preset-env": "^7.26.9",
+        "@babel/preset-typescript": "^7.26.0",
+        "@jest/globals": "^29.7.0",
+        "@types/jquery": "^3.5.32",
+        "@types/jqueryui": "^1.12.23",
+        "@types/path-browserify": "^1.0.3",
+        "@typescript-eslint/eslint-plugin": "^8.24.1",
+        "eslint": "^9.20.1",
+        "jest": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
+        "sass": "^1.85.0",
+        "ts-jest": "^29.2.5",
+        "ts-loader": "^9.5.2",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.7.3",
+        "webpack": "^5.98.0",
+        "webpack-cli": "^6.0.1"
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
-      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.7",
-        "@babel/parser": "^7.23.6",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -110,53 +106,45 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -165,19 +153,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz",
-      "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz",
+      "integrity": "sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.26.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -188,13 +175,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "regexpu-core": "^5.3.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -205,10 +193,11 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -220,75 +209,44 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -298,35 +256,38 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -336,14 +297,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -352,116 +314,88 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz",
-      "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.26.9"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -469,13 +403,47 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz",
-      "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -485,14 +453,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz",
-      "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -502,13 +471,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz",
-      "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -522,6 +492,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
       "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -534,6 +505,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -546,6 +518,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -558,6 +531,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -570,6 +544,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -580,37 +555,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz",
-      "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -620,12 +572,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz",
-      "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -639,6 +592,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -651,6 +605,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -659,12 +614,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -678,6 +634,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -690,6 +647,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -702,6 +660,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -714,6 +673,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -726,6 +686,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -738,6 +699,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -750,6 +712,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -765,6 +728,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -776,12 +740,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -795,6 +760,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
       "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -807,12 +773,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz",
-      "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -822,15 +789,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz",
-      "integrity": "sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
+      "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-remap-async-to-generator": "^7.25.9",
+        "@babel/traverse": "^7.26.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -840,14 +807,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-remap-async-to-generator": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -857,12 +825,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz",
-      "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -872,12 +841,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz",
-      "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -887,13 +857,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -903,14 +874,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz",
-      "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -920,18 +891,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz",
-      "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -942,13 +912,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz",
-      "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/template": "^7.22.15"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -958,12 +929,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz",
-      "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -973,13 +945,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz",
-      "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -989,12 +962,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz",
-      "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1003,14 +977,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz",
-      "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==",
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1020,13 +1011,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz",
-      "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1036,13 +1027,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1052,13 +1043,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz",
-      "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
+      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1068,14 +1060,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz",
-      "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1085,13 +1078,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz",
-      "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1101,12 +1094,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz",
-      "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1116,13 +1110,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1132,12 +1126,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz",
-      "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1147,13 +1142,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz",
-      "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1163,14 +1159,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1180,15 +1176,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz",
-      "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1198,13 +1195,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz",
-      "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1214,13 +1212,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1230,12 +1229,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz",
-      "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1245,13 +1245,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
+      "version": "7.26.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1261,13 +1261,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz",
-      "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1277,16 +1277,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz",
-      "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.3",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.23.3"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1296,13 +1295,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz",
-      "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1312,13 +1312,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz",
-      "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1328,14 +1328,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1345,12 +1345,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz",
-      "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1360,13 +1361,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz",
-      "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1376,15 +1378,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz",
-      "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1394,12 +1396,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz",
-      "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1409,12 +1412,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz",
-      "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -1424,13 +1428,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz",
-      "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==",
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1440,12 +1462,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz",
-      "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1455,13 +1478,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz",
-      "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1471,12 +1495,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz",
-      "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1486,12 +1511,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz",
-      "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1501,12 +1527,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz",
-      "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1516,15 +1543,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.8.tgz",
+      "integrity": "sha512-bME5J9AC8ChwA7aEPJ6zym3w7aObZULHhbNLU0bKUhKsAkylkzUdq+0kdymh9rzi8nlNFl2bmldFBCKNJBUpuw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-syntax-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1534,12 +1563,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz",
-      "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1549,13 +1579,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz",
-      "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1565,13 +1596,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz",
-      "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1581,13 +1613,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz",
-      "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1597,90 +1630,80 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.8.tgz",
-      "integrity": "sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz",
+      "integrity": "sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/compat-data": "^7.26.8",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
-        "@babel/plugin-syntax-import-meta": "^7.10.4",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-syntax-import-assertions": "^7.26.0",
+        "@babel/plugin-syntax-import-attributes": "^7.26.0",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.7",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.8",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.3",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.23.4",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/plugin-transform-arrow-functions": "^7.25.9",
+        "@babel/plugin-transform-async-generator-functions": "^7.26.8",
+        "@babel/plugin-transform-async-to-generator": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
+        "@babel/plugin-transform-block-scoping": "^7.25.9",
+        "@babel/plugin-transform-class-properties": "^7.25.9",
+        "@babel/plugin-transform-class-static-block": "^7.26.0",
+        "@babel/plugin-transform-classes": "^7.25.9",
+        "@babel/plugin-transform-computed-properties": "^7.25.9",
+        "@babel/plugin-transform-destructuring": "^7.25.9",
+        "@babel/plugin-transform-dotall-regex": "^7.25.9",
+        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-dynamic-import": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
+        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+        "@babel/plugin-transform-for-of": "^7.26.9",
+        "@babel/plugin-transform-function-name": "^7.25.9",
+        "@babel/plugin-transform-json-strings": "^7.25.9",
+        "@babel/plugin-transform-literals": "^7.25.9",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+        "@babel/plugin-transform-modules-amd": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.26.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+        "@babel/plugin-transform-modules-umd": "^7.25.9",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+        "@babel/plugin-transform-new-target": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
+        "@babel/plugin-transform-numeric-separator": "^7.25.9",
+        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+        "@babel/plugin-transform-object-super": "^7.25.9",
+        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9",
+        "@babel/plugin-transform-private-methods": "^7.25.9",
+        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+        "@babel/plugin-transform-property-literals": "^7.25.9",
+        "@babel/plugin-transform-regenerator": "^7.25.9",
+        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+        "@babel/plugin-transform-reserved-words": "^7.25.9",
+        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+        "@babel/plugin-transform-spread": "^7.25.9",
+        "@babel/plugin-transform-sticky-regex": "^7.25.9",
+        "@babel/plugin-transform-template-literals": "^7.26.8",
+        "@babel/plugin-transform-typeof-symbol": "^7.26.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-regex": "^7.25.9",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.7",
-        "babel-plugin-polyfill-corejs3": "^0.8.7",
-        "babel-plugin-polyfill-regenerator": "^0.5.4",
-        "core-js-compat": "^3.31.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.11.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.40.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1695,6 +1718,7 @@
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
       "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -1705,16 +1729,17 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz",
-      "integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz",
+      "integrity": "sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-typescript": "^7.23.3"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-option": "^7.25.9",
+        "@babel/plugin-syntax-jsx": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-typescript": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1723,17 +1748,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/regjsgen": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
-      "dev": true
-    },
     "node_modules/@babel/runtime": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz",
-      "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
+      "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1742,33 +1762,32 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1777,14 +1796,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1794,13 +1813,15 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
       "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -1813,54 +1834,114 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
       "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
       "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@eslint/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
+      "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -1868,7 +1949,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -1879,21 +1960,20 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -1904,6 +1984,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1911,61 +1992,76 @@
         "node": "*"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "9.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
+      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.6.tgz",
+      "integrity": "sha512-+0TjwR1eAUdZtvv/ir1mGX+v0tUoR3VEPB8Up0LLJC+whRW0GgBBtpbOkg/a/U4Dxa6l5a3l9AJ1aWIQVyoWJA==",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@eslint/core": "^0.11.0",
+        "levn": "^0.4.1"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -1973,6 +2069,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -1981,17 +2078,26 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-      "dev": true
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -2008,6 +2114,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -2017,6 +2124,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -2030,6 +2138,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -2043,6 +2152,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -2055,6 +2165,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -2070,6 +2181,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -2082,6 +2194,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2091,6 +2204,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -2100,6 +2214,7 @@
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -2112,81 +2227,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/core": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -2229,81 +2275,12 @@
         }
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/environment": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -2319,6 +2296,7 @@
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -2332,6 +2310,7 @@
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -2344,6 +2323,7 @@
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -2361,6 +2341,7 @@
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -2376,6 +2357,7 @@
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -2414,81 +2396,12 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -2501,6 +2414,7 @@
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -2515,6 +2429,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -2530,6 +2445,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -2545,6 +2461,7 @@
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -2566,81 +2483,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/types": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -2653,129 +2501,65 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -2786,6 +2570,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -2799,6 +2584,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -2808,6 +2594,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2816,17 +2603,329 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
       "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@sinonjs/commons": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -2836,6 +2935,7 @@
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -2845,39 +2945,45 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
       "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
       "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
       "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -2891,6 +2997,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -2900,31 +3007,57 @@
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -2933,13 +3066,15 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -2949,24 +3084,27 @@
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/jquery": {
-      "version": "3.5.29",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz",
-      "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/sizzle": "*"
       }
     },
     "node_modules/@types/jqueryui": {
-      "version": "1.12.21",
-      "resolved": "https://registry.npmjs.org/@types/jqueryui/-/jqueryui-1.12.21.tgz",
-      "integrity": "sha512-hsTOaWPg963smNdoHbEN2anu4vVWj9k2xuaZMIajWERPikaBRG49RmaDA/tb2HldX9/a0qHvQYKipXHSLhM3qA==",
+      "version": "1.12.23",
+      "resolved": "https://registry.npmjs.org/@types/jqueryui/-/jqueryui-1.12.23.tgz",
+      "integrity": "sha512-pm1yVNVI29B9IGw41anCEzA5eR2r1pYc7flqD471ZT7B0yUXIY7YNe/zq7LGpihIGXNzWyG+Q4YQSzv2AF3fNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/jquery": "*"
       }
@@ -2976,6 +3114,7 @@
       "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
       "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/tough-cookie": "*",
@@ -2986,52 +3125,53 @@
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz",
-      "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==",
+      "version": "22.13.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
+      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/path-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/path-browserify/-/path-browserify-1.0.2.tgz",
-      "integrity": "sha512-ZkC5IUqqIFPXx3ASTTybTzmQdwHwe2C0u3eL75ldQ6T9E9IWFJodn6hIfbZGab73DfyiHN4Xw15gNxUq2FbvBA==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz",
-      "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/path-browserify/-/path-browserify-1.0.3.tgz",
+      "integrity": "sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/sizzle": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
-      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
-      "dev": true
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
       "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
       "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -3040,116 +3180,77 @@
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz",
-      "integrity": "sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
+      "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/type-utils": "6.19.0",
-        "@typescript-eslint/utils": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
-        "debug": "^4.3.4",
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/type-utils": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
+        "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.0.tgz",
-      "integrity": "sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
+      "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz",
-      "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
+      "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0"
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -3157,39 +3258,37 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz",
-      "integrity": "sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
+      "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "@typescript-eslint/utils": "6.19.0",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz",
-      "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
+      "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -3197,111 +3296,38 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz",
-      "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
+      "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/visitor-keys": "6.19.0",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz",
-      "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.19.0",
-        "@typescript-eslint/types": "6.19.0",
-        "@typescript-eslint/typescript-estree": "6.19.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -3309,218 +3335,262 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.19.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz",
-      "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
+      "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.19.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
+      "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.24.1",
+        "eslint-visitor-keys": "^4.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "dev": true
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
-      "dev": true
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webpack-cli/configtest": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
-      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
+      "integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.x.x"
       }
     },
     "node_modules/@webpack-cli/info": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
-      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
+      "integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.x.x"
       }
     },
     "node_modules/@webpack-cli/serve": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
-      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
+      "integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.x.x"
       },
       "peerDependenciesMeta": {
         "webpack-dev-server": {
@@ -3532,26 +3602,30 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "deprecated": "Use your platform's native atob() and btoa() methods instead",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3564,34 +3638,31 @@
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
       "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.1.0",
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
       "engines": {
         "node": ">=0.4.0"
       }
@@ -3601,6 +3672,7 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -3613,6 +3685,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3624,20 +3697,54 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
       "peerDependencies": {
-        "ajv": "^6.9.1"
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
       }
     },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -3653,20 +3760,25 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -3674,6 +3786,7 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3686,34 +3799,36 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "Python-2.0"
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/babel-jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -3730,81 +3845,12 @@
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -3821,6 +3867,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -3837,6 +3884,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -3848,13 +3896,14 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz",
-      "integrity": "sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==",
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -3862,64 +3911,54 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz",
-      "integrity": "sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
+      "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.4.4",
-        "core-js-compat": "^3.33.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz",
-      "integrity": "sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
+        "core-js-compat": "^3.40.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+      "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -3930,6 +3969,7 @@
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -3945,22 +3985,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -3970,6 +4003,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -3978,9 +4012,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
       "funding": [
         {
@@ -3996,11 +4030,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4014,6 +4049,7 @@
       "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
       "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-json-stable-stringify": "2.x"
       },
@@ -4026,6 +4062,7 @@
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -4034,13 +4071,29 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -4050,14 +4103,15 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001579",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
-      "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==",
+      "version": "1.0.30001700",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "dev": true,
       "funding": [
         {
@@ -4072,20 +4126,24 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/char-regex": {
@@ -4093,54 +4151,33 @@
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">= 14.16.0"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+      "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0"
       }
@@ -4156,21 +4193,24 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
-      "dev": true
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
+      "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -4185,6 +4225,7 @@
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -4199,6 +4240,7 @@
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -4208,34 +4250,42 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -4247,27 +4297,31 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/core-js-compat": {
-      "version": "3.35.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz",
-      "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==",
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
+      "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.22.2"
+        "browserslist": "^4.24.3"
       },
       "funding": {
         "type": "opencollective",
@@ -4279,6 +4333,7 @@
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -4295,87 +4350,19 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/create-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/create-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/create-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -4389,13 +4376,15 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
       "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cssom": "~0.3.6"
       },
@@ -4407,13 +4396,15 @@
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
       "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "whatwg-mimetype": "^3.0.0",
@@ -4424,12 +4415,13 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -4441,16 +4433,18 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/dedent": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
-      "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -4464,13 +4458,15 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4480,15 +4476,31 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4498,6 +4510,7 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -4507,40 +4520,18 @@
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/domexception": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "deprecated": "Use your platform's native DOMException instead",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -4548,17 +4539,50 @@
         "node": ">=12"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.640",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.640.tgz",
-      "integrity": "sha512-z/6oZ/Muqk4BaE7P69bXhUhpJbUM9ZJeka43ZwxsDshKtePns4mhBlh8bU5+yrnOnz3fhG82XLzGUXazOmsWnA==",
-      "dev": true
+      "version": "1.5.102",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz",
+      "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -4570,13 +4594,15 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -4590,6 +4616,7 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -4598,10 +4625,11 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz",
-      "integrity": "sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+      "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "envinfo": "dist/cli.js"
       },
@@ -4614,32 +4642,88 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-arrayish": "^0.2.1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-module-lexer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
-      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==",
-      "dev": true
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/escodegen": {
@@ -4647,6 +4731,7 @@
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
       "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -4664,71 +4749,77 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "9.20.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
+      "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.0",
+        "@eslint/core": "^0.11.0",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "9.20.0",
+        "@eslint/plugin-kit": "^0.2.5",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.1",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -4739,6 +4830,7 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -4746,99 +4838,28 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/eslint/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/minimatch": {
@@ -4846,6 +4867,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4853,42 +4875,32 @@
         "node": "*"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -4899,6 +4911,7 @@
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -4908,10 +4921,11 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -4924,6 +4938,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -4936,6 +4951,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -4945,6 +4961,7 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4954,6 +4971,7 @@
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
@@ -4963,6 +4981,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -4995,6 +5014,7 @@
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -5010,19 +5030,21 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -5033,6 +5055,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5044,28 +5067,49 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
       "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.9.1"
       }
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -5075,20 +5119,45 @@
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/fill-range": {
@@ -5096,6 +5165,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -5108,6 +5178,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -5124,38 +5195,42 @@
       "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
       "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "bin": {
         "flat": "cli.js"
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -5166,7 +5241,8 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -5174,6 +5250,7 @@
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -5187,6 +5264,7 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5196,6 +5274,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -5205,24 +5284,66 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+      "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.0",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/get-package-type": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5234,7 +5355,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5255,6 +5378,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -5266,13 +5390,15 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -5283,6 +5409,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -5295,56 +5422,83 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -5357,6 +5511,7 @@
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -5368,13 +5523,15 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -5389,6 +5546,7 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -5402,6 +5560,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
@@ -5411,6 +5570,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -5419,25 +5579,28 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
-      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
-      "dev": true
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -5450,10 +5613,11 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -5473,6 +5637,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -5481,7 +5646,9 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -5491,13 +5658,15 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/interpret": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
       "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -5506,27 +5675,20 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5537,6 +5699,7 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5546,6 +5709,7 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5555,6 +5719,7 @@
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5564,6 +5729,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -5576,24 +5742,17 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -5605,13 +5764,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -5623,13 +5784,15 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5639,19 +5802,21 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz",
-      "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
         "semver": "^7.5.4"
       },
@@ -5659,26 +5824,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -5686,17 +5837,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-instrument/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -5706,32 +5852,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -5742,10 +5868,11 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -5754,11 +5881,55 @@
         "node": ">=8"
       }
     },
+    "node_modules/jake": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jake/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/jake/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -5785,6 +5956,7 @@
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -5799,6 +5971,7 @@
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -5825,81 +5998,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -5928,81 +6032,12 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-config": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -6043,81 +6078,12 @@
         }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-diff": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -6128,81 +6094,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-docblock": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -6215,6 +6112,7 @@
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -6226,81 +6124,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-environment-jsdom": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
       "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -6328,6 +6157,7 @@
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -6345,6 +6175,7 @@
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
       "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -6354,6 +6185,7 @@
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -6379,6 +6211,7 @@
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -6392,6 +6225,7 @@
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -6402,81 +6236,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -6492,81 +6257,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-mock": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -6581,6 +6277,7 @@
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -6598,6 +6295,7 @@
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -6607,6 +6305,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -6627,6 +6326,7 @@
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -6635,81 +6335,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runner": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -6737,81 +6368,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runtime": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -6840,81 +6402,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-snapshot": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -6941,84 +6434,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -7026,29 +6447,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -7061,81 +6465,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-validate": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -7148,26 +6483,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-validate/node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7175,66 +6496,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watcher": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -7249,81 +6516,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -7334,20 +6532,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7361,27 +6551,31 @@
     "node_modules/jquery": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+      "license": "MIT"
     },
     "node_modules/jquery-ui": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz",
-      "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.14.1.tgz",
+      "integrity": "sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ==",
+      "license": "MIT",
       "dependencies": {
-        "jquery": ">=1.8.0 <4.0.0"
+        "jquery": ">=1.12.0 <5.0.0"
       }
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -7394,6 +6588,7 @@
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
       "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "acorn": "^8.8.1",
@@ -7435,46 +6630,52 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -7487,6 +6688,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -7496,6 +6698,7 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7505,6 +6708,7 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7514,6 +6718,7 @@
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7523,6 +6728,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -7535,13 +6741,15 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.11.5"
       }
@@ -7551,6 +6759,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -7565,25 +6774,29 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -7593,6 +6806,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -7603,26 +6817,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -7630,49 +6830,58 @@
         "node": ">=10"
       }
     },
-    "node_modules/make-dir/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -7684,6 +6893,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -7693,6 +6903,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -7705,15 +6916,17 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -7725,40 +6938,54 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7768,6 +6995,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -7776,16 +7004,18 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
-      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
-      "dev": true
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -7795,6 +7025,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -7806,17 +7037,18 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -7827,6 +7059,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -7842,6 +7075,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -7857,6 +7091,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -7866,6 +7101,7 @@
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -7878,6 +7114,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -7892,12 +7129,13 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -7906,13 +7144,15 @@
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "license": "MIT"
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7922,6 +7162,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7931,6 +7172,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -7939,28 +7181,22 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -7973,6 +7209,7 @@
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -7982,6 +7219,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -7994,6 +7232,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -8007,6 +7246,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -8019,6 +7259,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -8034,6 +7275,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -8046,6 +7288,7 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -8055,6 +7298,7 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -8069,6 +7313,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8081,6 +7326,7 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -8090,24 +7336,32 @@
       }
     },
     "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
     },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/pure-rand": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
-      "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz",
+      "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==",
       "dev": true,
       "funding": [
         {
@@ -8118,13 +7372,15 @@
           "type": "opencollective",
           "url": "https://opencollective.com/fast-check"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -8144,33 +7400,38 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8.10.0"
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/rechoir": {
@@ -8178,6 +7439,7 @@
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
       "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve": "^1.20.0"
       },
@@ -8189,13 +7451,15 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2"
       },
@@ -8207,27 +7471,30 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
       "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsparser": "^0.9.1",
+        "regenerate-unicode-properties": "^10.2.0",
+        "regjsgen": "^0.8.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -8235,25 +7502,37 @@
         "node": ">=4"
       }
     },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+    "node_modules/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/regjsparser": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~0.5.0"
+        "jsesc": "~3.0.2"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
     "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/require-directory": {
@@ -8261,6 +7540,17 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8269,21 +7559,26 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -8293,6 +7588,7 @@
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -8305,6 +7601,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8314,15 +7611,17 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -8332,26 +7631,12 @@
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -8371,6 +7656,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -8393,22 +7679,25 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.70.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz",
-      "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==",
+      "version": "1.85.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz",
+      "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
+        "chokidar": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -8416,6 +7705,9 @@
       },
       "engines": {
         "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
       }
     },
     "node_modules/saxes": {
@@ -8423,6 +7715,7 @@
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
       "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -8431,14 +7724,16 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -8448,11 +7743,49 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -8462,6 +7795,7 @@
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -8471,6 +7805,7 @@
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -8483,6 +7818,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -8495,6 +7831,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8503,19 +7840,22 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8525,15 +7865,17 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8543,6 +7885,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -8552,13 +7895,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -8571,6 +7916,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8580,6 +7926,7 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -8593,6 +7940,7 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -8607,6 +7955,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -8619,6 +7968,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -8628,6 +7978,7 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8637,6 +7988,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -8645,15 +7997,16 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -8661,6 +8014,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8672,22 +8026,25 @@
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/terser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz",
-      "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==",
+      "version": "5.39.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -8702,16 +8059,17 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.11",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+      "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -8735,20 +8093,12 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/terser-webpack-plugin/node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -8763,6 +8113,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8778,6 +8129,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -8788,6 +8140,7 @@
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -8802,6 +8155,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -8812,6 +8166,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -8819,32 +8174,19 @@
         "node": "*"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -8853,10 +8195,11 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -8872,6 +8215,7 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
       "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.1.1"
       },
@@ -8880,40 +8224,44 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=16.13.0"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.1.1",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz",
-      "integrity": "sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==",
+      "version": "29.2.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+      "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
+        "bs-logger": "^0.2.6",
+        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "^7.5.3",
-        "yargs-parser": "^21.0.1"
+        "lodash.memoize": "^4.1.2",
+        "make-error": "^1.3.6",
+        "semver": "^7.6.3",
+        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "ts-jest": "cli.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/transform": "^29.0.0",
         "@jest/types": "^29.0.0",
         "babel-jest": "^29.0.0",
         "jest": "^29.0.0",
@@ -8923,6 +8271,9 @@
         "@babel/core": {
           "optional": true
         },
+        "@jest/transform": {
+          "optional": true
+        },
         "@jest/types": {
           "optional": true
         },
@@ -8934,26 +8285,12 @@
         }
       }
     },
-    "node_modules/ts-jest/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -8961,17 +8298,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/ts-jest/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/ts-loader": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
+      "version": "9.5.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.2.tgz",
+      "integrity": "sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "enhanced-resolve": "^5.0.0",
@@ -8987,84 +8319,12 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -9077,33 +8337,17 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
       "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">= 8"
       }
     },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -9147,6 +8391,7 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -9159,6 +8404,7 @@
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9168,6 +8414,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -9176,10 +8423,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
-      "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
+      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -9189,16 +8437,18 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+      "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9208,6 +8458,7 @@
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
         "unicode-property-aliases-ecmascript": "^2.0.0"
@@ -9217,10 +8468,11 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9230,6 +8482,7 @@
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -9239,14 +8492,15 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
       "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
       "dev": true,
       "funding": [
         {
@@ -9262,9 +8516,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -9278,6 +8533,7 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -9287,6 +8543,7 @@
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
       "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -9296,13 +8553,15 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/v8-to-istanbul": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
-      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -9317,6 +8576,7 @@
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
       "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^4.0.0"
       },
@@ -9329,6 +8589,7 @@
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -9338,6 +8599,7 @@
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
       "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -9351,23 +8613,25 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
       "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/webpack": {
-      "version": "5.94.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
-      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
+      "version": "5.98.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
+      "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
@@ -9379,9 +8643,9 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.2.0",
+        "schema-utils": "^4.3.0",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.10",
+        "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
@@ -9402,42 +8666,40 @@
       }
     },
     "node_modules/webpack-cli": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
-      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
+      "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.1.1",
-        "@webpack-cli/info": "^2.0.2",
-        "@webpack-cli/serve": "^2.0.5",
+        "@discoveryjs/json-ext": "^0.6.1",
+        "@webpack-cli/configtest": "^3.0.1",
+        "@webpack-cli/info": "^3.0.1",
+        "@webpack-cli/serve": "^3.0.1",
         "colorette": "^2.0.14",
-        "commander": "^10.0.1",
+        "commander": "^12.1.0",
         "cross-spawn": "^7.0.3",
-        "envinfo": "^7.7.3",
+        "envinfo": "^7.14.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^3.1.1",
         "rechoir": "^0.8.0",
-        "webpack-merge": "^5.7.3"
+        "webpack-merge": "^6.0.1"
       },
       "bin": {
         "webpack-cli": "bin/cli.js"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "5.x.x"
+        "webpack": "^5.82.0"
       },
       "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
         "webpack-bundle-analyzer": {
           "optional": true
         },
@@ -9447,26 +8709,28 @@
       }
     },
     "node_modules/webpack-cli/node_modules/commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
-      "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
         "flat": "^5.0.2",
-        "wildcard": "^2.0.0"
+        "wildcard": "^2.0.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/webpack-sources": {
@@ -9474,6 +8738,7 @@
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
@@ -9483,6 +8748,7 @@
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -9496,6 +8762,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -9503,13 +8770,15 @@
     "node_modules/webstorage-polyfill": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/webstorage-polyfill/-/webstorage-polyfill-1.0.1.tgz",
-      "integrity": "sha512-h1laObV7KeHl61q0aZUXft+giM2nKFI1WNsxF8v3ODYeAJP/8AjT1g0AOKnrB5atBYXVxwzpGGzTtRYDNUUtiA=="
+      "integrity": "sha512-h1laObV7KeHl61q0aZUXft+giM2nKFI1WNsxF8v3ODYeAJP/8AjT1g0AOKnrB5atBYXVxwzpGGzTtRYDNUUtiA==",
+      "license": "MIT"
     },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -9522,6 +8791,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
       "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
@@ -9531,6 +8801,7 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
       "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tr46": "^3.0.0",
         "webidl-conversions": "^7.0.0"
@@ -9544,6 +8815,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -9558,13 +8830,25 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
       "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9577,50 +8861,19 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/write-file-atomic": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -9630,10 +8883,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -9655,6 +8909,7 @@
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
       "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12"
       }
@@ -9663,13 +8918,15 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -9678,13 +8935,15 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -9703,6 +8962,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -9712,6 +8972,7 @@
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -9721,6 +8982,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/frontend/package.json b/frontend/package.json
index 22fc29b8..79eadec7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,28 +19,28 @@
   "license": "BSD-2-Clause",
   "dependencies": {
     "jquery": "^3.7.1",
-    "jquery-ui": "^1.13.2",
+    "jquery-ui": "^1.14.1",
     "path-browserify": "^1.0.1",
     "webstorage-polyfill": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.21.5",
-    "@babel/preset-typescript": "^7.21.5",
-    "@jest/globals": "^29.5.0",
-    "@types/jquery": "^3.5.29",
-    "@types/jqueryui": "^1.12.21",
-    "@types/path-browserify": "^1.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "eslint": "^8.55.0",
-    "jest": "^29.5.0",
-    "jest-config": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "sass": "^1.69.5",
-    "ts-jest": "^29.1.1",
-    "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3",
-    "webpack": "^5.94.0",
-    "webpack-cli": "^5.1.4"
+    "@babel/preset-env": "^7.26.9",
+    "@babel/preset-typescript": "^7.26.0",
+    "@jest/globals": "^29.7.0",
+    "@types/jquery": "^3.5.32",
+    "@types/jqueryui": "^1.12.23",
+    "@types/path-browserify": "^1.0.3",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "eslint": "^9.20.1",
+    "jest": "^29.7.0",
+    "jest-config": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "sass": "^1.85.0",
+    "ts-jest": "^29.2.5",
+    "ts-loader": "^9.5.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.3",
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
   }
 }
diff --git a/frontend/ts/dom/qr.ts b/frontend/ts/dom/qr.ts
index 3aa5d549..5dbb70cf 100755
--- a/frontend/ts/dom/qr.ts
+++ b/frontend/ts/dom/qr.ts
@@ -1,11 +1,9 @@
 import $ from "jquery";
 import "jquery-ui/ui/version";
 import "jquery-ui/ui/plugin";
-import "jquery-ui/ui/safe-active-element";
 import "jquery-ui/ui/widget";
 import "jquery-ui/ui/scroll-parent";
 import "jquery-ui/ui/widgets/mouse";
-import "jquery-ui/ui/safe-blur";
 import "jquery-ui/ui/widgets/draggable";
 
 import { upArrow, downArrow } from "../vars";
diff --git a/frontend/ts/dom/uploaddata.ts b/frontend/ts/dom/uploaddata.ts
index f82948db..bba7a67f 100644
--- a/frontend/ts/dom/uploaddata.ts
+++ b/frontend/ts/dom/uploaddata.ts
@@ -54,7 +54,7 @@ function onReaderLoad(name:string, e:ProgressEvent<FileReader>) {
 			"href": "#"
 		}).text("X").on("click", (e:JQuery.ClickEvent) => {
 			const $target = $(e.target);
-			const $browseBtn = $target.parents<HTMLInputElement>("#upload-box").siblings("input[name=imagefile]");
+			const $browseBtn = $target.parents<HTMLInputElement>("#upload-box").siblings<HTMLInputElement>("input[name=imagefile]");
 			$browseBtn.each((_, el) => {
 				el.value = null;
 			});
diff --git a/frontend/ts/notifications.ts b/frontend/ts/notifications.ts
index 2dcca63f..3f5709e6 100644
--- a/frontend/ts/notifications.ts
+++ b/frontend/ts/notifications.ts
@@ -8,11 +8,10 @@ function canNotify() {
 		&& (typeof Notification !== "undefined");
 }
 
-export function notify(title: string, body: string, img = noteIcon) {
+export function notify(title: string, body: string, icon = noteIcon) {
 	const n = new Notification(title, {
 		body: body,
-		image: img,
-		icon: noteIcon
+		icon: icon
 	});
 	setTimeout(() => {
 		n.close();

From aba2c6822135d3d4a0ed0592966a1860e31b8e18 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 12:59:20 -0800
Subject: [PATCH 113/122] Use h1 instead of div for lightbox title, footer
 element instead of div#footer

---
 frontend/sass/burichan.scss                        |  2 +-
 frontend/sass/global.scss                          |  6 ++++--
 frontend/sass/global/_lightbox.scss                | 12 ++++++------
 frontend/sass/global/_qr.scss                      |  2 +-
 frontend/sass/pipes.scss                           |  2 +-
 frontend/ts/dom/lightbox.ts                        |  2 +-
 html/css/burichan.css                              |  2 +-
 html/css/global.css                                | 14 ++++++--------
 html/css/pipes.css                                 |  2 +-
 pkg/building/building_test.go                      |  4 ++--
 pkg/building/buildingconsts_test.go                |  8 ++++----
 .../templatetests/templatecases_test.go            |  4 ++--
 templates/captcha.html                             |  4 ++--
 templates/page_footer.html                         |  4 ++--
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/frontend/sass/burichan.scss b/frontend/sass/burichan.scss
index 871c8774..38d47de0 100644
--- a/frontend/sass/burichan.scss
+++ b/frontend/sass/burichan.scss
@@ -71,6 +71,6 @@ div.dropdown-menu a:hover {
 	background: #0a127b;
 }
 
-div#footer {
+footer {
 	font-size: 0.75em;
 }
\ No newline at end of file
diff --git a/frontend/sass/global.scss b/frontend/sass/global.scss
index ea3e08e2..cebaf5a1 100644
--- a/frontend/sass/global.scss
+++ b/frontend/sass/global.scss
@@ -8,7 +8,9 @@
 @import 'global/animations';
 
 .increase-line-height {
-	line-height: 1.5;
+	header, .post, .reply {
+		line-height: 1.5;
+	}
 }
 
 header {
@@ -85,7 +87,7 @@ div.section-block {
 	text-align: center;
 }
 
-#footer {
+footer {
 	bottom: 0px;
 	clear: both;
 	left: 0px;
diff --git a/frontend/sass/global/_lightbox.scss b/frontend/sass/global/_lightbox.scss
index 3220283a..ea2a12aa 100644
--- a/frontend/sass/global/_lightbox.scss
+++ b/frontend/sass/global/_lightbox.scss
@@ -12,7 +12,6 @@
 	top:5%;
 	z-index:9001;
 	overflow: auto;
-	// display:hidden;
 }
 
 .lightbox * {
@@ -45,19 +44,20 @@
 }
 
 .lightbox-title {
-	font-size:42px;
-	font-weight:700;
+	// font-size:42px;
+	// font-weight:700;
 	text-align:center;
+	margin-top: 0px;
 }
 
 .lightbox-x {
 	color: #000!important;
 	float: right;
-	font-size: 32px;
-	font-weight: 700;
+	font-size: inherit;
+	// font-weight: 700;
 }
 
-.lightbox-x:hover {
+.lightbox-x:hover,.lightbox-x:active {
 	color:#555;
 }
 
diff --git a/frontend/sass/global/_qr.scss b/frontend/sass/global/_qr.scss
index dcfecf87..95329d02 100644
--- a/frontend/sass/global/_qr.scss
+++ b/frontend/sass/global/_qr.scss
@@ -9,7 +9,7 @@ div#qr-box {
 
 	input[type=text],textarea {
 		display: table-cell;
-		min-width:300px;
+		min-width:320px;
 		background: #FFF;
 		color: #000;
 		width:100%;
diff --git a/frontend/sass/pipes.scss b/frontend/sass/pipes.scss
index 5943de84..6bf73e38 100644
--- a/frontend/sass/pipes.scss
+++ b/frontend/sass/pipes.scss
@@ -34,7 +34,7 @@ a.topbar-item:hover {
 	background: $bglight;
 }
 
-div#footer, div#footer * {
+footer, footer * {
 	font-size: 9pt;
 }
 
diff --git a/frontend/ts/dom/lightbox.ts b/frontend/ts/dom/lightbox.ts
index 43de85a5..db1b3897 100755
--- a/frontend/ts/dom/lightbox.ts
+++ b/frontend/ts/dom/lightbox.ts
@@ -9,7 +9,7 @@ export function removeLightbox(...customs: any) {
 
 export function showLightBox(title: string, innerHTML: string) {
 	$(document.body).prepend(
-		`<div class="lightbox-bg"></div><div class="lightbox"><div class="lightbox-title">${title}<a href="javascript:;" class="lightbox-x">X</a><hr /></div>${innerHTML}</div>`
+		`<div class="lightbox-bg"></div><div class="lightbox"><h1 class="lightbox-title">${title}<a href="javascript:;" class="lightbox-x">X</a><hr /></h1>${innerHTML}</div>`
 	);
 	$("a.lightbox-x, .lightbox-bg").on("click", removeLightbox);
 }
diff --git a/html/css/burichan.css b/html/css/burichan.css
index 241727b7..3073f068 100644
--- a/html/css/burichan.css
+++ b/html/css/burichan.css
@@ -154,6 +154,6 @@ div.dropdown-menu a:hover {
   background: #0a127b;
 }
 
-div#footer {
+footer {
   font-size: 0.75em;
 }
diff --git a/html/css/global.css b/html/css/global.css
index cdceed40..0d521fd2 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -485,19 +485,17 @@ form#login-box input[type=submit] {
 }
 
 .lightbox-title {
-  font-size: 42px;
-  font-weight: 700;
   text-align: center;
+  margin-top: 0px;
 }
 
 .lightbox-x {
   color: #000 !important;
   float: right;
-  font-size: 32px;
-  font-weight: 700;
+  font-size: inherit;
 }
 
-.lightbox-x:hover {
+.lightbox-x:hover, .lightbox-x:active {
   color: #555;
 }
 
@@ -552,7 +550,7 @@ div#qr-box {
 }
 div#qr-box input[type=text], div#qr-box textarea {
   display: table-cell;
-  min-width: 300px;
+  min-width: 320px;
   background: #FFF;
   color: #000;
   width: 100%;
@@ -663,7 +661,7 @@ img#banpage-image {
     transform-origin: top center;
   }
 }
-.increase-line-height {
+.increase-line-height header, .increase-line-height .post, .increase-line-height .reply {
   line-height: 1.5;
 }
 
@@ -738,7 +736,7 @@ div.section-block div.section-body {
   text-align: center;
 }
 
-#footer {
+footer {
   bottom: 0px;
   clear: both;
   left: 0px;
diff --git a/html/css/pipes.css b/html/css/pipes.css
index 5488691b..45cea127 100644
--- a/html/css/pipes.css
+++ b/html/css/pipes.css
@@ -121,7 +121,7 @@ a.topbar-item:hover {
   background: #404040;
 }
 
-div#footer, div#footer * {
+footer, footer * {
   font-size: 9pt;
 }
 
diff --git a/pkg/building/building_test.go b/pkg/building/building_test.go
index 4744afac..7d60aee0 100644
--- a/pkg/building/building_test.go
+++ b/pkg/building/building_test.go
@@ -25,7 +25,7 @@ func TestBuildJS(t *testing.T) {
 	}
 
 	outDir := t.TempDir()
-	config.SetVersion("3.11.0")
+	config.SetVersion("4.0.2")
 	systemCriticalCfg := config.GetSystemCriticalConfig()
 	systemCriticalCfg.DocumentRoot = path.Join(outDir, "html")
 	systemCriticalCfg.TemplateDir = path.Join(testRoot, "templates")
@@ -147,7 +147,7 @@ func TestBuildFrontPage(t *testing.T) {
 		}
 		t.Run(driver, func(t *testing.T) {
 			outDir := t.TempDir()
-			config.SetVersion("3.11.0")
+			config.SetVersion("4.0.2")
 			systemCriticalCfg := config.GetSystemCriticalConfig()
 			systemCriticalCfg.DocumentRoot = path.Join(outDir, "html")
 			systemCriticalCfg.TemplateDir = path.Join(testRoot, "templates")
diff --git a/pkg/building/buildingconsts_test.go b/pkg/building/buildingconsts_test.go
index 6f25bd10..72a1f817 100644
--- a/pkg/building/buildingconsts_test.go
+++ b/pkg/building/buildingconsts_test.go
@@ -7,7 +7,7 @@ const defaultStyle = "test1.css";
 const webroot = "/chan";
 const serverTZ = 8;
 const fileTypes = [];`
-	expectedMinifiedFront   = `<!doctype html><html lang=en><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Gochan</title><link rel=stylesheet href=/chan/css/global.css><link id=theme rel=stylesheet href=/chan/css/test1.css><link rel="shortcut icon" href=/chan/favicon.png><script src=/chan/js/consts.js></script><script src=/chan/js/gochan.js></script><div id=topbar><div class=topbar-section><a href=/chan/ class=topbar-item>home</a></div><div class=topbar-section><a href=/chan/test/ class=topbar-item title="Testing board">/test/</a><a href=/chan/test2/ class=topbar-item title="Testing board 2">/test2/</a></div></div><div id=content><div id=top-pane><h1 id=site-title>Gochan</h1><span id=site-slogan></span></div><br><div id=frontpage><div class=section-block style="margin: 16px 64px 16px 64px;"><div class="section-body front-intro">Welcome to Gochan!</div></div><div class=section-block><div class=section-title-block><b>Boards</b></div><div class=section-body><ul style="float:left; list-style: none"><li style="text-align: center; font-weight: bold"><b><u>Main</u></b><li><a href=/chan/test/ title="Board for testing description">/test/</a> — Testing board<li><a href=/chan/test2/ title="Board for testing description 2">/test2/</a> — Testing board 2</ul></div></div><div class=section-block><div class=section-title-block><b>Recent Posts</b></div><div class=section-body><div id=recent-posts><div class=recent-post><a href=/chan/test/res/1.html#1 class=front-reply target=_blank><img src=/chan/test/thumb alt="post thumbnail"></a><br><br><a href=/chan/test/>/test/</a><hr>message_raw</div><div class=recent-post><a href=/chan/test/res/1.html#2 class=front-reply target=_blank><img src=/chan/test/thumb alt="post thumbnail"></a><br><br><a href=/chan/test/>/test/</a><hr>message_raw</div></div></div></div></div><div id=footer>Powered by <a href=http://github.com/gochan-org/gochan/>Gochan 3.11</a><br></div></div>`
+	expectedMinifiedFront   = `<!doctype html><html lang=en><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Gochan</title><link rel=stylesheet href=/chan/css/global.css><link id=theme rel=stylesheet href=/chan/css/test1.css><link rel="shortcut icon" href=/chan/favicon.png><script src=/chan/js/consts.js></script><script src=/chan/js/gochan.js></script><div id=topbar><div class=topbar-section><a href=/chan/ class=topbar-item>home</a></div><div class=topbar-section><a href=/chan/test/ class=topbar-item title="Testing board">/test/</a><a href=/chan/test2/ class=topbar-item title="Testing board 2">/test2/</a></div></div><div id=content><div id=top-pane><h1 id=site-title>Gochan</h1><span id=site-slogan></span></div><br><div id=frontpage><div class=section-block style="margin: 16px 64px 16px 64px;"><div class="section-body front-intro">Welcome to Gochan!</div></div><div class=section-block><div class=section-title-block><b>Boards</b></div><div class=section-body><ul style="float:left; list-style: none"><li style="text-align: center; font-weight: bold"><b><u>Main</u></b><li><a href=/chan/test/ title="Board for testing description">/test/</a> — Testing board<li><a href=/chan/test2/ title="Board for testing description 2">/test2/</a> — Testing board 2</ul></div></div><div class=section-block><div class=section-title-block><b>Recent Posts</b></div><div class=section-body><div id=recent-posts><div class=recent-post><a href=/chan/test/res/1.html#1 class=front-reply target=_blank><img src=/chan/test/thumb alt="post thumbnail"></a><br><br><a href=/chan/test/>/test/</a><hr>message_raw</div><div class=recent-post><a href=/chan/test/res/1.html#2 class=front-reply target=_blank><img src=/chan/test/thumb alt="post thumbnail"></a><br><br><a href=/chan/test/>/test/</a><hr>message_raw</div></div></div></div></div><footer>Powered by <a href=http://github.com/gochan-org/gochan/>Gochan 4.0.2</a><br></footer></div>`
 	expectedUnminifiedFront = `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -73,9 +73,9 @@ const fileTypes = [];`
 			</div>
 		</div>
 	</div>
-<div id="footer">
-	Powered by <a href="http://github.com/gochan-org/gochan/">Gochan 3.11</a><br />
-</div>
+<footer>
+	Powered by <a href="http://github.com/gochan-org/gochan/">Gochan 4.0.2</a><br />
+</footer>
 </div>
 </body>
 </html>
diff --git a/pkg/gctemplates/templatetests/templatecases_test.go b/pkg/gctemplates/templatetests/templatecases_test.go
index 3206fcbe..d63a1a64 100644
--- a/pkg/gctemplates/templatetests/templatecases_test.go
+++ b/pkg/gctemplates/templatetests/templatecases_test.go
@@ -36,7 +36,7 @@ const (
 		`<textarea rows="4"cols="48"name="appealmsg"id="postmsg"placeholder="Appeal message"></textarea>` +
 		`<input type="submit"name="doappeal"value="Submit"/><br/></form>`
 
-	footer = `<div id="footer">Powered by<a href="http://github.com/gochan-org/gochan/">Gochan 4.0</a><br /></div></div></body></html>`
+	footer = `<footer>Powered by<a href="http://github.com/gochan-org/gochan/">Gochan 4.0</a><br /></footer></div></body></html>`
 )
 
 var (
@@ -165,7 +165,7 @@ var (
 				},
 			},
 			expectedOutput: normalBanHeader +
-				`You are banned from posting on<span class="ban-boards">all boards</span>for the following reason:<p class="reason">ban message goes here</p>Your ban was placed on<time datetime="0001-01-01T00:00:00Z"class="ban-timestamp">Mon,January 01,0001 12:00:00 AM</time> and will expire on <time class="ban-timestamp" datetime="0001-01-01T00:00:00Z">Mon, January 01, 0001 12:00:00 AM</time>.<br/>Your IP address is<span class="ban-ip">192.168.56.1</span>.<br /><br/>You may appeal this ban:<br/><form id="appeal-form"action="/post"method="POST"><input type="hidden"name="board"value=""><input type="hidden"name="banid"value="0"><textarea rows="4"cols="48"name="appealmsg"id="postmsg"placeholder="Appeal message"></textarea><input type="submit"name="doappeal"value="Submit"/><br/></form></div></div></div><div id="footer">Powered by<a href="http://github.com/gochan-org/gochan/">Gochan 4.0</a><br /></div></div></body></html>`,
+				`You are banned from posting on<span class="ban-boards">all boards</span>for the following reason:<p class="reason">ban message goes here</p>Your ban was placed on<time datetime="0001-01-01T00:00:00Z"class="ban-timestamp">Mon,January 01,0001 12:00:00 AM</time> and will expire on <time class="ban-timestamp" datetime="0001-01-01T00:00:00Z">Mon, January 01, 0001 12:00:00 AM</time>.<br/>Your IP address is<span class="ban-ip">192.168.56.1</span>.<br /><br/>You may appeal this ban:<br/><form id="appeal-form"action="/post"method="POST"><input type="hidden"name="board"value=""><input type="hidden"name="banid"value="0"><textarea rows="4"cols="48"name="appealmsg"id="postmsg"placeholder="Appeal message"></textarea><input type="submit"name="doappeal"value="Submit"/><br/></form></div></div></div><footer>Powered by<a href="http://github.com/gochan-org/gochan/">Gochan 4.0</a><br /></footer></div></body></html>`,
 		},
 		{
 			desc: "unappealable temporary ban",
diff --git a/templates/captcha.html b/templates/captcha.html
index d89802e7..2d1c5a97 100644
--- a/templates/captcha.html
+++ b/templates/captcha.html
@@ -24,9 +24,9 @@
 	<script src="https://js.hcaptcha.com/1/api.js" async defer></script>
 	<input type="submit" value="Post">
 </form>
-<div id="footer">
+<footer>
 	Powered by <a href="http://github.com/gochan-org/gochan/">Gochan {{version}}</a><br />
-</div>
+</footer>
 </div>
 </body>
 </html>
diff --git a/templates/page_footer.html b/templates/page_footer.html
index 1558dd32..11e12290 100644
--- a/templates/page_footer.html
+++ b/templates/page_footer.html
@@ -1,6 +1,6 @@
-<div id="footer">
+<footer>
 	Powered by <a href="http://github.com/gochan-org/gochan/">Gochan {{version}}</a><br />
-</div>
+</footer>
 </div>
 </body>
 </html>

From 5ae229d61e6b29b40e7fdfc595f8dc17841b27d0 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:16:07 -0800
Subject: [PATCH 114/122] Add LoadPlugins test

---
 pkg/gcplugin/gcplugin.go | 21 +--------------------
 pkg/gcplugin/lua_test.go | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/pkg/gcplugin/gcplugin.go b/pkg/gcplugin/gcplugin.go
index 89438578..b1e8d44c 100644
--- a/pkg/gcplugin/gcplugin.go
+++ b/pkg/gcplugin/gcplugin.go
@@ -45,6 +45,7 @@ func initLua() {
 func ClosePlugins() {
 	if lState != nil {
 		lState.Close()
+		lState = nil
 	}
 }
 
@@ -112,17 +113,6 @@ func preloadLua() {
 	lState.SetGlobal("_GOCHAN_VERSION", lua.LString(config.GetVersion().String()))
 }
 
-func registerEventFunction(name string, fn *lua.LFunction) {
-	switch name {
-	case "onStartup":
-		fallthrough
-	case "onPost":
-		fallthrough
-	case "onDelete":
-		eventPlugins[name] = append(eventPlugins[name], fn)
-	}
-}
-
 func LoadPlugins(paths []string) error {
 	var err error
 	initLua()
@@ -134,15 +124,6 @@ func LoadPlugins(paths []string) error {
 			if err = lState.DoFile(pluginPath); err != nil {
 				return err
 			}
-			pluginTable := lState.NewTable()
-			pluginTable.ForEach(func(key, val lua.LValue) {
-				keyStr := key.String()
-				fn, ok := val.(*lua.LFunction)
-				if !ok {
-					return
-				}
-				registerEventFunction(keyStr, fn)
-			})
 		case ".so":
 			nativePlugin, err := plugin.Open(pluginPath)
 			if err != nil {
diff --git a/pkg/gcplugin/lua_test.go b/pkg/gcplugin/lua_test.go
index df9906f5..3738b258 100644
--- a/pkg/gcplugin/lua_test.go
+++ b/pkg/gcplugin/lua_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/gochan-org/gochan/pkg/config"
 	"github.com/gochan-org/gochan/pkg/gcsql"
+	"github.com/gochan-org/gochan/pkg/gcutil/testutil"
 	"github.com/stretchr/testify/assert"
 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"
@@ -38,7 +39,7 @@ return { ListenIP = system_critical_cfg.ListenIP, SiteSlogan = site_cfg.SiteSlog
 )
 
 func initPluginTests() {
-	config.SetVersion("3.8.0")
+	config.SetVersion("4.0.2")
 	initLua()
 }
 
@@ -107,3 +108,14 @@ return joined, query_escaped, query_unescaped, err`)
 	assert.Equal(t, errLV.Type(), lua.LTNil)
 	ClosePlugins()
 }
+
+func TestLoadPlugin(t *testing.T) {
+	testutil.GoToGochanRoot(t)
+	initPluginTests()
+	assert.NoError(t, LoadPlugins([]string{"examples/plugins/uploadfilenameupper.lua"}))
+	assert.NoError(t, LoadPlugins(nil))
+	assert.Error(t, LoadPlugins([]string{"not_a_file.lua"}))
+	assert.Error(t, LoadPlugins([]string{"invalid_ext.dll"}))
+	assert.ErrorContains(t, LoadPlugins([]string{"not_a_file.so"}), "realpath failed")
+	ClosePlugins()
+}

From 74f9e415b4e9352936137b3103bfcc0ab852b4a3 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 19:50:41 -0800
Subject: [PATCH 115/122] Fix deepsource issues

---
 pkg/gcplugin/gcplugin.go                     | 1 -
 pkg/posting/formatting.go                    | 2 +-
 tools/get_js.py                              | 6 +++---
 tools/selenium_testing/options.py            | 2 +-
 tools/selenium_testing/runtests.py           | 8 ++++----
 tools/selenium_testing/tests/test_posting.py | 4 ++--
 tools/selenium_testing/util/posting.py       | 2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkg/gcplugin/gcplugin.go b/pkg/gcplugin/gcplugin.go
index b1e8d44c..04fcbe0b 100644
--- a/pkg/gcplugin/gcplugin.go
+++ b/pkg/gcplugin/gcplugin.go
@@ -31,7 +31,6 @@ import (
 
 var (
 	lState             *lua.LState
-	eventPlugins       map[string][]*lua.LFunction
 	ErrInvalidInitFunc = errors.New("invalid InitPlugin, expected function with 0 arguments and 1 return value (error type)")
 )
 
diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index eabf78d0..7f9812f5 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -156,7 +156,7 @@ func ApplyDiceRoll(p *gcsql.Post) (rollSum int, err error) {
 			return 0, fmt.Errorf("dice roll too small")
 		}
 		for i := 0; i < numDice; i++ {
-			rollSum += rand.Intn(dieSize) + 1
+			rollSum += rand.Intn(dieSize) + 1 // skipcq: GSC-G404
 			switch roll[3] {
 			case "+":
 				mod, err := strconv.Atoi(roll[4])
diff --git a/tools/get_js.py b/tools/get_js.py
index 7971c403..11ca6d5c 100755
--- a/tools/get_js.py
+++ b/tools/get_js.py
@@ -11,8 +11,8 @@ from os import path
 import sys
 
 VERSION = "v3.10.2"
-DIR = "gochan-{}_linux".format(VERSION)
-DOWNLOAD_URL = "https://github.com/gochan-org/gochan/releases/download/{}/{}.tar.gz".format(VERSION, DIR)
+DIR = f"gochan-{VERSION}_linux"
+DOWNLOAD_URL = f"https://github.com/gochan-org/gochan/releases/download/{VERSION}/{DIR}.tar.gz"
 JS_DIR = path.join(DIR, "html/js/")
 
 if __name__ == "__main__":
@@ -20,7 +20,7 @@ if __name__ == "__main__":
 	if len(sys.argv) == 2:
 		match sys.argv[1]:
 			case "-h" | "--help":
-				print("usage: {} [path/to/out/js/]".format(sys.argv[0]))
+				print(f"usage: {sys.argv[0]} [path/to/out/js/]")
 				sys.exit(0)
 			case _:
 				out_dir = sys.argv[1]
diff --git a/tools/selenium_testing/options.py b/tools/selenium_testing/options.py
index 35a14687..7a64fe4f 100644
--- a/tools/selenium_testing/options.py
+++ b/tools/selenium_testing/options.py
@@ -132,7 +132,7 @@ class TestingOptions:
 			case ""|None:
 				raise ValueError("browser argument is required")
 			case _:
-				raise ValueError("Unrecognized browser argument %s" % browser)
+				raise ValueError(f"Unrecognized browser argument {browser}")
 
 
 	def boards_json(self) -> dict[str, object]:
diff --git a/tools/selenium_testing/runtests.py b/tools/selenium_testing/runtests.py
index 7513a369..ed451beb 100755
--- a/tools/selenium_testing/runtests.py
+++ b/tools/selenium_testing/runtests.py
@@ -21,7 +21,7 @@ def start_tests(dict_options:dict[str,object]=None):
 	options = TestingOptions.from_dict(dict_options)
 	set_active_options(options)
 	single_test = dict_options.get("single_test", "")
-	print("Using browser %s (headless: %s) on site %s" % (options.browser, options.headless, options.site))
+	print(f"Using browser {options.browser} (headless: {options.headless}) on site {options.site}")
 	if single_test == "":
 		suite = unittest.suite.TestSuite()
 		SeleniumTestCase.add(suite, options, TestPosting)
@@ -69,7 +69,7 @@ def setup_selenium_args(parser:ArgumentParser):
 	parser.add_argument("--keep-open", action="store_true",
 		help="If set, the browser windows will not automatically close after the tests are complete")
 	parser.add_argument("--site", default=default_site,
-		help=("Sets the site to be used for testing, defaults to %s" % default_site))
+		help=f"Sets the site to be used for testing, defaults to {default_site}")
 	parser.add_argument("--board1", default=default_board1,
 		help="Sets the main board to be used for testing. It must already be created or tests that use it will fail")
 	parser.add_argument("--board2", default=default_board2,
@@ -102,14 +102,14 @@ def setup_selenium_args(parser:ArgumentParser):
 		help="Sets the password to be used when logging in as a janitor. Janitor tests will fail if this does not exist")
 	parser.add_argument("--single-test", default="",
 		help="If specified, only the test method with this name will be run")
-	
+
 	return parser.parse_args()
 
 
 if __name__ == "__main__":
 	parser = ArgumentParser(description="Browser testing via Selenium")
 	args = setup_selenium_args(parser)
-	
+
 	try:
 		start_tests(args.__dict__)
 	except KeyboardInterrupt:
diff --git a/tools/selenium_testing/tests/test_posting.py b/tools/selenium_testing/tests/test_posting.py
index 73aad076..f56d875e 100644
--- a/tools/selenium_testing/tests/test_posting.py
+++ b/tools/selenium_testing/tests/test_posting.py
@@ -63,11 +63,11 @@ class TestPosting(SeleniumTestCase):
 
 		cur_url = self.driver.current_url
 		threadID = threadRE.findall(cur_url)[0][1]
-		self.driver.find_element(by=By.CSS_SELECTOR, value=("input#check%s"%threadID)).click()
+		self.driver.find_element(by=By.CSS_SELECTOR, value=f"input#check{threadID}").click()
 		cur_url = self.driver.current_url
 		self.driver.find_element(by=By.CSS_SELECTOR, value="input[name=move_btn]").click()
 		# wait for response to move_btn
-		WebDriverWait(self.driver, 10).until(EC.title_contains("Move thread #%s" % threadID))
+		WebDriverWait(self.driver, 10).until(EC.title_contains(f"Move thread #{threadID}"))
 
 		self.driver.find_element(by=By.CSS_SELECTOR, value="input[type=submit]").click()
 		# wait for response to move request (domove=1)
diff --git a/tools/selenium_testing/util/posting.py b/tools/selenium_testing/util/posting.py
index f6dbc99a..1dc03f00 100644
--- a/tools/selenium_testing/util/posting.py
+++ b/tools/selenium_testing/util/posting.py
@@ -52,7 +52,7 @@ def delete_post(options: TestingOptions, postID:int, password:str):
 	qr_buttons = options.driver.find_element(by=By.ID, value="qr-buttons")
 	if qr_buttons.is_displayed():
 		qr_buttons.find_element(by=By.LINK_TEXT, value="X").click()
-	options.driver.find_element(by=By.CSS_SELECTOR, value=("input#check%s"%postID)).click()
+	options.driver.find_element(by=By.CSS_SELECTOR, value=f"input#check{postID}").click()
 	if password != "":
 		delPasswordInput = options.driver.find_element(
 			by=By.CSS_SELECTOR,

From c842ca53f593b227b90995dfa2da056903153930 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 03:57:55 +0000
Subject: [PATCH 116/122] refactor: unused parameter should be replaced by
 underscore

Unused parameters in functions or methods should be replaced with `_`
(underscore) or removed.
---
 cmd/gochan/main.go          |  2 +-
 pkg/events/events_test.go   |  6 +++---
 pkg/gcsql/filterhandlers.go | 32 ++++++++++++++++----------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cmd/gochan/main.go b/cmd/gochan/main.go
index 10f44fb1..f556c630 100644
--- a/cmd/gochan/main.go
+++ b/cmd/gochan/main.go
@@ -78,7 +78,7 @@ func main() {
 		gcutil.LogFatal().Err(err).Msg("Failed to initialize the database")
 	}
 	events.TriggerEvent("db-initialized")
-	events.RegisterEvent([]string{"db-views-reset"}, func(trigger string, i ...any) error {
+	events.RegisterEvent([]string{"db-views-reset"}, func(_ string, _ ...any) error {
 		gcutil.LogInfo().Msg("SQL views reset")
 		return nil
 	})
diff --git a/pkg/events/events_test.go b/pkg/events/events_test.go
index 0673d656..184b7003 100644
--- a/pkg/events/events_test.go
+++ b/pkg/events/events_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestPanicRecover(t *testing.T) {
-	RegisterEvent([]string{"TestPanicRecoverEvt"}, func(tr string, i ...any) error {
+	RegisterEvent([]string{"TestPanicRecoverEvt"}, func(_ string, i ...any) error {
 		t.Log("Testing panic recover")
 		t.Log(i[0])
 		return nil
@@ -21,7 +21,7 @@ func TestPanicRecover(t *testing.T) {
 }
 
 func TestEventEditValue(t *testing.T) {
-	RegisterEvent([]string{"TestEventEditValue"}, func(tr string, i ...any) error {
+	RegisterEvent([]string{"TestEventEditValue"}, func(_ string, i ...any) error {
 		p := i[0].(*int)
 		*p += 1
 		return nil
@@ -35,7 +35,7 @@ func TestEventEditValue(t *testing.T) {
 
 func TestMultipleEventTriggers(t *testing.T) {
 	triggered := map[string]bool{}
-	RegisterEvent([]string{"a", "b"}, func(tr string, i ...any) error {
+	RegisterEvent([]string{"a", "b"}, func(tr string, _ ...any) error {
 		triggered[tr] = true
 		return nil
 	})
diff --git a/pkg/gcsql/filterhandlers.go b/pkg/gcsql/filterhandlers.go
index a619f31e..ff35b2e2 100644
--- a/pkg/gcsql/filterhandlers.go
+++ b/pkg/gcsql/filterhandlers.go
@@ -118,87 +118,87 @@ func init() {
 	filterFieldHandlers = map[string]FilterConditionHandler{
 		"name": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, p.Name)
 			},
 		},
 		"trip": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, p.Tripcode)
 			},
 		},
 		"email": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, p.Email)
 			},
 		},
 		"subject": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, p.Subject)
 			},
 		},
 		"body": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, p.MessageRaw)
 			},
 		},
 		"firsttimeboard": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				return firstPost(p, false)
 			},
 		},
 		"notfirsttimeboard": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				first, err := firstPost(p, false)
 				return !first, err
 			},
 		},
 		"firsttimesite": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				return firstPost(p, true)
 			},
 		},
 		"notfirsttimesite": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				first, err := firstPost(p, true)
 				return !first, err
 			},
 		},
 		"isop": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				return p.IsTopPost, nil
 			},
 		},
 		"notop": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, p *Post, _ *Upload, _ *FilterCondition) (bool, error) {
 				return !p.IsTopPost, nil
 			},
 		},
 		"hasfile": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, u *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, _ *Post, u *Upload, _ *FilterCondition) (bool, error) {
 				return u != nil, nil
 			},
 		},
 		"nofile": &conditionHandler{
 			fieldType: BooleanField,
-			matchFunc: func(r *http.Request, p *Post, u *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, _ *Post, u *Upload, _ *FilterCondition) (bool, error) {
 				return u == nil, nil
 			},
 		},
 		"filename": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, u *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, _ *Post, u *Upload, fc *FilterCondition) (bool, error) {
 				if u == nil {
 					return false, nil
 				}
@@ -207,7 +207,7 @@ func init() {
 		},
 		"checksum": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, u *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(_ *http.Request, _ *Post, u *Upload, fc *FilterCondition) (bool, error) {
 				if u == nil {
 					return false, nil
 				}
@@ -216,7 +216,7 @@ func init() {
 		},
 		"useragent": &conditionHandler{
 			fieldType: StringField,
-			matchFunc: func(r *http.Request, p *Post, _ *Upload, fc *FilterCondition) (bool, error) {
+			matchFunc: func(r *http.Request, _ *Post, _ *Upload, fc *FilterCondition) (bool, error) {
 				return matchString(fc, r.UserAgent())
 			},
 		},

From 39fdc0566fd4ccaa7b04997d0334ba9252613e5a Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 04:05:57 +0000
Subject: [PATCH 117/122] refactor: fix unused method receiver

Methods with unused receivers can be a symptom of unfinished refactoring or a bug. To keep
the same method signature, omit the receiver name or '_' as it is unused.
---
 cmd/gochan-migration/internal/gcupdate/gcupdate.go | 2 +-
 cmd/gochan-migration/internal/pre2021/bans.go      | 2 +-
 cmd/gochan-migration/internal/pre2021/posts.go     | 2 +-
 pkg/server/serverutil/util_test.go                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/gochan-migration/internal/gcupdate/gcupdate.go b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
index faaf69b8..5b7a9209 100644
--- a/cmd/gochan-migration/internal/gcupdate/gcupdate.go
+++ b/cmd/gochan-migration/internal/gcupdate/gcupdate.go
@@ -22,7 +22,7 @@ type GCDatabaseUpdater struct {
 }
 
 // IsMigratingInPlace implements common.DBMigrator.
-func (dbu *GCDatabaseUpdater) IsMigratingInPlace() bool {
+func (*GCDatabaseUpdater) IsMigratingInPlace() bool {
 	return true
 }
 
diff --git a/cmd/gochan-migration/internal/pre2021/bans.go b/cmd/gochan-migration/internal/pre2021/bans.go
index 5a0bfd10..19027380 100644
--- a/cmd/gochan-migration/internal/pre2021/bans.go
+++ b/cmd/gochan-migration/internal/pre2021/bans.go
@@ -66,7 +66,7 @@ func (m *Pre2021Migrator) migrateBansInPlace() error {
 	return m.migrateBansToNewDB()
 }
 
-func (m *Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int, errEv *zerolog.Event) error {
+func (*Pre2021Migrator) migrateBan(tx *sql.Tx, ban *migrationBan, boardID *int, errEv *zerolog.Event) error {
 	migratedBan := &gcsql.IPBan{
 		BoardID:    boardID,
 		RangeStart: ban.ip,
diff --git a/cmd/gochan-migration/internal/pre2021/posts.go b/cmd/gochan-migration/internal/pre2021/posts.go
index 3fa474fc..a773fb35 100644
--- a/cmd/gochan-migration/internal/pre2021/posts.go
+++ b/cmd/gochan-migration/internal/pre2021/posts.go
@@ -32,7 +32,7 @@ type migrationPost struct {
 	oldParentID int
 }
 
-func (m *Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *zerolog.Event) error {
+func (*Pre2021Migrator) migratePost(tx *sql.Tx, post *migrationPost, errEv *zerolog.Event) error {
 	var err error
 	opts := &gcsql.RequestOptions{Tx: tx}
 	if post.oldParentID == 0 {
diff --git a/pkg/server/serverutil/util_test.go b/pkg/server/serverutil/util_test.go
index 903a04c2..bd9879d9 100644
--- a/pkg/server/serverutil/util_test.go
+++ b/pkg/server/serverutil/util_test.go
@@ -62,7 +62,7 @@ type testResponseWriter struct {
 func (w *testResponseWriter) Header() http.Header {
 	return w.header
 }
-func (w *testResponseWriter) Write([]byte) (int, error) {
+func (*testResponseWriter) Write([]byte) (int, error) {
 	return 0, nil
 }
 func (w *testResponseWriter) WriteHeader(s int) {

From 0244811a7fcc8e2400801b39447161522771c06e Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 20:33:33 -0800
Subject: [PATCH 118/122] Fix more deepsource issues

---
 .../internal/pre2021/pre2021_test.go          |  2 +-
 pkg/manage/actionsModPerm.go                  |  2 +-
 pkg/posting/formatting.go                     | 24 +++++++++----------
 pkg/posting/formatting_test.go                | 19 +++++++++++++++
 pkg/server/serverutil/antispam_test.go        |  2 +-
 pkg/server/serverutil/util_test.go            |  4 ++--
 tools/get_js.py                               |  2 +-
 .../tests/test_staff_permissions.py           |  2 +-
 8 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/cmd/gochan-migration/internal/pre2021/pre2021_test.go b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
index d424eb53..5afa2afa 100644
--- a/cmd/gochan-migration/internal/pre2021/pre2021_test.go
+++ b/cmd/gochan-migration/internal/pre2021/pre2021_test.go
@@ -38,7 +38,7 @@ func setupMigrationTest(t *testing.T, outDir string, migrateInPlace bool) *Pre20
 		}
 		defer oldDbFile.Close()
 
-		newDbFile, err := os.OpenFile(migratedDBHost, os.O_CREATE|os.O_WRONLY, 0644)
+		newDbFile, err := os.OpenFile(migratedDBHost, os.O_CREATE|os.O_WRONLY, 0600)
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
diff --git a/pkg/manage/actionsModPerm.go b/pkg/manage/actionsModPerm.go
index 36047d1a..52cffd05 100644
--- a/pkg/manage/actionsModPerm.go
+++ b/pkg/manage/actionsModPerm.go
@@ -219,7 +219,7 @@ func filterHitsCallback(writer http.ResponseWriter, request *http.Request, staff
 			errEv.Err(err).Caller().RawJSON("postData", []byte(hit.PostData)).Msg("Unable to marshal un-minified post data")
 			return nil, err
 		}
-		hitsJSON = append(hitsJSON, template.HTML(strings.ReplaceAll(jsonBuf.String(), "\n", "<br>")))
+		hitsJSON = append(hitsJSON, template.HTML(strings.ReplaceAll(jsonBuf.String(), "\n", "<br>"))) // skipcq: GSC-G203
 	}
 	var buf bytes.Buffer
 	if err = serverutil.MinifyTemplate(gctemplates.ManageFilterHits, map[string]any{
diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 7f9812f5..46eab445 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -18,7 +18,7 @@ var (
 	msgfmtr         MessageFormatter
 	urlRE           = regexp.MustCompile(`https?://(\S+)`)
 	unsetBBcodeTags = []string{"center", "color", "img", "quote", "size"}
-	diceRoller      = regexp.MustCompile(`(?i)\[(\d*)d(\d+)(?:([+-])(\d+))?\]`)
+	diceRoller      = regexp.MustCompile(`(?i)(\S*)\[(\d*)d(\d+)(?:([+-])(\d+))?\](\S*)`)
 )
 
 // InitPosting prepares the formatter and the temp post pruner
@@ -142,13 +142,13 @@ func ApplyDiceRoll(p *gcsql.Post) (rollSum int, err error) {
 			continue
 		}
 		numDice := 1
-		if roll[1] != "" {
-			numDice, err = strconv.Atoi(roll[1])
+		if roll[2] != "" {
+			numDice, err = strconv.Atoi(roll[2])
 			if err != nil {
 				return 0, err
 			}
 		}
-		dieSize, err := strconv.Atoi(roll[2])
+		dieSize, err := strconv.Atoi(roll[3])
 		if err != nil {
 			return 0, err
 		}
@@ -157,27 +157,27 @@ func ApplyDiceRoll(p *gcsql.Post) (rollSum int, err error) {
 		}
 		for i := 0; i < numDice; i++ {
 			rollSum += rand.Intn(dieSize) + 1 // skipcq: GSC-G404
-			switch roll[3] {
+			switch roll[4] {
 			case "+":
-				mod, err := strconv.Atoi(roll[4])
+				mod, err := strconv.Atoi(roll[5])
 				if err != nil {
 					return 0, err
 				}
 				rollSum += mod
 			case "-":
-				mod, err := strconv.Atoi(roll[4])
+				mod, err := strconv.Atoi(roll[5])
 				if err != nil {
 					return 0, err
 				}
 				rollSum -= mod
 			}
 		}
-		words[w] = fmt.Sprintf(`<span class="dice-roll">%dd%d`, numDice, dieSize)
-		if roll[3] != "" {
-			words[w] += roll[3] + roll[4]
+		words[w] = fmt.Sprintf(`%s<span class="dice-roll">%dd%d`, roll[1], numDice, dieSize)
+		if roll[4] != "" {
+			words[w] += roll[4] + roll[5]
 		}
-		words[w] += fmt.Sprintf(" = %d</span>", rollSum)
+		words[w] += fmt.Sprintf(" = %d</span>%s", rollSum, roll[6])
 	}
-	p.Message = template.HTML(strings.Join(words, " "))
+	p.Message = template.HTML(strings.Join(words, " ")) // skipcq: GSC-G203
 	return
 }
diff --git a/pkg/posting/formatting_test.go b/pkg/posting/formatting_test.go
index 9eedeb38..2013c561 100644
--- a/pkg/posting/formatting_test.go
+++ b/pkg/posting/formatting_test.go
@@ -74,6 +74,25 @@ var (
 			expectMin: 1,
 			expectMax: 8,
 		},
+		{
+			desc: "before[1d6]after, no space",
+			post: gcsql.Post{
+				MessageRaw: "before[1d6]after",
+			},
+			matcher:   regexp.MustCompile(`before<span class="dice-roll">1d6 = \d</span>after`),
+			expectMin: 1,
+			expectMax: 6,
+		},
+		{
+			desc: "before [1d6] after, no space (test for injection)",
+			post: gcsql.Post{
+				MessageRaw: `<script>alert("lol")</script>[1d6]<script>alert("lmao")</script>`,
+			},
+			expectError: false,
+			matcher:     regexp.MustCompile(`&lt;script&gt;alert\(&#34;lol&#34;\)&lt;/script&gt;<span class="dice-roll">1d6 = \d</span>&lt;script&gt;alert\(&#34;lmao&#34;\)&lt;/script&gt;`),
+			expectMin:   1,
+			expectMax:   6,
+		},
 	}
 )
 
diff --git a/pkg/server/serverutil/antispam_test.go b/pkg/server/serverutil/antispam_test.go
index 6c06984a..52172b12 100644
--- a/pkg/server/serverutil/antispam_test.go
+++ b/pkg/server/serverutil/antispam_test.go
@@ -52,7 +52,7 @@ type checkRefererTestCase struct {
 func TestCheckReferer(t *testing.T) {
 	config.SetVersion("4.0.0")
 	systemCriticalConfig := config.GetSystemCriticalConfig()
-	req, err := http.NewRequest("GET", "http://gochan.org", nil)
+	req, err := http.NewRequest("GET", "https://gochan.org", nil)
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
diff --git a/pkg/server/serverutil/util_test.go b/pkg/server/serverutil/util_test.go
index bd9879d9..e86ebd01 100644
--- a/pkg/server/serverutil/util_test.go
+++ b/pkg/server/serverutil/util_test.go
@@ -36,7 +36,7 @@ type isRequestingJSONTestCase struct {
 }
 
 func TestIsRequestingJSON(t *testing.T) {
-	req, _ := http.NewRequest("GET", "http://localhost:8080", nil)
+	req, _ := http.NewRequest("GET", "https://localhost:8080", nil)
 	assert.False(t, IsRequestingJSON(req))
 	for _, tc := range isRequestingJSONTestCases {
 		t.Run("GET "+tc.val, func(t *testing.T) {
@@ -70,7 +70,7 @@ func (w *testResponseWriter) WriteHeader(s int) {
 }
 
 func TestDeleteCookie(t *testing.T) {
-	req, _ := http.NewRequest("GET", "http://localhost:8080", nil)
+	req, _ := http.NewRequest("GET", "https://localhost:8080", nil)
 	writer := testResponseWriter{
 		header: make(http.Header),
 	}
diff --git a/tools/get_js.py b/tools/get_js.py
index 11ca6d5c..8fa8557b 100755
--- a/tools/get_js.py
+++ b/tools/get_js.py
@@ -25,7 +25,7 @@ if __name__ == "__main__":
 			case _:
 				out_dir = sys.argv[1]
 
-	with urlopen(DOWNLOAD_URL) as response:
+	with urlopen(DOWNLOAD_URL) as response: # skipcq: BAN-B310
 		data = response.read()
 		tar_bytes = gzip.decompress(data)
 		buf = io.BytesIO(tar_bytes)
diff --git a/tools/selenium_testing/tests/test_staff_permissions.py b/tools/selenium_testing/tests/test_staff_permissions.py
index 521e5955..e36dea69 100644
--- a/tools/selenium_testing/tests/test_staff_permissions.py
+++ b/tools/selenium_testing/tests/test_staff_permissions.py
@@ -27,7 +27,7 @@ class TestStaffPermissions(SeleniumTestCase):
 		req = Request(urljoin(options.site, "manage/actions"))
 		# modern browsers add pretty printing to JSON so we need to pass the session cookie to a request to get the raw action list data
 		req.add_header("Cookie", f"sessiondata={cookie}")
-		with urlopen(req) as resp:
+		with urlopen(req) as resp: # skipcq: BAN-B310
 			global actions
 			actions = json.load(resp)
 

From 282f32c88d3dc3906e2ab0a9acece386ae4a895d Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Tue, 18 Feb 2025 20:49:43 -0800
Subject: [PATCH 119/122] Bump build version for v4.1 release

---
 build.py                   | 2 +-
 frontend/package-lock.json | 4 ++--
 frontend/package.json      | 2 +-
 html/error/404.html        | 2 +-
 html/error/500.html        | 2 +-
 html/error/502.html        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.py b/build.py
index e2c6feb6..92318b2f 100755
--- a/build.py
+++ b/build.py
@@ -39,7 +39,7 @@ release_files = (
 	"README.md",
 )
 
-GOCHAN_VERSION = "4.0.2"
+GOCHAN_VERSION = "4.1.0"
 DATABASE_VERSION = "4"  # stored in DBNAME.DBPREFIXdatabase_version
 
 PATH_NOTHING = -1
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 40b8f3a3..1bc88fd2 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "gochan.js",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "gochan.js",
-      "version": "4.0.2",
+      "version": "4.1.0",
       "license": "BSD-2-Clause",
       "dependencies": {
         "jquery": "^3.7.1",
diff --git a/frontend/package.json b/frontend/package.json
index 79eadec7..160f51ec 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gochan.js",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "",
   "main": "./ts/main.ts",
   "private": true,
diff --git a/html/error/404.html b/html/error/404.html
index 602780fd..efe84544 100755
--- a/html/error/404.html
+++ b/html/error/404.html
@@ -7,6 +7,6 @@
 <h1>404: File not found</h1>
 <img src="/error/lol 404.gif" alt="lol 404">
 <p>The requested file could not be found on this server.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.1.0
 </body>
 </html>
\ No newline at end of file
diff --git a/html/error/500.html b/html/error/500.html
index 8fe12c28..fd1643cb 100755
--- a/html/error/500.html
+++ b/html/error/500.html
@@ -7,6 +7,6 @@
 <h1>Error 500: Internal Server error</h1>
 <img src="/error/server500.gif" alt="server burning">
 <p>The server encountered an error while trying to serve the page, and we apologize for the inconvenience. The <a href="https://en.wikipedia.org/wiki/Idiot">system administrator</a> will try to fix things as soon they get around to it, whenever that is. Hopefully soon.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.1.0
 </body>
 </html>
\ No newline at end of file
diff --git a/html/error/502.html b/html/error/502.html
index e5644dd5..d6013c5e 100644
--- a/html/error/502.html
+++ b/html/error/502.html
@@ -7,6 +7,6 @@
 <h1>Error 502: Bad gateway</h1>
 <img src="/error/server500.gif" alt="server burning">
 <p>The server encountered an error while trying to serve the page, and we apologize for the inconvenience. The <a href="https://en.wikipedia.org/wiki/Idiot">system administrator</a> will try to fix things as soon they get around to it, whenever that is. Hopefully soon.</p>
-<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.0.2
+<hr/>Site powered by <a href="https://github.com/gochan-org/gochan" target="_blank">Gochan</a> v4.1.0
 </body>
 </html>
\ No newline at end of file

From 0ec52bfdf1b99412e13b8d93fbc6cef75369ec17 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Wed, 19 Feb 2025 17:10:57 -0800
Subject: [PATCH 120/122] Improve dice roll parsing

---
 pkg/posting/formatting.go      | 85 +++++++++++++++------------------
 pkg/posting/formatting_test.go | 87 ++++++++++++++++++++++++----------
 pkg/posting/post.go            |  2 +-
 3 files changed, 101 insertions(+), 73 deletions(-)

diff --git a/pkg/posting/formatting.go b/pkg/posting/formatting.go
index 46eab445..ac704c65 100644
--- a/pkg/posting/formatting.go
+++ b/pkg/posting/formatting.go
@@ -1,6 +1,7 @@
 package posting
 
 import (
+	"errors"
 	"fmt"
 	"html/template"
 	"math/rand"
@@ -18,7 +19,7 @@ var (
 	msgfmtr         MessageFormatter
 	urlRE           = regexp.MustCompile(`https?://(\S+)`)
 	unsetBBcodeTags = []string{"center", "color", "img", "quote", "size"}
-	diceRoller      = regexp.MustCompile(`(?i)(\S*)\[(\d*)d(\d+)(?:([+-])(\d+))?\](\S*)`)
+	diceRollRE      = regexp.MustCompile(`\[(\d*)d(\d+)(?:([+-])(\d+))?\]`)
 )
 
 // InitPosting prepares the formatter and the temp post pruner
@@ -134,50 +135,42 @@ func FormatMessage(message string, boardDir string) (template.HTML, error) {
 	return template.HTML(strings.Join(postLines, "<br />")), nil // skipcq: GSC-G203
 }
 
-func ApplyDiceRoll(p *gcsql.Post) (rollSum int, err error) {
-	words := strings.Split(string(p.Message), " ")
-	for w, word := range words {
-		roll := diceRoller.FindStringSubmatch(word)
-		if len(roll) == 0 {
-			continue
-		}
-		numDice := 1
-		if roll[2] != "" {
-			numDice, err = strconv.Atoi(roll[2])
-			if err != nil {
-				return 0, err
-			}
-		}
-		dieSize, err := strconv.Atoi(roll[3])
-		if err != nil {
-			return 0, err
-		}
-		if numDice < 1 || dieSize < 1 {
-			return 0, fmt.Errorf("dice roll too small")
-		}
-		for i := 0; i < numDice; i++ {
-			rollSum += rand.Intn(dieSize) + 1 // skipcq: GSC-G404
-			switch roll[4] {
-			case "+":
-				mod, err := strconv.Atoi(roll[5])
-				if err != nil {
-					return 0, err
-				}
-				rollSum += mod
-			case "-":
-				mod, err := strconv.Atoi(roll[5])
-				if err != nil {
-					return 0, err
-				}
-				rollSum -= mod
-			}
-		}
-		words[w] = fmt.Sprintf(`%s<span class="dice-roll">%dd%d`, roll[1], numDice, dieSize)
-		if roll[4] != "" {
-			words[w] += roll[4] + roll[5]
-		}
-		words[w] += fmt.Sprintf(" = %d</span>%s", rollSum, roll[6])
+func diceRoller(numDice int, diceSides int, modifier int) int {
+	rollSum := 0
+	for i := 0; i < numDice; i++ {
+		rollSum += rand.Intn(diceSides) + 1 // skipcq: GSC-G404
 	}
-	p.Message = template.HTML(strings.Join(words, " ")) // skipcq: GSC-G203
-	return
+	return rollSum + modifier
+}
+
+func ApplyDiceRoll(p *gcsql.Post) error {
+	var err error
+	result := diceRollRE.ReplaceAllStringFunc(string(p.Message), func(roll string) string {
+		rollMatch := diceRollRE.FindStringSubmatch(roll)
+		numDice := 1
+		if rollMatch[1] != "" {
+			numDice, _ = strconv.Atoi(rollMatch[1])
+		}
+		if numDice < 1 {
+			err = errors.New("number of dice must be at least 1")
+			return roll
+		}
+		dieSize, _ := strconv.Atoi(rollMatch[2])
+		if dieSize <= 1 {
+			err = errors.New("die size must be greater than 1")
+			return roll
+		}
+		modifierIsNegative := rollMatch[3] == "-"
+		modifier, _ := strconv.Atoi(rollMatch[4])
+		if modifierIsNegative {
+			modifier = -modifier
+		}
+		rollSum := diceRoller(numDice, dieSize, modifier)
+		return fmt.Sprintf(`<span class="dice-roll">%dd%d%s%s = %d</span>`, numDice, dieSize, rollMatch[3], rollMatch[4], rollSum)
+	})
+	if err != nil {
+		return err
+	}
+	p.Message = template.HTML(result) // skipcq: GSC-G203
+	return nil
 }
diff --git a/pkg/posting/formatting_test.go b/pkg/posting/formatting_test.go
index 2013c561..d6c79039 100644
--- a/pkg/posting/formatting_test.go
+++ b/pkg/posting/formatting_test.go
@@ -39,31 +39,31 @@ end)`
 var (
 	diceTestCases = []diceRollerTestCase{
 		{
-			desc: "[1d6]",
+			desc: "[2d6]",
 			post: gcsql.Post{
-				MessageRaw: "before [1d6] after",
+				MessageRaw: "[2d6]",
 			},
-			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6 = \d</span> after`),
-			expectMin: 1,
-			expectMax: 6,
-		},
-		{
-			desc: "[1d6+1]",
-			post: gcsql.Post{
-				MessageRaw: "before [1d6+1] after",
-			},
-			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6\+1 = \d</span> after`),
+			matcher:   regexp.MustCompile(`<span class="dice-roll">2d6 = \d{1,2}</span>`),
 			expectMin: 2,
-			expectMax: 7,
+			expectMax: 12,
 		},
 		{
-			desc: "[1d6-1]",
+			desc: "[2d6+1]",
 			post: gcsql.Post{
-				MessageRaw: "before [1d6-1] after",
+				MessageRaw: "[2d6+1]",
 			},
-			matcher:   regexp.MustCompile(`before <span class="dice-roll">1d6-1 = \d</span> after`),
-			expectMin: 0,
-			expectMax: 5,
+			matcher:   regexp.MustCompile(`<span class="dice-roll">2d6\+1 = \d{1,2}</span>`),
+			expectMin: 3,
+			expectMax: 13,
+		},
+		{
+			desc: "[2d6-1]",
+			post: gcsql.Post{
+				MessageRaw: "[2d6-1]",
+			},
+			matcher:   regexp.MustCompile(`<span class="dice-roll">2d6-1 = \d{1,2}</span>`),
+			expectMin: 1,
+			expectMax: 11,
 		},
 		{
 			desc: "[d8]",
@@ -88,10 +88,48 @@ var (
 			post: gcsql.Post{
 				MessageRaw: `<script>alert("lol")</script>[1d6]<script>alert("lmao")</script>`,
 			},
-			expectError: false,
-			matcher:     regexp.MustCompile(`&lt;script&gt;alert\(&#34;lol&#34;\)&lt;/script&gt;<span class="dice-roll">1d6 = \d</span>&lt;script&gt;alert\(&#34;lmao&#34;\)&lt;/script&gt;`),
-			expectMin:   1,
-			expectMax:   6,
+			matcher:   regexp.MustCompile(`&lt;script&gt;alert\(&#34;lol&#34;\)&lt;/script&gt;<span class="dice-roll">1d6 = \d</span>&lt;script&gt;alert\(&#34;lmao&#34;\)&lt;/script&gt;`),
+			expectMin: 1,
+			expectMax: 6,
+		},
+		{
+			desc: "two dice rolls, no space",
+			post: gcsql.Post{
+				MessageRaw: "[d6][2d6]",
+			},
+			matcher:   regexp.MustCompile(`<span class="dice-roll">1d6 = \d</span><span class="dice-roll">2d6 = \d{1,2}</span>`),
+			expectMin: 0,
+			expectMax: 7,
+		},
+		{
+			desc: "multiple dice rolls, no space",
+			post: gcsql.Post{
+				MessageRaw: "[d6][2d20-2][3d8+1]",
+			},
+			matcher:   regexp.MustCompile(`<span class="dice-roll">1d6 = \d</span><span class="dice-roll">2d20-2 = \d{1,2}</span><span class="dice-roll">3d8\+1 = \d{1,2}</span>`),
+			expectMin: 0,
+			expectMax: 38,
+		},
+		{
+			desc: "invalid number of dice",
+			post: gcsql.Post{
+				MessageRaw: "[0d6]",
+			},
+			expectError: true,
+		},
+		{
+			desc: "invalid die size",
+			post: gcsql.Post{
+				MessageRaw: "[1d0]",
+			},
+			expectError: true,
+		},
+		{
+			desc: "invalid modifier",
+			post: gcsql.Post{
+				MessageRaw: "[1d6+]",
+			},
+			matcher: regexp.MustCompile(`\[1d6\+\]`),
 		},
 	}
 )
@@ -148,15 +186,12 @@ func diceRollRunner(t *testing.T, tC *diceRollerTestCase) {
 	var err error
 	tC.post.Message, err = FormatMessage(tC.post.MessageRaw, "")
 	assert.NoError(t, err)
-	result, err := ApplyDiceRoll(&tC.post)
+	err = ApplyDiceRoll(&tC.post)
 	if tC.expectError {
 		assert.Error(t, err)
-		assert.Equal(t, 0, result)
 	} else {
 		assert.NoError(t, err)
 		assert.Regexp(t, tC.matcher, tC.post.Message)
-		assert.GreaterOrEqual(t, result, tC.expectMin)
-		assert.LessOrEqual(t, result, tC.expectMax)
 	}
 	if t.Failed() {
 		t.FailNow()
diff --git a/pkg/posting/post.go b/pkg/posting/post.go
index 3e4999d0..94596508 100644
--- a/pkg/posting/post.go
+++ b/pkg/posting/post.go
@@ -226,7 +226,7 @@ func doFormatting(post *gcsql.Post, board *gcsql.Board, request *http.Request, e
 		errEv.Err(err).Caller().Msg("Unable to format message")
 		return errors.New("unable to format message")
 	}
-	if _, err = ApplyDiceRoll(post); err != nil {
+	if err = ApplyDiceRoll(post); err != nil {
 		errEv.Err(err).Caller().Msg("Error applying dice roll")
 		return err
 	}

From 41fa1f6280c2981924ffb25c4f117b524dcddda3 Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 22 Feb 2025 10:41:54 -0800
Subject: [PATCH 121/122] Migrate SCSS, replace usage of @import with @use
 https://sass-lang.com/documentation/breaking-changes/import/

---
 frontend/sass/_yotsubacommon.scss    |  4 +--
 frontend/sass/bunkerchan.scss        | 30 +++++++++---------
 frontend/sass/bunkerchan/_front.scss |  6 ++--
 frontend/sass/bunkerchan/_img.scss   | 14 ++++-----
 frontend/sass/burichan.scss          | 26 ++++++++--------
 frontend/sass/burichan/_img.scss     | 15 ++++-----
 frontend/sass/burichan/_manage.scss  |  8 ++---
 frontend/sass/clear.scss             | 36 +++++++++++-----------
 frontend/sass/dark.scss              | 38 +++++++++++------------
 frontend/sass/darkbunker.scss        | 30 +++++++++---------
 frontend/sass/darkbunker/_img.scss   | 16 +++++-----
 frontend/sass/global.scss            | 16 +++++-----
 frontend/sass/global/_img.scss       |  2 +-
 frontend/sass/global/_lightbox.scss  | 21 +++++--------
 frontend/sass/global/_qr.scss        |  6 ++--
 frontend/sass/photon.scss            | 20 ++++++------
 frontend/sass/photon/_img.scss       | 20 ++++++------
 frontend/sass/pipes.scss             | 46 ++++++++++++++--------------
 frontend/sass/pipes/_front.scss      | 18 +++++------
 frontend/sass/pipes/_img.scss        | 16 +++++-----
 frontend/sass/pipes/_manage.scss     |  8 ++---
 frontend/sass/win9x.scss             | 42 ++++++++++++-------------
 frontend/sass/yotsuba.scss           | 28 ++++++++---------
 frontend/sass/yotsubab.scss          | 26 ++++++++--------
 html/css/global.css                  | 20 ------------
 25 files changed, 244 insertions(+), 268 deletions(-)

diff --git a/frontend/sass/_yotsubacommon.scss b/frontend/sass/_yotsubacommon.scss
index b4ed4169..702f0a58 100644
--- a/frontend/sass/_yotsubacommon.scss
+++ b/frontend/sass/_yotsubacommon.scss
@@ -1,4 +1,4 @@
-@import 'util';
+@use 'util';
 
 @mixin yotsuba(
 	$fadepath,
@@ -106,5 +106,5 @@
 		border: 1px dashed #222;
 	}
 
-	@include upload-box(#aaa, #444, #666);
+	@include util.upload-box(#aaa, #444, #666);
 }
\ No newline at end of file
diff --git a/frontend/sass/bunkerchan.scss b/frontend/sass/bunkerchan.scss
index 73dde2d3..b606eebe 100644
--- a/frontend/sass/bunkerchan.scss
+++ b/frontend/sass/bunkerchan.scss
@@ -1,12 +1,12 @@
-@import 'bunkerchan/colors';
-@import 'bunkerchan/front';
-@import 'bunkerchan/img';
-@import 'util';
+@use 'bunkerchan/colors';
+@use 'bunkerchan/front';
+@use 'bunkerchan/img';
+@use 'util';
 
 body {
-	background: $bgcol;
-	color: $color;
-	font-family: $font-family;
+	background: colors.$bgcol;
+	color: colors.$color;
+	font-family: colors.$font-family;
 	font-size: 70%;
 }
 
@@ -19,30 +19,30 @@ hr {
 }
 
 a, a:visited {
-	color: $topborder;
+	color: colors.$topborder;
 	text-decoration: none;
 }
 
 div#staff, select.post-actions {
-	background: $topbarbg;
-	border: 1px solid $topborder;
+	background: colors.$topbarbg;
+	border: 1px solid colors.$topborder;
 }
 
 div#topbar,
 div#topbar a,
 div#topbar a:visited,
 div.dropdown-menu {
-	background: $topbarbg;
-	border-bottom: 1px solid $topborder;
+	background: colors.$topbarbg;
+	border-bottom: 1px solid colors.$topborder;
 }
 
 div.dropdown-menu {
-	border-left: 1px solid $topborder;
-	border-right: 1px solid $topborder;
+	border-left: 1px solid colors.$topborder;
+	border-right: 1px solid colors.$topborder;
 }
 
 div.dropdown-menu a:hover, div.dropdown-menu a:active {
-	background: $bgcol;
+	background: colors.$bgcol;
 }
 
 table#pages, table#pages * {
diff --git a/frontend/sass/bunkerchan/_front.scss b/frontend/sass/bunkerchan/_front.scss
index 496027b5..269190b5 100644
--- a/frontend/sass/bunkerchan/_front.scss
+++ b/frontend/sass/bunkerchan/_front.scss
@@ -1,8 +1,8 @@
-@import 'colors';
+@use 'colors';
 
 div.section-title-block {
-	background: $topbarbg;
-	border: 1px solid $topborder;
+	background: colors.$topbarbg;
+	border: 1px solid colors.$topborder;
 	border-radius: 5px 5px 0px 0px;
 }
 
diff --git a/frontend/sass/bunkerchan/_img.scss b/frontend/sass/bunkerchan/_img.scss
index df840890..68326cce 100644
--- a/frontend/sass/bunkerchan/_img.scss
+++ b/frontend/sass/bunkerchan/_img.scss
@@ -1,15 +1,15 @@
-@import 'colors';
+@use 'colors';
 
 %formstyle {
-	background: $inputbg;
-	border: 1px double $inputborder;
-	color: $color;
+	background: colors.$inputbg;
+	border: 1px double colors.$inputborder;
+	color: colors.$color;
 }
 
 %darkselect {
-	background: $inputbg2;
+	background: colors.$inputbg2;
 	border-radius: 5px;
-	color: $color;
+	color: colors.$color;
 	@extend %formstyle;
 }
 
@@ -34,7 +34,7 @@ table#postbox-static, div#report-delbox, form#filterform {
 		@extend %darkselect;
 	}
 	button, input[type=submit] {
-		background: $inputbg2;
+		background: colors.$inputbg2;
 	}
 }
 
diff --git a/frontend/sass/burichan.scss b/frontend/sass/burichan.scss
index 38d47de0..2502f30b 100644
--- a/frontend/sass/burichan.scss
+++ b/frontend/sass/burichan.scss
@@ -1,17 +1,17 @@
-@import 'util';
-@import 'burichan/colors';
-@import 'burichan/img';
-@import 'burichan/front';
-@import 'burichan/manage';
+@use 'util';
+@use 'burichan/colors';
+@use 'burichan/img';
+@use 'burichan/front';
+@use 'burichan/manage';
 
 body {
-	font: $font;
-	background: $bgcol;
+	font: colors.$font;
+	background: colors.$bgcol;
 	margin: 8px;
 }
 
 a, a:visited {
-	color: $linkcol;
+	color: colors.$linkcol;
 	text-decoration: none;
 }
 
@@ -36,7 +36,7 @@ h3 {
 }
 
 h1, h2 {
-	font-family: $hfont-family;
+	font-family: colors.$hfont-family;
 }
 
 h1, h2, h3 {
@@ -45,7 +45,7 @@ h1, h2, h3 {
 }
 
 div#topbar {
-	@include shadow-filter(3px 5px 6px $shadowcol);
+	@include util.shadow-filter(3px 5px 6px colors.$shadowcol);
 	min-height: 1.5em;
 }
 
@@ -55,13 +55,13 @@ a.topbar-item:visited,
 .dropdown-button,
 div.dropdown-menu {
 	background: #080e5e;
-	color: $bgcol;
+	color: colors.$bgcol;
 }
 
 div.dropdown-menu {
-	@include shadow-filter(3px 5px 6px $shadowcol);
+	@include util.shadow-filter(3px 5px 6px colors.$shadowcol);
 	a, h3 {
-		color: $bgcol;
+		color: colors.$bgcol;
 	}
 }
 
diff --git a/frontend/sass/burichan/_img.scss b/frontend/sass/burichan/_img.scss
index 9a94bb94..36267fd1 100644
--- a/frontend/sass/burichan/_img.scss
+++ b/frontend/sass/burichan/_img.scss
@@ -1,14 +1,15 @@
-@import 'colors';
-@import '../global/colors';
+@use 'colors';
+@use '../global/colors' as global-colors;
+@use "../util";
 
 h1#board-title {
 	font-family: serif;
 	font-size: 2em;
-	color: $headercol;
+	color: global-colors.$headercol;
 }
 
 .postblock {
-	background:$postblock;
+	background:colors.$postblock;
 }
 
 div.file-info {
@@ -19,7 +20,7 @@ div.file-info {
 span.postername {
 	font-size: 1em;
 	font-family: serif;
-	color: $namecol;
+	color: global-colors.$namecol;
 	font-weight: 800;
 }
 
@@ -34,11 +35,11 @@ select.post-actions,
 div.reply,
 div.postprev,
 div.inlinepostprev {
-	border: 1px solid $bordercol;
+	border: 1px solid colors.$bordercol;
 }
 
 .dice-roll {
 	border: 1px dashed #222;
 }
 
-@include upload-box(#aaa, #444, #666);
\ No newline at end of file
+@include util.upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/burichan/_manage.scss b/frontend/sass/burichan/_manage.scss
index 3f60aba1..114c563e 100644
--- a/frontend/sass/burichan/_manage.scss
+++ b/frontend/sass/burichan/_manage.scss
@@ -1,17 +1,17 @@
-@import 'colors';
-@import '../util';
+@use 'colors';
+@use '../util';
 
 .loginbox input {
 	height: 20%;
 }
 
 .manage-header {
-	background: $bgcol;
+	background: colors.$bgcol;
 	border-radius: 8px;
 }
 
 table.mgmt-table {
 	tr:first-of-type th {
-		background: $postblock;
+		background: colors.$postblock;
 	}
 }
\ No newline at end of file
diff --git a/frontend/sass/clear.scss b/frontend/sass/clear.scss
index 356b173f..1ba74583 100644
--- a/frontend/sass/clear.scss
+++ b/frontend/sass/clear.scss
@@ -1,51 +1,51 @@
-@import 'clear/colors';
-@import './util';
+@use 'clear/colors';
+@use 'util';
 
 body {
-	background: $bgcol;
+	background: colors.$bgcol;
 	font-family: monospace, sans-serif;
 	font-size: 80%;
 }
 
 div#topbar {
-	background: $topbarbg;
-	border-bottom: 1px solid $topbarborder;
+	background: colors.$topbarbg;
+	border-bottom: 1px solid colors.$topbarborder;
 }
 
 a {
-	color: $linkcol;
+	color: colors.$linkcol;
 	text-decoration: none;
 	&:hover {
-		text-shadow: 0px 0px 5px $hrcol;
+		text-shadow: 0px 0px 5px colors.$hrcol;
 	}
 }
 
 header {
-	color: $headercol;
+	color: colors.$headercol;
 }
 
 hr {
 	border: none;
-	border-top: 1px solid $hrcol;
+	border-top: 1px solid colors.$hrcol;
 	height: 0;
 }
 
 div#content {
 	input, select, textarea {
-		border: 1px double $inputshadow;
+		border: 1px double colors.$inputshadow;
 		border-radius: 5px;
-		background: $inputcol;
+		background: colors.$inputcol;
 		color: #000;
 	}
 	input:active, select:active, textarea:active {
-		@include shadow-filter(0px 0px 5px $replyborder);
+		@include util.shadow-filter(0px 0px 5px colors.$replyborder);
 	}
 	input[type="button"],
 	input[type="submit"],
 	input[type="file"]::file-selector-button,
 	input[type="file"]::webkit-file-upload-button {
 		background: #A7A7A7;
-		border: 3px double $inputshadow;
+		border: 3px double colors.$inputshadow;
 		border-radius: 5px;
 		color: #000;
 	}
@@ -58,14 +58,14 @@ th.postblock,
 div.postprev,
 div.inlinepostprev,
 table.mgmt-table tr:first-of-type th {
-	background: $inputcol;
-	border: 1px solid $replyborder;
+	background: colors.$inputcol;
+	border: 1px solid colors.$replyborder;
 	border-radius: 5px;
 }
 
 span.subject {
 	font-weight: 800;
-	color: $subjectcol;
+	color: colors.$subjectcol;
 }
 
 table#pages, table#pages * {
@@ -74,7 +74,7 @@ table#pages, table#pages * {
 
 div.section-title-block {
 	background: #A7A7A7;
-	border-bottom: 1px solid $replyborder;
+	border-bottom: 1px solid colors.$replyborder;
 }
 
-@include upload-box(#aaa, #444, #666);
\ No newline at end of file
+@include util.upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/dark.scss b/frontend/sass/dark.scss
index c28c2078..04ecf774 100644
--- a/frontend/sass/dark.scss
+++ b/frontend/sass/dark.scss
@@ -1,41 +1,41 @@
-@import 'dark/colors';
+@use 'dark/colors';
 
 body {
-	background: $bgcol;
-	font-family: $font-family;
-	color: $color;
+	background: colors.$bgcol;
+	font-family: colors.$font-family;
+	color: colors.$color;
 	// font-size: 80%;
 }
 
 a {
 	text-decoration: none;
-	color: $linkcol;
+	color: colors.$linkcol;
 }
 
 div#topbar {
-	background: $topbarbg;
-	border-bottom: 1px solid $color;
+	background: colors.$topbarbg;
+	border-bottom: 1px solid colors.$color;
 	a {
 		text-shadow: black 1px 1px 1px, black -1px -1px 1px, black -1px 1px 1px, black 1px -1px 1px;
 	}
 }
 
 header {
-	color: $headercol;
+	color: colors.$headercol;
 }
 
 div#content {
 	input:not(div#qrbuttons input),
 	textarea, select {
-		background: $inputbg;
-		border: 1px solid $topbarbg;
-		color: $linkcol;
+		background: colors.$inputbg;
+		border: 1px solid colors.$topbarbg;
+		color: colors.$linkcol;
 	}
 }
 
 th.postblock, table.mgmt-table tr:first-of-type th {
-	background: $blockcol;
-	border: 1px solid $blockborder;
+	background: colors.$blockcol;
+	border: 1px solid colors.$blockborder;
 	border-radius: 5px;
 	text-align: left;
 }
@@ -43,13 +43,13 @@ th.postblock, table.mgmt-table tr:first-of-type th {
 div.reply,
 div.postprev,
 div.inlinepostprev {
-	background: $inputbg;
-	border: 1px solid $replyborder;
+	background: colors.$inputbg;
+	border: 1px solid colors.$replyborder;
 	border-radius: 5px;
 }
 
 span.postername {
-	color: $headercol;
+	color: colors.$headercol;
 	font-weight: bold;
 	a {
 		text-decoration: underline;
@@ -57,18 +57,18 @@ span.postername {
 }
 
 span.tripcode {
-	color: $headercol;
+	color: colors.$headercol;
 }
 
 .dropdown-menu {
-	background: $topbarbg!important;
+	background: colors.$topbarbg!important;
 	b {
 		color: black;
 	}
 }
 
 span.subject {
-	color: $subjectcol;
+	color: colors.$subjectcol;
 }
 
 table#pages, table#pages * {
diff --git a/frontend/sass/darkbunker.scss b/frontend/sass/darkbunker.scss
index 97476b96..6fac77e7 100644
--- a/frontend/sass/darkbunker.scss
+++ b/frontend/sass/darkbunker.scss
@@ -1,59 +1,59 @@
-@import './darkbunker/img';
-@import './darkbunker/vars';
-@import './util';
+@use 'darkbunker/img';
+@use 'darkbunker/vars';
+@use 'util';
 
 body {
-	background: $bgcol;
-	color: $txtcol;
+	background: vars.$bgcol;
+	color: vars.$txtcol;
 	font-family: arial,helvetica,sans-serif;
 	font-size: 10pt;
 }
 
 div#topbar {
-	background: $topbarcol;
-	border-bottom: 2px solid $linkcol;
+	background: vars.$topbarcol;
+	border-bottom: 2px solid vars.$linkcol;
 	* {
 		padding: 0px;
 	}
 }
 
 hr {
-	color: $bordercol;
+	color: vars.$bordercol;
 }
 
 a {
-	color: $linkcol;
+	color: vars.$linkcol;
 	text-decoration: none;
 }
 
 a:hover {
 	background: inherit;
-	color: $linklight;
+	color: vars.$linklight;
 }
 
 header {
 	h1, div#board-subtitle {
 		font-family: tahoma;
-		color: $headercol;
+		color: vars.$headercol;
 	}
 }
 
 th, div.reply {
-	background: $gridcol;
-	border: 1px solid $bordercol;
+	background: vars.$gridcol;
+	border: 1px solid vars.$bordercol;
 }
 
 div.section-block {
 	border: 1px solid white;
 
 	div.section-title-block {
-		background: $blocktitle;
+		background: vars.$blocktitle;
 		border: 1px solid white;
 		font-weight: bold;
 	}
 }
 
 div#frontpage div.section-block:first-child {
-	background: $gridcol;
+	background: vars.$gridcol;
 	// border: none;
 }
\ No newline at end of file
diff --git a/frontend/sass/darkbunker/_img.scss b/frontend/sass/darkbunker/_img.scss
index 52b445f7..0228b59e 100644
--- a/frontend/sass/darkbunker/_img.scss
+++ b/frontend/sass/darkbunker/_img.scss
@@ -1,23 +1,23 @@
-@import './vars';
+@use 'vars';
 
 div#content, div#qr-box {
-	color: $txtcol;
-	border: 1px double $inputshadow;
+	color: vars.$txtcol;
+	border: 1px double vars.$inputshadow;
 	border-radius: 5px;
 
 	textarea,
 	input:not([type="file"]):not([type="checkbox"]),
 	[type="submit"],
 	select {
-		color: $txtcol;
-		background: $gridcol;
-		border: 1px solid $inputshadow;
+		color: vars.$txtcol;
+		background: vars.$gridcol;
+		border: 1px solid vars.$inputshadow;
 		border-radius: 5px;
 	}
 }
 
 div#qr-box {
-	background: $gridcol;
+	background: vars.$gridcol;
 }
 
 form#postform, form#qrpostform {
@@ -29,5 +29,5 @@ form#postform, form#qrpostform {
 
 div#staffmenu, div#watchermenu {
 	background: black;
-	border: 1px solid $txtcol;
+	border: 1px solid vars.$txtcol;
 }
diff --git a/frontend/sass/global.scss b/frontend/sass/global.scss
index cebaf5a1..861b9c10 100644
--- a/frontend/sass/global.scss
+++ b/frontend/sass/global.scss
@@ -1,11 +1,11 @@
-@import 'global/img';
-@import 'global/front';
-@import 'global/manage';
-@import 'global/lightbox';
-@import 'global/qr';
-@import "global/watcher";
-@import 'global/bans';
-@import 'global/animations';
+@use 'global/img';
+@use 'global/front';
+@use 'global/manage';
+@use 'global/lightbox';
+@use 'global/qr';
+@use "global/watcher";
+@use 'global/bans';
+@use 'global/animations';
 
 .increase-line-height {
 	header, .post, .reply {
diff --git a/frontend/sass/global/_img.scss b/frontend/sass/global/_img.scss
index 694f1010..1d3d0588 100755
--- a/frontend/sass/global/_img.scss
+++ b/frontend/sass/global/_img.scss
@@ -1,4 +1,4 @@
-@import 'animations';
+@use 'animations';
 
 #boardmenu-bottom {
 	margin-top: 16px;
diff --git a/frontend/sass/global/_lightbox.scss b/frontend/sass/global/_lightbox.scss
index ea2a12aa..6b797837 100644
--- a/frontend/sass/global/_lightbox.scss
+++ b/frontend/sass/global/_lightbox.scss
@@ -1,4 +1,4 @@
-@import '../util';
+@use '../util';
 
 .lightbox {
 	background:#CDCDCD;
@@ -15,8 +15,7 @@
 }
 
 .lightbox * {
-	// box-shadow: 0px 0px 0px 0px #000000;
-	@include shadow-filter(0px 0px 0px #000);
+	@include util.shadow-filter(0px 0px 0px #000);
 	color:#000000;
 }
 
@@ -44,8 +43,6 @@
 }
 
 .lightbox-title {
-	// font-size:42px;
-	// font-weight:700;
 	text-align:center;
 	margin-top: 0px;
 }
@@ -54,7 +51,6 @@
 	color: #000!important;
 	float: right;
 	font-size: inherit;
-	// font-weight: 700;
 }
 
 .lightbox-x:hover,.lightbox-x:active {
@@ -70,14 +66,14 @@
 .lightbox input[type=password],
 .lightbox input[type=file],
 .lightbox textarea {
-	background:#FFF;
-	border:1px solid #000;
-	color:#000;
+	background: #FFF;
+	border: 1px solid #000;
+	color: #000;
 }
 
 .lightbox textarea#sql-statement {
-	width:95%;
-	height:300px;
+	width: 95%;
+	height: 300px;
 	margin-left: 0px;
 	clear: both;
 	background: #FFF;
@@ -92,8 +88,7 @@
 	border: 1px solid #000;
 	border-radius: 0px;
 	background: #777;
-	// box-shadow: 0px 0px 0px 0px #000000;
-	@include shadow-filter(0px 0px 0px #000);
+	@include util.shadow-filter(0px 0px 0px #000);
 }
 
 #settings-container table textarea {
diff --git a/frontend/sass/global/_qr.scss b/frontend/sass/global/_qr.scss
index 95329d02..0149495b 100644
--- a/frontend/sass/global/_qr.scss
+++ b/frontend/sass/global/_qr.scss
@@ -1,8 +1,8 @@
-@import '../util';
+@use '../util';
 
 div#qr-box {
 	padding:1px;
-	@include box-sizing(border-box);
+	@include util.box-sizing(border-box);
 	min-width: 300px;
 	background:lightgray;
 	border: 1px solid #000;
@@ -13,7 +13,7 @@ div#qr-box {
 		background: #FFF;
 		color: #000;
 		width:100%;
-		@include box-sizing(border-box);
+		@include util.box-sizing(border-box);
 	}
 	input[type=file] {
 		background: lightgray;
diff --git a/frontend/sass/photon.scss b/frontend/sass/photon.scss
index 18a16682..ddeed809 100644
--- a/frontend/sass/photon.scss
+++ b/frontend/sass/photon.scss
@@ -1,10 +1,10 @@
-@import 'photon/colors';
-@import 'photon/img';
-@import 'util';
+@use 'photon/colors';
+@use 'photon/img';
+@use 'util';
 
 body {
-	background: $bgcol;
-	font: 15px $font;
+	background: colors.$bgcol;
+	font: 15px colors.$font;
 }
 
 a {
@@ -18,25 +18,25 @@ div#topbar, div.dropdown-menu {
 }
 
 div#topbar {
-	@include shadow-filter(0px 2px 2px $shadowcol);
+	@include util.shadow-filter(0px 2px 2px colors.$shadowcol);
 }
 
 .dropdown-menu {
 	color: #FFF;
 	background: #000!important;
-	@include shadow-filter(2px 2px 3px $shadowcol);
+	@include util.shadow-filter(2px 2px 3px colors.$shadowcol);
 	z-index: 0;
 	div:hover {
-		background: $dropdowncol;
+		background: colors.$dropdowncol;
 	}
 }
 
 header, div#top-pane, a {
-	color: $linkcol;
+	color: colors.$linkcol;
 }
 
 #site-title, #board-title {
 	font-weight: 800;
 }
 
-@include upload-box(#aaa, #444, #666);
\ No newline at end of file
+@include util.upload-box(#aaa, #444, #666);
\ No newline at end of file
diff --git a/frontend/sass/photon/_img.scss b/frontend/sass/photon/_img.scss
index 3e4ffe9d..486077e8 100644
--- a/frontend/sass/photon/_img.scss
+++ b/frontend/sass/photon/_img.scss
@@ -1,25 +1,25 @@
-@import '../util';
-@import 'colors';
+@use '../util';
+@use 'colors';
 
 div.reply,
 div.postprev,
 div.inlinepostprev,
 th.postblock {
-	background: $replycol;
-	border: 1px solid $replyborder;
-	@include border-radius(5px);
+	background: colors.$replycol;
+	border: 1px solid colors.$replyborder;
+	@include util.border-radius(5px);
 }
 
 span.subject {
-	color: $subjectcol;
+	color: colors.$subjectcol;
 }
 
 div.section-title-block {
-	background: $replyborder;
+	background: colors.$replyborder;
 }
 
 div.section-block {
-	@include border-radius(5px);
-	background: $sectionbg;
-	border: 1px solid $sectionborder;
+	@include util.border-radius(5px);
+	background: colors.$sectionbg;
+	border: 1px solid colors.$sectionborder;
 }
\ No newline at end of file
diff --git a/frontend/sass/pipes.scss b/frontend/sass/pipes.scss
index 6bf73e38..1e37e4de 100644
--- a/frontend/sass/pipes.scss
+++ b/frontend/sass/pipes.scss
@@ -1,37 +1,37 @@
-@import 'pipes/colors';
-@import 'pipes/front';
-@import 'pipes/manage';
-@import 'pipes/img';
-@import 'util';
+@use 'pipes/colors';
+@use 'pipes/front';
+@use 'pipes/manage';
+@use 'pipes/img';
+@use 'util';
 
 * {
 	outline: none;
 }
 
 body {
-	background: $bgcol;
+	background: colors.$bgcol;
 	background-image: url(res/pipes_bg.png);
 	color: #d8d0b9;
-	font: $font;
+	font: colors.$font;
 }
 
 header h1, #site-title {
-	color: $headercol;
+	color: colors.$headercol;
 }
 
 a {
-	color: $linkcol;
-	font: $font;
+	color: colors.$linkcol;
+	font: colors.$font;
 	text-decoration: none;
 }
 
 a:hover {
 	background: inherit;
-	color: $linklight;
+	color: colors.$linklight;
 }
 
 a.topbar-item:hover {
-	background: $bglight;
+	background: colors.$bglight;
 }
 
 footer, footer * {
@@ -39,35 +39,35 @@ footer, footer * {
 }
 
 div#topbar {
-	background: $topbarcol;
+	background: colors.$topbarcol;
 	// @include box-shadow(0px 2px 2px 3px $shadowcol);
-	@include shadow-filter(0px 4px 2px $shadowcol);
+	@include util.shadow-filter(0px 4px 2px colors.$shadowcol);
 
 	li:hover {
-		background: $bglight;
+		background: colors.$bglight;
 	}
 }
 
 .dropdown-menu {
-	background: $topbarcol!important;
-	@include shadow-filter(2px 2px 3px $shadowcol);
+	background: colors.$topbarcol!important;
+	@include util.shadow-filter(2px 2px 3px colors.$shadowcol);
 	z-index: 0;
 	div:hover {
-		background: $bglight;
+		background: colors.$bglight;
 	}
 }
 
 .ui-tabs-tab {
-	background: $topbarcol;
-	border: 1px solid $bglight;
+	background: colors.$topbarcol;
+	border: 1px solid colors.$bglight;
 }
 
 .ui-tabs-active {
-	background: $bgcol;
+	background: colors.$bgcol;
 }
 
 .ui-tabs-panel {
-	background: $bgcol;
-	border: 1px solid $topbarcol;
+	background: colors.$bgcol;
+	border: 1px solid colors.$topbarcol;
 	padding: 8px;
 }
\ No newline at end of file
diff --git a/frontend/sass/pipes/_front.scss b/frontend/sass/pipes/_front.scss
index ced579ee..911345d5 100644
--- a/frontend/sass/pipes/_front.scss
+++ b/frontend/sass/pipes/_front.scss
@@ -1,8 +1,8 @@
-@import 'colors';
-@import '../util';
+@use 'colors';
+@use '../util';
 
 .dropdown-button:hover {
-	background: $bglight;
+	background: colors.$bglight;
 }
 
 .section-body {
@@ -10,27 +10,27 @@
 }
 
 .section-title-block {
-	background: $topbarcol;
+	background: colors.$topbarcol;
 	border-radius: 4px 4px 0px 0px;
 }
 
 .tab {
-	background: $bglight;
-	border: 1px solid $bgcol;
+	background: colors.$bglight;
+	border: 1px solid colors.$bgcol;
 }
 
 #current-tab {
-	background: $bgcol;
+	background: colors.$bgcol;
 }
 
 div#recent-posts-header {
 	// @include box-shadow(0px 2px 2px 3px $shadowcol);
-	@include shadow-filter(0px 2px 3px $shadowcol);
+	@include util.shadow-filter(0px 2px 3px colors.$shadowcol);
 	margin-bottom: 8px;
 	padding: 4px 8px 4px 8px;
 }
 
 .postblock {
-	background: $bgcol;
+	background: colors.$bgcol;
 	font-weight: 700;
 }
diff --git a/frontend/sass/pipes/_img.scss b/frontend/sass/pipes/_img.scss
index 289897cb..1b79a34b 100644
--- a/frontend/sass/pipes/_img.scss
+++ b/frontend/sass/pipes/_img.scss
@@ -1,8 +1,8 @@
-@import '_colors';
-@import '../util';
+@use '_colors';
+@use '../util';
 
 .dropdown-button:hover {
-	background: $bglight;
+	background: colors.$bglight;
 }
 
 img.thumbnail {
@@ -12,13 +12,13 @@ img.thumbnail {
 }
 
 .reply, .inlinepostprev, .postprev {
-	background: $postblock;
-	border: 1px solid $postblockcol;
+	background: colors.$postblock;
+	border: 1px solid colors.$postblockcol;
 }
 
 .postblock,
 table.mgmt-table tr:first-of-type th {
-	background: $postblock;
+	background: colors.$postblock;
 	font-weight: 700;
 }
 
@@ -45,8 +45,8 @@ div#content {
 	textarea,
 	select#changepage,
 	select.post-actions {
-		background: $postblock;
-		border: 1px solid $postblockcol;
+		background: colors.$postblock;
+		border: 1px solid colors.$postblockcol;
 		color: #FFF;
 	}
 }
diff --git a/frontend/sass/pipes/_manage.scss b/frontend/sass/pipes/_manage.scss
index 1b9c4fae..3a030b50 100644
--- a/frontend/sass/pipes/_manage.scss
+++ b/frontend/sass/pipes/_manage.scss
@@ -1,13 +1,13 @@
-@import 'colors';
-@import '../util';
+@use 'colors';
+@use '../util';
 
 .loginbox input {
 	height: 20%;
 }
 
 .manage-header {
-	background: $topbarcol;
+	background: colors.$topbarcol;
 	// @include box-shadow(2px 2px 3px 4px $shadowcol);
-	@include shadow-filter(4px 4px 4px $shadowcol);
+	@include util.shadow-filter(4px 4px 4px colors.$shadowcol);
 	border-radius: 8px;
 }
\ No newline at end of file
diff --git a/frontend/sass/win9x.scss b/frontend/sass/win9x.scss
index 127c3ad7..93e9879a 100755
--- a/frontend/sass/win9x.scss
+++ b/frontend/sass/win9x.scss
@@ -1,27 +1,27 @@
-@import 'win9x/vars';
+@use 'win9x/vars';
 
 @font-face {
-	@include mssans-font(400, normal);
+	@include vars.mssans-font(400, normal);
 	
 }
 @font-face {
-	@include mssans-font(700, normal);
+	@include vars.mssans-font(700, normal);
 }
 
 body {
-	font-size: $fontsize;
+	font-size: vars.$fontsize;
 	color: white;
-	background: $bgcol;
+	background: vars.$bgcol;
 }
 
 a {
-	color: $txtcol;
+	color: vars.$txtcol;
 	text-decoration: none;
 }
 
 input {
-	color: $txtcol;
-	font-size: $fontsize!important;
+	color: vars.$txtcol;
+	font-size: vars.$fontsize!important;
 	font-family: "Pixelated MS Sans Serif", Arial;
 	outline: none;
 }
@@ -30,7 +30,7 @@ input {
 div#topbar {
 	height: 26px;
 	background: silver!important;
-	box-shadow: $bar-shadow;
+	box-shadow: vars.$bar-shadow;
 	box-sizing: border-box;
 	border: none!important;
 	border-radius: 0!important;
@@ -39,9 +39,9 @@ div#topbar {
 	}
 	a[href="/"] {
 		font-family: "Pixelated MS Sans Serif", Arial;
-		font-size: $fontsize;
+		font-size: vars.$fontsize;
 		content: "Start"!important;
-		background: $start_path!important;
+		background: vars.$start_path!important;
 		background-repeat: no-repeat!important;
 		background-position-x: 3px!important;
 		background-position-y: 4px!important;
@@ -54,12 +54,12 @@ div#topbar {
 div#topbar,
 div#topbar a {
 	background: silver!important;
-	box-shadow: $bar-shadow;
+	box-shadow: vars.$bar-shadow;
 	box-sizing: border-box;
 	border: none!important;
 	border-radius: 0!important;
 	height:24px;
-	color: $txtcol!important;
+	color: vars.$txtcol!important;
 	font-family: "Pixelated MS Sans Serif", Arial;
 	font-size: 11px;
 	cursor: default;
@@ -70,10 +70,10 @@ div#content {
 	input[type=button],
 	input[role=pushbutton],
 	input[type=submit] {
-		color: $txtcol!important;
+		color: vars.$txtcol!important;
 		/* font-size: 12px!important; */
 		background: silver!important;
-		box-shadow: $bar-shadow;
+		box-shadow: vars.$bar-shadow;
 		box-sizing: border-box;
 		border: none!important;
 		border-radius: 0!important;
@@ -95,7 +95,7 @@ div#qr-title {
 	background: linear-gradient(90deg,navy,#1084d0);
 	a {
 		font-family: Arial, Helvetica, sans-serif;
-		box-shadow: $bar-shadow;
+		box-shadow: vars.$bar-shadow;
 		min-width: 16px;
 		min-height: 14px;
 		display: block;
@@ -105,7 +105,7 @@ div#qr-title {
 		background-position: top 3px left 40px!important;
 	}
 	a:hover {
-		color:$txtcol;
+		color:vars.$txtcol;
 	}
 	span#qr-buttons * {
 		display: inline-block;
@@ -125,7 +125,7 @@ div#qr-box {
 		box-shadow: inset -1px -1px #fff,inset 1px 1px grey,inset -2px -2px #dfdfdf,inset 2px 2px #0a0a0a;
 		margin: 0;
 		font-family: "Pixelated MS Sans Serif",Arial;
-		color: $txtcol;
+		color: vars.$txtcol;
 		appearance: none;
 	}
 }
@@ -140,7 +140,7 @@ input[type=text] {
 } */
 
 a.boardlistactive {
-	color: $txtcol!important;
+	color: vars.$txtcol!important;
 	padding: 6px 3px!important;
 	outline: 1px dotted #000;
 	outline-offset: -4px;
@@ -148,7 +148,7 @@ a.boardlistactive {
 
 
 h1, h2, div.subtitle, a#qrDisplayButton {
-	color: $txtcol;
+	color: vars.$txtcol;
 	font-family: Arial, sans-serif;
 }
 
@@ -172,7 +172,7 @@ div#content select {
 }
 
 div.pages {
-	background: $bgcol;
+	background: vars.$bgcol;
 	border: none;
 	color: white;
 	/* border-right: black;
diff --git a/frontend/sass/yotsuba.scss b/frontend/sass/yotsuba.scss
index a0a11316..d6486eb4 100644
--- a/frontend/sass/yotsuba.scss
+++ b/frontend/sass/yotsuba.scss
@@ -1,23 +1,23 @@
-@import 'global/colors';
-@import 'yotsuba/colors';
-@import 'yotsubacommon';
+@use 'global/colors' as global-colors;
+@use 'yotsuba/colors' as yotsuba-colors;
+@use 'yotsubacommon';
 
-@include yotsuba(
+@include yotsubacommon.yotsuba(
 	'res/yotsuba_bg.png',
-	$bgcol, /* $bodybg */
+	yotsuba-colors.$bgcol, /* $bodybg */
 	maroon, /* $bodycol */
-	$topbarbg,
-	$topbarborder,
-	$headercol,
-	$postblockbg,
-	$postblockborder,
-	$postblockborder, /* $sectiontitlecol */
+	yotsuba-colors.$topbarbg,
+	yotsuba-colors.$topbarborder,
+	global-colors.$headercol,
+	yotsuba-colors.$postblockbg,
+	yotsuba-colors.$postblockborder,
+	yotsuba-colors.$postblockborder, /* $sectiontitlecol */
 	#fca, /* $sectiontitlebg */
-	$borderbotright,
+	yotsuba-colors.$borderbotright,
 	maroon, /* $linkcol */
 	#D9BfB7, /* $hrcol */
 	#CC1105, /* $subjectcol */
-	$namecol,
-	$replybg,
+	global-colors.$namecol,
+	yotsuba-colors.$replybg,
 	navy /* $postlinkcol */
 );
diff --git a/frontend/sass/yotsubab.scss b/frontend/sass/yotsubab.scss
index 26990949..8f8c0297 100644
--- a/frontend/sass/yotsubab.scss
+++ b/frontend/sass/yotsubab.scss
@@ -1,23 +1,23 @@
-@import 'global/colors';
-@import 'yotsubab/colors';
-@import 'yotsubacommon';
+@use 'global/colors' as global-colors;
+@use 'yotsubab/colors' as yotsubab-colors;
+@use 'yotsubacommon';
 
-@include yotsuba(
+@include yotsubacommon.yotsuba(
 	'res/yotsubab_bg.png',
-	$bgcol, /* $bodybg */
+	yotsubab-colors.$bgcol, /* $bodybg */
 	#000, /* $bodycol */
 	#D6DAF0, /* $topbarbg */
-	$topbarborder,
-	$headercol,
-	$postblockbg,
-	$postblockborder,
+	yotsubab-colors.$topbarborder,
+	global-colors.$headercol,
+	yotsubab-colors.$postblockbg,
+	yotsubab-colors.$postblockborder,
 	#000, /* $sectiontitlecol */
-	$postblockbg, /* $sectiontitlebg */
-	$borderbotright,
+	yotsubab-colors.$postblockbg, /* $sectiontitlebg */
+	yotsubab-colors.$borderbotright,
 	#34345C, /* $linkcol */
 	#B7C5D9, /* $hrcol */
 	#0F0C5D, /* $subjectcol */
-	$namecol,
-	$replybg,
+	global-colors.$namecol,
+	yotsubab-colors.$replybg,
 	navy /* $postlinkcol */
 );
diff --git a/html/css/global.css b/html/css/global.css
index 0d521fd2..dfb85507 100644
--- a/html/css/global.css
+++ b/html/css/global.css
@@ -641,26 +641,6 @@ img#banpage-image {
   margin: 4px 8px 8px 4px;
 }
 
-@keyframes slideopen {
-  from {
-    transform: scale(1, 0);
-    transform-origin: top center;
-  }
-  to {
-    transform: scale(1, 1);
-    transform-origin: top center;
-  }
-}
-@keyframes slideclose {
-  from {
-    transform: scale(1, 1);
-    transform-origin: top center;
-  }
-  to {
-    transform: scale(1, 0);
-    transform-origin: top center;
-  }
-}
 .increase-line-height header, .increase-line-height .post, .increase-line-height .reply {
   line-height: 1.5;
 }

From 1339f58a66ced7fa3d2c68792aa1a2d2b62a3d7b Mon Sep 17 00:00:00 2001
From: Eggbertx <eggbertx@users.noreply.github.com>
Date: Sat, 22 Feb 2025 11:35:03 -0800
Subject: [PATCH 122/122] Add defer to gochan.js script tag, add option to open
 external links in new tab

---
 frontend/ts/gochan.ts      |  3 ++-
 frontend/ts/settings.ts    | 17 +++++++++++++++--
 templates/page_header.html |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/frontend/ts/gochan.ts b/frontend/ts/gochan.ts
index 88508774..340b0a83 100755
--- a/frontend/ts/gochan.ts
+++ b/frontend/ts/gochan.ts
@@ -4,7 +4,7 @@ import "./vars";
 import "./cookies";
 import "./notifications";
 import { setPageBanner } from "./dom/banners";
-import { setCustomCSS, setCustomJS, setTheme } from "./settings";
+import { setCustomCSS, setCustomJS, setTheme, updateExternalLinks } from "./settings";
 import { handleKeydown } from "./boardevents";
 import { initStaff, createStaffMenu, addStaffThreadOptions } from "./management/manage";
 import { getPageThread } from "./postinfo";
@@ -57,6 +57,7 @@ $(() => {
 	});
 	$(document).on("keydown", handleKeydown);
 	initFlags();
+	updateExternalLinks();
 	setCustomCSS();
 	setCustomJS();
 });
diff --git a/frontend/ts/settings.ts b/frontend/ts/settings.ts
index b51d66c5..9667a3a4 100755
--- a/frontend/ts/settings.ts
+++ b/frontend/ts/settings.ts
@@ -217,6 +217,19 @@ function setLineHeight() {
 	}
 }
 
+export function updateExternalLinks(post?: JQuery<HTMLElement>) {
+	const $src = post ?? $(".post-text");
+	const extPostLinks = $src.find<HTMLAnchorElement>("a:not(.postref)");
+	const newTab = getBooleanStorageVal("extlinksnewtab", true);
+	for(const link of extPostLinks) {
+		if(link.hostname !== location.hostname) {
+			link.target = newTab?"_blank":"_self";
+		} else {
+			link.target = "_self";
+		}
+	}
+}
+
 /**
  * executes the custom JavaScript set in the settings
  */
@@ -266,6 +279,7 @@ $(() => {
 		if(getBooleanStorageVal("useqr", true)) initQR();
 		else closeQR();
 	}));
+	settings.set("extlinksnewtab", new BooleanSetting("extlinksnewtab", "Open external links in new tab", true, updateExternalLinks));
 	settings.set("persistentqr", new BooleanSetting("persistentqr", "Persistent Quick Reply", false));
 	settings.set("watcherseconds", new NumberSetting("watcherseconds", "Check watched threads every # seconds", 15, {
 		min: 2
@@ -276,6 +290,5 @@ $(() => {
 	settings.set("customjs", new TextSetting("customjs", "Custom JavaScript", ""));
 	settings.set("customcss", new TextSetting("customcss", "Custom CSS", "", setCustomCSS));
 
-	if($settingsButton === null)
-		$settingsButton = new TopBarButton("Settings", createLightbox, {before: "a#watcher"});
+	$settingsButton ??= new TopBarButton("Settings", createLightbox, {before: "a#watcher"});
 });
\ No newline at end of file
diff --git a/templates/page_header.html b/templates/page_header.html
index 2cf35247..fd58bf86 100644
--- a/templates/page_header.html
+++ b/templates/page_header.html
@@ -27,7 +27,7 @@
 		<link id="flags" rel="stylesheet" href="{{webPath `/css/flags.css`}}"/>
 	{{- end -}}
 	<script type="text/javascript" src="{{webPath "/js/consts.js"}}"></script>
-	<script type="text/javascript" src="{{webPath "/js/gochan.js"}}"></script>
+	<script type="text/javascript" src="{{webPath "/js/gochan.js"}}" defer></script>
 </head>
 <body>
 {{template "topbar" .}}