dkforest

commit 5e01f89ec20bac733fa82427405389799211243f
parent d37b524c44c41e933b982bc9ac940887e560950f
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 12 Jun 2023 21:18:49 -0700

cleanup

Diffstat:
M
pkg/web/handlers/admin.go
 | 
2
+-
M
pkg/web/handlers/api/v1/chat.go
 | 
4
++--
M
pkg/web/handlers/chess.go
 | 
8
++++----
M
pkg/web/handlers/usersStreamsManager/usersStreamsManager.go
 | 
2
+-

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -702,7 +702,7 @@ func AdminEditRoomHandler(c echo.Context) error {
 
 func StreamUsersHandler(c echo.Context) error {
 	db := c.Get("database").(*database.DkfDB)
-	usersIDs := usersStreamsManager.UsersStreamsManagerInst.GetUsers()
+	usersIDs := usersStreamsManager.Inst.GetUsers()
 	users, _ := db.GetUsersByID(usersIDs)
 	out := ""
 	for _, user := range users {
diff --git a/pkg/web/handlers/api/v1/chat.go b/pkg/web/handlers/api/v1/chat.go
@@ -102,10 +102,10 @@ func ChatStreamMessagesHandler(c echo.Context) error {
 	quit := hutils.CloseSignalChan(c)
 
 	// Keep track of users streams, so we can limit how many are open at one time per user
-	if err := usersStreamsManager.UsersStreamsManagerInst.Add(authUser.ID, ""); err != nil {
+	if err := usersStreamsManager.Inst.Add(authUser.ID, ""); err != nil {
 		return nil
 	}
-	defer usersStreamsManager.UsersStreamsManagerInst.Remove(authUser.ID, "")
+	defer usersStreamsManager.Inst.Remove(authUser.ID, "")
 
 	// Keep track of how many bytes we sent on the http request, so we can auto-refresh when passing a threshold
 	bytesSent := 0
diff --git a/pkg/web/handlers/chess.go b/pkg/web/handlers/chess.go
@@ -271,10 +271,10 @@ func ChessGameHandler(c echo.Context) error {
 
 	quit := hutils.CloseSignalChan(c)
 
-	if err := usersStreamsManager.UsersStreamsManagerInst.Add(authUser.ID, key); err != nil {
+	if err := usersStreamsManager.Inst.Add(authUser.ID, key); err != nil {
 		return nil
 	}
-	defer usersStreamsManager.UsersStreamsManagerInst.Remove(authUser.ID, key)
+	defer usersStreamsManager.Inst.Remove(authUser.ID, key)
 
 	c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTMLCharsetUTF8)
 	c.Response().WriteHeader(http.StatusOK)
@@ -309,8 +309,8 @@ func ChessGameHandler(c echo.Context) error {
 			case <-quit:
 				return
 			}
-			p1Count := usersStreamsManager.UsersStreamsManagerInst.GetUserStreamsCountFor(p1ID, key)
-			p2Count := usersStreamsManager.UsersStreamsManagerInst.GetUserStreamsCountFor(p2ID, key)
+			p1Count := usersStreamsManager.Inst.GetUserStreamsCountFor(p1ID, key)
+			p2Count := usersStreamsManager.Inst.GetUserStreamsCountFor(p2ID, key)
 			if p1Online && p1Count == 0 {
 				p1Online = false
 				send(`<style>#p1Status { background-color: darkred !important; }</style>`)
diff --git a/pkg/web/handlers/usersStreamsManager/usersStreamsManager.go b/pkg/web/handlers/usersStreamsManager/usersStreamsManager.go
@@ -78,4 +78,4 @@ func (m *UsersStreamsManager) GetUsers() (out []database.UserID) {
 	return
 }
 
-var UsersStreamsManagerInst = NewUsersStreamsManager()
+var Inst = NewUsersStreamsManager()