dkforest

commit 06e707377bca70656e079863b3fa0f840b34fd40
parent 66a02a930e3b5d32795389cbd99733b3a78f3345
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 29 Dec 2023 00:05:35 -0500

cleanup

Diffstat:
M
pkg/web/handlers/chess.go
 | 
5
+++--
M
pkg/web/handlers/utils/stream/stream.go
 | 
8
++++----

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pkg/web/handlers/chess.go b/pkg/web/handlers/chess.go
@@ -12,6 +12,7 @@ import (
 	hutils "dkforest/pkg/web/handlers/utils"
 	"dkforest/pkg/web/handlers/utils/stream"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/labstack/echo"
 	"github.com/notnil/chess"
@@ -159,7 +160,7 @@ Loop:
 
 		_, progress, err = sub.ReceiveTimeout2(1*time.Second, streamItem.Quit)
 		if err != nil {
-			if err == pubsub.ErrCancelled {
+			if errors.Is(err, pubsub.ErrCancelled) {
 				break Loop
 			}
 			continue
@@ -677,7 +678,7 @@ Loop:
 
 		_, payload, err := sub.ReceiveTimeout2(1*time.Second, streamItem.Quit)
 		if err != nil {
-			if err == pubsub.ErrCancelled {
+			if errors.Is(err, pubsub.ErrCancelled) {
 				break Loop
 			}
 			continue
diff --git a/pkg/web/handlers/utils/stream/stream.go b/pkg/web/handlers/utils/stream/stream.go
@@ -7,20 +7,20 @@ import (
 	"github.com/labstack/echo"
 )
 
-type StreamItem struct {
+type Item struct {
 	Quit <-chan struct{}
 	item *usersStreamsManager.Item
 }
 
-func (s *StreamItem) Cleanup() {
+func (s *Item) Cleanup() {
 	s.item.Cleanup()
 }
 
-func SetStreaming(c echo.Context, userID database.UserID, key string) (*StreamItem, error) {
+func SetStreaming(c echo.Context, userID database.UserID, key string) (*Item, error) {
 	// Keep track of users streams, so we can limit how many are open at one time per user
 	item, err := usersStreamsManager.Inst.Add(userID, key)
 	if err != nil {
 		return nil, err
 	}
-	return &StreamItem{Quit: hutils.SetStreaming(c), item: item}, nil
+	return &Item{Quit: hutils.SetStreaming(c), item: item}, nil
 }