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

Why did I make it this way??? #13

Merged
Guzio merged 121 commits from main into mergable-fr-fr 2026-04-15 20:05:01 +00:00
Conversation 0 Commits 121 Files changed 79 +13 -1
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8c87d93011 - Show all commits

11
src/d2m/actions/remove-member.js
View file

@ -19,7 +19,18 @@ async function removeMember(userID, guildID) {
} }
})() })()
for (const m of membership) { for (const m of membership) {
try {
await api.leaveRoom(m.room_id, m.mxid) await api.leaveRoom(m.room_id, m.mxid)
} catch (e) {
if (String(e).includes("not in room")) {
// no further action needed
} else {
throw e
}
}
// Update cache to say that the member isn't in the room any more
// You'd think this would happen automatically when the leave event arrives at Matrix's event dispatcher, but that isn't 100% reliable.
db.prepare("DELETE FROM sim_member WHERE room_id = ? AND mxid = ?").run(m.room_id, m.mxid)
} }
} }

1
src/d2m/event-dispatcher.js
View file

@ -125,6 +125,7 @@ module.exports = {
// Send in order // Send in order
for (let i = Math.min(messages.length, latestBridgedMessageIndex)-1; i >= 0; i--) { for (let i = Math.min(messages.length, latestBridgedMessageIndex)-1; i >= 0; i--) {
const message = messages[i] const message = messages[i]
if (message.type === DiscordTypes.MessageType.UserJoin) continue // since join announcements don't become events, it would be a repetition to act on them during backfill
if (!members.has(message.author.id)) members.set(message.author.id, await client.snow.guild.getGuildMember(guild.id, message.author.id).catch(() => undefined)) if (!members.has(message.author.id)) members.set(message.author.id, await client.snow.guild.getGuildMember(guild.id, message.author.id).catch(() => undefined))
await module.exports.MESSAGE_CREATE(client, { await module.exports.MESSAGE_CREATE(client, {