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

WIP: feature: threads'n'forums #74

Draft
Guzio wants to merge 109 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 6 Commits 109 Files changed 17 +8 -2
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 81bf0b935f - Show all commits

10
src/web/routes/link.js
View file

@ -173,8 +173,9 @@ as.router.post("/api/link", defineEventHandler(async event => {
const row = from("channel_room").select("channel_id", "room_id").and("WHERE channel_id = ? OR room_id = ?").get(channel.id, parsedBody.matrix)
if (row) throw createError({status: 400, message: "Bad Request", data: `Channel ID ${row.channel_id} or room ID ${parsedBody.matrix} are already bridged and cannot be reused`})
// Check room is part of the guild's space
// Check room is an actual room (not space) and is part of the guild's space
let foundRoom = false
let foundSpace = false
/** @type {string[]?} */
let foundVia = null
for await (const room of api.generateFullHierarchy(spaceID)) {
@ -186,13 +187,18 @@ as.router.post("/api/link", defineEventHandler(async event => {
}
// When finding a room during iteration, see if it was the requested room (to confirm that the room is in the space)
if (room.room_id === parsedBody.matrix && !room.room_type) {
if (room.room_id === parsedBody.matrix) {
foundRoom = true
}
if (foundRoom && foundVia) break
if (room.room_type && room.room_type === "m.space") {
foundSpace = true
}
}
if (!foundRoom) throw createError({status: 400, message: "Bad Request", data: "Matrix room needs to be part of the bridged space"})
else if (!foundRoom) throw createError({status: 400, message: "Bad Request", data: "Matrix room cannot be of type m.space"})
// Check room exists and bridge is joined
try {