dkforest

commit 58d126247a55f9072d84cdc8eb07662b39524cee
parent eea6f8f74cf0bed1ab9d9b9fd75c74419f284cc6
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri,  9 Jun 2023 09:59:26 -0700

simplify code indentation

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

1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/pkg/web/handlers/interceptors/slashInterceptor.go b/pkg/web/handlers/interceptors/slashInterceptor.go
@@ -827,40 +827,42 @@ func handleEditCmd(c *command.Command) (handled bool) {
 	if m := editRgx.FindStringSubmatch(c.Message); len(m) == 3 {
 		date := m[1]
 		newMsg := m[2]
-		if dt, err := utils.ParsePrevDatetimeAt(date, clockwork.NewRealClock()); err == nil {
-			if time.Since(dt) <= config.EditMessageTimeLimit {
-				if msg, err := c.DB.GetRoomChatMessageByDate(c.Room.ID, c.AuthUser.ID, dt.UTC()); err == nil {
-					c.EditMsg = &msg
-					c.OrigMessage = newMsg
-					c.Message = newMsg
-
-					// If we're editing a message which contains a link to an uploaded file,
-					// we need to re-add the link to the html.
-					if msg.UploadID != nil {
-						if newUpload, err := c.DB.GetUploadByID(*msg.UploadID); err == nil {
-							c.Upload = &newUpload
-						}
-					}
+		dt, err := utils.ParsePrevDatetimeAt(date, clockwork.NewRealClock())
+		if err != nil {
+			c.Err = errors.New("failed to parse timestamp")
+			return true
+		}
+		if time.Since(dt) > config.EditMessageTimeLimit {
+			c.Err = errors.New("message to old to be edited")
+			return true
+		}
+		msg, err := c.DB.GetRoomChatMessageByDate(c.Room.ID, c.AuthUser.ID, dt.UTC())
+		if err != nil {
+			c.Err = fmt.Errorf("failed to get message at timestamp %s", date)
+			return true
+		}
+		c.EditMsg = &msg
+		c.OrigMessage = newMsg
+		c.Message = newMsg
 
-					if pmRgx.MatchString(c.Message) {
-						handlePMCmd(c)
-					} else if c.AuthUser.IsModerator() && strings.HasPrefix(c.Message, "/m ") {
-						handleModeratorGroupCmd(c)
-					} else if strings.HasPrefix(c.Message, "/hbm ") {
-						handleHbmCmd(c)
-					} else if strings.HasPrefix(c.Message, "/g ") {
-						handleGroupChatCmd(c)
-					} else if strings.HasPrefix(c.Message, "/system ") || strings.HasPrefix(c.Message, "/sys ") {
-						handleSystemCmd(c)
-					}
-				} else {
-					c.Err = fmt.Errorf("failed to get message at timestamp %s", date)
-				}
-			} else {
-				c.Err = errors.New("message to old to be edited")
+		// If we're editing a message which contains a link to an uploaded file,
+		// we need to re-add the link to the html.
+		if msg.UploadID != nil {
+			if newUpload, err := c.DB.GetUploadByID(*msg.UploadID); err == nil {
+				c.Upload = &newUpload
 			}
-		} else {
-			c.Err = errors.New("failed to parse timestamp")
+		}
+
+		if pmRgx.MatchString(c.Message) {
+			handlePMCmd(c)
+		} else if c.AuthUser.IsModerator() && strings.HasPrefix(c.Message, "/m ") {
+			handleModeratorGroupCmd(c)
+		} else if strings.HasPrefix(c.Message, "/hbm ") {
+			handleHbmCmd(c)
+		} else if strings.HasPrefix(c.Message, "/g ") {
+			handleGroupChatCmd(c)
+		} else if strings.HasPrefix(c.Message, "/system ") || strings.HasPrefix(c.Message, "/sys ") {
+			handleSystemCmd(c)
 		}
 		return true
 	}