cadence/out-of-your-element
cadence/out-of-your-element
3
8
Fork 6
Code Issues 18 Pull requests 3 Releases 27 Activity

i dont even know what this PR is supposed to be about anymore, everyone lost the plot somewhere in the middle of act 2 #74

Open
Guzio wants to merge 128 commits from Guzio/out-of-your-element:mergable-fr-fr into main
pull from: Guzio/out-of-your-element:mergable-fr-fr
merge into: cadence:main
Conversation 8 Commits 128 Files changed 19 +11 -5
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c8bf730ec4 - Show all commits

Filter out the root space

Prev Next
Guzio 2026-04-26 13:07:39 +00:00
commit c8bf730ec4

5
src/web/pug/guild.pug
View file

@ -257,6 +257,11 @@ block body
ul.my8.ml24
each row in removedEncryptedRooms
li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
h3.mt24 Unavailable rooms: Root space
.s-card.p0
ul.my8.ml24
each row in removedRootSpaceRooms
li: a(href=`https://matrix.to/#/${row.room_id}`) (#{row.room_type}) #{row.name}
h3.mt24 Unavailable rooms: Archived thread
p If you still want to link with any of these rooms (eg. you accidentally unlinked it and want to bring it back, or you're migrating from a different bridge that happens to use OOYE's prefixes), please remove the [⛓️] or [🔒⛓️] prefix in Matrix's room settings and refresh the page.
.s-card.p0

11
src/web/routes/guild.js
View file

@ -118,8 +118,9 @@ function getPosition(channel, channels) {
* @param {DiscordTypes.APIGuild} guild
* @param {Ty.R.Hierarchy[]} rooms
* @param {string[]} roles
* @param {string?} space
*/
function getChannelRoomsLinks(guild, rooms, roles) {
function getChannelRoomsLinks(guild, rooms, roles, space) {
let channelIDs = discord.guildChannelMap.get(guild.id)
assert(channelIDs)
@ -149,7 +150,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
let linkedRoomIDs = linkedChannels.map(c => c.room_id)
let unlinkedRooms = [...rooms]
let removedLinkedRooms = dUtils.filterTo(unlinkedRooms, r => !linkedRoomIDs.includes(r.room_id))
let removedWrongTypeRooms = []
let removedRootSpaceRooms = dUtils.filterTo(unlinkedRooms, r => r.room_id !== space)
let removedEncryptedRooms = dUtils.filterTo(unlinkedRooms, r => !r.encryption && !r["im.nheko.summary.encryption"])
// https://discord.com/developers/docs/topics/threads#active-archived-threads
// need to filter out linked archived threads from unlinkedRooms, will just do that by comparing against the name
@ -157,7 +158,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
return {
linkedChannelsWithDetails, unlinkedChannels, unlinkedRooms,
removedUncachedChannels, removedWrongTypeChannels, removedPrivateChannels, removedLinkedRooms, removedWrongTypeRooms, removedArchivedThreadRooms, removedEncryptedRooms
removedUncachedChannels, removedWrongTypeChannels, removedPrivateChannels, removedLinkedRooms, removedRootSpaceRooms, removedArchivedThreadRooms, removedEncryptedRooms
}
}
@ -198,14 +199,14 @@ as.router.get("/guild", defineEventHandler(async event => {
// Easy mode guild that hasn't been linked yet - need to remove elements that would require an existing space
if (!row.space_id) {
const links = getChannelRoomsLinks(guild, [], roles)
const links = getChannelRoomsLinks(guild, [], roles, row.space_id)
return pugSync.render(event, "guild.pug", {guild, guild_id, ...links, ...row})
}
// Linked guild
const api = getAPI(event)
const rooms = await api.getFullHierarchy(row.space_id)
const links = getChannelRoomsLinks(guild, rooms, roles)
const links = getChannelRoomsLinks(guild, rooms, roles, row.space_id)
return pugSync.render(event, "guild.pug", {guild, guild_id, ...links, ...row})
}))