commit 658141266103579d4b706df7da25dab88d20ff9c
parent 177fd402bd26e79011431c5b4e09899d1f25ec56
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Fri, 3 Feb 2023 22:09:50 -0800
revert utc clock
Diffstat:
3 files changed, 39 insertions(+), 47 deletions(-)
diff --git a/pkg/web/handlers/api/v1/data.go b/pkg/web/handlers/api/v1/data.go
@@ -4,7 +4,6 @@ import (
"dkforest/pkg/database"
"dkforest/pkg/managers"
"encoding/json"
- "time"
)
type chatTopBarData struct {
@@ -36,7 +35,6 @@ type chatMessagesData struct {
OfficialRooms []database.ChatRoomAug
SubscribedRooms []database.ChatRoomAug
ForceManualRefresh bool
- Now time.Time
Error string
ErrorTs int64
}
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -126,7 +126,6 @@ func ChatMessagesHandler(c echo.Context) error {
database.UpdateChatReadRecord(authUser.ID, room.ID)
var data chatMessagesData
- data.Now = time.Now().UTC()
data.Error = c.QueryParam("error")
if data.Error != "" {
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -158,8 +158,7 @@
.read-marker { border-top: {{ $.AuthUser.ChatReadMarkerSize }}px solid {{ $.AuthUser.ChatReadMarkerColor }}; }
#msgs { {{ if not .AuthUser.HideRightColumn }}width: calc(100% - 170px); float: left; {{ end }}line-height: 1.2; }
#no-msg { padding-left: 10px; color: #ddd; }
- #rgt-pane { display: flex; width: 150px; height: 100%; float: left; margin-left: 20px; position: fixed; right: 0; overflow-y: auto; line-height: 1.15; }
- #rgt-pane-container { display: flex; flex-direction: column; }
+ #rgt-pane { width: 150px; height: 100%; float: left; margin-left: 20px; position: fixed; right: 0; overflow-y: auto; line-height: 1.15; }
.rgt-title { font-weight: bolder; color: #ced4da; }
.mb-20px { margin-bottom: 20px; }
.mb-30px { margin-bottom: 30px; }
@@ -167,7 +166,6 @@
.mt-10px { margin-top: 10px; }
.notif, .notif:hover { color: #e74c3c; }
#msg-err { background-color: #8f2d2d; color: #ffffff; padding: 1px 5px 2px 5px; display: block; text-decoration: none; }
- .curr-time { margin-top: auto; margin-left: auto; color: #999; font-family: 'Courier New', Courier, monospace; font-size: 14px; }
</style>
</head>
<body>
@@ -344,53 +342,50 @@
</div>
{{- if not .AuthUser.HideRightColumn -}}
<div id="rgt-pane">
- <div id="rgt-pane-container">
- <div class="mb-20px">
- <div class="rgt-title">Inbox (<a href="/settings/inbox" target="_top"{{ if gt .Data.InboxCount 0 }}class="notif"{{ end }}>{{ .Data.InboxCount }}</a>)</div>
- </div>
- <div class="mb-20px">
- <div class="rgt-title">Rooms:</div>
- {{- range .Data.OfficialRooms -}}
- {{- if eq .Name "club" -}}
- {{- if $.AuthUser.IsClubMember -}}
- <div><a href="/chat/club" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#club</a></div>
- {{- end -}}
- {{- else if eq .Name "moderators" -}}
- {{- if $.AuthUser.IsModerator -}}
- <div><a href="/chat/moderators" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#moderators</a></div>
- {{- end -}}
- {{- else -}}
- <div><a href="/chat/{{ .Name }}" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#{{ .Name }}</a></div>
+ <div class="mb-20px">
+ <div class="rgt-title">Inbox (<a href="/settings/inbox" target="_top"{{ if gt .Data.InboxCount 0 }}class="notif"{{ end }}>{{ .Data.InboxCount }}</a>)</div>
+ </div>
+ <div class="mb-20px">
+ <div class="rgt-title">Rooms:</div>
+ {{- range .Data.OfficialRooms -}}
+ {{- if eq .Name "club" -}}
+ {{- if $.AuthUser.IsClubMember -}}
+ <div><a href="/chat/club" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#club</a></div>
{{- end -}}
+ {{- else if eq .Name "moderators" -}}
+ {{- if $.AuthUser.IsModerator -}}
+ <div><a href="/chat/moderators" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#moderators</a></div>
+ {{- end -}}
+ {{- else -}}
+ <div><a href="/chat/{{ .Name }}" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#{{ .Name }}</a></div>
{{- end -}}
+ {{- end -}}
- {{- if .Data.SubscribedRooms -}}
- <div class="mt-10px"></div>
- {{ range .Data.SubscribedRooms }}
- <div><a href="/chat/{{ .Name }}" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#{{ .Name }}</a></div>
- {{ end }}
- {{- end -}}
+ {{- if .Data.SubscribedRooms -}}
+ <div class="mt-10px"></div>
+ {{ range .Data.SubscribedRooms }}
+ <div><a href="/chat/{{ .Name }}" target="_top"{{ if .IsUnread }} class="unread_room"{{ end }}>#{{ .Name }}</a></div>
+ {{ end }}
+ {{- end -}}
- <div class="mt-5px"><a href="/rooms" target="_top">[...]</a></div>
- </div>
- <div class="mb-20px">
- <div class="rgt-title">In this room:</div>
- {{- range .Data.Members -}}
- {{ template "member" dict "Parent" $ "El" . }}
- {{- end -}}
- </div>
- {{- if or .Data.VisibleMemberInChat $.AuthUser.DisplayHellbanned -}}
- <div class="mb-30px">
- {{- if .Data.MembersInChat -}}
- <div class="rgt-title">In other rooms:</div>
- {{- range .Data.MembersInChat -}}
- {{ template "member" dict "Parent" $ "El" . }}
- {{- end -}}
- {{- end -}}
- </div>
+ <div class="mt-5px"><a href="/rooms" target="_top">[...]</a></div>
+ </div>
+ <div class="mb-20px">
+ <div class="rgt-title">In this room:</div>
+ {{- range .Data.Members -}}
+ {{ template "member" dict "Parent" $ "El" . }}
{{- end -}}
- <div class="curr-time">{{ .Data.Now.Format "15:04:05" }}</div>
</div>
+ {{- if or .Data.VisibleMemberInChat $.AuthUser.DisplayHellbanned -}}
+ <div class="mb-30px">
+ {{- if .Data.MembersInChat -}}
+ <div class="rgt-title">In other rooms:</div>
+ {{- range .Data.MembersInChat -}}
+ {{ template "member" dict "Parent" $ "El" . }}
+ {{- end -}}
+ {{- end -}}
+ </div>
+ {{- end -}}
</div>
{{- end -}}
