cadence/out-of-your-element
cadence/out-of-your-element
3
7
Fork 3
Code Issues 11 Pull requests 2 Releases 22 Activity

Fix duplicate guilds in list

Browse source
This commit is contained in:
Cadence Ember 2025-02-03 23:30:32 +13:00
parent 978eb40e1d
commit 3d0609f8f1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/web/pug-sync.js
View file

@ -35,7 +35,7 @@ function render(event, filename, locals) {
pugCache.set(path, async (event, locals) => { pugCache.set(path, async (event, locals) => {
defaultContentType(event, "text/html; charset=utf-8") defaultContentType(event, "text/html; charset=utf-8")
const session = await useSession(event, {password: reg.as_token}) const session = await useSession(event, {password: reg.as_token})
const managed = (session.data.managedGuilds || []).concat(session.data.matrixGuilds || []) const managed = new Set((session.data.managedGuilds || []).concat(session.data.matrixGuilds || []))
const rel = x => getRelativePath(event.path, x) const rel = x => getRelativePath(event.path, x)
return template(Object.assign({}, return template(Object.assign({},
getQuery(event), // Query parameters can be easily accessed on the top level but don't allow them to overwrite anything getQuery(event), // Query parameters can be easily accessed on the top level but don't allow them to overwrite anything

2
src/web/pug/guild_access_denied.pug
View file

@ -18,7 +18,7 @@ block body
p Select a server from the top right corner to continue. p Select a server from the top right corner to continue.
p If the server you're looking for isn't there, try #[a(href=rel("/oauth?action=add")) logging in again.] p If the server you're looking for isn't there, try #[a(href=rel("/oauth?action=add")) logging in again.]
else if !discord.guilds.has(guild_id) || !managed.includes(guild_id) else if !discord.guilds.has(guild_id) || !managed.has(guild_id)
.s-empty-state.wmx4.p48 .s-empty-state.wmx4.p48
!= icons.Spots.SpotAlertXL != icons.Spots.SpotAlertXL
p Either the selected server doesn't exist, or you don't have the Manage Server permission on Discord. p Either the selected server doesn't exist, or you don't have the Manage Server permission on Discord.

8
src/web/pug/includes/template.pug
View file

@ -75,17 +75,17 @@ html(lang="en")
a.s-btn.s-btn__icon.s-btn__featured.s-btn__outlined.as-center(href=rel("/oauth")) a.s-btn.s-btn__icon.s-btn__featured.s-btn__outlined.as-center(href=rel("/oauth"))
!= icons.Icons.IconDiscord != icons.Icons.IconDiscord
= ` Log in with Discord` = ` Log in with Discord`
if guild_id && managed.includes(guild_id) && discord.guilds.has(guild_id) if guild_id && managed.has(guild_id) && discord.guilds.has(guild_id)
button.s-topbar--item.s-btn.s-btn__muted.s-user-card(popovertarget="guilds") button.s-topbar--item.s-btn.s-btn__muted.s-btn__dropdown.pr32.bar0.s-user-card(popovertarget="guilds")
+guild(discord.guilds.get(guild_id)) +guild(discord.guilds.get(guild_id))
else if managed.length else if managed.size
button.s-topbar--item.s-btn.s-btn__muted.s-btn__dropdown.pr24.s-user-card.bar0.fc-black(popovertarget="guilds") button.s-topbar--item.s-btn.s-btn__muted.s-btn__dropdown.pr24.s-user-card.bar0.fc-black(popovertarget="guilds")
| Your servers | Your servers
#guilds(popover data-popper-placement="bottom" style="display: revert; width: revert;").s-popover.overflow-visible #guilds(popover data-popper-placement="bottom" style="display: revert; width: revert;").s-popover.overflow-visible
.s-popover--arrow.s-popover--arrow__tc .s-popover--arrow.s-popover--arrow__tc
.s-popover--content.overflow-y-auto.overflow-x-hidden .s-popover--content.overflow-y-auto.overflow-x-hidden
ul.s-menu(role="menu") ul.s-menu(role="menu")
each guild in managed.map(id => discord.guilds.get(id)).filter(g => g) each guild in [...managed].map(id => discord.guilds.get(id)).filter(g => g).sort((a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1)
li(role="menuitem") li(role="menuitem")
a.s-topbar--item.s-user-card.d-flex.p4(href=rel(`/guild?guild_id=${guild.id}`)) a.s-topbar--item.s-user-card.d-flex.p4(href=rel(`/guild?guild_id=${guild.id}`))
+guild(guild) +guild(guild)