dkforest

commit a4b07b3c53500c4ebfae51905d2d38fa7ffecaeb
parent 0a73dada1df449bbfd94b2d7f9207f7f9df0b283
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 12 Jan 2023 19:54:13 -0800

simplify template

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
7
+++++++
M
pkg/web/public/views/pages/chat-messages.gohtml
 | 
7
+------

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -77,6 +77,13 @@ type ChatMessage struct {
 	IsHellbanned bool
 }
 
+func (m *ChatMessage) GetProfile(authUser *User) string {
+	if m.ToUserID != nil && *m.ToUserID != authUser.ID {
+		return m.ToUser.Username
+	}
+	return m.User.Username
+}
+
 // GetRawMessage get RawMessage value, decrypt it if needed
 func (m *ChatMessage) GetRawMessage(key string) (string, error) {
 	if !m.Room.IsProtected() {
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -259,12 +259,7 @@
                         {{- if ne $.Data.DateFormat "" -}}
                             <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?quote={{ .UUID }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="date date-link" title="{{ .CreatedAt.Format "01-02 15:04:05" }}">{{ .CreatedAt.Format $.Data.DateFormat }}</a>&nbsp;
                         {{- end -}}
-                        {{- if and .ToUserID (ne .ToUser.ID $.AuthUser.ID) -}}
-                            <a href="/u/{{ .ToUser.Username }}" target="_blank" class="f-def-clr">-</a>
-                        {{- else -}}
-                            <a href="/u/{{ .User.Username }}" target="_blank" class="f-def-clr">-</a>
-                        {{- end -}}
-                        &nbsp;
+                        <a href="/u/{{ .GetProfile $.AuthUser }}" target="_blank" class="f-def-clr">-</a>&nbsp;
                         {{- if .ToUserID -}}
                             [
                             {{- if eq .User.ID $.AuthUser.ID -}}