dkforest

commit 7396f7cc680978075cf5cf27ac9900059140c57a
parent 658141266103579d4b706df7da25dab88d20ff9c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri,  3 Feb 2023 22:15:58 -0800

display elapsed time on the first timestamp title

Diffstat:
M
pkg/template/fn.go
 | 
4
++++
M
pkg/template/tmp.go
 | 
1
+
M
pkg/web/public/views/pages/chat-messages.gohtml
 | 
4
+++-

3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/pkg/template/fn.go b/pkg/template/fn.go
@@ -339,3 +339,7 @@ func isStrEmpty(v string) bool {
 func ms2s(v int64) int64 {
 	return v / 1000
 }
+
+func since(v time.Time) string {
+	return humanize.Time(v)
+}
diff --git a/pkg/template/tmp.go b/pkg/template/tmp.go
@@ -77,6 +77,7 @@ func GetRenderer(e *echo.Echo) *Templates {
 	tmplBuilder.AddFn("fmtBool", fmtBool)
 	tmplBuilder.AddFn("isStrEmpty", isStrEmpty)
 	tmplBuilder.AddFn("ms2s", ms2s)
+	tmplBuilder.AddFn("since", since)
 
 	tmplBuilder.BuildTemplates()
 	return tmplBuilder
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -193,6 +193,7 @@
         <div id="msgs">
             {{ $baseTopBarURL := (print "/api/v1/chat/top-bar/" $.Data.RoomName) }}
             {{ $readMarkerRendered := false }}
+            {{ $isFirstMsg := true }}
             {{ range $idx, $e := .Data.Messages }}
                 {{ $tagType := "tag" }}
                 {{- if and $.AuthUser.CanSeeHB (or .IsHellbanned .User.IsHellbanned) -}}
@@ -269,7 +270,8 @@
                             {{- end -}}
                         {{- end -}}
                         {{- if ne $.Data.DateFormat "" -}}
-                            <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;
+                            <a href="{{ $baseTopBarURL }}?quote={{ .UUID }}{{ $.Data.TopBarQueryParams | safeURL }}" target="iframe1" class="date date-link" title="{{ .CreatedAt.Format "01-02 15:04:05" }}{{ if $isFirstMsg }} ({{ .CreatedAt | since }}){{ end }}">{{ .CreatedAt.Format $.Data.DateFormat }}</a>&nbsp;
+                            {{ $isFirstMsg = false }}
                         {{- end -}}
                         <a href="/u/{{ .GetProfile $.AuthUser }}" target="_blank" class="f-def-clr">-</a>&nbsp;
                         {{- if .ToUserID -}}