dkforest

commit 0a4326d3e09a211f3a2a1d1260f05aa9982e3641
parent d833f176d0cb3cea64b64038feecd39ea4a345ba
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 18 Jan 2023 18:36:30 -0800

cleanup

Diffstat:
M
pkg/database/utils/utils.go
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/database/utils/utils.go b/pkg/database/utils/utils.go
@@ -141,18 +141,18 @@ func kick(kicked, kickedBy database.User, silent, purge bool) error {
 }
 
 func GetRoomAndKey(c echo.Context, roomName string) (database.ChatRoom, string, error) {
+	roomKey := ""
 	room, err := database.GetChatRoomByName(roomName)
 	if err != nil {
-		return room, "", c.NoContent(http.StatusNotFound)
+		return room, roomKey, c.NoContent(http.StatusNotFound)
 	}
 	if !room.HasAccess(c) {
-		return room, "", c.NoContent(http.StatusForbidden)
+		return room, roomKey, c.NoContent(http.StatusForbidden)
 	}
-	roomKey := ""
 	if room.IsProtected() {
 		key, err := hutils.GetRoomKeyCookie(c, int64(room.ID))
 		if err != nil {
-			return room, "", c.NoContent(http.StatusForbidden)
+			return room, roomKey, c.NoContent(http.StatusForbidden)
 		}
 		roomKey = key.Value
 	}