dkforest

commit 616991baf4c88e1b82ebe83b05e1631bfe391783
parent 30a539d46f8b002a31111054f0dc4808b48e7813
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 10 Jun 2023 04:12:00 -0700

simplify code

Diffstat:
M
pkg/web/handlers/api/v1/handlers.go
 | 
25
+++++++------------------

1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -397,24 +397,13 @@ func ChatDeleteMessageHandler(c echo.Context) error {
 		return err
 	}
 
-	if authUser.IsAdmin {
-	} else if authUser.IsModerator() {
-		if msg.User.Username != config.NullUsername {
-			if msg.TooOldToDelete() && msg.UserID == authUser.ID {
-				return c.Redirect(http.StatusFound, c.Request().Referer())
-			}
-			if msg.UserID != authUser.ID {
-				auditMsg := fmt.Sprintf(`deleted msg #%d from user "%s" #%d -> %s`,
-					msg.ID,
-					msg.User.Username,
-					msg.User.ID,
-					utils.TruncStr(msg.RawMessage, 75, "…"))
-				db.NewAudit(*authUser, auditMsg)
-			}
-		}
-	} else if msg.Room.IsRoomOwner(*authUser) { // Room owner can delete messages in its room
-	} else if msg.TooOldToDelete() {
-		return c.Redirect(http.StatusFound, c.Request().Referer())
+	if authUser.IsModerator() && !msg.OwnMessage(*authUser) && msg.User.Username != config.NullUsername {
+		auditMsg := fmt.Sprintf(`deleted msg #%d from user "%s" #%d -> %s`,
+			msg.ID,
+			msg.User.Username,
+			msg.User.ID,
+			utils.TruncStr(msg.RawMessage, 75, "…"))
+		db.NewAudit(*authUser, auditMsg)
 	}
 
 	if msg.RoomID == config.GeneralRoomID && msg.ToUserID == nil {