d2m/converters/expression.js

@@ -29,9 +29,8 @@ async function emojisToState(emojis) {
 				},
 				url
 			}
-			db.prepare("INSERT OR IGNORE INTO emoji (emoji_id, animated, mxc_url) VALUES (?, ?, ?)").run(emoji.id, +!!emoji.animated, url)
 		}).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") { // Lol.
 				return
 			}
 			console.error(`Trying to handle emoji ${emoji.name} (${emoji.id}), but...`)

d2m/converters/message-to-event.js

@@ -41,12 +41,8 @@ function getDiscordParseCallbacks(message, useHTML) {
 		/** @param {{animated: boolean, name: string, id: string, type: "discordEmoji"}} node */
 		emoji: node => {
 			if (useHTML) {
-				const mxc = select("emoji", "mxc_url", "WHERE emoji_id = ?").pluck().get(node.id)
+				// TODO: upload the emoji and actually use the right mxc!!
-				if (mxc) {
-					return `<img data-mx-emoticon height="32" src="${mxc}" title=":${node.name}:" alt=":${node.name}:">`
-				} else {
 				return `<img src="mxc://cadence.moe/${node.id}" data-mx-emoticon alt=":${node.name}:" title=":${node.name}:" height="24">`
-				}
 			} else {
 				return `:${node.name}:`
 			}

d2m/converters/message-to-event.test.js

@@ -379,27 +379,3 @@ test("message2event: thread start message reference", async t => {
 		"m.mentions": {}
 	}])
 })
-
-test("message2event: single large bridged emoji", async t => {
-	const events = await messageToEvent(data.message.single_emoji, data.guild.general, {})
-	t.deepEqual(events, [{
-		$type: "m.room.message",
-		"m.mentions": {},
-		msgtype: "m.text",
-		body: ":hippo:",
-		format: "org.matrix.custom.html",
-		formatted_body: '<img data-mx-emoticon height="32" src="mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC" title=":hippo:" alt=":hippo:">'
-	}])
-})
-
-test("message2event: mid-message small bridged emoji", async t => {
-	const events = await messageToEvent(data.message.surrounded_emoji, data.guild.general, {})
-	t.deepEqual(events, [{
-		$type: "m.room.message",
-		"m.mentions": {},
-		msgtype: "m.text",
-		body: "h is for :hippo:!",
-		format: "org.matrix.custom.html",
-		formatted_body: 'h is for <img data-mx-emoticon height="32" src="mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC" title=":hippo:" alt=":hippo:">!'
-	}])
-})

db/ooye-test-data.sql

@@ -66,11 +66,7 @@ INSERT INTO file (discord_url, mxc_url) VALUES
 ('https://cdn.discordapp.com/attachments/112760669178241024/1128084851023675515/RDT_20230704_0936184915846675925224905.jpg', 'mxc://cadence.moe/WlAbFSiNRIHPDEwKdyPeGywa'),
 ('https://cdn.discordapp.com/guilds/112760669178241024/users/134826546694193153/avatars/38dd359aa12bcd52dd3164126c587f8c.png?size=1024', 'mxc://cadence.moe/rfemHmAtcprjLEiPiEuzPhpl'),
 ('https://cdn.discordapp.com/icons/112760669178241024/a_f83622e09ead74f0c5c527fe241f8f8c.png?size=1024', 'mxc://cadence.moe/zKXGZhmImMHuGQZWJEFKJbsF'),
-('https://cdn.discordapp.com/avatars/113340068197859328/b48302623a12bc7c59a71328f72ccb39.png?size=1024', 'mxc://cadence.moe/UpAeIqeclhKfeiZNdIWNcXXL'),
+('https://cdn.discordapp.com/avatars/113340068197859328/b48302623a12bc7c59a71328f72ccb39.png?size=1024', 'mxc://cadence.moe/UpAeIqeclhKfeiZNdIWNcXXL');
-('https://cdn.discordapp.com/emojis/230201364309868544.png', 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC');
-
-INSERT INTO emoji (emoji_id, animated, mxc_url) VALUES
-('230201364309868544', 0, 'mxc://cadence.moe/qWmbXeRspZRLPcjseyLmeyXC');
 
 INSERT INTO member_cache (room_id, mxid, displayname, avatar_url) VALUES
 ('!kLRqKKUQXcibIMtOpl:cadence.moe', '@cadence:cadence.moe', 'cadence [they]', NULL),

db/orm-utils.d.ts

@@ -62,12 +62,6 @@ export type Models = {
 		webhook_id: string
 		webhook_token: string
 	}
-
-	emoji: {
-		emoji_id: string
-		animated: number
-		mxc_url: string
-	}
 }
 
 export type Prepared<Row> = {

test/data.js

@@ -958,69 +958,7 @@ module.exports = {
 			},
 			attachments: [],
 			guild_id: "112760669178241024"
-		},
+		}
-		single_emoji: {
-			id: "1126733830494093453",
-			type: 0,
-			content: "<:hippo:230201364309868544>",
-			channel_id: "112760669178241024",
-			author: {
-				id: "111604486476181504",
-				username: "kyuugryphon",
-				avatar: "e4ce31267ca524d19be80e684d4cafa1",
-				discriminator: "0",
-				public_flags: 0,
-				flags: 0,
-				banner: null,
-				accent_color: null,
-				global_name: "KyuuGryphon",
-				avatar_decoration: null,
-				display_name: "KyuuGryphon",
-				banner_color: null
-			},
-			attachments: [],
-			embeds: [],
-			mentions: [],
-			mention_roles: [],
-			pinned: false,
-			mention_everyone: false,
-			tts: false,
-			timestamp: "2023-07-07T04:37:58.892000+00:00",
-			edited_timestamp: null,
-			flags: 0,
-			components: []
-		},
-		surrounded_emoji: {
-			id: "1126733830494093453",
-			type: 0,
-			content: "h is for <:hippo:230201364309868544>!",
-			channel_id: "112760669178241024",
-			author: {
-				id: "111604486476181504",
-				username: "kyuugryphon",
-				avatar: "e4ce31267ca524d19be80e684d4cafa1",
-				discriminator: "0",
-				public_flags: 0,
-				flags: 0,
-				banner: null,
-				accent_color: null,
-				global_name: "KyuuGryphon",
-				avatar_decoration: null,
-				display_name: "KyuuGryphon",
-				banner_color: null
-			},
-			attachments: [],
-			embeds: [],
-			mentions: [],
-			mention_roles: [],
-			pinned: false,
-			mention_everyone: false,
-			tts: false,
-			timestamp: "2023-07-07T04:37:58.892000+00:00",
-			edited_timestamp: null,
-			flags: 0,
-			components: []
-		},
 	},
 	message_with_embeds: {
 		nothing_but_a_field: {