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 +267 -271
2 changed files with 267 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c3f2fbbeb1 - Show all commits

Settled on a reasonable compromise for this

Prev Next
Guzio 2026-04-26 12:22:45 +00:00
commit c3f2fbbeb1

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

@ -257,13 +257,9 @@ block body
ul.my8.ml24
each row in removedEncryptedRooms
li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name
//h3.mt24 Unavailable rooms: Wrong type
//.s-card.p0
// ul.my8.ml24
// each row in removedWrongTypeRooms
// li: a(href=`https://matrix.to/#/${row.room_id}`) (#{row.room_type}) #{row.name}
//h3.mt24 Unavailable rooms: Archived thread
//.s-card.p0
// ul.my8.ml24
// each row in removedArchivedThreadRooms
// li: a(href=`https://matrix.to/#/${row.room_id}`)= 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
ul.my8.ml24
each row in removedArchivedThreadRooms
li: a(href=`https://matrix.to/#/${row.room_id}`)= row.name

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

@ -68,7 +68,7 @@ const linkRules = new Map([
[3, {type: "TYPING", humanName:"Group DMs", unsupported: "OOYE won't support DMs until a good way of doing it can be figured out. Please see https://gitdab.com/cadence/out-of-your-element#caveats for more."}],
[4, {type: "SPACE", humanName:"Categories", unsupported: "There is no concept of categories on Matrix."}], //...at least officially. In practice, some clients will render sub-spaces as categories. TODO: Bridge categories to sub-spaces.
[5, {type: "TYPING", humanName:"Announcement text channels"}],
[10, {type: "TYPING", humanName:"Announcement threads"}], //Currently testing: Letting users bridge threads however they like. In case this doesn't work: , unsupported: "Threads must be bridged automatically, to ensure proper lifecycle management (so that archiving threads won't break them). Please send a message in this thread to bridge it automatically."
[10, {type: "TYPING", humanName:"Announcement threads"}],
[11, {type: "TYPING", humanName:"Normal threads"}],
[12, {type: "TYPING", humanName:"Private threads"}],
[13, {type: "TYPING", humanName:"Stage VCs"}],
@ -153,7 +153,7 @@ function getChannelRoomsLinks(guild, rooms, roles) {
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
let removedArchivedThreadRooms = [] //dUtils.filterTo(unlinkedRooms, r => r.name && !r.name.match(/^\[(🔒)?⛓️\]/)) COMMENTED OUT - Currently testing: Letting users bridge threads however they like.
let removedArchivedThreadRooms = dUtils.filterTo(unlinkedRooms, r => r.name && !r.name.match(/^\[(🔒)?⛓️\]/))
return {
linkedChannelsWithDetails, unlinkedChannels, unlinkedRooms,