dkforest

commit a50b6c95fc66bbd22142cb8c5c6dceb7e4e29b2d
parent daf3312efcaf3900c0b59a0187ac5177ff392869
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri,  9 Jun 2023 20:43:50 -0700

cleanup

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

1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/pkg/web/handlers/interceptors/slashInterceptor.go b/pkg/web/handlers/interceptors/slashInterceptor.go
@@ -1348,38 +1348,30 @@ func handleDeleteMsgCmd(c *command.Command) (handled bool) {
 		if len(msgs) == 0 {
 			c.Err = errors.New("failed to find msg")
 			return true
+		}
 
-		} else if len(msgs) == 1 {
-			if !c.AuthUser.IsModerator() {
-				c.Err = delMsgFn(msgs)
-				return true
-			}
-			// Moderator
-			msg := msgs[0]
-			_ = msg.Delete(c.DB)
-			c.Err = command.ErrRedirect
+		if !c.AuthUser.IsModerator() {
+			c.Err = delMsgFn(msgs)
 			return true
+		}
 
+		// Moderator
+		var msg database.ChatMessage
+		if len(msgs) == 1 {
+			msg = msgs[0]
 		} else if len(msgs) > 1 {
-			if !c.AuthUser.IsModerator() {
-				c.Err = delMsgFn(msgs)
-				return true
-			}
-
-			// Moderator
 			if matchUsername == "" {
 				c.Err = errors.New("more the 1 msg with this timestamp")
 				return true
 			}
-			msg, err := getMsgForUsername(msgs, database.Username(matchUsername))
+			msg, err = getMsgForUsername(msgs, database.Username(matchUsername))
 			if err != nil {
 				c.Err = err
 				return true
 			}
-			_ = msg.Delete(c.DB)
-			c.Err = command.ErrRedirect
-			return true
 		}
+		_ = msg.Delete(c.DB)
+		c.Err = command.ErrRedirect
 		return true
 
 	} else if strings.HasPrefix(c.Message, "/d ") {