diff --git a/src/d2m/actions/create-room.js b/src/d2m/actions/create-room.js index 19085c2..0924631 100644 --- a/src/d2m/actions/create-room.js +++ b/src/d2m/actions/create-room.js @@ -147,8 +147,7 @@ async function channelToKState(channel, guild, di) { "m.room.power_levels/": { events_default: everyoneCanSend ? 0 : 50, events: { - "m.reaction": 0, - "m.room.redaction": 0 // only affects redactions of own events, required to be able to un-react + "m.reaction": 0 }, notifications: { room: everyoneCanMentionEveryone ? 0 : 20 diff --git a/src/d2m/actions/create-room.test.js b/src/d2m/actions/create-room.test.js index e653744..2f380bb 100644 --- a/src/d2m/actions/create-room.test.js +++ b/src/d2m/actions/create-room.test.js @@ -154,8 +154,7 @@ test("channel2room: read-only discord channel", async t => { "m.room.power_levels/": { events_default: 50, // <-- it should be read-only! events: { - "m.reaction": 0, - "m.room.redaction": 0 + "m.reaction": 0 }, notifications: { room: 20, diff --git a/src/d2m/actions/register-pk-user.js b/src/d2m/actions/register-pk-user.js index 477b0d8..cfd51af 100644 --- a/src/d2m/actions/register-pk-user.js +++ b/src/d2m/actions/register-pk-user.js @@ -148,10 +148,10 @@ async function fetchMessage(messageID) { try { var res = await fetch(`https://api.pluralkit.me/v2/messages/${messageID}`) if (res.ok) return res.json() - var errorGetter = () => res.json() + var errorGetter = res.json } catch (e) { // Catch any network issues too. - errorGetter = () => e.toString() + errorGetter = e.toString } // I think the backend needs some time to update. diff --git a/src/m2d/actions/send-event.js b/src/m2d/actions/send-event.js index 6b4eb26..edeb156 100644 --- a/src/m2d/actions/send-event.js +++ b/src/m2d/actions/send-event.js @@ -62,7 +62,7 @@ async function resolvePendingFiles(message) { /** @param {Ty.Event.Outer_M_Room_Message | Ty.Event.Outer_M_Room_Message_File | Ty.Event.Outer_M_Sticker} event */ async function sendEvent(event) { const row = select("channel_room", ["channel_id", "thread_parent"], {room_id: event.room_id}).get() - if (!row) return [] // allow the bot to exist in unbridged rooms, just don't do anything with it + if (!row) return // allow the bot to exist in unbridged rooms, just don't do anything with it let channelID = row.channel_id let threadID = undefined if (row.thread_parent) { diff --git a/src/m2d/event-dispatcher.js b/src/m2d/event-dispatcher.js index a8c0ba1..a55c326 100644 --- a/src/m2d/event-dispatcher.js +++ b/src/m2d/event-dispatcher.js @@ -187,7 +187,6 @@ sync.addTemporaryListener(as, "type:m.room.message", guard("m.room.message", async event => { if (utils.eventSenderIsFromDiscord(event.sender)) return const messageResponses = await sendEvent.sendEvent(event) - if (!messageResponses.length) return if (event.type === "m.room.message" && event.content.msgtype === "m.text") { // @ts-ignore await matrixCommandHandler.execute(event) diff --git a/test/data.js b/test/data.js index 01e49a4..1c44af5 100644 --- a/test/data.js +++ b/test/data.js @@ -75,8 +75,7 @@ module.exports = { "m.room.power_levels/": { events_default: 0, events: { - "m.reaction": 0, - "m.room.redaction": 0 + "m.reaction": 0 }, users: { "@test_auto_invite:example.org": 100 @@ -3026,7 +3025,6 @@ module.exports = { }, webhook_id: "1109360903096369153" }, - reply_with_only_embed: { type: 19, tts: false,