dkforest

commit 4465e80ccb8225f1ee206be45bf2a8394b325c78
parent 816b286e105b05a217428d17a9462b425979b696
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun, 19 Mar 2023 03:08:07 -0700

simplify template

Diffstat:
M
pkg/web/public/views/pages/chat-messages.gohtml
 | 
38
+++++++++++++++++---------------------

1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -306,7 +306,22 @@
                             {{- end -}}
                             ] - 
                         {{- else if .System -}}
+                            <span class="sysmsg">{{ .Message | safe }}</span>
                         {{- else if .IsMe -}}
+                            {{- 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 -}}
+                            <span class="o-wrap"><span {{ .User.GenerateChatStyle | attr }}>
+                                {{- if eq .User.ID $.AuthUser.ID -}}
+                                    {{- if .CanBeEdited -}}
+                                        <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                    {{- else -}}
+                                        {{ .User.Username }}
+                                    {{- end -}}
+                                {{- else -}}
+                                    <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                {{- end }}
+                                    {{ .TrimMe | safe }}
+                            </span></span>
                         {{- 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 -}}
@@ -327,27 +342,8 @@
                             {{- end -}}
                             &nbsp;
                         {{- end -}}
-                        {{- if .System -}}
-                            <span class="sysmsg">{{ .Message | safe }}</span>
-                        {{- else -}}
-                            {{- if .IsMe -}}
-                                {{- 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 -}}
-                                <span class="o-wrap"><span {{ .User.GenerateChatStyle | attr }}>
-                                    {{- if eq .User.ID $.AuthUser.ID -}}
-                                        {{- if .CanBeEdited -}}
-                                            <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
-                                        {{- else -}}
-                                            {{ .User.Username }}
-                                        {{- end -}}
-                                    {{- else -}}
-                                        <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
-                                    {{- end }}
-                                    {{ .TrimMe | safe }}
-                                </span></span>
-                            {{- else -}}
-                                <span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .Message | safe }}</span></span>
-                            {{- end -}}
+                        {{- if and (not .System) (not .IsMe) -}}
+                            <span {{ .User.GenerateChatStyle | attr }}><span class="o-wrap">{{ .Message | safe }}</span></span>
                         {{- end -}}
                     </div>
                 {{- end -}}