From decccb9fedb55fd98578afd73226791d6b11b304 Mon Sep 17 00:00:00 2001
From: Ash Keel <ash@nebula.cafe>
Date: Thu, 21 Mar 2024 20:58:44 +0100
Subject: [PATCH] chore: fix tests

---
 database/database_test.go    |  1 -
 twitch/client/client.go      | 14 --------------
 twitch/client/client_test.go |  2 +-
 webserver/server_test.go     |  9 +++++----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/database/database_test.go b/database/database_test.go
index 3b87982..8764e73 100644
--- a/database/database_test.go
+++ b/database/database_test.go
@@ -162,7 +162,6 @@ func TestLocalDBClientGetJSON(t *testing.T) {
 		A string
 		B int
 	}
-
 	testStruct := test{
 		A: "test",
 		B: 42,
diff --git a/twitch/client/client.go b/twitch/client/client.go
index fcb67c6..0fe6c7e 100644
--- a/twitch/client/client.go
+++ b/twitch/client/client.go
@@ -69,7 +69,6 @@ func NewManager(ctx context.Context, db database.Database, server *webserver.Web
 		}
 
 		// New client works, replace old
-		updatedClient.Merge(manager.client)
 		manager.client = updatedClient
 
 		logger.Info("Reloaded/updated Twitch integration")
@@ -104,19 +103,6 @@ type Client struct {
 	streamOnline *sync.RWSync[bool]
 }
 
-func (c *Client) Merge(old *Client) {
-	// Copy bot instance and some params
-	c.streamOnline.Set(old.streamOnline.Get())
-	c.ensureRoute()
-}
-
-// Hacky function to deal with sync issues when restarting client
-func (c *Client) ensureRoute() {
-	if c.Config.Get().Enabled {
-		c.server.RegisterRoute(twitch.CallbackRoute, c)
-	}
-}
-
 func newClient(ctx context.Context, config twitch.Config, db database.Database, server *webserver.WebServer) (*Client, error) {
 	// Create Twitch client
 	client := &Client{
diff --git a/twitch/client/client_test.go b/twitch/client/client_test.go
index 729116c..9b14fbb 100644
--- a/twitch/client/client_test.go
+++ b/twitch/client/client_test.go
@@ -14,7 +14,7 @@ func TestNewClient(t *testing.T) {
 	client, _ := database.CreateInMemoryLocalClient(t)
 	defer database.CleanupLocalClient(client)
 
-	server, err := webserver.NewServer(client, webserver.DefaultServerFactory)
+	server, err := webserver.NewServer(context.Background(), client, webserver.DefaultServerFactory)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/webserver/server_test.go b/webserver/server_test.go
index 00033b7..074f3e8 100644
--- a/webserver/server_test.go
+++ b/webserver/server_test.go
@@ -1,6 +1,7 @@
 package webserver
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -15,7 +16,7 @@ func TestNewServer(t *testing.T) {
 	client, _ := database.CreateInMemoryLocalClient(t)
 	defer database.CleanupLocalClient(client)
 
-	_, err := NewServer(client, DefaultServerFactory)
+	_, err := NewServer(context.Background(), client, DefaultServerFactory)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -26,7 +27,7 @@ func TestNewServerWithTestFactory(t *testing.T) {
 	defer database.CleanupLocalClient(client)
 
 	testServer := NewTestServer()
-	_, err := NewServer(client, testServer.Factory())
+	_, err := NewServer(context.Background(), client, testServer.Factory())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -38,7 +39,7 @@ func TestListen(t *testing.T) {
 
 	// Create a test server
 	testServer := NewTestServer()
-	server, err := NewServer(client, testServer.Factory())
+	server, err := NewServer(context.Background(), client, testServer.Factory())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -95,7 +96,7 @@ func TestCustomRoute(t *testing.T) {
 	defer database.CleanupLocalClient(client)
 
 	// Create test server
-	server, err := NewServer(client, nil)
+	server, err := NewServer(context.Background(), client, nil)
 	if err != nil {
 		t.Fatal(err)
 	}