dkforest

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

commit ab1382d4f85171662dd2520fa7e5a143f03ffc2e
parent d124d172d461b4c143df53e0edd53a3e99b03929
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed,  7 Jun 2023 02:33:08 -0700

fixes

Diffstat:
Mpkg/web/handlers/api/v1/messages.qtpl | 6+++++-
Mpkg/web/handlers/api/v1/messages.qtpl.go | 1042++++++++++++++++++++++++++++++++++++++++---------------------------------------
Mpkg/web/handlers/api/v1/topBarHandler.go | 9+++++++--
Mpkg/web/handlers/handlers.go | 4+++-
4 files changed, 538 insertions(+), 523 deletions(-)

diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl @@ -209,9 +209,13 @@ z-index: 999; border-radius: 5px; } - .code-modal textarea { + .code-modal .wrapper { position: absolute; top: 10px; left: 10px; right: 10px; bottom: 30px; + } + .code-modal .wrapper textarea { + width: 100%; + height: 100%; background-color: rgba(79,79,79,1); color: #fff; border: 1px solid rgba(90,90,90,1); diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go @@ -271,9 +271,13 @@ func StreamGenerateStyle(qw422016 *qt422016.Writer, AuthUser *database.User, Dat z-index: 999; border-radius: 5px; } - .code-modal textarea { + .code-modal .wrapper { position: absolute; top: 10px; left: 10px; right: 10px; bottom: 30px; + } + .code-modal .wrapper textarea { + width: 100%; + height: 100%; background-color: rgba(79,79,79,1); color: #fff; border: 1px solid rgba(90,90,90,1); @@ -284,86 +288,86 @@ func StreamGenerateStyle(qw422016 *qt422016.Writer, AuthUser *database.User, Dat } </style> `) -//line messages.qtpl:224 +//line messages.qtpl:228 } -//line messages.qtpl:224 +//line messages.qtpl:228 func WriteGenerateStyle(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:224 +//line messages.qtpl:228 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:224 +//line messages.qtpl:228 StreamGenerateStyle(qw422016, AuthUser, Data) -//line messages.qtpl:224 +//line messages.qtpl:228 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:224 +//line messages.qtpl:228 } -//line messages.qtpl:224 +//line messages.qtpl:228 func GenerateStyle(AuthUser *database.User, Data ChatMessagesData) string { -//line messages.qtpl:224 +//line messages.qtpl:228 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:224 +//line messages.qtpl:228 WriteGenerateStyle(qb422016, AuthUser, Data) -//line messages.qtpl:224 +//line messages.qtpl:228 qs422016 := string(qb422016.B) -//line messages.qtpl:224 +//line messages.qtpl:228 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:224 +//line messages.qtpl:228 return qs422016 -//line messages.qtpl:224 +//line messages.qtpl:228 } -//line messages.qtpl:226 +//line messages.qtpl:230 func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:226 +//line messages.qtpl:230 qw422016.N().S(`<html lang="en"> <head> <title></title> `) -//line messages.qtpl:230 +//line messages.qtpl:234 if !Data.ChatMenuData.PreventRefresh && !Data.ForceManualRefresh { -//line messages.qtpl:230 +//line messages.qtpl:234 qw422016.N().S(`<meta http-equiv="refresh" content="`) -//line messages.qtpl:230 +//line messages.qtpl:234 qw422016.N().DL(AuthUser.RefreshRate) -//line messages.qtpl:230 +//line messages.qtpl:234 qw422016.N().S(`">`) -//line messages.qtpl:230 +//line messages.qtpl:234 } -//line messages.qtpl:231 +//line messages.qtpl:235 if AuthUser.CollectMetadata { -//line messages.qtpl:231 +//line messages.qtpl:235 qw422016.N().S(`<link rel="stylesheet" type="text/css" href="/public/css/meta.css?v=`) -//line messages.qtpl:231 +//line messages.qtpl:235 qw422016.E().S(VERSION) -//line messages.qtpl:231 +//line messages.qtpl:235 qw422016.N().S(`" />`) -//line messages.qtpl:231 +//line messages.qtpl:235 } -//line messages.qtpl:232 +//line messages.qtpl:236 StreamGenerateStyle(qw422016, AuthUser, Data) -//line messages.qtpl:232 +//line messages.qtpl:236 qw422016.N().S(` </head> <body> `) -//line messages.qtpl:236 +//line messages.qtpl:240 if Data.ForceManualRefresh { -//line messages.qtpl:236 +//line messages.qtpl:240 qw422016.N().S(` <div id="manualrefresh"> <h4>Manual refresh required</h4> <form method="get" action="/chat/`) -//line messages.qtpl:239 +//line messages.qtpl:243 qw422016.E().S(Data.ChatMenuData.RoomName) -//line messages.qtpl:239 +//line messages.qtpl:243 qw422016.N().S(`" target="_top"> <input type="submit" value="Reload" /> </form> </div> `) -//line messages.qtpl:243 +//line messages.qtpl:247 } else if !Data.ChatMenuData.PreventRefresh { -//line messages.qtpl:243 +//line messages.qtpl:247 qw422016.N().S(` <div id="manualrefresh"> <h4>Manual refresh required</h4> <form method="get"> @@ -371,493 +375,484 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin </form> </div> `) -//line messages.qtpl:250 +//line messages.qtpl:254 } -//line messages.qtpl:250 +//line messages.qtpl:254 qw422016.N().S(` `) -//line messages.qtpl:252 +//line messages.qtpl:256 if Data.Error != "" { -//line messages.qtpl:252 +//line messages.qtpl:256 qw422016.N().S(` <a href="/api/v1/chat/messages/`) -//line messages.qtpl:253 +//line messages.qtpl:257 qw422016.E().S(Data.ChatMenuData.RoomName) -//line messages.qtpl:253 +//line messages.qtpl:257 qw422016.N().S(`" id="msg-err">× `) -//line messages.qtpl:253 +//line messages.qtpl:257 qw422016.E().S(Data.Error) -//line messages.qtpl:253 +//line messages.qtpl:257 qw422016.N().S(`</a> `) -//line messages.qtpl:254 +//line messages.qtpl:258 } -//line messages.qtpl:254 +//line messages.qtpl:258 qw422016.N().S(` `) -//line messages.qtpl:256 +//line messages.qtpl:260 if Data.PmSound || Data.TaggedSound { -//line messages.qtpl:256 +//line messages.qtpl:260 qw422016.N().S(` <audio src="/public/mp3/sound5.mp3" autoplay></audio> `) -//line messages.qtpl:258 +//line messages.qtpl:262 } else if Data.NewMessageSound { -//line messages.qtpl:258 +//line messages.qtpl:262 qw422016.N().S(` <audio src="/public/mp3/sound6.mp3" autoplay></audio> `) -//line messages.qtpl:260 +//line messages.qtpl:264 } -//line messages.qtpl:260 +//line messages.qtpl:264 qw422016.N().S(` <div id="msgs"> `) -//line messages.qtpl:263 +//line messages.qtpl:267 StreamRenderMessages(qw422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:263 +//line messages.qtpl:267 qw422016.N().S(` </div> `) -//line messages.qtpl:266 +//line messages.qtpl:270 if !AuthUser.HideRightColumn { -//line messages.qtpl:266 +//line messages.qtpl:270 qw422016.N().S(` <div id="rgt-pane-w"> `) -//line messages.qtpl:268 +//line messages.qtpl:272 StreamRenderRightColumn(qw422016, AuthUser, Data.ChatMenuData) -//line messages.qtpl:268 +//line messages.qtpl:272 qw422016.N().S(` </div> `) -//line messages.qtpl:270 +//line messages.qtpl:274 } -//line messages.qtpl:271 +//line messages.qtpl:275 if AuthUser.CollectMetadata { -//line messages.qtpl:271 +//line messages.qtpl:275 qw422016.N().S(` <div class="div_1"></div> <div class="div_2"></div> <div class="div_f0">a</div> `) -//line messages.qtpl:275 +//line messages.qtpl:279 } -//line messages.qtpl:275 +//line messages.qtpl:279 qw422016.N().S(` </body> </html> `) -//line messages.qtpl:278 +//line messages.qtpl:282 } -//line messages.qtpl:278 +//line messages.qtpl:282 func WriteMessages(qq422016 qtio422016.Writer, VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) { -//line messages.qtpl:278 +//line messages.qtpl:282 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:278 +//line messages.qtpl:282 StreamMessages(qw422016, VERSION, CSRF, NullUsername, AuthUser, Data) -//line messages.qtpl:278 +//line messages.qtpl:282 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:278 +//line messages.qtpl:282 } -//line messages.qtpl:278 +//line messages.qtpl:282 func Messages(VERSION, CSRF, NullUsername string, AuthUser *database.User, Data ChatMessagesData) string { -//line messages.qtpl:278 +//line messages.qtpl:282 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:278 +//line messages.qtpl:282 WriteMessages(qb422016, VERSION, CSRF, NullUsername, AuthUser, Data) -//line messages.qtpl:278 +//line messages.qtpl:282 qs422016 := string(qb422016.B) -//line messages.qtpl:278 +//line messages.qtpl:282 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:278 +//line messages.qtpl:282 return qs422016 -//line messages.qtpl:278 +//line messages.qtpl:282 } -//line messages.qtpl:281 +//line messages.qtpl:285 func StreamRenderRightColumn(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMenuData) { -//line messages.qtpl:281 +//line messages.qtpl:285 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:284 +//line messages.qtpl:288 if Data.InboxCount > 0 { -//line messages.qtpl:284 +//line messages.qtpl:288 qw422016.N().S(`class="notif"`) -//line messages.qtpl:284 +//line messages.qtpl:288 } -//line messages.qtpl:284 +//line messages.qtpl:288 qw422016.N().S(`>`) -//line messages.qtpl:284 +//line messages.qtpl:288 qw422016.N().DL(Data.InboxCount) -//line messages.qtpl:284 +//line messages.qtpl:288 qw422016.N().S(`</a>)</div> </div> <div class="mb-20px"> <div class="rgt-title">Rooms:</div> `) -//line messages.qtpl:288 +//line messages.qtpl:292 for _, e := range Data.OfficialRooms { -//line messages.qtpl:289 +//line messages.qtpl:293 if e.Name == "club" { -//line messages.qtpl:290 +//line messages.qtpl:294 if AuthUser.IsClubMember { -//line messages.qtpl:290 +//line messages.qtpl:294 qw422016.N().S(` <div><a href="/chat/club" target="_top"`) -//line messages.qtpl:291 +//line messages.qtpl:295 if e.IsUnread { -//line messages.qtpl:291 +//line messages.qtpl:295 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:291 +//line messages.qtpl:295 } -//line messages.qtpl:291 +//line messages.qtpl:295 qw422016.N().S(`>#club</a></div> `) -//line messages.qtpl:292 +//line messages.qtpl:296 } -//line messages.qtpl:293 +//line messages.qtpl:297 } else if e.Name == "moderators" { -//line messages.qtpl:294 +//line messages.qtpl:298 if AuthUser.IsModerator() { -//line messages.qtpl:294 +//line messages.qtpl:298 qw422016.N().S(` <div><a href="/chat/moderators" target="_top"`) -//line messages.qtpl:295 +//line messages.qtpl:299 if e.IsUnread { -//line messages.qtpl:295 +//line messages.qtpl:299 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:295 +//line messages.qtpl:299 } -//line messages.qtpl:295 +//line messages.qtpl:299 qw422016.N().S(`>#moderators</a></div> `) -//line messages.qtpl:296 +//line messages.qtpl:300 } -//line messages.qtpl:297 +//line messages.qtpl:301 } else { -//line messages.qtpl:297 +//line messages.qtpl:301 qw422016.N().S(` <div><a href="/chat/`) -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.E().S(e.Name) -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.N().S(`" target="_top"`) -//line messages.qtpl:298 +//line messages.qtpl:302 if e.IsUnread { -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:298 +//line messages.qtpl:302 } -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.N().S(`>#`) -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.E().S(e.Name) -//line messages.qtpl:298 +//line messages.qtpl:302 qw422016.N().S(`</a></div> `) -//line messages.qtpl:299 +//line messages.qtpl:303 } -//line messages.qtpl:300 +//line messages.qtpl:304 } -//line messages.qtpl:301 +//line messages.qtpl:305 if len(Data.SubscribedRooms) > 0 { -//line messages.qtpl:301 +//line messages.qtpl:305 qw422016.N().S(` <div class="mt-10px"></div> `) -//line messages.qtpl:303 +//line messages.qtpl:307 for _, e := range Data.SubscribedRooms { -//line messages.qtpl:303 +//line messages.qtpl:307 qw422016.N().S(` <div><a href="/chat/`) -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.E().S(e.Name) -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.N().S(`" target="_top"`) -//line messages.qtpl:304 +//line messages.qtpl:308 if e.IsUnread { -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.N().S(` class="unread_room"`) -//line messages.qtpl:304 +//line messages.qtpl:308 } -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.N().S(`>#`) -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.E().S(e.Name) -//line messages.qtpl:304 +//line messages.qtpl:308 qw422016.N().S(`</a></div> `) -//line messages.qtpl:305 +//line messages.qtpl:309 } -//line messages.qtpl:306 +//line messages.qtpl:310 } -//line messages.qtpl:306 +//line messages.qtpl:310 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:311 +//line messages.qtpl:315 for _, e := range Data.Members { -//line messages.qtpl:311 +//line messages.qtpl:315 qw422016.N().S(` `) -//line messages.qtpl:312 +//line messages.qtpl:316 StreamMember(qw422016, AuthUser, Data, e) -//line messages.qtpl:312 +//line messages.qtpl:316 qw422016.N().S(` `) -//line messages.qtpl:313 +//line messages.qtpl:317 } -//line messages.qtpl:313 +//line messages.qtpl:317 qw422016.N().S(` </div> `) -//line messages.qtpl:315 +//line messages.qtpl:319 if Data.VisibleMemberInChat || AuthUser.DisplayHellbanned { -//line messages.qtpl:315 +//line messages.qtpl:319 qw422016.N().S(` <div class="mb-30px"> `) -//line messages.qtpl:317 +//line messages.qtpl:321 if len(Data.MembersInChat) > 0 { -//line messages.qtpl:317 +//line messages.qtpl:321 qw422016.N().S(` <div class="rgt-title">In other rooms:</div> `) -//line messages.qtpl:319 +//line messages.qtpl:323 for _, e := range Data.MembersInChat { -//line messages.qtpl:319 +//line messages.qtpl:323 qw422016.N().S(` `) -//line messages.qtpl:320 +//line messages.qtpl:324 StreamMember(qw422016, AuthUser, Data, e) -//line messages.qtpl:320 +//line messages.qtpl:324 qw422016.N().S(` `) -//line messages.qtpl:321 +//line messages.qtpl:325 } -//line messages.qtpl:322 +//line messages.qtpl:326 } -//line messages.qtpl:322 +//line messages.qtpl:326 qw422016.N().S(` </div> `) -//line messages.qtpl:324 +//line messages.qtpl:328 } -//line messages.qtpl:324 +//line messages.qtpl:328 qw422016.N().S(`</div> `) -//line messages.qtpl:326 +//line messages.qtpl:330 } -//line messages.qtpl:326 +//line messages.qtpl:330 func WriteRenderRightColumn(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMenuData) { -//line messages.qtpl:326 +//line messages.qtpl:330 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:326 +//line messages.qtpl:330 StreamRenderRightColumn(qw422016, AuthUser, Data) -//line messages.qtpl:326 +//line messages.qtpl:330 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:326 +//line messages.qtpl:330 } -//line messages.qtpl:326 +//line messages.qtpl:330 func RenderRightColumn(AuthUser *database.User, Data ChatMenuData) string { -//line messages.qtpl:326 +//line messages.qtpl:330 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:326 +//line messages.qtpl:330 WriteRenderRightColumn(qb422016, AuthUser, Data) -//line messages.qtpl:326 +//line messages.qtpl:330 qs422016 := string(qb422016.B) -//line messages.qtpl:326 +//line messages.qtpl:330 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:326 +//line messages.qtpl:330 return qs422016 -//line messages.qtpl:326 +//line messages.qtpl:330 } -//line messages.qtpl:328 +//line messages.qtpl:332 func StreamRenderMessages(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) { -//line messages.qtpl:330 +//line messages.qtpl:334 baseTopBarURL := "/api/v1/chat/top-bar/" + Data.ChatMenuData.RoomName readMarkerRendered := false isFirstMsg := true -//line messages.qtpl:334 +//line messages.qtpl:338 for idx, e := range Data.Messages { -//line messages.qtpl:335 +//line messages.qtpl:339 StreamRenderMessage(qw422016, idx, e, AuthUser, Data, baseTopBarURL, &readMarkerRendered, &isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:335 +//line messages.qtpl:339 qw422016.N().S(` `) -//line messages.qtpl:336 +//line messages.qtpl:340 } -//line messages.qtpl:336 +//line messages.qtpl:340 qw422016.N().S(` `) -//line messages.qtpl:337 +//line messages.qtpl:341 if len(Data.Messages) == 0 { -//line messages.qtpl:337 +//line messages.qtpl:341 qw422016.N().S(` <div id="no-msg"><em>No message yet</em></div> `) -//line messages.qtpl:339 +//line messages.qtpl:343 } -//line messages.qtpl:339 +//line messages.qtpl:343 qw422016.N().S(` `) -//line messages.qtpl:340 +//line messages.qtpl:344 } -//line messages.qtpl:340 +//line messages.qtpl:344 func WriteRenderMessages(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) { -//line messages.qtpl:340 +//line messages.qtpl:344 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:340 +//line messages.qtpl:344 StreamRenderMessages(qw422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:340 +//line messages.qtpl:344 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:340 +//line messages.qtpl:344 } -//line messages.qtpl:340 +//line messages.qtpl:344 func RenderMessages(AuthUser *database.User, Data ChatMessagesData, CSRF, NullUsername string) string { -//line messages.qtpl:340 +//line messages.qtpl:344 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:340 +//line messages.qtpl:344 WriteRenderMessages(qb422016, AuthUser, Data, CSRF, NullUsername) -//line messages.qtpl:340 +//line messages.qtpl:344 qs422016 := string(qb422016.B) -//line messages.qtpl:340 +//line messages.qtpl:344 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:340 +//line messages.qtpl:344 return qs422016 -//line messages.qtpl:340 +//line messages.qtpl:344 } -//line messages.qtpl:342 +//line messages.qtpl:346 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:344 +//line messages.qtpl:348 if e.UserCanSee(*AuthUser) { -//line messages.qtpl:345 +//line messages.qtpl:349 if AuthUser.ChatReadMarkerEnabled && e.CreatedAt.Before(Data.ReadMarker.ReadAt) && !*readMarkerRendered { -//line messages.qtpl:345 +//line messages.qtpl:349 qw422016.N().S(` <div class="read-marker read-marker-0"`) -//line messages.qtpl:346 +//line messages.qtpl:350 if idx == 0 { -//line messages.qtpl:346 +//line messages.qtpl:350 qw422016.N().S(` style="display:none;"`) -//line messages.qtpl:346 +//line messages.qtpl:350 } -//line messages.qtpl:346 +//line messages.qtpl:350 qw422016.N().S(`></div> `) -//line messages.qtpl:347 +//line messages.qtpl:351 *readMarkerRendered = true -//line messages.qtpl:348 +//line messages.qtpl:352 } -//line messages.qtpl:348 +//line messages.qtpl:352 qw422016.N().S(` <div id="msgid-`) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.E().S(e.UUID) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.N().S(`" class="msgidc-`) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.E().S(e.UUID) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.N().S(`-`) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.N().DL(e.Rev) -//line messages.qtpl:349 +//line messages.qtpl:353 qw422016.N().S(` msg `) -//line messages.qtpl:350 +//line messages.qtpl:354 if (e.User.IsHellbanned || e.IsHellbanned) && AuthUser.DisplayHellbanned { -//line messages.qtpl:350 +//line messages.qtpl:354 qw422016.N().S(` hb-row `) -//line messages.qtpl:351 +//line messages.qtpl:355 } else if AuthUser.ID == e.User.ID && AuthUser.HighlightOwnMessages { -//line messages.qtpl:351 +//line messages.qtpl:355 qw422016.N().S(` own-highlight`) -//line messages.qtpl:351 +//line messages.qtpl:355 } -//line messages.qtpl:351 +//line messages.qtpl:355 qw422016.N().S(` "> `) -//line messages.qtpl:353 +//line messages.qtpl:357 if e.UserCanDelete(*AuthUser) { -//line messages.qtpl:354 +//line messages.qtpl:358 if !e.TooOldToDelete() { -//line messages.qtpl:355 +//line messages.qtpl:359 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:355 +//line messages.qtpl:359 qw422016.N().S(` <form method="post" action="/api/v1/chat/messages/delete/`) -//line messages.qtpl:356 +//line messages.qtpl:360 qw422016.E().S(e.UUID) -//line messages.qtpl:356 +//line messages.qtpl:360 qw422016.N().S(`" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:357 +//line messages.qtpl:361 qw422016.E().S(CSRF) -//line messages.qtpl:357 +//line messages.qtpl:361 qw422016.N().S(`" /> <button class="mod-btn delete_msg_btn " title="delete" style=" `) -//line messages.qtpl:361 +//line messages.qtpl:365 if string(e.User.Username) != NullUsername { -//line messages.qtpl:362 +//line messages.qtpl:366 if (AuthUser.IsModerator() && e.UserID != AuthUser.ID) || AuthUser.IsAdmin || (e.Room.OwnerUserID != nil && *e.Room.OwnerUserID == AuthUser.ID) { -//line messages.qtpl:362 +//line messages.qtpl:366 qw422016.N().S(` animation: `) -//line messages.qtpl:363 +//line messages.qtpl:367 qw422016.N().DL(e.DeleteSecondsRemaining()) -//line messages.qtpl:363 +//line messages.qtpl:367 qw422016.N().S(`s 1s forwards orange_btn; `) -//line messages.qtpl:364 +//line messages.qtpl:368 } else { -//line messages.qtpl:364 +//line messages.qtpl:368 qw422016.N().S(` animation: `) -//line messages.qtpl:365 +//line messages.qtpl:369 qw422016.N().DL(e.DeleteSecondsRemaining()) -//line messages.qtpl:365 +//line messages.qtpl:369 qw422016.N().S(`s 1s forwards hide_btn; `) -//line messages.qtpl:366 +//line messages.qtpl:370 } -//line messages.qtpl:367 +//line messages.qtpl:371 } -//line messages.qtpl:367 +//line messages.qtpl:371 qw422016.N().S(` " ></button> </form> `) -//line messages.qtpl:371 +//line messages.qtpl:375 } -//line messages.qtpl:372 +//line messages.qtpl:376 } else if (AuthUser.IsModerator() && e.TooOldToDelete() && e.UserID != AuthUser.ID) || AuthUser.IsAdmin || (e.Room.OwnerUserID != nil && *e.Room.OwnerUserID == AuthUser.ID) { -//line messages.qtpl:373 +//line messages.qtpl:377 if AuthUser.DisplayDeleteButton { -//line messages.qtpl:373 +//line messages.qtpl:377 qw422016.N().S(` <form method="post" action="/api/v1/chat/messages/delete/`) -//line messages.qtpl:374 +//line messages.qtpl:378 qw422016.E().S(e.UUID) -//line messages.qtpl:374 +//line messages.qtpl:378 qw422016.N().S(`" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:375 +//line messages.qtpl:379 qw422016.E().S(CSRF) -//line messages.qtpl:375 +//line messages.qtpl:379 qw422016.N().S(`" /> <button class="mod-btn delete_msg_btn f-orange-clr" title="delete"></button> </form> `) -//line messages.qtpl:378 - } -//line messages.qtpl:379 - } else if AuthUser.IsModerator() { -//line messages.qtpl:380 - if AuthUser.DisplayDeleteButton { -//line messages.qtpl:380 - qw422016.N().S(` <div class="spacer16"></div> -`) //line messages.qtpl:382 } //line messages.qtpl:383 - } else { + } else if AuthUser.IsModerator() { //line messages.qtpl:384 if AuthUser.DisplayDeleteButton { //line messages.qtpl:384 @@ -866,420 +861,403 @@ func StreamRenderMessage(qw422016 *qt422016.Writer, idx int, e database.ChatMess //line messages.qtpl:386 } //line messages.qtpl:387 - } + } else { +//line messages.qtpl:388 + if AuthUser.DisplayDeleteButton { //line messages.qtpl:388 + qw422016.N().S(` <div class="spacer16"></div> +`) +//line messages.qtpl:390 + } +//line messages.qtpl:391 + } +//line messages.qtpl:392 if AuthUser.IsModerator() { -//line messages.qtpl:389 +//line messages.qtpl:393 if e.UserID != AuthUser.ID { -//line messages.qtpl:390 +//line messages.qtpl:394 if AuthUser.DisplayHellbanButton { -//line messages.qtpl:391 +//line messages.qtpl:395 if string(e.User.Username) == NullUsername { -//line messages.qtpl:391 +//line messages.qtpl:395 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:393 +//line messages.qtpl:397 } else { -//line messages.qtpl:394 +//line messages.qtpl:398 if e.User.IsHellbanned { -//line messages.qtpl:394 +//line messages.qtpl:398 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:395 +//line messages.qtpl:399 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:395 +//line messages.qtpl:399 qw422016.N().S(`/unhellban" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:396 +//line messages.qtpl:400 qw422016.E().S(CSRF) -//line messages.qtpl:396 +//line messages.qtpl:400 qw422016.N().S(`" /> <button class="mod-btn hb_btn f-orange-clr line-through" title="unhellban"></button> </form> `) -//line messages.qtpl:399 +//line messages.qtpl:403 } else { -//line messages.qtpl:399 +//line messages.qtpl:403 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:400 +//line messages.qtpl:404 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:400 +//line messages.qtpl:404 qw422016.N().S(`/hellban" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:401 +//line messages.qtpl:405 qw422016.E().S(CSRF) -//line messages.qtpl:401 +//line messages.qtpl:405 qw422016.N().S(`" /> <button class="mod-btn hb_btn f-orange-clr" title="hellban"></button> </form> `) -//line messages.qtpl:404 +//line messages.qtpl:408 } -//line messages.qtpl:405 +//line messages.qtpl:409 } -//line messages.qtpl:406 +//line messages.qtpl:410 } -//line messages.qtpl:407 +//line messages.qtpl:411 if AuthUser.DisplayKickButton { -//line messages.qtpl:407 +//line messages.qtpl:411 qw422016.N().S(` <form method="post" action="/api/v1/users/`) -//line messages.qtpl:408 +//line messages.qtpl:412 qw422016.E().S(e.UserID.String()) -//line messages.qtpl:408 +//line messages.qtpl:412 qw422016.N().S(`/kick" class="d-inline"> <input type="hidden" name="csrf" value="`) -//line messages.qtpl:409 +//line messages.qtpl:413 qw422016.E().S(CSRF) -//line messages.qtpl:409 +//line messages.qtpl:413 qw422016.N().S(`" /> <button class="mod-btn k_btn f-orange-clr" title="kick"></button> </form> `) -//line messages.qtpl:412 +//line messages.qtpl:416 } -//line messages.qtpl:413 +//line messages.qtpl:417 } else { -//line messages.qtpl:414 +//line messages.qtpl:418 if AuthUser.DisplayKickButton && AuthUser.DisplayHellbanButton { -//line messages.qtpl:414 +//line messages.qtpl:418 qw422016.N().S(` <div class="spacer36"></div> `) -//line messages.qtpl:416 +//line messages.qtpl:420 } else if AuthUser.DisplayKickButton || AuthUser.DisplayHellbanButton { -//line messages.qtpl:416 +//line messages.qtpl:420 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:418 +//line messages.qtpl:422 } -//line messages.qtpl:419 +//line messages.qtpl:423 } -//line messages.qtpl:420 +//line messages.qtpl:424 } -//line messages.qtpl:421 +//line messages.qtpl:425 } else { -//line messages.qtpl:422 +//line messages.qtpl:426 if Data.NbButtons == 3 { -//line messages.qtpl:422 +//line messages.qtpl:426 qw422016.N().S(` <div class="spacer56"></div> `) -//line messages.qtpl:424 +//line messages.qtpl:428 } else if Data.NbButtons == 2 { -//line messages.qtpl:424 +//line messages.qtpl:428 qw422016.N().S(` <div class="spacer36"></div> `) -//line messages.qtpl:426 +//line messages.qtpl:430 } else if Data.NbButtons == 1 { -//line messages.qtpl:426 +//line messages.qtpl:430 qw422016.N().S(` <div class="spacer16"></div> `) -//line messages.qtpl:428 +//line messages.qtpl:432 } -//line messages.qtpl:429 +//line messages.qtpl:433 } -//line messages.qtpl:430 +//line messages.qtpl:434 if AuthUser.GetDateFormat() != "" { -//line messages.qtpl:430 +//line messages.qtpl:434 qw422016.N().S(` <a href="`) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(`?quote=`) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.E().S(e.UUID) -//line messages.qtpl:431 +//line messages.qtpl:435 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(`" target="iframe1" class="date date-link" title="`) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.E().S(e.CreatedAt.Format("01-02 15:04:05")) -//line messages.qtpl:431 +//line messages.qtpl:435 if *isFirstMsg { -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(` (`) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.E().S(humanize.Time(e.CreatedAt)) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(`)`) -//line messages.qtpl:431 +//line messages.qtpl:435 } -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(`">`) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.E().S(e.CreatedAt.Format(AuthUser.GetDateFormat())) -//line messages.qtpl:431 +//line messages.qtpl:435 qw422016.N().S(`</a> `) -//line messages.qtpl:432 +//line messages.qtpl:436 *isFirstMsg = false -//line messages.qtpl:432 +//line messages.qtpl:436 qw422016.N().S(` `) -//line messages.qtpl:433 +//line messages.qtpl:437 } -//line messages.qtpl:433 +//line messages.qtpl:437 qw422016.N().S(` <a href="/u/`) -//line messages.qtpl:434 +//line messages.qtpl:438 qw422016.E().S(string(e.GetProfile(AuthUser))) -//line messages.qtpl:434 +//line messages.qtpl:438 qw422016.N().S(`" target="_blank" class="f-def-clr">-</a> `) -//line messages.qtpl:435 +//line messages.qtpl:439 if e.System { -//line messages.qtpl:435 +//line messages.qtpl:439 qw422016.N().S(` <span class="sysmsg">`) -//line messages.qtpl:436 +//line messages.qtpl:440 streamunesc(qw422016, e.Message) -//line messages.qtpl:436 +//line messages.qtpl:440 qw422016.N().S(`</span> `) -//line messages.qtpl:437 +//line messages.qtpl:441 } else { -//line messages.qtpl:438 +//line messages.qtpl:442 if e.Moderators { -//line messages.qtpl:438 +//line messages.qtpl:442 qw422016.N().S(`<span class="sysmsg">[<a href="`) -//line messages.qtpl:438 +//line messages.qtpl:442 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:438 +//line messages.qtpl:442 qw422016.N().S(`?m=1`) -//line messages.qtpl:438 +//line messages.qtpl:442 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:438 +//line messages.qtpl:442 qw422016.N().S(`" target="iframe1" class="sysmsg f-white-clr">M</a>]</span>&nbsp;`) -//line messages.qtpl:438 +//line messages.qtpl:442 } -//line messages.qtpl:439 +//line messages.qtpl:443 if e.GroupID != nil { -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.N().S(`<span class="sysmsg">[<a href="`) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.N().S(`?g=`) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.E().S(e.Group.Name) -//line messages.qtpl:439 +//line messages.qtpl:443 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.N().S(`" target="iframe1" class="sysmsg f-white-clr">`) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.E().S(e.Group.Name) -//line messages.qtpl:439 +//line messages.qtpl:443 qw422016.N().S(`</a>]</span>&nbsp;`) -//line messages.qtpl:439 +//line messages.qtpl:443 } -//line messages.qtpl:440 +//line messages.qtpl:444 if e.ToUserID != nil { -//line messages.qtpl:440 +//line messages.qtpl:444 qw422016.N().S(` [`) -//line messages.qtpl:441 +//line messages.qtpl:445 streamfromUsername(qw422016, AuthUser, Data, e, baseTopBarURL) -//line messages.qtpl:441 +//line messages.qtpl:445 qw422016.N().S(` → `) -//line messages.qtpl:443 +//line messages.qtpl:447 if e.ToUser.ID == AuthUser.ID { -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`<span `) -//line messages.qtpl:443 +//line messages.qtpl:447 streamunesc(qw422016, e.ToUser.GenerateChatStyle()) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`>`) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.E().S(string(e.ToUser.Username)) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`</span>`) -//line messages.qtpl:443 +//line messages.qtpl:447 } else { -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`<a `) -//line messages.qtpl:443 +//line messages.qtpl:447 streamunesc(qw422016, e.ToUser.GenerateChatStyle()) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(` href="`) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`?pm=`) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.E().S(string(e.ToUser.Username)) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.E().S(Data.TopBarQueryParams) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.E().S(string(e.ToUser.Username)) -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`</a>`) -//line messages.qtpl:443 +//line messages.qtpl:447 } -//line messages.qtpl:443 +//line messages.qtpl:447 qw422016.N().S(`] - `) -//line messages.qtpl:444 +//line messages.qtpl:448 } else { -//line messages.qtpl:445 +//line messages.qtpl:449 streamfromUsername(qw422016, AuthUser, Data, e, baseTopBarURL) -//line messages.qtpl:446 +//line messages.qtpl:450 if !e.IsMe() { -//line messages.qtpl:447 +//line messages.qtpl:451 if AuthUser.CanSeeHB() && (e.IsHellbanned || e.User.IsHellbanned) && (e.ToUserID == nil) { -//line messages.qtpl:447 +//line messages.qtpl:451 qw422016.N().S(` <a href="`) -//line messages.qtpl:448 +//line messages.qtpl:452 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:448 +//line messages.qtpl:452 qw422016.N().S(`?hbm=1`) -//line messages.qtpl:448 +//line messages.qtpl:452 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:448 +//line messages.qtpl:452 qw422016.N().S(`" target="iframe1" class="f-def-clr">-</a> `) -//line messages.qtpl:449 +//line messages.qtpl:453 } else { -//line messages.qtpl:449 +//line messages.qtpl:453 qw422016.N().S(` - `) -//line messages.qtpl:451 +//line messages.qtpl:455 } -//line messages.qtpl:452 +//line messages.qtpl:456 } -//line messages.qtpl:453 +//line messages.qtpl:457 } -//line messages.qtpl:453 +//line messages.qtpl:457 qw422016.N().S(` <span `) -//line messages.qtpl:454 +//line messages.qtpl:458 streamunesc(qw422016, e.User.GenerateChatStyle()) -//line messages.qtpl:454 +//line messages.qtpl:458 qw422016.N().S(`><span class="o-wrap">`) -//line messages.qtpl:454 +//line messages.qtpl:458 qw422016.N().S(unesc(e.MsgToDisplay())) -//line messages.qtpl:454 +//line messages.qtpl:458 qw422016.N().S(`</span></span> `) -//line messages.qtpl:455 +//line messages.qtpl:459 } -//line messages.qtpl:455 +//line messages.qtpl:459 qw422016.N().S(` </div> `) -//line messages.qtpl:457 +//line messages.qtpl:461 } -//line messages.qtpl:458 +//line messages.qtpl:462 } -//line messages.qtpl:458 +//line messages.qtpl:462 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:458 +//line messages.qtpl:462 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:458 +//line messages.qtpl:462 StreamRenderMessage(qw422016, idx, e, AuthUser, Data, baseTopBarURL, readMarkerRendered, isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:458 +//line messages.qtpl:462 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:458 +//line messages.qtpl:462 } -//line messages.qtpl:458 +//line messages.qtpl:462 func RenderMessage(idx int, e database.ChatMessage, AuthUser *database.User, Data ChatMessagesData, baseTopBarURL string, readMarkerRendered, isFirstMsg *bool, CSRF, NullUsername string) string { -//line messages.qtpl:458 +//line messages.qtpl:462 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:458 +//line messages.qtpl:462 WriteRenderMessage(qb422016, idx, e, AuthUser, Data, baseTopBarURL, readMarkerRendered, isFirstMsg, CSRF, NullUsername) -//line messages.qtpl:458 +//line messages.qtpl:462 qs422016 := string(qb422016.B) -//line messages.qtpl:458 +//line messages.qtpl:462 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:458 +//line messages.qtpl:462 return qs422016 -//line messages.qtpl:458 +//line messages.qtpl:462 } -//line messages.qtpl:461 +//line messages.qtpl:465 func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) { -//line messages.qtpl:461 +//line messages.qtpl:465 qw422016.N().S(` `) -//line messages.qtpl:462 +//line messages.qtpl:466 baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName -//line messages.qtpl:463 +//line messages.qtpl:467 if El.Username == AuthUser.Username { -//line messages.qtpl:463 +//line messages.qtpl:467 qw422016.N().S(` <div> <span style="color: `) -//line messages.qtpl:465 +//line messages.qtpl:469 qw422016.E().S(El.Color) -//line messages.qtpl:465 +//line messages.qtpl:469 qw422016.N().S(`;">`) -//line messages.qtpl:465 +//line messages.qtpl:469 qw422016.E().S(string(El.Username)) -//line messages.qtpl:465 +//line messages.qtpl:469 qw422016.N().S(`</span> `) -//line messages.qtpl:466 +//line messages.qtpl:470 if El.AfkIndicatorEnabled { -//line messages.qtpl:466 +//line messages.qtpl:470 qw422016.N().S(` <small class="afk-indicator">afk</small> `) -//line messages.qtpl:468 +//line messages.qtpl:472 } -//line messages.qtpl:468 +//line messages.qtpl:472 qw422016.N().S(` </div> `) -//line messages.qtpl:470 +//line messages.qtpl:474 } else { -//line messages.qtpl:471 +//line messages.qtpl:475 if !El.IsHellbanned || AuthUser.ID == El.UserID || (El.IsHellbanned && AuthUser.IsHellbanned) || AuthUser.DisplayHellbanned { -//line messages.qtpl:471 +//line messages.qtpl:475 qw422016.N().S(` <div> `) -//line messages.qtpl:473 +//line messages.qtpl:477 tagType := "tag" -//line messages.qtpl:474 +//line messages.qtpl:478 if AuthUser.CanSeeHB() && El.IsHellbanned { -//line messages.qtpl:475 +//line messages.qtpl:479 tagType = "htag" -//line messages.qtpl:476 - } -//line messages.qtpl:477 - qw422016.N().S(`<a href="`) -//line messages.qtpl:478 - qw422016.E().S(baseTopBarURL) -//line messages.qtpl:478 - qw422016.N().S(`?`) -//line messages.qtpl:478 - qw422016.E().S(tagType) -//line messages.qtpl:478 - qw422016.N().S(`=`) -//line messages.qtpl:478 - qw422016.E().S(string(El.Username)) -//line messages.qtpl:478 - streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:478 - qw422016.N().S(`"target="iframe1"`) -//line messages.qtpl:480 - if El.IsHellbanned && AuthUser.DisplayHellbanned { -//line messages.qtpl:480 - qw422016.N().S(`class="hb-row"`) //line messages.qtpl:480 } -//line messages.qtpl:480 - qw422016.N().S(`style="color:`) //line messages.qtpl:481 - qw422016.E().S(El.Color) -//line messages.qtpl:481 - qw422016.N().S(`;">`) -//line messages.qtpl:481 - qw422016.E().S(string(El.Username[0])) -//line messages.qtpl:481 - qw422016.N().S(`</a><a href="`) + qw422016.N().S(`<a href="`) //line messages.qtpl:482 qw422016.E().S(baseTopBarURL) //line messages.qtpl:482 - qw422016.N().S(`?pm=`) + qw422016.N().S(`?`) +//line messages.qtpl:482 + qw422016.E().S(tagType) +//line messages.qtpl:482 + qw422016.N().S(`=`) //line messages.qtpl:482 qw422016.E().S(string(El.Username)) //line messages.qtpl:482 @@ -1299,13 +1277,19 @@ func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatM //line messages.qtpl:485 qw422016.N().S(`;">`) //line messages.qtpl:485 - qw422016.E().S(string(El.Username[1 : len(El.Username)-1])) + qw422016.E().S(string(El.Username[0])) //line messages.qtpl:485 - qw422016.N().S(`</a><a href="/u/`) + qw422016.N().S(`</a><a href="`) +//line messages.qtpl:486 + qw422016.E().S(baseTopBarURL) +//line messages.qtpl:486 + qw422016.N().S(`?pm=`) //line messages.qtpl:486 qw422016.E().S(string(El.Username)) //line messages.qtpl:486 - qw422016.N().S(`"rel="noopener noreferrer" target="_blank"`) + streamunesc(qw422016, Data.TopBarQueryParams) +//line messages.qtpl:486 + qw422016.N().S(`"target="iframe1"`) //line messages.qtpl:488 if El.IsHellbanned && AuthUser.DisplayHellbanned { //line messages.qtpl:488 @@ -1319,165 +1303,185 @@ func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatM //line messages.qtpl:489 qw422016.N().S(`;">`) //line messages.qtpl:489 - qw422016.E().S(string(El.Username[len(El.Username)-1])) + qw422016.E().S(string(El.Username[1 : len(El.Username)-1])) //line messages.qtpl:489 + qw422016.N().S(`</a><a href="/u/`) +//line messages.qtpl:490 + qw422016.E().S(string(El.Username)) +//line messages.qtpl:490 + qw422016.N().S(`"rel="noopener noreferrer" target="_blank"`) +//line messages.qtpl:492 + if El.IsHellbanned && AuthUser.DisplayHellbanned { +//line messages.qtpl:492 + qw422016.N().S(`class="hb-row"`) +//line messages.qtpl:492 + } +//line messages.qtpl:492 + qw422016.N().S(`style="color:`) +//line messages.qtpl:493 + qw422016.E().S(El.Color) +//line messages.qtpl:493 + qw422016.N().S(`;">`) +//line messages.qtpl:493 + qw422016.E().S(string(El.Username[len(El.Username)-1])) +//line messages.qtpl:493 qw422016.N().S(`</a>`) -//line messages.qtpl:491 +//line messages.qtpl:495 if El.AfkIndicatorEnabled { -//line messages.qtpl:491 +//line messages.qtpl:495 qw422016.N().S(` <small class="afk-indicator">afk</small> `) -//line messages.qtpl:493 +//line messages.qtpl:497 } -//line messages.qtpl:493 +//line messages.qtpl:497 qw422016.N().S(` </div> `) -//line messages.qtpl:495 +//line messages.qtpl:499 } -//line messages.qtpl:496 +//line messages.qtpl:500 } -//line messages.qtpl:497 +//line messages.qtpl:501 } -//line messages.qtpl:497 +//line messages.qtpl:501 func WriteMember(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) { -//line messages.qtpl:497 +//line messages.qtpl:501 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:497 +//line messages.qtpl:501 StreamMember(qw422016, AuthUser, Data, El) -//line messages.qtpl:497 +//line messages.qtpl:501 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:497 +//line messages.qtpl:501 } -//line messages.qtpl:497 +//line messages.qtpl:501 func Member(AuthUser *database.User, Data ChatMenuData, El managers.UserInfo) string { -//line messages.qtpl:497 +//line messages.qtpl:501 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:497 +//line messages.qtpl:501 WriteMember(qb422016, AuthUser, Data, El) -//line messages.qtpl:497 +//line messages.qtpl:501 qs422016 := string(qb422016.B) -//line messages.qtpl:497 +//line messages.qtpl:501 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:497 +//line messages.qtpl:501 return qs422016 -//line messages.qtpl:497 +//line messages.qtpl:501 } -//line messages.qtpl:500 +//line messages.qtpl:504 func streamfromUsername(qw422016 *qt422016.Writer, AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) { -//line messages.qtpl:501 +//line messages.qtpl:505 tagType := "tag" -//line messages.qtpl:502 +//line messages.qtpl:506 if El.ToUserID != nil { -//line messages.qtpl:503 +//line messages.qtpl:507 tagType = "pm" -//line messages.qtpl:504 +//line messages.qtpl:508 } else if AuthUser.CanSeeHB() && (El.IsHellbanned || El.User.IsHellbanned) { -//line messages.qtpl:505 +//line messages.qtpl:509 tagType = "htag" -//line messages.qtpl:506 +//line messages.qtpl:510 } else if AuthUser.IsModerator() && El.Moderators { -//line messages.qtpl:507 +//line messages.qtpl:511 tagType = "mtag" -//line messages.qtpl:508 +//line messages.qtpl:512 } -//line messages.qtpl:509 +//line messages.qtpl:513 if El.User.ID == AuthUser.ID { -//line messages.qtpl:510 +//line messages.qtpl:514 if El.CanBeEdited() { -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`<a `) -//line messages.qtpl:510 +//line messages.qtpl:514 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(` href="`) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`?e=`) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.E().S(El.CreatedAt.Format("15:04:05")) -//line messages.qtpl:510 +//line messages.qtpl:514 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.E().S(string(El.User.Username)) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`</a>`) -//line messages.qtpl:510 +//line messages.qtpl:514 } else { -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`<span `) -//line messages.qtpl:510 +//line messages.qtpl:514 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`>`) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.E().S(string(El.User.Username)) -//line messages.qtpl:510 +//line messages.qtpl:514 qw422016.N().S(`</span>`) -//line messages.qtpl:510 +//line messages.qtpl:514 } -//line messages.qtpl:511 +//line messages.qtpl:515 } else { -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(`<a `) -//line messages.qtpl:511 +//line messages.qtpl:515 streamunesc(qw422016, El.User.GenerateChatStyle()) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(` href="`) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.E().S(baseTopBarURL) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(`?`) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.E().S(tagType) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(`=`) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.E().S(string(El.User.Username)) -//line messages.qtpl:511 +//line messages.qtpl:515 streamunesc(qw422016, Data.TopBarQueryParams) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(`" target="iframe1">`) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.E().S(string(El.User.Username)) -//line messages.qtpl:511 +//line messages.qtpl:515 qw422016.N().S(`</a>`) -//line messages.qtpl:511 +//line messages.qtpl:515 } -//line messages.qtpl:512 +//line messages.qtpl:516 } -//line messages.qtpl:512 +//line messages.qtpl:516 func writefromUsername(qq422016 qtio422016.Writer, AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) { -//line messages.qtpl:512 +//line messages.qtpl:516 qw422016 := qt422016.AcquireWriter(qq422016) -//line messages.qtpl:512 +//line messages.qtpl:516 streamfromUsername(qw422016, AuthUser, Data, El, baseTopBarURL) -//line messages.qtpl:512 +//line messages.qtpl:516 qt422016.ReleaseWriter(qw422016) -//line messages.qtpl:512 +//line messages.qtpl:516 } -//line messages.qtpl:512 +//line messages.qtpl:516 func fromUsername(AuthUser *database.User, Data ChatMessagesData, El database.ChatMessage, baseTopBarURL string) string { -//line messages.qtpl:512 +//line messages.qtpl:516 qb422016 := qt422016.AcquireByteBuffer() -//line messages.qtpl:512 +//line messages.qtpl:516 writefromUsername(qb422016, AuthUser, Data, El, baseTopBarURL) -//line messages.qtpl:512 +//line messages.qtpl:516 qs422016 := string(qb422016.B) -//line messages.qtpl:512 +//line messages.qtpl:516 qt422016.ReleaseByteBuffer(qb422016) -//line messages.qtpl:512 +//line messages.qtpl:516 return qs422016 -//line messages.qtpl:512 +//line messages.qtpl:516 } diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go @@ -275,9 +275,14 @@ func ChatTopBarHandler(c echo.Context) error { if !utils.InArr(lang, []string{"go", "c", "cpp", "py", "js"}) { lang = "" } - origMessage = "\n```" + lang + "\n" + origMessage + "\n```\n" - cmd := NewCommand(c, origMessage, room, roomKey) + newOrigMessage := "\n```" + lang + "\n" + origMessage + "\n```\n" + cmd := NewCommand(c, newOrigMessage, room, roomKey) cmd.redirectQP = redirectQP + + if origMessage == "" { + return c.Redirect(http.StatusFound, cmd.redirectURL()) + } + MsgInterceptor{}.InterceptMsg(cmd) data.Message = cmd.dataMessage if cmd.err != nil { diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go @@ -5258,7 +5258,9 @@ Loop: <form method="post" target="iframe1" action="/api/v1/chat/top-bar/` + roomName + `"> <input type="hidden" name="csrf" value="` + csrf + `" /> <input type="hidden" name="sender" value="codeModal" /> - <textarea name="message" placeholder="Paste your code here..."></textarea> + <div class=wrapper> + <textarea name="message" placeholder="Paste your code here..."></textarea> + </div> <div class="controls"> <select name="lang"> <option value="">Raw text</option>