dkforest

commit 94c198a3ec3d68590e4ea03aed6fdce3a3247cd2
parent 709733147d5afa7ac25bf70ae856ba4064aea589
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 19 Mar 2023 04:28:20 -0700

cleanup template

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

2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -212,6 +212,13 @@ func (m *ChatMessage) TrimMe() string {
 	return "<p>" + strings.TrimPrefix(m.Message, "<p>/me ")
 }
 
+func (m *ChatMessage) MsgToDisplay() string {
+	if m.IsMe() {
+		return m.TrimMe()
+	}
+	return m.Message
+}
+
 func (m *ChatMessage) DoSave(db *DkfDB) {
 	if err := db.db.Save(m).Error; err != nil {
 		logrus.Error(err)
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -283,38 +283,31 @@
                         <a href="/u/{{ .GetProfile $.AuthUser }}" target="_blank" class="f-def-clr">-</a>&nbsp;
                         {{- if .System -}}
                             <span class="sysmsg">{{ .Message | safe }}</span>
-                        {{- else if .ToUserID -}}
-                            [
-                            {{- template "from-username" dict "Parent" $ "El" . "baseTopBarURL" $baseTopBarURL "CanBeEdited" .CanBeEdited "GenerateChatStyle" .User.GenerateChatStyle -}}
-                            &nbsp;→&nbsp;
-                            {{- if eq .ToUser.ID $.AuthUser.ID -}}
-                                <span {{ .ToUser.GenerateChatStyle | attr }}>{{ .ToUser.Username }}</span>
-                            {{- else -}}
-                                <a {{ .ToUser.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?pm={{ .ToUser.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .ToUser.Username }}</a>
-                            {{- end -}}
-                            ] -&nbsp;
                         {{- else -}}
-                            {{- if .Moderators -}}<span class="sysmsg">[<a href="{{ $baseTopBarURL }}?m=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;{{- end -}}
-                            {{- if .GroupID -}}<span class="sysmsg">[<a href="{{ $baseTopBarURL }}?g={{ .Group.Name }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">{{ .Group.Name }}</a>]</span>&nbsp;{{- end -}}
-                            {{- if .IsMe -}}
-                                <span class="o-wrap"><span {{ .User.GenerateChatStyle | attr }}>
-                                    {{- template "from-username" dict "Parent" $ "El" . "baseTopBarURL" $baseTopBarURL "CanBeEdited" .CanBeEdited "GenerateChatStyle" .User.GenerateChatStyle -}}
-                                    &nbsp;
-                                    {{ .TrimMe | safe }}
-                                </span></span>
-                            {{- else -}}
+                            {{- if .ToUserID -}}
+                                [
                                 {{- template "from-username" dict "Parent" $ "El" . "baseTopBarURL" $baseTopBarURL "CanBeEdited" .CanBeEdited "GenerateChatStyle" .User.GenerateChatStyle -}}
-                                &nbsp;
-                                {{- if and $.AuthUser.CanSeeHB (or .IsHellbanned .User.IsHellbanned) (not .ToUserID) -}}
-                                    <a href="{{ $baseTopBarURL }}?hbm=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="f-def-clr">-</a>
+                                &nbsp;→&nbsp;
+                                {{- if eq .ToUser.ID $.AuthUser.ID -}}
+                                    <span {{ .ToUser.GenerateChatStyle | attr }}>{{ .ToUser.Username }}</span>
                                 {{- else -}}
-                                    -
+                                    <a {{ .ToUser.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?pm={{ .ToUser.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .ToUser.Username }}</a>
+                                {{- end -}}
+                                ] -
+                            {{- else -}}
+                                {{- if .Moderators -}}<span class="sysmsg">[<a href="{{ $baseTopBarURL }}?m=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;{{- end -}}
+                                {{- if .GroupID -}}<span class="sysmsg">[<a href="{{ $baseTopBarURL }}?g={{ .Group.Name }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">{{ .Group.Name }}</a>]</span>&nbsp;{{- end -}}
+                                {{- template "from-username" dict "Parent" $ "El" . "baseTopBarURL" $baseTopBarURL "CanBeEdited" .CanBeEdited "GenerateChatStyle" .User.GenerateChatStyle -}}
+                                {{- if not .IsMe -}}
+                                    &nbsp;
+                                    {{- if and $.AuthUser.CanSeeHB (or .IsHellbanned .User.IsHellbanned) (not .ToUserID) -}}
+                                        <a href="{{ $baseTopBarURL }}?hbm=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="f-def-clr">-</a>
+                                    {{- else -}}
+                                        -
+                                    {{- end -}}
                                 {{- end -}}
-                                &nbsp;
                             {{- end -}}
-                        {{- end -}}
-                        {{- if and (not .System) (not .IsMe) -}}
-                            <span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .Message | safe }}</span></span>
+                            &nbsp;<span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .MsgToDisplay | safe }}</span></span>
                         {{- end -}}
                     </div>
                 {{- end -}}