diff --git a/d2m/event-dispatcher.js b/d2m/event-dispatcher.js index ec04750..54d858a 100644 --- a/d2m/event-dispatcher.js +++ b/d2m/event-dispatcher.js @@ -244,8 +244,6 @@ module.exports = { if (row) return // The message was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it. } - if (dUtils.isEphemeralMessage(message)) return // Ephemeral messages are for the eyes of the receiver only! - const {affected, row} = await speedbump.maybeDoSpeedbump(message.channel_id, message.id) if (affected) return @@ -264,8 +262,6 @@ module.exports = { if (row) return // The message was sent by the bridge's own webhook on discord. We don't want to reflect this back, so just drop it. } - if (dUtils.isEphemeralMessage(data)) return // Ephemeral messages are for the eyes of the receiver only! - // Edits need to go through the speedbump as well. If the message is delayed but the edit isn't, we don't have anything to edit from. const {affected, row} = await speedbump.maybeDoSpeedbump(data.channel_id, data.id) if (affected) return diff --git a/discord/utils.js b/discord/utils.js index c7045ec..2726a1a 100644 --- a/discord/utils.js +++ b/discord/utils.js @@ -101,14 +101,6 @@ function isWebhookMessage(message) { return message.webhook_id && !isInteractionResponse } -/** - * Ephemeral messages can be generated if a slash command is attached to the same bot that OOYE is running on - * @param {DiscordTypes.APIMessage} message - */ -function isEphemeralMessage(message) { - return message.flags & (1 << 6); -} - /** @param {string} snowflake */ function snowflakeToTimestampExact(snowflake) { return Number(BigInt(snowflake) >> 22n) + EPOCH @@ -124,6 +116,5 @@ module.exports.hasPermission = hasPermission module.exports.hasSomePermissions = hasSomePermissions module.exports.hasAllPermissions = hasAllPermissions module.exports.isWebhookMessage = isWebhookMessage -module.exports.isEphemeralMessage = isEphemeralMessage module.exports.snowflakeToTimestampExact = snowflakeToTimestampExact module.exports.timestampToSnowflakeInexact = timestampToSnowflakeInexact diff --git a/m2d/actions/redact.js b/m2d/actions/redact.js index 7569df4..26a7142 100644 --- a/m2d/actions/redact.js +++ b/m2d/actions/redact.js @@ -16,7 +16,7 @@ async function deleteMessage(event) { db.prepare("DELETE FROM event_message WHERE event_id = ?").run(event.event_id) for (const row of rows) { db.prepare("DELETE FROM message_channel WHERE message_id = ?").run(row.message_id) - await discord.snow.channel.deleteMessage(row.channel_id, row.message_id, event.content.reason) + discord.snow.channel.deleteMessage(row.channel_id, row.message_id, event.content.reason) } }