Guzio/out-of-your-element
1
0
Fork 0
forked from cadence/out-of-your-element
Code Pull requests Activity

Emergency sync #11

Merged
Guzio merged 13 commits from cadence/out-of-your-element:main into main 2026-03-14 07:10:15 +00:00
Conversation 0 Commits 13 Files changed 37 +10 -10
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 99f4c52beb - Show all commits

2
src/matrix/room-upgrade.js
View file

@ -54,6 +54,7 @@ async function onBotMembership(event, api, createRoom) {
assert.equal(event.type, "m.room.member") assert.equal(event.type, "m.room.member")
assert.equal(event.state_key, utils.bot) assert.equal(event.state_key, utils.bot)
return await roomUpgradeSema.request(async () => {
// Check if an upgrade is pending for this room // Check if an upgrade is pending for this room
const newRoomID = event.room_id const newRoomID = event.room_id
const oldRoomID = select("room_upgrade_pending", "old_room_id", {new_room_id: newRoomID}).pluck().get() const oldRoomID = select("room_upgrade_pending", "old_room_id", {new_room_id: newRoomID}).pluck().get()
@ -64,7 +65,6 @@ async function onBotMembership(event, api, createRoom) {
// Check if is join/invite // Check if is join/invite
if (event.content.membership !== "invite" && event.content.membership !== "join") return false if (event.content.membership !== "invite" && event.content.membership !== "join") return false
return await roomUpgradeSema.request(async () => {
// If invited, join // If invited, join
if (event.content.membership === "invite") { if (event.content.membership === "invite") {
await api.joinRoom(newRoomID) await api.joinRoom(newRoomID)