refactor custom emoji schema; make reactions work
This commit is contained in:
parent
c7ddf638db
commit
92dee012fc
9 changed files with 70 additions and 34 deletions
|
@ -10,6 +10,8 @@ const api = sync.require("../../matrix/api")
|
||||||
const registerUser = sync.require("./register-user")
|
const registerUser = sync.require("./register-user")
|
||||||
/** @type {import("../actions/create-room")} */
|
/** @type {import("../actions/create-room")} */
|
||||||
const createRoom = sync.require("../actions/create-room")
|
const createRoom = sync.require("../actions/create-room")
|
||||||
|
/** @type {import("../../matrix/file")} */
|
||||||
|
const file = sync.require("../../matrix/file")
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {import("discord-api-types/v10").GatewayMessageReactionAddDispatchData} data
|
* @param {import("discord-api-types/v10").GatewayMessageReactionAddDispatchData} data
|
||||||
|
@ -25,13 +27,16 @@ async function addReaction(data) {
|
||||||
let key
|
let key
|
||||||
if (data.emoji.id) {
|
if (data.emoji.id) {
|
||||||
// Custom emoji
|
// Custom emoji
|
||||||
const mxc = select("emoji", "mxc_url", "WHERE emoji_id = ?").pluck().get(data.emoji.id)
|
const mxc = select("emoji", "mxc_url", "WHERE id = ?").pluck().get(data.emoji.id)
|
||||||
if (mxc) {
|
if (mxc) {
|
||||||
// The custom emoji is registered and we should send it
|
// The custom emoji is registered and we should send it
|
||||||
key = mxc
|
key = mxc
|
||||||
} else {
|
} else {
|
||||||
// The custom emoji is not registered. We *could* register it right now and it would work, but for now I'm just going to send the name. It's whatever. TODO change this probably.
|
// The custom emoji is not registered. We will register it and then add it.
|
||||||
key = "<" + data.emoji.name + ">"
|
const mxc = await file.uploadDiscordFileToMxc(file.emoji(data.emoji.id, data.emoji.animated))
|
||||||
|
db.prepare("INSERT OR IGNORE INTO emoji (id, name, animated, mxc_url) VALUES (?, ?, ?, ?)").run(data.emoji.id, data.emoji.name, data.emoji.animated, mxc)
|
||||||
|
key = mxc
|
||||||
|
// TODO: what happens if the matrix user also tries adding this reaction? the bridge bot isn't able to use that emoji...
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Default emoji
|
// Default emoji
|
||||||
|
|
|
@ -29,7 +29,7 @@ async function emojisToState(emojis) {
|
||||||
},
|
},
|
||||||
url
|
url
|
||||||
}
|
}
|
||||||
db.prepare("INSERT OR IGNORE INTO emoji (emoji_id, animated, mxc_url) VALUES (?, ?, ?)").run(emoji.id, +!!emoji.animated, url)
|
db.prepare("INSERT OR IGNORE INTO emoji (id, name, animated, mxc_url) VALUES (?, ?, ?, ?)").run(emoji.id, emoji.name, +!!emoji.animated, url)
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
if (e.data.errcode === "M_TOO_LARGE") { // Very unlikely to happen. Only possible for 3x-series emojis uploaded shortly after animated emojis were introduced, when there was no 256 KB size limit.
|
if (e.data.errcode === "M_TOO_LARGE") { // Very unlikely to happen. Only possible for 3x-series emojis uploaded shortly after animated emojis were introduced, when there was no 256 KB size limit.
|
||||||
return
|
return
|
||||||
|
|
|
@ -41,7 +41,8 @@ function getDiscordParseCallbacks(message, useHTML) {
|
||||||
/** @param {{animated: boolean, name: string, id: string, type: "discordEmoji"}} node */
|
/** @param {{animated: boolean, name: string, id: string, type: "discordEmoji"}} node */
|
||||||
emoji: node => {
|
emoji: node => {
|
||||||
if (useHTML) {
|
if (useHTML) {
|
||||||
const mxc = select("emoji", "mxc_url", "WHERE emoji_id = ?").pluck().get(node.id)
|
const mxc = select("emoji", "mxc_url", "WHERE id = ?").pluck().get(node.id)
|
||||||
|
// TODO: upload and register the emoji so it can be added no matter what
|
||||||
if (mxc) {
|
if (mxc) {
|
||||||
return `<img data-mx-emoticon height="32" src="${mxc}" title=":${node.name}:" alt=":${node.name}:">`
|
return `<img data-mx-emoticon height="32" src="${mxc}" title=":${node.name}:" alt=":${node.name}:">`
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -64,9 +64,10 @@ CREATE TABLE IF NOT EXISTS "lottie" (
|
||||||
PRIMARY KEY("id")
|
PRIMARY KEY("id")
|
||||||
) WITHOUT ROWID;
|
) WITHOUT ROWID;
|
||||||
CREATE TABLE IF NOT EXISTS "emoji" (
|
CREATE TABLE IF NOT EXISTS "emoji" (
|
||||||
"emoji_id" TEXT NOT NULL,
|
"id" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
"animated" INTEGER NOT NULL,
|
"animated" INTEGER NOT NULL,
|
||||||
"mxc_url" TEXT NOT NULL,
|
"mxc_url" TEXT NOT NULL,
|
||||||
PRIMARY KEY("emoji_id")
|
PRIMARY KEY("id")
|
||||||
) WITHOUT ROWID;
|
) WITHOUT ROWID;
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
|
@ -70,9 +70,9 @@ INSERT INTO file (discord_url, mxc_url) VALUES
|
||||||
('https://cdn.discordapp.com/emojis/230201364309868544.png', 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'),
|
('https://cdn.discordapp.com/emojis/230201364309868544.png', 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'),
|
||||||
('https://cdn.discordapp.com/emojis/393635038903926784.gif', 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc');
|
('https://cdn.discordapp.com/emojis/393635038903926784.gif', 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc');
|
||||||
|
|
||||||
INSERT INTO emoji (emoji_id, animated, mxc_url) VALUES
|
INSERT INTO emoji (id, name, animated, mxc_url) VALUES
|
||||||
('230201364309868544', 0, 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'),
|
('230201364309868544', 'hippo', 0, 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC'),
|
||||||
('393635038903926784', 1, 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc');
|
('393635038903926784', 'hipposcope', 1, 'mxc://cadence.moe/WbYqNlACRuicynBfdnPYtmvc');
|
||||||
|
|
||||||
INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES
|
INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES
|
||||||
('!kLRqKKUQXcibIMtOpl:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', NULL),
|
('!kLRqKKUQXcibIMtOpl:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', NULL),
|
||||||
|
|
3
db/orm-utils.d.ts
vendored
3
db/orm-utils.d.ts
vendored
|
@ -64,7 +64,8 @@ export type Models = {
|
||||||
}
|
}
|
||||||
|
|
||||||
emoji: {
|
emoji: {
|
||||||
emoji_id: string
|
id: string
|
||||||
|
name: string
|
||||||
animated: number
|
animated: number
|
||||||
mxc_url: string
|
mxc_url: string
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,8 +159,8 @@ Can use custom transaction ID (?) to send the original timestamps to Matrix. See
|
||||||
|
|
||||||
```
|
```
|
||||||
pragma case_sensitive_like = 1;
|
pragma case_sensitive_like = 1;
|
||||||
insert into emoji select replace(substr(discord_url, 35), ".gif", "") as emoji_id, 1 as animated, mxc_url from file where discord_url like 'https://cdn.discordapp.com/emojis/%.gif';
|
insert into emoji select replace(substr(discord_url, 35), ".gif", "") as id, 1 as animated, mxc_url from file where discord_url like 'https://cdn.discordapp.com/emojis/%.gif';
|
||||||
insert into emoji select replace(substr(discord_url, 35), ".png", "") as emoji_id, 0 as animated, mxc_url from file where discord_url like 'https://cdn.discordapp.com/emojis/%.png';
|
insert into emoji select replace(substr(discord_url, 35), ".png", "") as id, 0 as animated, mxc_url from file where discord_url like 'https://cdn.discordapp.com/emojis/%.png';
|
||||||
```
|
```
|
||||||
|
|
||||||
# Various considerations
|
# Various considerations
|
||||||
|
|
|
@ -15,27 +15,40 @@ async function addReaction(event) {
|
||||||
const messageID = select("event_message", "message_id", "WHERE event_id = ? AND part = 0").pluck().get(event.content["m.relates_to"].event_id) // 0 = primary
|
const messageID = select("event_message", "message_id", "WHERE event_id = ? AND part = 0").pluck().get(event.content["m.relates_to"].event_id) // 0 = primary
|
||||||
if (!messageID) return // Nothing can be done if the parent message was never bridged.
|
if (!messageID) return // Nothing can be done if the parent message was never bridged.
|
||||||
|
|
||||||
// no need to sync the matrix member to the other side. but if I did need to, this is where I'd do it
|
const emoji = event.content["m.relates_to"].key // TODO: handle custom text or emoji reactions
|
||||||
|
let discordPreferredEncoding
|
||||||
|
if (emoji.startsWith("mxc://")) {
|
||||||
|
// Custom emoji
|
||||||
|
const row = select("emoji", ["id", "name"], "WHERE mxc_url = ?").get(emoji)
|
||||||
|
if (row) {
|
||||||
|
// Great, we know exactly what this emoji is!
|
||||||
|
discordPreferredEncoding = encodeURIComponent(`${row.name}:${row.id}`)
|
||||||
|
} else {
|
||||||
|
// We don't have this emoji and there's no realistic way to just-in-time upload a new emoji somewhere.
|
||||||
|
// We can't try using a known emoji with the same name because we don't even know what the name is. We only have the mxc url.
|
||||||
|
// Sucks!
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Default emoji
|
||||||
|
// https://github.com/discord/discord-api-docs/issues/2723#issuecomment-807022205 ????????????
|
||||||
|
const encoded = encodeURIComponent(emoji)
|
||||||
|
const encodedTrimmed = encoded.replace(/%EF%B8%8F/g, "")
|
||||||
|
|
||||||
let emoji = event.content["m.relates_to"].key // TODO: handle custom text or emoji reactions
|
const forceTrimmedList = [
|
||||||
let encoded = encodeURIComponent(emoji)
|
"%F0%9F%91%8D", // 👍
|
||||||
let encodedTrimmed = encoded.replace(/%EF%B8%8F/g, "")
|
"%E2%AD%90" // ⭐
|
||||||
|
]
|
||||||
|
|
||||||
// https://github.com/discord/discord-api-docs/issues/2723#issuecomment-807022205 ????????????
|
discordPreferredEncoding =
|
||||||
|
( forceTrimmedList.includes(encodedTrimmed) ? encodedTrimmed
|
||||||
|
: encodedTrimmed !== encoded && [...emoji].length === 2 ? encoded
|
||||||
|
: encodedTrimmed)
|
||||||
|
|
||||||
const forceTrimmedList = [
|
console.log("add reaction from matrix:", emoji, encoded, encodedTrimmed, "chosen:", discordPreferredEncoding)
|
||||||
"%F0%9F%91%8D", // 👍
|
}
|
||||||
"%E2%AD%90" // ⭐
|
|
||||||
]
|
|
||||||
|
|
||||||
let discordPreferredEncoding =
|
return discord.snow.channel.createReaction(channelID, messageID, discordPreferredEncoding) // acting as the discord bot itself
|
||||||
( forceTrimmedList.includes(encodedTrimmed) ? encodedTrimmed
|
|
||||||
: encodedTrimmed !== encoded && [...emoji].length === 2 ? encoded
|
|
||||||
: encodedTrimmed)
|
|
||||||
|
|
||||||
console.log("add reaction from matrix:", emoji, encoded, encodedTrimmed, "chosen:", discordPreferredEncoding)
|
|
||||||
|
|
||||||
return discord.snow.channel.createReaction(channelID, messageID, discordPreferredEncoding)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports.addReaction = addReaction
|
module.exports.addReaction = addReaction
|
||||||
|
|
|
@ -120,9 +120,25 @@ turndownService.addRule("inlineLink", {
|
||||||
turndownService.addRule("emoji", {
|
turndownService.addRule("emoji", {
|
||||||
filter: function (node, options) {
|
filter: function (node, options) {
|
||||||
if (node.nodeName !== "IMG" || !node.hasAttribute("data-mx-emoticon") || !node.getAttribute("src")) return false
|
if (node.nodeName !== "IMG" || !node.hasAttribute("data-mx-emoticon") || !node.getAttribute("src")) return false
|
||||||
const row = select("emoji", ["emoji_id", "animated"], "WHERE mxc_url = ?").get(node.getAttribute("src"))
|
let row = select("emoji", ["id", "name", "animated"], "WHERE mxc_url = ?").get(node.getAttribute("src"))
|
||||||
|
if (!row) {
|
||||||
|
// We don't know what this is... but maybe we can guess based on the name?
|
||||||
|
const guessedName = node.getAttribute("title")?.replace?.(/^:|:$/g, "")
|
||||||
|
if (!guessedName) return false
|
||||||
|
for (const guild of discord.guilds.values()) {
|
||||||
|
/** @type {{name: string, id: string, animated: number}[]} */
|
||||||
|
// @ts-ignore
|
||||||
|
const emojis = guild.emojis
|
||||||
|
const match = emojis.find(e => e.name === guessedName) || emojis.find(e => e.name?.toLowerCase() === guessedName.toLowerCase())
|
||||||
|
if (match) {
|
||||||
|
row = match
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!row) return false
|
if (!row) return false
|
||||||
node.setAttribute("data-emoji-id", row.emoji_id)
|
node.setAttribute("data-emoji-id", row.id)
|
||||||
|
node.setAttribute("data-emoji-name", row.name)
|
||||||
node.setAttribute("data-emoji-animated-char", row.animated ? "a" : "")
|
node.setAttribute("data-emoji-animated-char", row.animated ? "a" : "")
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
|
@ -133,8 +149,7 @@ turndownService.addRule("emoji", {
|
||||||
/** @type {string} */
|
/** @type {string} */
|
||||||
const animatedChar = node.getAttribute("data-emoji-animated-char")
|
const animatedChar = node.getAttribute("data-emoji-animated-char")
|
||||||
/** @type {string} */
|
/** @type {string} */
|
||||||
const title = node.getAttribute("title") || "__"
|
const name = node.getAttribute("data-emoji-name")
|
||||||
const name = title.replace(/^:|:$/g, "")
|
|
||||||
return `<${animatedChar}:${name}:${id}>`
|
return `<${animatedChar}:${name}:${id}>`
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue