dkforest

commit 60d092124f136aa9c7cad610553aaab107f86d3b
parent 5dea9e98af623a8bc31259ee36a9827f2bf0a741
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 20 Dec 2023 10:21:44 -0500

cleanup

Diffstat:
M
pkg/web/handlers/interceptors/slashInterceptor.go
 | 
32
++++++++++++++++----------------

1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pkg/web/handlers/interceptors/slashInterceptor.go b/pkg/web/handlers/interceptors/slashInterceptor.go
@@ -1787,26 +1787,26 @@ func handleRefreshCmd(c *command.Command) (handled bool) {
 }
 
 func handleWizzCmd(c *command.Command) (handled bool) {
-	if c.Message == "/wizz" {
-		database.MsgPubSub.Pub("wizz_"+c.AuthUser.Username.String(), database.ChatMessageType{Typ: database.Wizz})
-		c.ZeroSysMsgTo(c.AuthUser, "wizzed by "+c.AuthUser.Username.String())
-		c.Err = command.ErrRedirect
-		return true
-
-	} else if m := wizzRgx.FindStringSubmatch(c.Message); len(m) == 2 {
-		username := database.Username(m[1])
-		wizzedUser := c.AuthUser
-		if username != c.AuthUser.Username {
-			user, err := c.DB.GetUserByUsername(username)
-			if err != nil {
-				c.Err = ErrUsernameNotFound
-				return true
+	m := wizzRgx.FindStringSubmatch(c.Message)
+	if c.Message == "/wizz" || len(m) == 2 {
+		var wizzedUser *database.User
+		wizzedUser = c.AuthUser
+
+		if len(m) == 2 {
+			username := database.Username(m[1])
+			if username != c.AuthUser.Username {
+				user, err := c.DB.GetUserByUsername(username)
+				if err != nil {
+					c.Err = ErrUsernameNotFound
+					return true
+				}
+				wizzedUser = &user
 			}
-			wizzedUser = &user
+			c.ZeroSysMsgToSkipNotify(c.AuthUser, "you wizzed "+wizzedUser.Username.String())
 		}
+
 		database.MsgPubSub.Pub("wizz_"+wizzedUser.Username.String(), database.ChatMessageType{Typ: database.Wizz})
 		c.ZeroSysMsgTo(wizzedUser, "wizzed by "+c.AuthUser.Username.String())
-		c.ZeroSysMsgToSkipNotify(c.AuthUser, "you wizzed "+wizzedUser.Username.String())
 		c.Err = command.ErrRedirect
 		return true
 	}