dkforest

commit 3567b24a41d6e47363ef37cbc8cc86dd849e1b3c
parent 63647ac21df80af175462f3cfa56d10b5504d3c3
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat,  3 Dec 2022 03:14:55 -0500

fix broken templates

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

5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pkg/template/fn.go b/pkg/template/fn.go
@@ -302,6 +302,13 @@ func derefI64(v *int64) int64 {
 	return *v
 }
 
+func derefUserID(v *database.UserID) database.UserID {
+	if v == nil {
+		return 0
+	}
+	return *v
+}
+
 func shortHost(v string) string {
 	parsed, err := url.Parse(v)
 	if err != nil {
diff --git a/pkg/template/tmp.go b/pkg/template/tmp.go
@@ -70,6 +70,7 @@ func GetRenderer(e *echo.Echo) *Templates {
 	tmplBuilder.AddFn("last4", last4)
 	tmplBuilder.AddFn("toMs", toMs)
 	tmplBuilder.AddFn("derefI64", derefI64)
+	tmplBuilder.AddFn("derefUserID", derefUserID)
 	tmplBuilder.AddFn("shortHost", shortHost)
 	tmplBuilder.AddFn("b64", b64)
 	tmplBuilder.AddFn("fmtBool", fmtBool)
diff --git a/pkg/web/public/views/pages/chat-archive.gohtml b/pkg/web/public/views/pages/chat-archive.gohtml
@@ -82,7 +82,7 @@
                                 <input type="hidden" name="csrf" value="{{ $.CSRF }}" />
                                 <button class="mod-btn delete_msg_btn" title="delete"></button>
                             </form>
-                        {{ else if or (and $.AuthUser.IsModerator .TooOldToDelete (ne .UserID $.AuthUser.ID)) $.AuthUser.IsAdmin (and .Room.OwnerUserID (eq (derefI64 .Room.OwnerUserID) $.AuthUser.ID)) }}
+                        {{ else if or (and $.AuthUser.IsModerator .TooOldToDelete (ne .UserID $.AuthUser.ID)) $.AuthUser.IsAdmin (and .Room.OwnerUserID (eq (derefUserID .Room.OwnerUserID) $.AuthUser.ID)) }}
                             <form method="post" action="/api/v1/chat/messages/delete/{{ .UUID }}" style="display: inline;">
                                 <input type="hidden" name="csrf" value="{{ $.CSRF }}" />
                                 <button class="mod-btn delete_msg_btn" style="color: orange;" title="delete"></button>
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -182,7 +182,7 @@
                                         <button class="mod-btn delete_msg_btn" title="delete"></button>
                                     </form>
                                 {{ end }}
-                            {{ else if or (and $.AuthUser.IsModerator .TooOldToDelete (ne .UserID $.AuthUser.ID)) $.AuthUser.IsAdmin (and .Room.OwnerUserID (eq (derefI64 .Room.OwnerUserID) $.AuthUser.ID)) }}
+                            {{ else if or (and $.AuthUser.IsModerator .TooOldToDelete (ne .UserID $.AuthUser.ID)) $.AuthUser.IsAdmin (and .Room.OwnerUserID (eq (derefUserID .Room.OwnerUserID) $.AuthUser.ID)) }}
                                 {{ if $.AuthUser.DisplayDeleteButton }}
                                     <form method="post" action="/api/v1/chat/messages/delete/{{ .UUID }}" style="display: inline;">
                                         <input type="hidden" name="csrf" value="{{ $.CSRF }}" />
diff --git a/pkg/web/public/views/pages/chat.gohtml b/pkg/web/public/views/pages/chat.gohtml
@@ -182,7 +182,7 @@
         <div>
             > {{ t "Room" . }} #{{ .Data.Room.Name }}
             <div style="padding-left: 30px;" class="d-inline">
-<!--                {{ if and .Data.Room.OwnerUserID (eq (derefI64 .Data.Room.OwnerUserID) .AuthUser.ID) }}-->
+<!--                {{ if and .Data.Room.OwnerUserID (eq (derefUserID .Data.Room.OwnerUserID) .AuthUser.ID) }}-->
 <!--                    <a href="/chat/{{ .Data.Room.Name }}/settings" class="btn btn-xs btn-secondary">{{ t "Room settings" . }}</a>-->
 <!--                {{ end }}-->
                 {{ if .Data.Room.Password }}
@@ -204,7 +204,7 @@
                         </form>
                     {{ end }}
                 {{ end }}
-                {{ if and .Data.Room.OwnerUserID (eq (derefI64 .Data.Room.OwnerUserID) .AuthUser.ID) }}
+                {{ if and .Data.Room.OwnerUserID (eq (derefUserID .Data.Room.OwnerUserID) .AuthUser.ID) }}
                     <a href="/chat/{{ .Data.Room.Name }}/delete" class="btn btn-xs btn-danger">{{ t "Delete room" . }}</a>
                 {{ end }}
             </div>