dkforest

commit 7d648856f0e8eeaa6ff12f6db9ff538ba8f15655
parent d9773e8ebe33af43b90415e05db6df9575b393a7
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 28 Jan 2023 11:29:05 -0800

simplify template

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

1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -186,6 +186,7 @@
         {{ end }}
 
         <div id="msgs">
+            {{ $baseTopBarURL := (print "/api/v1/chat/top-bar/" $.Data.RoomName) }}
             {{ $readMarkerRendered := false }}
             {{ range $idx, $e := .Data.Messages }}
                 {{- if (.UserCanSee $.AuthUser) -}}
@@ -257,35 +258,35 @@
                             {{- end -}}
                         {{- end -}}
                         {{- 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;
+                            <a href="{{ $baseTopBarURL }}?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 -}}
                         <a href="/u/{{ .GetProfile $.AuthUser }}" target="_blank" class="f-def-clr">-</a>&nbsp;
                         {{- if .ToUserID -}}
                             [
                             {{- if eq .User.ID $.AuthUser.ID -}}
                                 {{- if .CanBeEdited -}}
-                                    <a {{ .User.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                    <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
                                 {{- else -}}
                                     <span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span>
                                 {{- end -}}
                             {{- else -}}
-                                <a {{ .User.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?pm={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?pm={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
                             {{- end -}}
                             &nbsp;→&nbsp;
                             {{- if eq .ToUser.ID $.AuthUser.ID -}}
                                 <span {{ .ToUser.GenerateChatStyle | attr }}>{{ .ToUser.Username }}</span>
                             {{- else -}}
-                                <a {{ .ToUser.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?pm={{ .ToUser.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .ToUser.Username }}</a>
+                                <a {{ .ToUser.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?pm={{ .ToUser.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .ToUser.Username }}</a>
                             {{- end -}}
                             ] -&nbsp;
                         {{- else if .System -}}
                         {{- else if .IsMe -}}
                         {{- else -}}
-                            {{- if .Moderators -}}<span class="sysmsg">[<a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?m=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;{{- end -}}
-                            {{- if .GroupID -}}<span class="sysmsg">[<a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?g={{ .Group.Name }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">{{ .Group.Name }}</a>]</span>&nbsp;{{- end -}}
+                            {{- 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 eq .User.ID $.AuthUser.ID -}}
                                 {{- if .CanBeEdited -}}
-                                    <a {{ .User.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                    <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?e={{ .CreatedAt.Format "15:04:05" }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
                                 {{- else -}}
                                     <span {{ .User.GenerateChatStyle | attr }}>{{ .User.Username }}</span>
                                 {{- end -}}
@@ -296,11 +297,11 @@
                                 {{- else if and $.AuthUser.IsModerator .Moderators -}}
                                     {{ $tagType = "mtag" }}
                                 {{- end -}}
-                                <a {{ .User.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
                             {{- end -}}
                             &nbsp;
                             {{- if and $.AuthUser.CanSeeHB (or .IsHellbanned .User.IsHellbanned) (not .ToUserID) -}}
-                                <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?hbm=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="f-def-clr">-</a>
+                                <a href="{{ $baseTopBarURL }}?hbm=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="f-def-clr">-</a>
                             {{- else -}}
                                 -
                             {{- end -}}
@@ -310,12 +311,12 @@
                             <span class="sysmsg">{{ .Message | safe }}</span>
                         {{- else -}}
                             {{- if .IsMe -}}
-                                {{- if .Moderators -}}<span class="sysmsg">[<a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?m=1{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;{{- end -}}
-                                {{- if .GroupID -}}<span class="sysmsg">[<a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?g={{ .Group.Name }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="sysmsg f-white-clr">{{ .Group.Name }}</a>]</span>&nbsp;{{- end -}}
+                                {{- 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="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?e={{ .CreatedAt.Format "15:04:05" }}" target="iframe1">{{ .User.Username }}</a>
+                                            <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?e={{ .CreatedAt.Format "15:04:05" }}" target="iframe1">{{ .User.Username }}</a>
                                         {{- else -}}
                                             {{ .User.Username }}
                                         {{- end -}}
@@ -326,7 +327,7 @@
                                         {{- else if and $.AuthUser.IsModerator .Moderators -}}
                                             {{ $tagType = "mtag" }}
                                         {{- end -}}
-                                        <a {{ .User.GenerateChatStyle | attr }} href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
+                                        <a {{ .User.GenerateChatStyle | attr }} href="{{ $baseTopBarURL }}?{{ $tagType }}={{ .User.Username }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1">{{ .User.Username }}</a>
                                     {{- end }}
                                     {{ .TrimMe | safe }}
                                 </span></span>
@@ -399,6 +400,7 @@
 {{ end }}
 
 {{ define "member" }}
+    {{ $baseTopBarURL := (print "/api/v1/chat/top-bar/" $.Parent.Data.RoomName) }}
     {{- if eq .El.Username .Parent.AuthUser.Username -}}
         <div>
             <span style="color: {{ .El.Color }};">{{ .El.Username }}</span>
@@ -409,12 +411,12 @@
     {{- else -}}
         {{- if or (not .El.IsHellbanned) (eq .Parent.AuthUser.ID .El.UserID) (and .El.IsHellbanned .Parent.AuthUser.IsHellbanned) .Parent.AuthUser.DisplayHellbanned -}}
             <div>
-                <a href="/api/v1/chat/top-bar/{{ .Parent.Data.RoomName }}?tag={{ .El.Username }}{{ .Parent.Data.TopBarQueryParams | safeURL }}"
+                <a href="{{ $baseTopBarURL }}?tag={{ .El.Username }}{{ .Parent.Data.TopBarQueryParams | safeURL }}"
                    target="iframe1"
                    {{ if and (.El.IsHellbanned) .Parent.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }}
                    style="color: {{ .El.Color }};">{{ .El.Username | first }}</a>
                 {{- /* hack to remove spaces between links */ -}}
-                <a href="/api/v1/chat/top-bar/{{ .Parent.Data.RoomName }}?pm={{ .El.Username }}{{ .Parent.Data.TopBarQueryParams | safeURL }}"
+                <a href="{{ $baseTopBarURL }}?pm={{ .El.Username }}{{ .Parent.Data.TopBarQueryParams | safeURL }}"
                    target="iframe1"
                    {{ if and (.El.IsHellbanned) .Parent.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }}
                    style="color: {{ .El.Color }};">{{ .El.Username | rest }}</a>