commit f55bc3814eef948c4829e69a2df9d6e8aa1985ef
parent 0e01df5e2967353c81377cb42d758edd146c356d
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Sat, 20 May 2023 17:46:14 -0700
improve template
Diffstat:
2 files changed, 87 insertions(+), 169 deletions(-)
diff --git a/pkg/web/handlers/api/v1/messages.qtpl b/pkg/web/handlers/api/v1/messages.qtpl
@@ -6,8 +6,8 @@
<html lang="en">
<head>
<title></title>
- {% if !Data.PreventRefresh && !Data.ForceManualRefresh %}<meta http-equiv="refresh" content="{%dl AuthUser.RefreshRate %}">{% endif %}
- {% if AuthUser.CollectMetadata %}<link rel="stylesheet" type="text/css" href="/public/css/meta.css?v={%s VERSION %}" />{% endif %}
+ {%- if !Data.PreventRefresh && !Data.ForceManualRefresh -%}<meta http-equiv="refresh" content="{%dl AuthUser.RefreshRate %}">{%- endif -%}
+ {%- if AuthUser.CollectMetadata -%}<link rel="stylesheet" type="text/css" href="/public/css/meta.css?v={%s VERSION %}" />{%- endif -%}
<style>
/* http://meyerweb.com/eric/tools/css/reset/
@@ -324,50 +324,50 @@
</div>
<div class="mb-20px">
<div class="rgt-title">Rooms:</div>
- {% for _, e := range Data.OfficialRooms %}
- {% if e.Name == "club" %}
- {% if AuthUser.IsClubMember %}
+ {%- for _, e := range Data.OfficialRooms -%}
+ {%- if e.Name == "club" -%}
+ {%- if AuthUser.IsClubMember -%}
<div><a href="/chat/club" target="_top"{% if e.IsUnread %} class="unread_room"{% endif %}>#club</a></div>
- {% endif %}
- {% elseif e.Name == "moderators" %}
- {% if AuthUser.IsModerator() %}
+ {%- endif -%}
+ {%- elseif e.Name == "moderators" -%}
+ {%- if AuthUser.IsModerator() -%}
<div><a href="/chat/moderators" target="_top"{% if e.IsUnread %} class="unread_room"{% endif %}>#moderators</a></div>
- {% endif %}
- {% else %}
+ {%- endif -%}
+ {%- else -%}
<div><a href="/chat/{%s e.Name %}" target="_top"{% if e.IsUnread %} class="unread_room"{% endif %}>#{%s e.Name %}</a></div>
- {% endif %}
- {% endfor %}
- {% if len(Data.SubscribedRooms) > 0 %}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- if len(Data.SubscribedRooms) > 0 -%}
<div class="mt-10px"></div>
- {% for _, e := range Data.SubscribedRooms %}
+ {%- for _, e := range Data.SubscribedRooms -%}
<div><a href="/chat/{%s e.Name %}" target="_top"{% if e.IsUnread %} class="unread_room"{% endif %}>#{%s e.Name %}</a></div>
- {% endfor %}
- {% endif %}
+ {%- endfor -%}
+ {%- endif -%}
<div class="mt-5px"><a href="/rooms" target="_top">[...]</a></div>
</div>
<div class="mb-20px">
<div class="rgt-title">In this room:</div>
- {% for _, e := range Data.Members %}
+ {%- for _, e := range Data.Members -%}
{%= Member(AuthUser, Data, e) %}
- {% endfor %}
+ {%- endfor -%}
</div>
- {% if Data.VisibleMemberInChat || AuthUser.DisplayHellbanned %}
+ {%- if Data.VisibleMemberInChat || AuthUser.DisplayHellbanned -%}
<div class="mb-30px">
- {% if len(Data.MembersInChat) > 0 %}
+ {%- if len(Data.MembersInChat) > 0 -%}
<div class="rgt-title">In other rooms:</div>
- {% for _, e := range Data.MembersInChat %}
+ {%- for _, e := range Data.MembersInChat -%}
{%= Member(AuthUser, Data, e) %}
- {% endfor %}
- {% endif %}
+ {%- endfor -%}
+ {%- endif -%}
</div>
- {% endif %}
+ {%- endif -%}
</div>
- {% endif %}
- {% if AuthUser.CollectMetadata %}
+ {%- endif -%}
+ {%- if AuthUser.CollectMetadata -%}
<div class="div_1"></div>
<div class="div_2"></div>
<div class="div_f0">a</div>
- {% endif %}
+ {%- endif -%}
</body>
</html>
{% endfunc %}
@@ -375,22 +375,22 @@
{% func Member(AuthUser *database.User, Data chatMessagesData, El managers.UserInfo) %}
- {% code baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName %}
- {% if El.Username == AuthUser.Username %}
+ {%- code baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName -%}
+ {%- if El.Username == AuthUser.Username -%}
<div>
<span style="color: {%s El.Color %};">{%s El.Username %}</span>
- {% if El.AfkIndicatorEnabled %}
+ {%- if El.AfkIndicatorEnabled -%}
<small class="afk-indicator">afk</small>
- {% endif %}
+ {%- endif -%}
</div>
- {% else %}
- {% if !El.IsHellbanned || AuthUser.ID == El.UserID || (El.IsHellbanned && AuthUser.IsHellbanned) || AuthUser.DisplayHellbanned %}
+ {%- else -%}
+ {%- if !El.IsHellbanned || AuthUser.ID == El.UserID || (El.IsHellbanned && AuthUser.IsHellbanned) || AuthUser.DisplayHellbanned -%}
<div>
- {% code tagType := "tag" %}
- {% if AuthUser.CanSeeHB() && El.IsHellbanned %}
- {% code tagType = "htag" %}
- {% endif %}
- {% stripspace %}
+ {%- code tagType := "tag" -%}
+ {%- if AuthUser.CanSeeHB() && El.IsHellbanned -%}
+ {%- code tagType = "htag" -%}
+ {%- endif -%}
+ {%- stripspace -%}
<a href="{%s baseTopBarURL %}?{%s tagType %}={%s El.Username %}{%= unesc(Data.TopBarQueryParams) %}"
target="iframe1"
{% if El.IsHellbanned && AuthUser.DisplayHellbanned %}class="hb-row"{% endif %}
@@ -403,13 +403,13 @@
rel="noopener noreferrer" target="_blank"
{% if El.IsHellbanned && AuthUser.DisplayHellbanned %}class="hb-row"{% endif %}
style="color: {%s El.Color %};">{%s string(El.Username[len(El.Username)-1]) %}</a>
- {% endstripspace %}
- {% if El.AfkIndicatorEnabled %}
+ {%- endstripspace -%}
+ {%- if El.AfkIndicatorEnabled -%}
<small class="afk-indicator">afk</small>
- {% endif %}
+ {%- endif -%}
</div>
- {% endif %}
- {% endif %}
+ {%- endif -%}
+ {%- endif -%}
{% endfunc %}
diff --git a/pkg/web/handlers/api/v1/messages.qtpl.go b/pkg/web/handlers/api/v1/messages.qtpl.go
@@ -32,7 +32,7 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
qw422016.N().S(`<html lang="en">
<head>
<title></title>
- `)
+`)
//line messages.qtpl:9
if !Data.PreventRefresh && !Data.ForceManualRefresh {
//line messages.qtpl:9
@@ -43,9 +43,6 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
qw422016.N().S(`">`)
//line messages.qtpl:9
}
-//line messages.qtpl:9
- qw422016.N().S(`
- `)
//line messages.qtpl:10
if AuthUser.CollectMetadata {
//line messages.qtpl:10
@@ -58,7 +55,6 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
}
//line messages.qtpl:10
qw422016.N().S(`
-
<style>
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
@@ -768,22 +764,15 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
</div>
<div class="mb-20px">
<div class="rgt-title">Rooms:</div>
- `)
+`)
//line messages.qtpl:327
for _, e := range Data.OfficialRooms {
-//line messages.qtpl:327
- qw422016.N().S(`
- `)
//line messages.qtpl:328
if e.Name == "club" {
-//line messages.qtpl:328
- qw422016.N().S(`
- `)
//line messages.qtpl:329
if AuthUser.IsClubMember {
//line messages.qtpl:329
- qw422016.N().S(`
- <div><a href="/chat/club" target="_top"`)
+ qw422016.N().S(` <div><a href="/chat/club" target="_top"`)
//line messages.qtpl:330
if e.IsUnread {
//line messages.qtpl:330
@@ -792,22 +781,15 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
}
//line messages.qtpl:330
qw422016.N().S(`>#club</a></div>
- `)
+`)
//line messages.qtpl:331
}
-//line messages.qtpl:331
- qw422016.N().S(`
- `)
//line messages.qtpl:332
} else if e.Name == "moderators" {
-//line messages.qtpl:332
- qw422016.N().S(`
- `)
//line messages.qtpl:333
if AuthUser.IsModerator() {
//line messages.qtpl:333
- qw422016.N().S(`
- <div><a href="/chat/moderators" target="_top"`)
+ qw422016.N().S(` <div><a href="/chat/moderators" target="_top"`)
//line messages.qtpl:334
if e.IsUnread {
//line messages.qtpl:334
@@ -816,17 +798,13 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
}
//line messages.qtpl:334
qw422016.N().S(`>#moderators</a></div>
- `)
+`)
//line messages.qtpl:335
}
-//line messages.qtpl:335
- qw422016.N().S(`
- `)
//line messages.qtpl:336
} else {
//line messages.qtpl:336
- qw422016.N().S(`
- <div><a href="/chat/`)
+ qw422016.N().S(` <div><a href="/chat/`)
//line messages.qtpl:337
qw422016.E().S(e.Name)
//line messages.qtpl:337
@@ -843,28 +821,20 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
qw422016.E().S(e.Name)
//line messages.qtpl:337
qw422016.N().S(`</a></div>
- `)
+`)
//line messages.qtpl:338
}
-//line messages.qtpl:338
- qw422016.N().S(`
- `)
//line messages.qtpl:339
}
-//line messages.qtpl:339
- qw422016.N().S(`
- `)
//line messages.qtpl:340
if len(Data.SubscribedRooms) > 0 {
//line messages.qtpl:340
- qw422016.N().S(`
- <div class="mt-10px"></div>
- `)
+ qw422016.N().S(` <div class="mt-10px"></div>
+`)
//line messages.qtpl:342
for _, e := range Data.SubscribedRooms {
//line messages.qtpl:342
- qw422016.N().S(`
- <div><a href="/chat/`)
+ qw422016.N().S(` <div><a href="/chat/`)
//line messages.qtpl:343
qw422016.E().S(e.Name)
//line messages.qtpl:343
@@ -881,94 +851,75 @@ func StreamMessages(qw422016 *qt422016.Writer, VERSION, CSRF, NullUsername strin
qw422016.E().S(e.Name)
//line messages.qtpl:343
qw422016.N().S(`</a></div>
- `)
+`)
//line messages.qtpl:344
}
-//line messages.qtpl:344
- qw422016.N().S(`
- `)
//line messages.qtpl:345
}
//line messages.qtpl:345
- qw422016.N().S(`
- <div class="mt-5px"><a href="/rooms" target="_top">[...]</a></div>
+ 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:350
for _, e := range Data.Members {
//line messages.qtpl:350
- qw422016.N().S(`
- `)
+ qw422016.N().S(` `)
//line messages.qtpl:351
StreamMember(qw422016, AuthUser, Data, e)
//line messages.qtpl:351
qw422016.N().S(`
- `)
+`)
//line messages.qtpl:352
}
//line messages.qtpl:352
- qw422016.N().S(`
- </div>
- `)
+ qw422016.N().S(` </div>
+`)
//line messages.qtpl:354
if Data.VisibleMemberInChat || AuthUser.DisplayHellbanned {
//line messages.qtpl:354
- qw422016.N().S(`
- <div class="mb-30px">
- `)
+ qw422016.N().S(` <div class="mb-30px">
+`)
//line messages.qtpl:356
if len(Data.MembersInChat) > 0 {
//line messages.qtpl:356
- qw422016.N().S(`
- <div class="rgt-title">In other rooms:</div>
- `)
+ qw422016.N().S(` <div class="rgt-title">In other rooms:</div>
+`)
//line messages.qtpl:358
for _, e := range Data.MembersInChat {
//line messages.qtpl:358
- qw422016.N().S(`
- `)
+ qw422016.N().S(` `)
//line messages.qtpl:359
StreamMember(qw422016, AuthUser, Data, e)
//line messages.qtpl:359
qw422016.N().S(`
- `)
+`)
//line messages.qtpl:360
}
-//line messages.qtpl:360
- qw422016.N().S(`
- `)
//line messages.qtpl:361
}
//line messages.qtpl:361
- qw422016.N().S(`
- </div>
- `)
+ qw422016.N().S(` </div>
+`)
//line messages.qtpl:363
}
//line messages.qtpl:363
- qw422016.N().S(`
- </div>
- `)
+ qw422016.N().S(` </div>
+`)
//line messages.qtpl:365
}
-//line messages.qtpl:365
- qw422016.N().S(`
- `)
//line messages.qtpl:366
if AuthUser.CollectMetadata {
//line messages.qtpl:366
- qw422016.N().S(`
- <div class="div_1"></div>
+ qw422016.N().S(` <div class="div_1"></div>
<div class="div_2"></div>
<div class="div_f0">a</div>
- `)
+`)
//line messages.qtpl:370
}
//line messages.qtpl:370
- qw422016.N().S(`
- </body>
+ qw422016.N().S(` </body>
</html>
`)
//line messages.qtpl:373
@@ -1004,18 +955,14 @@ func Messages(VERSION, CSRF, NullUsername string, AuthUser *database.User, Data
func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data chatMessagesData, El managers.UserInfo) {
//line messages.qtpl:377
qw422016.N().S(`
- `)
+`)
//line messages.qtpl:378
baseTopBarURL := "/api/v1/chat/top-bar/" + Data.RoomName
-//line messages.qtpl:378
- qw422016.N().S(`
- `)
//line messages.qtpl:379
if El.Username == AuthUser.Username {
//line messages.qtpl:379
- qw422016.N().S(`
- <div>
+ qw422016.N().S(` <div>
<span style="color: `)
//line messages.qtpl:381
qw422016.E().S(El.Color)
@@ -1025,52 +972,34 @@ func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data chatM
qw422016.E().S(El.Username)
//line messages.qtpl:381
qw422016.N().S(`</span>
- `)
+`)
//line messages.qtpl:382
if El.AfkIndicatorEnabled {
//line messages.qtpl:382
- qw422016.N().S(`
- <small class="afk-indicator">afk</small>
- `)
+ qw422016.N().S(` <small class="afk-indicator">afk</small>
+`)
//line messages.qtpl:384
}
//line messages.qtpl:384
- qw422016.N().S(`
- </div>
- `)
+ qw422016.N().S(` </div>
+`)
//line messages.qtpl:386
} else {
-//line messages.qtpl:386
- qw422016.N().S(`
- `)
//line messages.qtpl:387
if !El.IsHellbanned || AuthUser.ID == El.UserID || (El.IsHellbanned && AuthUser.IsHellbanned) || AuthUser.DisplayHellbanned {
//line messages.qtpl:387
- qw422016.N().S(`
- <div>
- `)
+ qw422016.N().S(` <div>
+`)
//line messages.qtpl:389
tagType := "tag"
-//line messages.qtpl:389
- qw422016.N().S(`
- `)
//line messages.qtpl:390
if AuthUser.CanSeeHB() && El.IsHellbanned {
-//line messages.qtpl:390
- qw422016.N().S(`
- `)
//line messages.qtpl:391
tagType = "htag"
-//line messages.qtpl:391
- qw422016.N().S(`
- `)
//line messages.qtpl:392
}
-//line messages.qtpl:392
- qw422016.N().S(`
- `)
//line messages.qtpl:393
qw422016.N().S(`<a href="`)
//line messages.qtpl:394
@@ -1149,31 +1078,20 @@ func StreamMember(qw422016 *qt422016.Writer, AuthUser *database.User, Data chatM
qw422016.E().S(string(El.Username[len(El.Username)-1]))
//line messages.qtpl:405
qw422016.N().S(`</a>`)
-//line messages.qtpl:406
- qw422016.N().S(`
- `)
//line messages.qtpl:407
if El.AfkIndicatorEnabled {
//line messages.qtpl:407
- qw422016.N().S(`
- <small class="afk-indicator">afk</small>
- `)
+ qw422016.N().S(` <small class="afk-indicator">afk</small>
+`)
//line messages.qtpl:409
}
//line messages.qtpl:409
- qw422016.N().S(`
- </div>
- `)
+ qw422016.N().S(` </div>
+`)
//line messages.qtpl:411
}
-//line messages.qtpl:411
- qw422016.N().S(`
- `)
//line messages.qtpl:412
}
-//line messages.qtpl:412
- qw422016.N().S(`
-`)
//line messages.qtpl:413
}
