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

Fix matrix api joinRoom() for remote rooms #60

Open
Elliu wants to merge 6 commits from Elliu/out-of-your-element:fix-remote-join into main
pull from: Elliu/out-of-your-element:fix-remote-join
merge into: cadence:main
Conversation 2 Commits 6 Files changed 6 +19 -7
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 91d62e7b28 - Show all commits

4
src/matrix/api.js
View file

@ -64,9 +64,9 @@ async function createRoom(content) {
/** /**
* @returns {Promise<string>} room ID * @returns {Promise<string>} room ID
*/ */
async function joinRoom(roomIDOrAlias, mxid) { async function joinRoom(roomIDOrAlias, mxid, via) {
/** @type {Ty.R.RoomJoined} */ /** @type {Ty.R.RoomJoined} */
const root = await mreq.mreq("POST", path(`/client/v3/join/${roomIDOrAlias}`, mxid), {}) const root = await mreq.mreq("POST", path(`/client/v3/join/${roomIDOrAlias}`, mxid, via), {})
return root.room_id return root.room_id
} }

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

@ -77,7 +77,7 @@ as.router.post("/api/link-space", defineEventHandler(async event => {
// Check space exists and bridge is joined // Check space exists and bridge is joined
try { try {
await api.joinRoom(parsedBody.space_id) await api.joinRoom(parsedBody.space_id, null, via)
} catch (e) { } catch (e) {
throw createError({status: 403, message: e.errcode, data: `${e.errcode} - ${e.message}`}) throw createError({status: 403, message: e.errcode, data: `${e.errcode} - ${e.message}`})
} }
@ -135,19 +135,31 @@ as.router.post("/api/link", defineEventHandler(async event => {
// Check room is part of the guild's space // Check room is part of the guild's space
let found = false let found = false
let via = undefined
for await (const room of api.generateFullHierarchy(spaceID)) { for await (const room of api.generateFullHierarchy(spaceID)) {
if (room.room_id === parsedBody.matrix && !room.room_type) { if (via === undefined && room.room_type === "m.space") {
for (state of room.children_state) {
if (state.state_key === parsedBody.matrix){
via = {via: state.content.via}
if (found === true)
break
}
}
}
if (!found && room.room_id === parsedBody.matrix && !room.room_type) {
found = true found = true
break if (via !== undefined)
break
} }
} }
if (!found) throw createError({status: 400, message: "Bad Request", data: "Matrix room needs to be part of the bridged space"}) if (!found) throw createError({status: 400, message: "Bad Request", data: "Matrix room needs to be part of the bridged space"})
// Check room exists and bridge is joined // Check room exists and bridge is joined
try { try {
await api.joinRoom(parsedBody.matrix) await api.joinRoom(parsedBody.matrix, null, via ?? {})
} catch (e) { } catch (e) {
throw createError({status: 403, message: e.errcode, data: `${e.errcode} - ${e.message}`}) throw createError({status: 403, message: e.errcode, data: `${e.errcode} - ${e.message}${via === null ? " (hint: couln't find a \"via\" in the space children_state for this room in order to help joining this room)" : ""}`})
} }
// Check bridge has PL 100 // Check bridge has PL 100