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

Other kinds of reaction removals

Browse source
This commit is contained in:
Cadence Ember 2023-09-25 23:15:36 +13:00
parent c3040f19c2
commit c1cbdfee82
5 changed files with 151 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

75
d2m/actions/remove-reaction.js
View file

@ -9,6 +9,10 @@ const {discord, sync, db, select} = passthrough
const api = sync.require("../../matrix/api")
/** @type {import("../converters/emoji-to-key")} */
const emojiToKey = sync.require("../converters/emoji-to-key")
/** @type {import("../../m2d/converters/utils")} */
const utils = sync.require("../../m2d/converters/utils")
/** @type {import("../../m2d/converters/emoji")} */
const emoji = sync.require("../../m2d/converters/emoji")
/**
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveDispatchData} data
@ -18,16 +22,77 @@ async function removeReaction(data) {
if (!roomID) return
const eventIDForMessage = select("event_message", "event_id", "WHERE message_id = ? AND part = 0").pluck().get(data.message_id)
if (!eventIDForMessage) return
const mxid = select("sim", "mxid", "WHERE discord_id = ?").pluck().get(data.user_id)
if (!mxid) return
/** @type {Ty.Pagination<Ty.Event.Outer<Ty.Event.M_Reaction>>} */
const relations = await api.getRelations(roomID, eventIDForMessage, "m.annotation")
const key = await emojiToKey.emojiToKey(data.emoji)
const eventIDForReaction = relations.chunk.find(e => e.sender === mxid && e.content["m.relates_to"].key === key)
if (!eventIDForReaction) return
await api.redactEvent(roomID, eventIDForReaction.event_id, mxid)
const wantToRemoveMatrixReaction = data.user_id === discord.application.id
for (const event of relations.chunk) {
if (event.content["m.relates_to"].key === key) {
const lookingAtMatrixReaction = !utils.eventSenderIsFromDiscord(event.sender)
if (lookingAtMatrixReaction && wantToRemoveMatrixReaction) {
// We are removing a Matrix user's reaction, so we need to redact from the correct user ID (not @_ooye_matrix_bridge).
// Even though the bridge bot only reacted once on Discord-side, multiple Matrix users may have
// reacted on Matrix-side. Semantically, we want to remove the reaction from EVERY Matrix user.
await api.redactEvent(roomID, event.event_id)
// Clean up the database
const hash = utils.getEventIDHash(event.event_id)
db.prepare("DELETE FROM reaction WHERE hashed_event_id = ?").run(hash)
}
if (!lookingAtMatrixReaction && !wantToRemoveMatrixReaction) {
// We are removing a Discord user's reaction, so we just make the sim user remove it.
const mxid = select("sim", "mxid", "WHERE discord_id = ?").pluck().get(data.user_id)
await api.redactEvent(roomID, event.event_id, mxid)
}
}
}
}
/**
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveEmojiDispatchData} data
*/
async function removeEmojiReaction(data) {
const roomID = select("channel_room", "room_id", "WHERE channel_id = ?").pluck().get(data.channel_id)
if (!roomID) return
const eventIDForMessage = select("event_message", "event_id", "WHERE message_id = ? AND part = 0").pluck().get(data.message_id)
if (!eventIDForMessage) return
/** @type {Ty.Pagination<Ty.Event.Outer<Ty.Event.M_Reaction>>} */
const relations = await api.getRelations(roomID, eventIDForMessage, "m.annotation")
const key = await emojiToKey.emojiToKey(data.emoji)
for (const event of relations.chunk) {
if (event.content["m.relates_to"].key === key) {
const mxid = utils.eventSenderIsFromDiscord(event.sender) ? event.sender : undefined
await api.redactEvent(roomID, event.event_id, mxid)
}
}
const discordPreferredEncoding = emoji.encodeEmoji(key, undefined)
db.prepare("DELETE FROM reaction WHERE message_id = ? AND encoded_emoji = ?").run(data.message_id, discordPreferredEncoding)
}
/**
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveAllDispatchData} data
*/
async function removeAllReactions(data) {
const roomID = select("channel_room", "room_id", "WHERE channel_id = ?").pluck().get(data.channel_id)
if (!roomID) return
const eventIDForMessage = select("event_message", "event_id", "WHERE message_id = ? AND part = 0").pluck().get(data.message_id)
if (!eventIDForMessage) return
/** @type {Ty.Pagination<Ty.Event.Outer<Ty.Event.M_Reaction>>} */
const relations = await api.getRelations(roomID, eventIDForMessage, "m.annotation")
for (const event of relations.chunk) {
const mxid = utils.eventSenderIsFromDiscord(event.sender) ? event.sender : undefined
await api.redactEvent(roomID, event.event_id, mxid)
}
db.prepare("DELETE FROM reaction WHERE message_id = ?").run(data.message_id)
}
module.exports.removeReaction = removeReaction
module.exports.removeEmojiReaction = removeEmojiReaction
module.exports.removeAllReactions = removeAllReactions

6
d2m/discord-packets.js
View file

@ -158,6 +158,12 @@ const utils = {
} else if (message.t === "MESSAGE_REACTION_REMOVE") {
await eventDispatcher.onReactionRemove(client, message.d)
} else if (message.t === "MESSAGE_REACTION_REMOVE_EMOJI") {
await eventDispatcher.onReactionEmojiRemove(client, message.d)
} else if (message.t === "MESSAGE_REACTION_REMOVE_ALL") {
await eventDispatcher.onRemoveAllReactions(client, message.d)
}
} catch (e) {
// Let OOYE try to handle errors too

19
d2m/event-dispatcher.js
View file

@ -214,13 +214,28 @@ module.exports = {
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayMessageReactionAddDispatchData} data
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveDispatchData} data
*/
async onReactionRemove(client, data) {
if (data.user_id === client.user.id) return // m2d reactions are added by the discord bot user - do not reflect them back to matrix.
await removeReaction.removeReaction(data)
},
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveEmojiDispatchData} data
*/
async onReactionEmojiRemove(client, data) {
await removeReaction.removeEmojiReaction(data)
},
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayMessageReactionRemoveAllDispatchData} data
*/
async onRemoveAllReactions(client, data) {
await removeReaction.removeAllReactions(data)
},
/**
* @param {import("./discord-client")} client
* @param {import("discord-api-types/v10").GatewayMessageDeleteDispatchData} data