dkforest

commit 4b93ecc7a469628d8858fb3b1ae3637d090cfad3
parent f5a291c3794b2157046b714ed426a3c326e9c57b
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 10 Jun 2023 03:13:20 -0700

Add OwnMessage helper

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
4
++++
M
pkg/web/handlers/api/v1/messages.qtpl
 | 
2
+-
M
pkg/web/handlers/api/v1/messages.qtpl.go
 | 
2
+-

3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -224,6 +224,10 @@ func (m *ChatMessage) TooOldToDelete() bool {
 	return time.Since(m.CreatedAt) > config.EditMessageTimeLimit
 }
 
+func (m *ChatMessage) OwnMessage(user User) bool {
+	return m.UserID == user.ID
+}
+
 func (m *ChatMessage) IsPmRecipient(user User) bool {
 	return m.ToUserID != nil && *m.ToUserID == user.ID
 }
diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl
@@ -354,7 +354,7 @@
                     {%- endif -%}
                 {%- endif -%}
                 {%- if AuthUser.IsModerator() -%}
-                    {%- if e.UserID != AuthUser.ID -%}
+                    {%- if !e.OwnMessage(*AuthUser) -%}
                         {%- if AuthUser.DisplayHellbanButton -%}
                             {%- if string(e.User.Username) == NullUsername -%}
                                 <div class="spacer16"></div>
diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go
@@ -826,7 +826,7 @@ func StreamRenderMessage(qw422016 *qt422016.Writer, idx int, e database.ChatMess
 //line messages.qtpl:356
 			if AuthUser.IsModerator() {
 //line messages.qtpl:357
-				if e.UserID != AuthUser.ID {
+				if !e.OwnMessage(*AuthUser) {
 //line messages.qtpl:358
 					if AuthUser.DisplayHellbanButton {
 //line messages.qtpl:359