dkforest

commit c974c5e2e0acae28d717dfa7a91192f15d9b4362
parent 6256ebad406f49b51e287392311830d9e4b6f985
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 12 Dec 2023 17:20:03 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker/poker.go
 | 
21
+++++++--------------

1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -1227,9 +1227,6 @@ func PokerUnSitHandler(c echo.Context) error {
 	authUser := c.Get("authUser").(*database.User)
 	roomID := c.Param("roomID")
 	html := hutils.HtmlCssReset + `<form method="post"><button>UnSit</button></form>`
-	if _, err := db.GetPokerTableBySlug(roomID); err != nil {
-		return c.HTML(http.StatusOK, html)
-	}
 	roomTopic := "room_" + roomID
 	roomLogsTopic := "room_" + roomID + "_logs"
 	g := PokerInstance.GetGame(roomID)
@@ -1255,10 +1252,6 @@ func PokerSitHandler(c echo.Context) error {
 	}
 	pos--
 	roomID := c.Param("roomID")
-	pokerTable, err := db.GetPokerTableBySlug(roomID)
-	if err != nil {
-		return c.HTML(http.StatusOK, html)
-	}
 	roomTopic := "room_" + roomID
 	roomUserTopic := "room_" + roomID + "_" + authUser.Username.String()
 	roomLogsTopic := "room_" + roomID + "_logs"
@@ -1268,6 +1261,10 @@ func PokerSitHandler(c echo.Context) error {
 	}
 
 	if c.Request().Method == http.MethodPost {
+		pokerTable, err := db.GetPokerTableBySlug(roomID)
+		if err != nil {
+			return c.HTML(http.StatusOK, html)
+		}
 		tableAccount, err := db.GetPokerTableAccount(authUser.ID, pokerTable.ID)
 		if err != nil {
 			logrus.Error(err)
@@ -1890,15 +1887,11 @@ body {
 
 func PokerLogsHandler(c echo.Context) error {
 	roomID := c.Param("roomID")
-	db := c.Get("database").(*database.DkfDB)
-
-	pokerTable, err := db.GetPokerTableBySlug(roomID)
-	if err != nil {
+	send := func(s string) { _, _ = c.Response().Write([]byte(s)) }
+	g := PokerInstance.GetGame(roomID)
+	if g == nil {
 		return c.Redirect(http.StatusFound, "/")
 	}
-
-	send := func(s string) { _, _ = c.Response().Write([]byte(s)) }
-	g := PokerInstance.GetOrCreateGame(roomID, pokerTable.ID)
 	roomLogsTopic := "room_" + roomID + "_logs"
 	sub := PokerPubSub.Subscribe([]string{roomLogsTopic})
 	defer sub.Close()