commit 06e210d95d225eae5d1326bc6893534becdd6778 parent 939cabf5e9d0c25910c7c9c02025eac4b510ed40 Author: n0tr1v <n0tr1v@protonmail.com> Date: Thu, 12 Jan 2023 20:59:41 -0800 simplify template Diffstat:
| M | pkg/web/public/views/pages/chat-messages.gohtml | | | 81 | ++++++++++++++++++++++++++++++------------------------------------------------- |
1 file changed, 31 insertions(+), 50 deletions(-)
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml @@ -373,31 +373,7 @@ <div class="mb-20px"> <div class="rgt-title">In this room:</div> {{- range .Data.Members -}} - {{- if eq .Username $.AuthUser.Username -}} - <div> - <span style="color: {{ .Color }};">{{ .Username }}</span> - {{ if .AfkIndicatorEnabled -}} - <small class="afk-indicator">afk</small> - {{- end -}} - </div> - {{- else -}} - {{- if or (not .IsHellbanned) (eq $.AuthUser.ID .UserID) (and .IsHellbanned $.AuthUser.IsHellbanned) $.AuthUser.DisplayHellbanned -}} - <div> - <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?tag={{ .Username }}{{ $.Data.TopBarQueryParams | safeURL }}" - target="iframe1" - {{ if and (.IsHellbanned) $.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }} - style="color: {{ .Color }};">{{ .Username | first }}</a> - {{- /* hack to remove spaces between links */ -}} - <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?pm={{ .Username }}{{ $.Data.TopBarQueryParams | safeURL }}" - target="iframe1" - {{ if and (.IsHellbanned) $.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }} - style="color: {{ .Color }};">{{ .Username | rest }}</a> - {{ if .AfkIndicatorEnabled -}} - <small class="afk-indicator">afk</small> - {{- end -}} - </div> - {{- end -}} - {{- end -}} + {{ template "member" dict "Parent" $ "El" . }} {{- end -}} </div> {{- if or .Data.VisibleMemberInChat $.AuthUser.DisplayHellbanned -}} @@ -405,31 +381,7 @@ {{- if .Data.MembersInChat -}} <div class="rgt-title">In other rooms:</div> {{- range .Data.MembersInChat -}} - {{- if eq .Username $.AuthUser.Username -}} - <div> - <span style="color: {{ .Color }};">{{ .Username }}</span> - {{ if .AfkIndicatorEnabled -}} - <small class="afk-indicator">afk</small> - {{- end -}} - </div> - {{- else -}} - {{- if or (not .IsHellbanned) (eq $.AuthUser.ID .UserID) (and .IsHellbanned $.AuthUser.IsHellbanned) $.AuthUser.DisplayHellbanned -}} - <div> - <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?tag={{ .Username }}{{ $.Data.TopBarQueryParams | safeURL }}" - target="iframe1" - {{ if and (.IsHellbanned) $.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }} - style="color: {{ .Color }};">{{ .Username | first }}</a> - {{- /* hack to remove spaces between links */ -}} - <a href="/api/v1/chat/top-bar/{{ $.Data.RoomName }}?pm={{ .Username }}{{ $.Data.TopBarQueryParams | safeURL }}" - target="iframe1" - {{ if and (.IsHellbanned) $.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }} - style="color: {{ .Color }};">{{ .Username | rest }}</a> - {{ if .AfkIndicatorEnabled -}} - <small class="afk-indicator">afk</small> - {{- end -}} - </div> - {{- end -}} - {{- end -}} + {{ template "member" dict "Parent" $ "El" . }} {{- end -}} {{- end -}} </div> @@ -445,3 +397,31 @@ </body> </html> {{ end }} + +{{ define "member" }} + {{- if eq .El.Username .Parent.AuthUser.Username -}} + <div> + <span style="color: {{ .El.Color }};">{{ .El.Username }}</span> + {{ if .El.AfkIndicatorEnabled -}} + <small class="afk-indicator">afk</small> + {{- end -}} + </div> + {{- 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 }}" + 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 }}" + target="iframe1" + {{ if and (.El.IsHellbanned) .Parent.AuthUser.DisplayHellbanned }}class="hb-row"{{ end }} + style="color: {{ .El.Color }};">{{ .El.Username | rest }}</a> + {{ if .El.AfkIndicatorEnabled -}} + <small class="afk-indicator">afk</small> + {{- end -}} + </div> + {{- end -}} + {{- end -}} +{{ end }} +\ No newline at end of file