dkforest

commit 12e506bb5f25245e8b0b8694420b52c0cf98420b
parent 1823890108d70bc8711b157e44652440425e4e58
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 19 Mar 2023 05:21:35 -0700

cleanup

Diffstat:
M
pkg/web/public/views/pages/chat-archive.gohtml
 | 
20
++++++++------------

1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/pkg/web/public/views/pages/chat-archive.gohtml b/pkg/web/public/views/pages/chat-archive.gohtml
@@ -131,23 +131,19 @@
                     {{- else -}}
                         <a href="/u/{{ .User.Username }}" target="_blank" style="color: #888;">-</a>&nbsp;
                     {{- end -}}
-                    {{- if .ToUserID -}}
-                        [<span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span> → <span {{ .ToUser.GenerateChatStyle | attr }}>{{ .ToUser.Username }}</span>] -&nbsp;
-                    {{- else if .System -}}
-                    {{- else if .IsMe -}}
-                    {{- else -}}
-                        {{- if .Moderators -}}<span class="sysmsg">[M]</span>&nbsp;{{- end -}}
-                        <span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span> -&nbsp;
-                    {{- end -}}
                     {{- if .System -}}
                         <span class="sysmsg">{{ .Message | safe }}</span>
                     {{- else -}}
-                        {{- if .IsMe -}}
-                            {{- if .Moderators -}}<span class="sysmsg">[M]</span>&nbsp;{{- end -}}
-                            <span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .User.Username }} {{ .TrimMe | safe }}</span></span>
+                        {{- if .Moderators -}}<span class="sysmsg">[M]</span>&nbsp;{{- end -}}
+                        {{- if .ToUserID -}}
+                            [<span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span> → <span {{ .ToUser.GenerateChatStyle | attr }}>{{ .ToUser.Username }}</span>] -&nbsp;
                         {{- else -}}
-                            <span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .Message | safe }}</span></span>
+                            <span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span>
+                            {{- if not .IsMe -}}
+                                &nbsp;-
+                            {{- end -}}
                         {{- end -}}
+                        &nbsp;<span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .MsgToDisplay | safe }}</span></span>
                     {{- end -}}
                 </div>
             {{- end -}}