dkforest

commit 275a7fa7fef71f8fc7757ffbc72663c7a36052aa
parent 085398dc4363f0a3aaf7c0e9a45b61e106e48b39
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 16 Jun 2023 06:06:44 -0700

simplify code

Diffstat:
M
pkg/web/handlers/api/v1/messages.qtpl
 | 
4
++--
M
pkg/web/handlers/api/v1/messages.qtpl.go
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl
@@ -320,10 +320,10 @@
 {%- func RenderMessage(idx int, e database.ChatMessage, AuthUser *database.User,
     Data ChatMessagesData, baseTopBarURL string, readMarkerRendered, isFirstMsg *bool, CSRF, NullUsername string, readMarkerRev *int, isEdit bool) -%}
     {%- if e.UserCanSee(*AuthUser) -%}
-        {%- if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered && readMarkerRev == nil  && !isEdit%}
+        {%- if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered  && !isEdit%}
             <div class="read-marker read-marker-0"{% if idx == 0 %} style="display:none;"{% endif %}></div>
             {%- code *readMarkerRendered = true -%}
-        {%- elseif AuthUser.ChatReadMarkerEnabled && e.CreatedAt.After(Data.ReadMarker.ReadAt) && !*readMarkerRendered && readMarkerRev != nil && isEdit -%}
+        {%- elseif AuthUser.ChatReadMarkerEnabled && e.CreatedAt.After(Data.ReadMarker.ReadAt) && !*readMarkerRendered && isEdit && readMarkerRev != nil -%}
             <style>.read-marker-{%d (*readMarkerRev) %}{display:none !important;}</style>
             {%- code *readMarkerRev++ -%}
             <div class="read-marker read-marker-{%d *readMarkerRev %}"></div>
diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go
@@ -706,7 +706,7 @@ func StreamRenderMessage(qw422016 *qt422016.Writer, idx int, e database.ChatMess
 //line messages.qtpl:322
 	if e.UserCanSee(*AuthUser) {
 //line messages.qtpl:323
-		if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered && readMarkerRev == nil && !isEdit {
+		if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered && !isEdit {
 //line messages.qtpl:323
 			qw422016.N().S(`
             <div class="read-marker read-marker-0"`)
@@ -723,7 +723,7 @@ func StreamRenderMessage(qw422016 *qt422016.Writer, idx int, e database.ChatMess
 			*readMarkerRendered = true
 
 //line messages.qtpl:326
-		} else if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.After(Data.ReadMarker.ReadAt) && !*readMarkerRendered && readMarkerRev != nil && isEdit {
+		} else if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.After(Data.ReadMarker.ReadAt) && !*readMarkerRendered && isEdit && readMarkerRev != nil {
 //line messages.qtpl:326
 			qw422016.N().S(`            <style>.read-marker-`)
 //line messages.qtpl:327