dkforest

A forum and chat platform (onion)
git clone https://git.dasho.dev/n0tr1v/dkforest.git
Log | Files | Refs | LICENSE

commit 593887334c280451439501c1c64746847006cfc4
parent 99a6722347a698354b791087f1fa2072608dc49c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 23 May 2023 20:50:45 -0700

graceful shutdown & better stream closed notice

Diffstat:
Mpkg/web/handlers/api/v1/messages.qtpl | 14+++++++++++++-
Mpkg/web/handlers/api/v1/messages.qtpl.go | 1082++++++++++++++++++++++++++++++++++++++++---------------------------------------
Mpkg/web/handlers/handlers.go | 15+--------------
Mpkg/web/web.go | 68++++++++++++++++++++++++++++++++++++++++++++++----------------------
4 files changed, 607 insertions(+), 572 deletions(-)

diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl @@ -115,7 +115,19 @@ line-height: 1.4; } .k_btn::after { content: "k"; } - #manualrefresh, .connection-closed { + .connection-closed { + color: #bf2718; + display: block; + position: fixed; + text-align: center; + top: 0; + left: calc(50% - 200px); + width: 400px; + z-index: 2; + background-color: #500000; + border: 2px solid #ff0000; + } + #manualrefresh { {% if !Data.ForceManualRefresh %} top: -200%; animation: timeout_messages {%dl Data.ManualRefreshTimeout %}s forwards; diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go @@ -141,22 +141,34 @@ func StreamGenerateStyle(qw422016 *qt422016.Writer, AuthUser *database.User, Dat line-height: 1.4; } .k_btn::after { content: "k"; } - #manualrefresh, .connection-closed { + .connection-closed { + color: #bf2718; + display: block; + position: fixed; + text-align: center; + top: 0; + left: calc(50% - 200px); + width: 400px; + z-index: 2; + background-color: #500000; + border: 2px solid #ff0000; + } + #manualrefresh { `) -//line messages.qtpl:119 +//line messages.qtpl:131 if !Data.ForceManualRefresh { -//line messages.qtpl:119 +//line messages.qtpl:131 qw422016.N().S(` top: -200%; animation: timeout_messages `) -//line messages.qtpl:121 +//line messages.qtpl:133 qw422016.N().DL(Data.ManualRefreshTimeout) -//line messages.qtpl:121 +//line messages.qtpl:133 qw422016.N().S(`s forwards; `) -//line messages.qtpl:122 +//line messages.qtpl:134 } -//line messages.qtpl:122 +//line messages.qtpl:134 qw422016.N().S(` color: #bf2718; display: block; @@ -202,28 +214,28 @@ func StreamGenerateStyle(qw422016 *qt422016.Writer, AuthUser *database.User, Dat .f-white-clr, .f-white-clr:hover { color: white; } .line-through { text-decoration: line-through; } .hb-row { background-color: rgba(0, 0, 0, 0.7); opacity: `) -//line messages.qtpl:166 +//line messages.qtpl:178 qw422016.N().F(AuthUser.GetHellbanOpacityF64()) -//line messages.qtpl:166 +//line messages.qtpl:178 qw422016.N().S(`; } .own-highlight { background-color: rgba(255,241,176,0.05); } .read-marker { border-top: `) -//line messages.qtpl:168 +//line messages.qtpl:180 qw422016.N().DL(AuthUser.ChatReadMarkerSize) -//line messages.qtpl:168 +//line messages.qtpl:180 qw422016.N().S(`px solid `) -//line messages.qtpl:168 +//line messages.qtpl:180 qw422016.E().S(AuthUser.ChatReadMarkerColor) -//line messages.qtpl:168 +//line messages.qtpl:180 qw422016.N().S(`; } #msgs { `) -//line messages.qtpl:169 +//line messages.qtpl:181 if !AuthUser.HideRightColumn { -//line messages.qtpl:169 +//line messages.qtpl:181 qw422016.N().S(`width: calc(100% - 170px); float: left; `) -//line messages.qtpl:169 +//line messages.qtpl:181 } -//line messages.qtpl:169 +//line messages.qtpl:181 qw422016.N().S(`line-height: 1.2; } #no-msg { padding-left: 10px; color: #ddd; } #rgt-pane { width: 150px; height: 100%; float: left; margin-left: 20px; position: fixed; right: 0; overflow-y: auto; line-height: 1.15; } @@ -245,86 +257,86 @@ func StreamGenerateStyle(qw422016 *qt422016.Writer, AuthUser *database.User, Dat } </style> `) -//line messages.qtpl:189 +//line messages.qtpl:201 } -//line messages.qtpl:189 +//line messages.qtpl:201 func WriteGenerateStyle(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:189 +//line messages.qtpl:201 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:189 +//line messages.qtpl:201 StreamGenerateStyle(qw422016, AuthUser, Data) -//line messages.qtpl:189 +//line messages.qtpl:201 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:189 +//line messages.qtpl:201 } -//line messages.qtpl:189 +//line messages.qtpl:201 func GenerateStyle(AuthUser *database.User, Data ChatMessagesData) string { -//line messages.qtpl:189 +//line messages.qtpl:201 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:189 +//line messages.qtpl:201 WriteGenerateStyle(qb422016, AuthUser, Data) -//line messages.qtpl:189 +//line messages.qtpl:201 qs422016 := string(qb422016.B) -//line messages.qtpl:189 +//line messages.qtpl:201 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:189 +//line messages.qtpl:201 return qs422016 -//line messages.qtpl:189 +//line messages.qtpl:201 } -//line messages.qtpl:191 +//line messages.qtpl:203 func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:191 +//line messages.qtpl:203 qw422016.N().S(`<html lang="en"> <head> <title></title> `) -//line messages.qtpl:195 +//line messages.qtpl:207 if !Data.PreventRefresh && !Data.ForceManualRefresh { -//line messages.qtpl:195 +//line messages.qtpl:207 qw422016.N().S(`<meta http-equiv="refresh" content="`) -//line messages.qtpl:195 +//line messages.qtpl:207 qw422016.N().DL(AuthUser.RefreshRate) -//line messages.qtpl:195 +//line messages.qtpl:207 qw422016.N().S(`">`) -//line messages.qtpl:195 +//line messages.qtpl:207 } -//line messages.qtpl:196 +//line messages.qtpl:208 if AuthUser.CollectMetadata { -//line messages.qtpl:196 +//line messages.qtpl:208 qw422016.N().S(`<link rel="stylesheet" type="text/css" href="/public/css/meta.css?v=`) -//line messages.qtpl:196 +//line messages.qtpl:208 qw422016.E().S(VERSION) -//line messages.qtpl:196 +//line messages.qtpl:208 qw422016.N().S(`" />`) -//line messages.qtpl:196 +//line messages.qtpl:208 } -//line messages.qtpl:197 +//line messages.qtpl:209 StreamGenerateStyle(qw422016, AuthUser, Data) -//line messages.qtpl:197 +//line messages.qtpl:209 qw422016.N().S(` </head> <body> `) -//line messages.qtpl:201 +//line messages.qtpl:213 if Data.ForceManualRefresh { -//line messages.qtpl:201 +//line messages.qtpl:213 qw422016.N().S(` <div id="manualrefresh"> <h4>Manual refresh required</h4> <form method="get" action="/chat/`) -//line messages.qtpl:204 +//line messages.qtpl:216 qw422016.E().S(Data.ChatMenuData.RoomName) -//line messages.qtpl:204 +//line messages.qtpl:216 qw422016.N().S(`" target="_top"> <input type="submit" value="Reload" /> </form> </div> `) -//line messages.qtpl:208 +//line messages.qtpl:220 } else if !Data.PreventRefresh { -//line messages.qtpl:208 +//line messages.qtpl:220 qw422016.N().S(` <div id="manualrefresh"> <h4>Manual refresh required</h4> <form method="get"> @@ -332,1103 +344,1103 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin </form> </div> `) -//line messages.qtpl:215 +//line messages.qtpl:227 } -//line messages.qtpl:215 +//line messages.qtpl:227 qw422016.N().S(` `) -//line messages.qtpl:217 +//line messages.qtpl:229 if Data.Error != "" { -//line messages.qtpl:217 +//line messages.qtpl:229 qw422016.N().S(` <a href="/api/v1/chat/messages/`) -//line messages.qtpl:218 +//line messages.qtpl:230 qw422016.E().S(Data.ChatMenuData.RoomName) -//line messages.qtpl:218 +//line messages.qtpl:230 qw422016.N().S(`" id="msg-err">× `) -//line messages.qtpl:218 +//line messages.qtpl:230 qw422016.E().S(Data.Error) -//line messages.qtpl:218 +//line messages.qtpl:230 qw422016.N().S(`</a> `) -//line messages.qtpl:219 +//line messages.qtpl:231 } -//line messages.qtpl:219 +//line messages.qtpl:231 qw422016.N().S(` `) -//line messages.qtpl:221 +//line messages.qtpl:233 if Data.PmSound || Data.TaggedSound { -//line messages.qtpl:221 +//line messages.qtpl:233 qw422016.N().S(` <audio src="/public/mp3/sound5.mp3" autoplay></audio> `) -//line messages.qtpl:223 +//line messages.qtpl:235 } else if Data.NewMessageSound { -//line messages.qtpl:223 +//line messages.qtpl:235 qw422016.N().S(` <audio src="/public/mp3/sound6.mp3" autoplay></audio> `) -//line messages.qtpl:225 +//line messages.qtpl:237 } -//line messages.qtpl:225 +//line messages.qtpl:237 qw422016.N().S(` <div id="msgs"> `) -//line messages.qtpl:228 +//line messages.qtpl:240 StreamRenderMessages(qw422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:228 +//line messages.qtpl:240 qw422016.N().S(` </div> `) -//line messages.qtpl:231 +//line messages.qtpl:243 if !AuthUser.HideRightColumn { -//line messages.qtpl:231 +//line messages.qtpl:243 qw422016.N().S(` `) -//line messages.qtpl:232 +//line messages.qtpl:244 StreamRenderRightColumn(qw422016, AuthUser, Data.ChatMenuData) -//line messages.qtpl:233 +//line messages.qtpl:245 } -//line messages.qtpl:234 +//line messages.qtpl:246 if AuthUser.CollectMetadata { -//line messages.qtpl:234 +//line messages.qtpl:246 qw422016.N().S(` <div class="div_1"></div> <div class="div_2"></div> <div class="div_f0">a</div> `) -//line messages.qtpl:238 +//line messages.qtpl:250 } -//line messages.qtpl:238 +//line messages.qtpl:250 qw422016.N().S(` </body> </html> `) -//line messages.qtpl:241 +//line messages.qtpl:253 } -//line messages.qtpl:241 +//line messages.qtpl:253 func WriteMessages(qq422016 qtio422016.Writer, VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:241 +//line messages.qtpl:253 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:241 +//line messages.qtpl:253 StreamMessages(qw422016, VERSION, CSRF, NullUsername, AuthUser, Data) -//line messages.qtpl:241 +//line messages.qtpl:253 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:241 +//line messages.qtpl:253 } -//line messages.qtpl:241 +//line messages.qtpl:253 func Messages(VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) string { -//line messages.qtpl:241 +//line messages.qtpl:253 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:241 +//line messages.qtpl:253 WriteMessages(qb422016, VERSION, CSRF, NullUsername, AuthUser, Data) -//line messages.qtpl:241 +//line messages.qtpl:253 qs422016 := string(qb422016.B) -//line messages.qtpl:241 +//line messages.qtpl:253 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:241 +//line messages.qtpl:253 return qs422016 -//line messages.qtpl:241 +//line messages.qtpl:253 } -//line messages.qtpl:244 +//line messages.qtpl:256 func StreamRenderRightColumn(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMenuData) { -//line messages.qtpl:244 +//line messages.qtpl:256 qw422016.N().S(`<div id="rgt-pane"> <div class="mb-20px"> <div class="rgt-title">Inbox (<a href="/settings/inbox" target="_top"`) -//line messages.qtpl:247 +//line messages.qtpl:259 if Data.InboxCount > 0 { -//line messages.qtpl:247 +//line messages.qtpl:259 qw422016.N().S(`class="notif"`) -//line messages.qtpl:247 +//line messages.qtpl:259 } -//line messages.qtpl:247 +//line messages.qtpl:259 qw422016.N().S(`>`) -//line messages.qtpl:247 +//line messages.qtpl:259 qw422016.N().DL(Data.InboxCount) -//line messages.qtpl:247 +//line messages.qtpl:259 qw422016.N().S(`</a>)</div> </div> <div class="mb-20px"> <div class="rgt-title">Rooms:</div> `) -//line messages.qtpl:251 +//line messages.qtpl:263 for _, e := range Data.OfficialRooms { -//line messages.qtpl:252 +//line messages.qtpl:264 if e.Name == "club" { -//line messages.qtpl:253 +//line messages.qtpl:265 if AuthUser.IsClubMember { -//line messages.qtpl:253 +//line messages.qtpl:265 qw422016.N().S(` <div><a href="/chat/club" target="_top"`) -//line messages.qtpl:254 +//line messages.qtpl:266 if e.IsUnread { -//line messages.qtpl:254 +//line messages.qtpl:266 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:254 +//line messages.qtpl:266 } -//line messages.qtpl:254 +//line messages.qtpl:266 qw422016.N().S(`>#club</a></div> `) -//line messages.qtpl:255 +//line messages.qtpl:267 } -//line messages.qtpl:256 +//line messages.qtpl:268 } else if e.Name == "moderators" { -//line messages.qtpl:257 +//line messages.qtpl:269 if AuthUser.IsModerator() { -//line messages.qtpl:257 +//line messages.qtpl:269 qw422016.N().S(` <div><a href="/chat/moderators" target="_top"`) -//line messages.qtpl:258 +//line messages.qtpl:270 if e.IsUnread { -//line messages.qtpl:258 +//line messages.qtpl:270 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:258 +//line messages.qtpl:270 } -//line messages.qtpl:258 +//line messages.qtpl:270 qw422016.N().S(`>#moderators</a></div> `) -//line messages.qtpl:259 +//line messages.qtpl:271 } -//line messages.qtpl:260 +//line messages.qtpl:272 } else { -//line messages.qtpl:260 +//line messages.qtpl:272 qw422016.N().S(` <div><a href="/chat/`) -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.E().S(e.Name) -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.N().S(`" target="_top"`) -//line messages.qtpl:261 +//line messages.qtpl:273 if e.IsUnread { -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:261 +//line messages.qtpl:273 } -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.N().S(`>#`) -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.E().S(e.Name) -//line messages.qtpl:261 +//line messages.qtpl:273 qw422016.N().S(`</a></div> `) -//line messages.qtpl:262 +//line messages.qtpl:274 } -//line messages.qtpl:263 +//line messages.qtpl:275 } -//line messages.qtpl:264 +//line messages.qtpl:276 if len(Data.SubscribedRooms) > 0 { -//line messages.qtpl:264 +//line messages.qtpl:276 qw422016.N().S(` <div class="mt-10px"></div> `) -//line messages.qtpl:266 +//line messages.qtpl:278 for _, e := range Data.SubscribedRooms { -//line messages.qtpl:266 +//line messages.qtpl:278 qw422016.N().S(` <div><a href="/chat/`) -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.E().S(e.Name) -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.N().S(`" target="_top"`) -//line messages.qtpl:267 +//line messages.qtpl:279 if e.IsUnread { -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:267 +//line messages.qtpl:279 } -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.N().S(`>#`) -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.E().S(e.Name) -//line messages.qtpl:267 +//line messages.qtpl:279 qw422016.N().S(`</a></div> `) -//line messages.qtpl:268 +//line messages.qtpl:280 } -//line messages.qtpl:269 +//line messages.qtpl:281 } -//line messages.qtpl:269 +//line messages.qtpl:281 qw422016.N().S(` <div class="mt-5px"><a href="/rooms" target="_top">[...]</a></div> </div> <div class="mb-20px"> <div class="rgt-title">In this room:</div> `) -//line messages.qtpl:274 +//line messages.qtpl:286 for _, e := range Data.Members { -//line messages.qtpl:274 +//line messages.qtpl:286 qw422016.N().S(` `) -//line messages.qtpl:275 +//line messages.qtpl:287 StreamMember(qw422016, AuthUser, Data, e) -//line messages.qtpl:275 +//line messages.qtpl:287 qw422016.N().S(` `) -//line messages.qtpl:276 +//line messages.qtpl:288 } -//line messages.qtpl:276 +//line messages.qtpl:288 qw422016.N().S(` </div> `) -//line messages.qtpl:278 +//line messages.qtpl:290 if Data.VisibleMemberInChat || AuthUser.DisplayHellbanned { -//line messages.qtpl:278 +//line messages.qtpl:290 qw422016.N().S(` <div class="mb-30px"> `) -//line messages.qtpl:280 +//line messages.qtpl:292 if len(Data.MembersInChat) > 0 { -//line messages.qtpl:280 +//line messages.qtpl:292 qw422016.N().S(` <div class="rgt-title">In other rooms:</div> `) -//line messages.qtpl:282 +//line messages.qtpl:294 for _, e := range Data.MembersInChat { -//line messages.qtpl:282 +//line messages.qtpl:294 qw422016.N().S(` `) -//line messages.qtpl:283 +//line messages.qtpl:295 StreamMember(qw422016, AuthUser, Data, e) -//line messages.qtpl:283 +//line messages.qtpl:295 qw422016.N().S(` `) -//line messages.qtpl:284 +//line messages.qtpl:296 } -//line messages.qtpl:285 +//line messages.qtpl:297 } -//line messages.qtpl:285 +//line messages.qtpl:297 qw422016.N().S(` </div> `) -//line messages.qtpl:287 +//line messages.qtpl:299 } -//line messages.qtpl:287 +//line messages.qtpl:299 qw422016.N().S(`</div> `) -//line messages.qtpl:289 +//line messages.qtpl:301 } -//line messages.qtpl:289 +//line messages.qtpl:301 func WriteRenderRightColumn(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMenuData) { -//line messages.qtpl:289 +//line messages.qtpl:301 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:289 +//line messages.qtpl:301 StreamRenderRightColumn(qw422016, AuthUser, Data) -//line messages.qtpl:289 +//line messages.qtpl:301 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:289 +//line messages.qtpl:301 } -//line messages.qtpl:289 +//line messages.qtpl:301 func RenderRightColumn(AuthUser *database.User, Data ChatMenuData) string { -//line messages.qtpl:289 +//line messages.qtpl:301 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:289 +//line messages.qtpl:301 WriteRenderRightColumn(qb422016, AuthUser, Data) -//line messages.qtpl:289 +//line messages.qtpl:301 qs422016 := string(qb422016.B) -//line messages.qtpl:289 +//line messages.qtpl:301 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:289 +//line messages.qtpl:301 return qs422016 -//line messages.qtpl:289 +//line messages.qtpl:301 } -//line messages.qtpl:291 +//line messages.qtpl:303 func StreamRenderMessages(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) { -//line messages.qtpl:293 +//line messages.qtpl:305 baseTopBarURL := "/api/v1/chat/top-bar/" + Data.ChatMenuData.RoomName readMarkerRendered := false isFirstMsg := true -//line messages.qtpl:297 +//line messages.qtpl:309 for idx, e := range Data.Messages { -//line messages.qtpl:298 +//line messages.qtpl:310 StreamRenderMessage(qw422016, idx, e, AuthUser, Data, baseTopBarURL, &readMarkerRendered, &isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:298 +//line messages.qtpl:310 qw422016.N().S(` `) -//line messages.qtpl:299 +//line messages.qtpl:311 } -//line messages.qtpl:299 +//line messages.qtpl:311 qw422016.N().S(` `) -//line messages.qtpl:300 +//line messages.qtpl:312 if len(Data.Messages) == 0 { -//line messages.qtpl:300 +//line messages.qtpl:312 qw422016.N().S(` <div id="no-msg"><em>No message yet</em></div> `) -//line messages.qtpl:302 +//line messages.qtpl:314 } -//line messages.qtpl:302 +//line messages.qtpl:314 qw422016.N().S(` `) -//line messages.qtpl:303 +//line messages.qtpl:315 } -//line messages.qtpl:303 +//line messages.qtpl:315 func WriteRenderMessages(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) { -//line messages.qtpl:303 +//line messages.qtpl:315 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:303 +//line messages.qtpl:315 StreamRenderMessages(qw422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:303 +//line messages.qtpl:315 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:303 +//line messages.qtpl:315 } -//line messages.qtpl:303 +//line messages.qtpl:315 func RenderMessages(AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) string { -//line messages.qtpl:303 +//line messages.qtpl:315 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:303 +//line messages.qtpl:315 WriteRenderMessages(qb422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:303 +//line messages.qtpl:315 qs422016 := string(qb422016.B) -//line messages.qtpl:303 +//line messages.qtpl:315 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:303 +//line messages.qtpl:315 return qs422016 -//line messages.qtpl:303 +//line messages.qtpl:315 } -//line messages.qtpl:305 +//line messages.qtpl:317 func StreamRenderMessage(qw422016 *qt422016.Writer, idx int, e database.ChatMessage, AuthUser *database.User, Data ChatMessagesData, baseTopBarURL string, readMarkerRendered, isFirstMsg *bool, CSRF, NullUsername string) { -//line messages.qtpl:307 +//line messages.qtpl:319 if e.UserCanSee(*AuthUser) { -//line messages.qtpl:307 +//line messages.qtpl:319 qw422016.N().S(` <div id="msgid-`) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.E().S(e.UUID) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.N().S(`" class="msgidc-`) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.E().S(e.UUID) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.N().S(`-`) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.N().DL(e.Rev) -//line messages.qtpl:308 +//line messages.qtpl:320 qw422016.N().S(` msg `) -//line messages.qtpl:309 +//line messages.qtpl:321 if (e.User.IsHellbanned || e.IsHellbanned) && AuthUser.DisplayHellbanned { -//line messages.qtpl:309 +//line messages.qtpl:321 qw422016.N().S(` hb-row `) -//line messages.qtpl:310 +//line messages.qtpl:322 } else if AuthUser.ID == e.User.ID && AuthUser.HighlightOwnMessages { -//line messages.qtpl:310 +//line messages.qtpl:322 qw422016.N().S(` own-highlight`) -//line messages.qtpl:310 +//line messages.qtpl:322 } -//line messages.qtpl:311 +//line messages.qtpl:323 if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered { -//line messages.qtpl:311 +//line messages.qtpl:323 qw422016.N().S(` `) -//line messages.qtpl:312 +//line messages.qtpl:324 if idx > 0 { -//line messages.qtpl:312 +//line messages.qtpl:324 qw422016.N().S(`read-marker`) -//line messages.qtpl:312 +//line messages.qtpl:324 } -//line messages.qtpl:313 +//line messages.qtpl:325 *readMarkerRendered = true -//line messages.qtpl:314 +//line messages.qtpl:326 } -//line messages.qtpl:314 +//line messages.qtpl:326 qw422016.N().S(` "> `) -//line messages.qtpl:316 +//line messages.qtpl:328 if e.UserCanDelete(*AuthUser) { -//line messages.qtpl:317 +//line messages.qtpl:329 if !e.TooOldToDelete() { -//line messages.qtpl:318 +//line messages.qtpl:330 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:318 +//line messages.qtpl:330 qw422016.N().S(` <form method="post" action="/api/v1/chat/messages/delete/`) -//line messages.qtpl:319 +//line messages.qtpl:331 qw422016.E().S(e.UUID) -//line messages.qtpl:319 +//line messages.qtpl:331 qw422016.N().S(`" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:320 +//line messages.qtpl:332 qw422016.E().S(CSRF) -//line messages.qtpl:320 +//line messages.qtpl:332 qw422016.N().S(`" /> <button class="mod-btn delete_msg_btn `) -//line messages.qtpl:322 +//line messages.qtpl:334 if e.User.Username != NullUsername { -//line messages.qtpl:322 +//line messages.qtpl:334 qw422016.N().S(` `) -//line messages.qtpl:323 +//line messages.qtpl:335 if (AuthUser.IsModerator() && e.UserID != AuthUser.ID) || AuthUser.IsAdmin || (e.Room.OwnerUserID != nil && *e.Room.OwnerUserID == AuthUser.ID) { -//line messages.qtpl:323 +//line messages.qtpl:335 qw422016.N().S(` orange-after `) -//line messages.qtpl:325 +//line messages.qtpl:337 } else { -//line messages.qtpl:325 +//line messages.qtpl:337 qw422016.N().S(` hide-after `) -//line messages.qtpl:327 +//line messages.qtpl:339 } -//line messages.qtpl:327 +//line messages.qtpl:339 qw422016.N().S(` `) -//line messages.qtpl:328 +//line messages.qtpl:340 } -//line messages.qtpl:328 +//line messages.qtpl:340 qw422016.N().S(` " title="delete"></button> </form> `) -//line messages.qtpl:331 +//line messages.qtpl:343 } -//line messages.qtpl:332 +//line messages.qtpl:344 } else if (AuthUser.IsModerator() && e.TooOldToDelete() && e.UserID != AuthUser.ID) || AuthUser.IsAdmin || (e.Room.OwnerUserID != nil && *e.Room.OwnerUserID == AuthUser.ID) { -//line messages.qtpl:333 +//line messages.qtpl:345 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:333 +//line messages.qtpl:345 qw422016.N().S(` <form method="post" action="/api/v1/chat/messages/delete/`) -//line messages.qtpl:334 +//line messages.qtpl:346 qw422016.E().S(e.UUID) -//line messages.qtpl:334 +//line messages.qtpl:346 qw422016.N().S(`" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:335 +//line messages.qtpl:347 qw422016.E().S(CSRF) -//line messages.qtpl:335 +//line messages.qtpl:347 qw422016.N().S(`" /> <button class="mod-btn delete_msg_btn f-orange-clr" title="delete"></button> </form> `) -//line messages.qtpl:338 +//line messages.qtpl:350 } -//line messages.qtpl:339 +//line messages.qtpl:351 } else if AuthUser.IsModerator() { -//line messages.qtpl:340 +//line messages.qtpl:352 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:340 +//line messages.qtpl:352 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:342 +//line messages.qtpl:354 } -//line messages.qtpl:343 +//line messages.qtpl:355 } else { -//line messages.qtpl:344 +//line messages.qtpl:356 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:344 +//line messages.qtpl:356 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:346 +//line messages.qtpl:358 } -//line messages.qtpl:347 +//line messages.qtpl:359 } -//line messages.qtpl:348 +//line messages.qtpl:360 if AuthUser.IsModerator() { -//line messages.qtpl:349 +//line messages.qtpl:361 if e.UserID != AuthUser.ID { -//line messages.qtpl:350 +//line messages.qtpl:362 if AuthUser.DisplayHellbanButton { -//line messages.qtpl:351 +//line messages.qtpl:363 if e.User.Username == NullUsername { -//line messages.qtpl:351 +//line messages.qtpl:363 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:353 +//line messages.qtpl:365 } else { -//line messages.qtpl:354 +//line messages.qtpl:366 if e.User.IsHellbanned { -//line messages.qtpl:354 +//line messages.qtpl:366 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:355 +//line messages.qtpl:367 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:355 +//line messages.qtpl:367 qw422016.N().S(`/unhellban" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:356 +//line messages.qtpl:368 qw422016.E().S(CSRF) -//line messages.qtpl:356 +//line messages.qtpl:368 qw422016.N().S(`" /> <button class="mod-btn hb_btn f-orange-clr line-through" title="unhellban"></button> </form> `) -//line messages.qtpl:359 +//line messages.qtpl:371 } else { -//line messages.qtpl:359 +//line messages.qtpl:371 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:360 +//line messages.qtpl:372 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:360 +//line messages.qtpl:372 qw422016.N().S(`/hellban" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:361 +//line messages.qtpl:373 qw422016.E().S(CSRF) -//line messages.qtpl:361 +//line messages.qtpl:373 qw422016.N().S(`" /> <button class="mod-btn hb_btn f-orange-clr" title="hellban"></button> </form> `) -//line messages.qtpl:364 +//line messages.qtpl:376 } -//line messages.qtpl:365 +//line messages.qtpl:377 } -//line messages.qtpl:366 +//line messages.qtpl:378 } -//line messages.qtpl:367 +//line messages.qtpl:379 if AuthUser.DisplayKickButton { -//line messages.qtpl:367 +//line messages.qtpl:379 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:368 +//line messages.qtpl:380 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:368 +//line messages.qtpl:380 qw422016.N().S(`/kick" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:369 +//line messages.qtpl:381 qw422016.E().S(CSRF) -//line messages.qtpl:369 +//line messages.qtpl:381 qw422016.N().S(`" /> <button class="mod-btn k_btn f-orange-clr" title="kick"></button> </form> `) -//line messages.qtpl:372 +//line messages.qtpl:384 } -//line messages.qtpl:373 +//line messages.qtpl:385 } else { -//line messages.qtpl:374 +//line messages.qtpl:386 if AuthUser.DisplayKickButton && AuthUser.DisplayHellbanButton { -//line messages.qtpl:374 +//line messages.qtpl:386 qw422016.N().S(` <div class="spacer36"></div> `) -//line messages.qtpl:376 +//line messages.qtpl:388 } else if AuthUser.DisplayKickButton || AuthUser.DisplayHellbanButton { -//line messages.qtpl:376 +//line messages.qtpl:388 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:378 +//line messages.qtpl:390 } -//line messages.qtpl:379 +//line messages.qtpl:391 } -//line messages.qtpl:380 +//line messages.qtpl:392 } -//line messages.qtpl:381 +//line messages.qtpl:393 } else { -//line messages.qtpl:382 +//line messages.qtpl:394 if Data.NbButtons == 3 { -//line messages.qtpl:382 +//line messages.qtpl:394 qw422016.N().S(` <div class="spacer56"></div> `) -//line messages.qtpl:384 +//line messages.qtpl:396 } else if Data.NbButtons == 2 { -//line messages.qtpl:384 +//line messages.qtpl:396 qw422016.N().S(` <div class="spacer36"></div> `) -//line messages.qtpl:386 +//line messages.qtpl:398 } else if Data.NbButtons == 1 { -//line messages.qtpl:386 +//line messages.qtpl:398 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:388 +//line messages.qtpl:400 } -//line messages.qtpl:389 +//line messages.qtpl:401 } -//line messages.qtpl:390 +//line messages.qtpl:402 if AuthUser.GetDateFormat() != "" { -//line messages.qtpl:390 +//line messages.qtpl:402 qw422016.N().S(` <a href="`) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(`?quote=`) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.E().S(e.UUID) -//line messages.qtpl:391 +//line messages.qtpl:403 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(`" target="iframe1" class="date date-link" title="`) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.E().S(e.CreatedAt.Format("01-02 15:04:05")) -//line messages.qtpl:391 +//line messages.qtpl:403 if *isFirstMsg { -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(` (`) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.E().S(humanize.Time(e.CreatedAt)) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(`)`) -//line messages.qtpl:391 +//line messages.qtpl:403 } -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(`">`) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.E().S(e.CreatedAt.Format(AuthUser.GetDateFormat())) -//line messages.qtpl:391 +//line messages.qtpl:403 qw422016.N().S(`</a> `) -//line messages.qtpl:392 +//line messages.qtpl:404 *isFirstMsg = false -//line messages.qtpl:392 +//line messages.qtpl:404 qw422016.N().S(` `) -//line messages.qtpl:393 +//line messages.qtpl:405 } -//line messages.qtpl:393 +//line messages.qtpl:405 qw422016.N().S(` <a href="/u/`) -//line messages.qtpl:394 +//line messages.qtpl:406 qw422016.E().S(e.GetProfile(AuthUser)) -//line messages.qtpl:394 +//line messages.qtpl:406 qw422016.N().S(`" target="_blank" class="f-def-clr">-</a> `) -//line messages.qtpl:395 +//line messages.qtpl:407 if e.System { -//line messages.qtpl:395 +//line messages.qtpl:407 qw422016.N().S(` <span class="sysmsg">`) -//line messages.qtpl:396 +//line messages.qtpl:408 streamunesc(qw422016, e.Message) -//line messages.qtpl:396 +//line messages.qtpl:408 qw422016.N().S(`</span> `) -//line messages.qtpl:397 +//line messages.qtpl:409 } else { -//line messages.qtpl:398 +//line messages.qtpl:410 if e.Moderators { -//line messages.qtpl:398 +//line messages.qtpl:410 qw422016.N().S(`<span class="sysmsg">[<a href="`) -//line messages.qtpl:398 +//line messages.qtpl:410 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:398 +//line messages.qtpl:410 qw422016.N().S(`?m=1`) -//line messages.qtpl:398 +//line messages.qtpl:410 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:398 +//line messages.qtpl:410 qw422016.N().S(`" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;`) -//line messages.qtpl:398 +//line messages.qtpl:410 } -//line messages.qtpl:399 +//line messages.qtpl:411 if e.GroupID != nil { -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.N().S(`<span class="sysmsg">[<a href="`) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.N().S(`?g=`) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.E().S(e.Group.Name) -//line messages.qtpl:399 +//line messages.qtpl:411 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.N().S(`" target="iframe1" class="sysmsg f-white-clr">`) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.E().S(e.Group.Name) -//line messages.qtpl:399 +//line messages.qtpl:411 qw422016.N().S(`</a>]</span>&nbsp;`) -//line messages.qtpl:399 +//line messages.qtpl:411 } -//line messages.qtpl:400 +//line messages.qtpl:412 if e.ToUserID != nil { -//line messages.qtpl:400 +//line messages.qtpl:412 qw422016.N().S(` [`) -//line messages.qtpl:401 +//line messages.qtpl:413 streamfromUsername(qw422016, AuthUser, Data, e, baseTopBarURL) -//line messages.qtpl:401 +//line messages.qtpl:413 qw422016.N().S(` → `) -//line messages.qtpl:403 +//line messages.qtpl:415 if e.ToUser.ID == AuthUser.ID { -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`<span `) -//line messages.qtpl:403 +//line messages.qtpl:415 streamunesc(qw422016, e.ToUser.GenerateChatStyle()) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`>`) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.E().S(e.ToUser.Username) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`</span>`) -//line messages.qtpl:403 +//line messages.qtpl:415 } else { -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`<a `) -//line messages.qtpl:403 +//line messages.qtpl:415 streamunesc(qw422016, e.ToUser.GenerateChatStyle()) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(` href="`) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`?pm=`) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.E().S(e.ToUser.Username) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.E().S(Data.TopBarQueryParams) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.E().S(e.ToUser.Username) -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`</a>`) -//line messages.qtpl:403 +//line messages.qtpl:415 } -//line messages.qtpl:403 +//line messages.qtpl:415 qw422016.N().S(`] - `) -//line messages.qtpl:404 +//line messages.qtpl:416 } else { -//line messages.qtpl:405 +//line messages.qtpl:417 streamfromUsername(qw422016, AuthUser, Data, e, baseTopBarURL) -//line messages.qtpl:406 +//line messages.qtpl:418 if !e.IsMe() { -//line messages.qtpl:407 +//line messages.qtpl:419 if AuthUser.CanSeeHB() && (e.IsHellbanned || e.User.IsHellbanned) && (e.ToUserID == nil) { -//line messages.qtpl:407 +//line messages.qtpl:419 qw422016.N().S(` <a href="`) -//line messages.qtpl:408 +//line messages.qtpl:420 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:408 +//line messages.qtpl:420 qw422016.N().S(`?hbm=1`) -//line messages.qtpl:408 +//line messages.qtpl:420 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:408 +//line messages.qtpl:420 qw422016.N().S(`" target="iframe1" class="f-def-clr">-</a> `) -//line messages.qtpl:409 +//line messages.qtpl:421 } else { -//line messages.qtpl:409 +//line messages.qtpl:421 qw422016.N().S(` - `) -//line messages.qtpl:411 +//line messages.qtpl:423 } -//line messages.qtpl:412 +//line messages.qtpl:424 } -//line messages.qtpl:413 +//line messages.qtpl:425 } -//line messages.qtpl:413 +//line messages.qtpl:425 qw422016.N().S(` <span `) -//line messages.qtpl:414 +//line messages.qtpl:426 streamunesc(qw422016, e.User.GenerateChatStyle()) -//line messages.qtpl:414 +//line messages.qtpl:426 qw422016.N().S(`><span class="o-wrap">`) -//line messages.qtpl:414 +//line messages.qtpl:426 qw422016.N().S(unesc(e.MsgToDisplay())) -//line messages.qtpl:414 +//line messages.qtpl:426 qw422016.N().S(`</span></span> `) -//line messages.qtpl:415 +//line messages.qtpl:427 } -//line messages.qtpl:415 +//line messages.qtpl:427 qw422016.N().S(` </div> `) -//line messages.qtpl:417 +//line messages.qtpl:429 } -//line messages.qtpl:418 +//line messages.qtpl:430 } -//line messages.qtpl:418 +//line messages.qtpl:430 func WriteRenderMessage(qq422016 qtio422016.Writer, idx int, e database.ChatMessage, AuthUser *database.User, Data ChatMessagesData, baseTopBarURL string, readMarkerRendered, isFirstMsg *bool, CSRF, NullUsername string) { -//line messages.qtpl:418 +//line messages.qtpl:430 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:418 +//line messages.qtpl:430 StreamRenderMessage(qw422016, idx, e, AuthUser, Data, baseTopBarURL, readMarkerRendered, isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:418 +//line messages.qtpl:430 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:418 +//line messages.qtpl:430 } -//line messages.qtpl:418 +//line messages.qtpl:430 func RenderMessage(idx int, e database.ChatMessage, AuthUser *database.User, Data ChatMessagesData, baseTopBarURL string, readMarkerRendered, isFirstMsg *bool, CSRF, NullUsername string) string { -//line messages.qtpl:418 +//line messages.qtpl:430 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:418 +//line messages.qtpl:430 WriteRenderMessage(qb422016, idx, e, AuthUser, Data, baseTopBarURL, readMarkerRendered, isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:418 +//line messages.qtpl:430 qs422016 := string(qb422016.B) -//line messages.qtpl:418 +//line messages.qtpl:430 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:418 +//line messages.qtpl:430 return qs422016 -//line messages.qtpl:418 +//line messages.qtpl:430 } -//line messages.qtpl:421 +//line messages.qtpl:433 func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) { -//line messages.qtpl:421 +//line messages.qtpl:433 qw422016.N().S(` `) -//line messages.qtpl:422 +//line messages.qtpl:434 baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName -//line messages.qtpl:423 +//line messages.qtpl:435 if El.Username == AuthUser.Username { -//line messages.qtpl:423 +//line messages.qtpl:435 qw422016.N().S(` <div> <span style="color: `) -//line messages.qtpl:425 +//line messages.qtpl:437 qw422016.E().S(El.Color) -//line messages.qtpl:425 +//line messages.qtpl:437 qw422016.N().S(`;">`) -//line messages.qtpl:425 +//line messages.qtpl:437 qw422016.E().S(El.Username) -//line messages.qtpl:425 +//line messages.qtpl:437 qw422016.N().S(`</span> `) -//line messages.qtpl:426 +//line messages.qtpl:438 if El.AfkIndicatorEnabled { -//line messages.qtpl:426 +//line messages.qtpl:438 qw422016.N().S(` <small class="afk-indicator">afk</small> `) -//line messages.qtpl:428 +//line messages.qtpl:440 } -//line messages.qtpl:428 +//line messages.qtpl:440 qw422016.N().S(` </div> `) -//line messages.qtpl:430 +//line messages.qtpl:442 } else { -//line messages.qtpl:431 +//line messages.qtpl:443 if !El.IsHellbanned || AuthUser.ID == El.UserID || (El.IsHellbanned && AuthUser.IsHellbanned) || AuthUser.DisplayHellbanned { -//line messages.qtpl:431 +//line messages.qtpl:443 qw422016.N().S(` <div> `) -//line messages.qtpl:433 +//line messages.qtpl:445 tagType := "tag" -//line messages.qtpl:434 +//line messages.qtpl:446 if AuthUser.CanSeeHB() && El.IsHellbanned { -//line messages.qtpl:435 +//line messages.qtpl:447 tagType = "htag" -//line messages.qtpl:436 +//line messages.qtpl:448 } -//line messages.qtpl:437 +//line messages.qtpl:449 qw422016.N().S(`<a href="`) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.N().S(`?`) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.E().S(tagType) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.N().S(`=`) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.E().S(El.Username) -//line messages.qtpl:438 +//line messages.qtpl:450 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:438 +//line messages.qtpl:450 qw422016.N().S(`"target="iframe1"`) -//line messages.qtpl:440 +//line messages.qtpl:452 if El.IsHellbanned && AuthUser.DisplayHellbanned { -//line messages.qtpl:440 +//line messages.qtpl:452 qw422016.N().S(`class="hb-row"`) -//line messages.qtpl:440 +//line messages.qtpl:452 } -//line messages.qtpl:440 +//line messages.qtpl:452 qw422016.N().S(`style="color:`) -//line messages.qtpl:441 +//line messages.qtpl:453 qw422016.E().S(El.Color) -//line messages.qtpl:441 +//line messages.qtpl:453 qw422016.N().S(`;">`) -//line messages.qtpl:441 +//line messages.qtpl:453 qw422016.E().S(string(El.Username[0])) -//line messages.qtpl:441 +//line messages.qtpl:453 qw422016.N().S(`</a><a href="`) -//line messages.qtpl:442 +//line messages.qtpl:454 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:442 +//line messages.qtpl:454 qw422016.N().S(`?pm=`) -//line messages.qtpl:442 +//line messages.qtpl:454 qw422016.E().S(El.Username) -//line messages.qtpl:442 +//line messages.qtpl:454 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:442 +//line messages.qtpl:454 qw422016.N().S(`"target="iframe1"`) -//line messages.qtpl:444 +//line messages.qtpl:456 if El.IsHellbanned && AuthUser.DisplayHellbanned { -//line messages.qtpl:444 +//line messages.qtpl:456 qw422016.N().S(`class="hb-row"`) -//line messages.qtpl:444 +//line messages.qtpl:456 } -//line messages.qtpl:444 +//line messages.qtpl:456 qw422016.N().S(`style="color:`) -//line messages.qtpl:445 +//line messages.qtpl:457 qw422016.E().S(El.Color) -//line messages.qtpl:445 +//line messages.qtpl:457 qw422016.N().S(`;">`) -//line messages.qtpl:445 +//line messages.qtpl:457 qw422016.E().S(string(El.Username[1 : len(El.Username)-1])) -//line messages.qtpl:445 +//line messages.qtpl:457 qw422016.N().S(`</a><a href="/u/`) -//line messages.qtpl:446 +//line messages.qtpl:458 qw422016.E().S(El.Username) -//line messages.qtpl:446 +//line messages.qtpl:458 qw422016.N().S(`"rel="noopener noreferrer" target="_blank"`) -//line messages.qtpl:448 +//line messages.qtpl:460 if El.IsHellbanned && AuthUser.DisplayHellbanned { -//line messages.qtpl:448 +//line messages.qtpl:460 qw422016.N().S(`class="hb-row"`) -//line messages.qtpl:448 +//line messages.qtpl:460 } -//line messages.qtpl:448 +//line messages.qtpl:460 qw422016.N().S(`style="color:`) -//line messages.qtpl:449 +//line messages.qtpl:461 qw422016.E().S(El.Color) -//line messages.qtpl:449 +//line messages.qtpl:461 qw422016.N().S(`;">`) -//line messages.qtpl:449 +//line messages.qtpl:461 qw422016.E().S(string(El.Username[len(El.Username)-1])) -//line messages.qtpl:449 +//line messages.qtpl:461 qw422016.N().S(`</a>`) -//line messages.qtpl:451 +//line messages.qtpl:463 if El.AfkIndicatorEnabled { -//line messages.qtpl:451 +//line messages.qtpl:463 qw422016.N().S(` <small class="afk-indicator">afk</small> `) -//line messages.qtpl:453 +//line messages.qtpl:465 } -//line messages.qtpl:453 +//line messages.qtpl:465 qw422016.N().S(` </div> `) -//line messages.qtpl:455 +//line messages.qtpl:467 } -//line messages.qtpl:456 +//line messages.qtpl:468 } -//line messages.qtpl:457 +//line messages.qtpl:469 } -//line messages.qtpl:457 +//line messages.qtpl:469 func WriteMember(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) { -//line messages.qtpl:457 +//line messages.qtpl:469 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:457 +//line messages.qtpl:469 StreamMember(qw422016, AuthUser, Data, El) -//line messages.qtpl:457 +//line messages.qtpl:469 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:457 +//line messages.qtpl:469 } -//line messages.qtpl:457 +//line messages.qtpl:469 func Member(AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) string { -//line messages.qtpl:457 +//line messages.qtpl:469 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:457 +//line messages.qtpl:469 WriteMember(qb422016, AuthUser, Data, El) -//line messages.qtpl:457 +//line messages.qtpl:469 qs422016 := string(qb422016.B) -//line messages.qtpl:457 +//line messages.qtpl:469 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:457 +//line messages.qtpl:469 return qs422016 -//line messages.qtpl:457 +//line messages.qtpl:469 } -//line messages.qtpl:460 +//line messages.qtpl:472 func streamfromUsername(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) { -//line messages.qtpl:461 +//line messages.qtpl:473 tagType := "tag" -//line messages.qtpl:462 +//line messages.qtpl:474 if El.ToUserID != nil { -//line messages.qtpl:463 +//line messages.qtpl:475 tagType = "pm" -//line messages.qtpl:464 +//line messages.qtpl:476 } else if AuthUser.CanSeeHB() && (El.IsHellbanned || El.User.IsHellbanned) { -//line messages.qtpl:465 +//line messages.qtpl:477 tagType = "htag" -//line messages.qtpl:466 +//line messages.qtpl:478 } else if AuthUser.IsModerator() && El.Moderators { -//line messages.qtpl:467 +//line messages.qtpl:479 tagType = "mtag" -//line messages.qtpl:468 +//line messages.qtpl:480 } -//line messages.qtpl:469 +//line messages.qtpl:481 if El.User.ID == AuthUser.ID { -//line messages.qtpl:470 +//line messages.qtpl:482 if El.CanBeEdited() { -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`<a `) -//line messages.qtpl:470 +//line messages.qtpl:482 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(` href="`) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`?e=`) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.E().S(El.CreatedAt.Format("15:04:05")) -//line messages.qtpl:470 +//line messages.qtpl:482 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.E().S(El.User.Username) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`</a>`) -//line messages.qtpl:470 +//line messages.qtpl:482 } else { -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`<span `) -//line messages.qtpl:470 +//line messages.qtpl:482 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`>`) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.E().S(El.User.Username) -//line messages.qtpl:470 +//line messages.qtpl:482 qw422016.N().S(`</span>`) -//line messages.qtpl:470 +//line messages.qtpl:482 } -//line messages.qtpl:471 +//line messages.qtpl:483 } else { -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(`<a `) -//line messages.qtpl:471 +//line messages.qtpl:483 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(` href="`) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(`?`) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.E().S(tagType) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(`=`) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.E().S(El.User.Username) -//line messages.qtpl:471 +//line messages.qtpl:483 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.E().S(El.User.Username) -//line messages.qtpl:471 +//line messages.qtpl:483 qw422016.N().S(`</a>`) -//line messages.qtpl:471 +//line messages.qtpl:483 } -//line messages.qtpl:472 +//line messages.qtpl:484 } -//line messages.qtpl:472 +//line messages.qtpl:484 func writefromUsername(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) { -//line messages.qtpl:472 +//line messages.qtpl:484 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:472 +//line messages.qtpl:484 streamfromUsername(qw422016, AuthUser, Data, El, baseTopBarURL) -//line messages.qtpl:472 +//line messages.qtpl:484 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:472 +//line messages.qtpl:484 } -//line messages.qtpl:472 +//line messages.qtpl:484 func fromUsername(AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) string { -//line messages.qtpl:472 +//line messages.qtpl:484 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:472 +//line messages.qtpl:484 writefromUsername(qb422016, AuthUser, Data, El, baseTopBarURL) -//line messages.qtpl:472 +//line messages.qtpl:484 qs422016 := string(qb422016.B) -//line messages.qtpl:472 +//line messages.qtpl:484 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:472 +//line messages.qtpl:484 return qs422016 -//line messages.qtpl:472 +//line messages.qtpl:484 } diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go @@ -4944,15 +4944,8 @@ func ChatStreamMessagesHandler(c echo.Context) error { data := v1.ChatMessagesData{} data.ChatMenuData.RoomName = room.Name - data.ManualRefreshTimeout = 30 + data.ManualRefreshTimeout = 0 _, _ = c.Response().Write([]byte(v1.GenerateStyle(authUser, data))) - _, _ = c.Response().Write([]byte(fmt.Sprintf(` - <div id="manualrefresh"> - <h4>Manual refresh required</h4> - <form method="get"> - <input type="submit" value="Reload" /> - </form> - </div>`))) _, _ = c.Response().Write([]byte(`<div id="http-alive-indicator"></div>`)) _, _ = c.Response().Write([]byte(fmt.Sprintf(`<div style="display:flex;flex-direction:column-reverse;" id="msgs">`))) c.Response().Flush() @@ -5000,13 +4993,7 @@ Loop: db.UpdateChatReadRecord(authUser.ID, room.ID) _, _ = c.Response().Write([]byte(`<style>#http-alive-indicator{background-color:` + clrs[clrIdx%len(clrs)] + `;}</style>`)) - _, _ = c.Response().Write([]byte(`<style>#manualrefresh{animation: none;}</style>`)) c.Response().Flush() - utils.SGo(func() { - time.Sleep(100 * time.Millisecond) - _, _ = c.Response().Write([]byte(`<style>#manualrefresh{animation: timeout_messages 30s forwards;}</style>`)) - c.Response().Flush() - }) clrIdx++ _, msgTyp, err := sub.ReceiveTimeout(5 * time.Second) diff --git a/pkg/web/web.go b/pkg/web/web.go @@ -321,32 +321,53 @@ func getBaseServer(db *database.DkfDB) *echo.Echo { return e } -func startI2pServer(db *database.DkfDB, host string, port int) { +func getI2pServer(db *database.DkfDB) *echo.Echo { if config.Development.IsTrue() { - return + return nil } - address := host + ":" + strconv.Itoa(port) - e := getBaseServer(db) - logrus.Info("start i2p server on " + address) - startServer(e, address) + return getBaseServer(db) } -func startTorServer(db *database.DkfDB, host string, port int) { - address := host + ":" + strconv.Itoa(port) +func getTorServer(db *database.DkfDB) *echo.Echo { e := getBaseServer(db) configTorProdServer(e) - logrus.Info("start tor server on " + address) - startServer(e, address) + return e } func startServer(e *echo.Echo, address string) { - serverError := make(chan struct{}) +} + +// Start ... +func Start(db *database.DkfDB, host string, port int) { + // Server for Tor/dev + e1 := getTorServer(db) + // Start server for I2P + e2 := getI2pServer(db) + + serverError1 := make(chan struct{}) + serverError2 := make(chan struct{}) + + utils.SGo(func() { + if e2 != nil { + address := host + ":" + strconv.Itoa(port+1) + logrus.Info("start i2p server on " + address) + if err := e2.Start(address); err != nil { + if err != http.ErrServerClosed { + logrus.Error(err) + } + close(serverError2) + } + } + }) utils.SGo(func() { - if err := e.Start(address); err != nil { + address := host + ":" + strconv.Itoa(port) + logrus.Info("start tor server on " + address) + if err := e1.Start(address); err != nil { if err != http.ErrServerClosed { logrus.Error(err) } + close(serverError1) } }) @@ -356,23 +377,26 @@ func startServer(e *echo.Echo, address string) { signal.Notify(quit, os.Interrupt) select { case <-quit: - case <-serverError: + case <-serverError1: + case <-serverError2: } + logrus.Info("graceful shutdown") ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - if err := e.Shutdown(ctx); err != nil { + if err := e1.Shutdown(ctx); err != nil { logrus.Errorf("graceful shutdown failed: %s", err.Error()) } - logrus.Info("Bye!") -} -// Start ... -func Start(db *database.DkfDB, host string, port int) { - // Start server for I2P - go startI2pServer(db, host, port+1) - // Server for Tor/dev - startTorServer(db, host, port) + if e2 != nil { + ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + if err := e2.Shutdown(ctx); err != nil { + logrus.Errorf("graceful shutdown failed: %s", err.Error()) + } + } + + logrus.Info("Bye!") } func extractGlobalCircuitIdentifier(m string) int64 {