From edf60bcd2d4c820c2e8eeac87da6771239c40551 Mon Sep 17 00:00:00 2001
From: Cadence Ember <cadence@disroot.org>
Date: Sun, 15 Jun 2025 21:18:33 +1200
Subject: [PATCH] Remove provider line from Tenor gifs

---
 .../message-to-event.embeds.test.js           | 19 +++++
 src/d2m/converters/message-to-event.js        |  2 +-
 test/data.js                                  | 77 +++++++++++++++++++
 3 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/src/d2m/converters/message-to-event.embeds.test.js b/src/d2m/converters/message-to-event.embeds.test.js
index 9c18386..ed165c6 100644
--- a/src/d2m/converters/message-to-event.embeds.test.js
+++ b/src/d2m/converters/message-to-event.embeds.test.js
@@ -321,6 +321,25 @@ test("message2event embeds: youtube video", async t => {
 	}])
 })
 
+test("message2event embeds: tenor gif should show a video link without a provider", async t => {
+	const events = await messageToEvent(data.message_with_embeds.tenor_gif, data.guild.general, {}, {})
+	t.deepEqual(events, [{
+		$type: "m.room.message",
+		msgtype: "m.text",
+		body: "@Realdditors: get real https://tenor.com/view/get-real-gif-26176788",
+		format: "org.matrix.custom.html",
+		formatted_body: "<font color=\"#ff4500\">@Realdditors</font> get real <a href=\"https://tenor.com/view/get-real-gif-26176788\">https://tenor.com/view/get-real-gif-26176788</a>",
+		"m.mentions": {}
+	}, {
+		$type: "m.room.message",
+		msgtype: "m.notice",
+		body: "| 🎞️ https://media.tenor.com/Bz5pfRIu81oAAAPo/get-real.mp4",
+		format: "org.matrix.custom.html",
+		formatted_body: "<blockquote><p>🎞️ https://media.tenor.com/Bz5pfRIu81oAAAPo/get-real.mp4</p></blockquote>",
+		"m.mentions": {}
+	}])
+})
+
 test("message2event embeds: if discord creates an embed preview for a discord channel link, don't copy that embed", async t => {
 	const events = await messageToEvent(data.message_with_embeds.discord_server_included_punctuation_bad_discord, data.guild.general, {}, {
 		api: {
diff --git a/src/d2m/converters/message-to-event.js b/src/d2m/converters/message-to-event.js
index cdceeca..104a08c 100644
--- a/src/d2m/converters/message-to-event.js
+++ b/src/d2m/converters/message-to-event.js
@@ -676,7 +676,7 @@ async function messageToEvent(message, guild, options = {}, di) {
 		const rep = new mxUtils.MatrixStringBuilder()
 
 		// Provider
-		if (embed.provider?.name) {
+		if (embed.provider?.name && embed.provider.name !== "Tenor") {
 			if (embed.provider.url) {
 				rep.addParagraph(`via ${embed.provider.name} ${embed.provider.url}`, tag`<sub><a href="${embed.provider.url}">${embed.provider.name}</a></sub>`)
 			} else {
diff --git a/test/data.js b/test/data.js
index 78fcb75..fba0587 100644
--- a/test/data.js
+++ b/test/data.js
@@ -208,6 +208,25 @@ module.exports = {
 					hoist: true,
 					flags: 0,
 					color: 16745267
+				}, {
+					version: 1743122443142,
+					unicode_emoji: null,
+					tags: {},
+					position: 3,
+					permissions: "0",
+					name: "Realdditors",
+					mentionable: true,
+					managed: false,
+					id: "1182745800661540927",
+					icon: null,
+					hoist: false,
+					flags: 0,
+					colors: {
+						tertiary_color: null,
+						secondary_color: null,
+						primary_color: 16729344
+					},
+					color: 16729344
 				}
 			],
 			discovery_splash: null,
@@ -3778,6 +3797,64 @@ module.exports = {
 			edited_timestamp: null,
 			flags: 0,
 			components: []
+		},
+		tenor_gif: {
+			type: 0,
+			content: "<@&1182745800661540927> get real https://tenor.com/view/get-real-gif-26176788",
+			mentions: [],
+			mention_roles: [ "1182745800661540927" ],
+			attachments: [],
+			embeds: [
+				{
+					type: "gifv",
+					url: "https://tenor.com/view/get-real-gif-26176788",
+					provider: { name: "Tenor", url: "https://tenor.co" },
+					thumbnail: {
+						url: "https://media.tenor.com/Bz5pfRIu81oAAAAe/get-real.png",
+						proxy_url: "https://images-ext-1.discordapp.net/external/I71Ngw9drAKZhL_lhQRnAD_A-DkRNgN3EeZ2njv3Vi4/https/media.tenor.com/Bz5pfRIu81oAAAAe/get-real.png",
+						width: 632,
+						height: 640,
+						placeholder: "IBgSHwSYaIePiHh/d7h3d4eEJvkchZsA",
+						placeholder_version: 1,
+						flags: 0
+					},
+					video: {
+						url: "https://media.tenor.com/Bz5pfRIu81oAAAPo/get-real.mp4",
+						proxy_url: "https://images-ext-1.discordapp.net/external/vNEtsZd1p_mWQh-nEIa0ZBndMEo2_oa1sAOMyXsgoWI/https/media.tenor.com/Bz5pfRIu81oAAAPo/get-real.mp4",
+						width: 632,
+						height: 640,
+						placeholder: "IBgSHwSYaIePiHh/d7h3d4eEJvkchZsA",
+						placeholder_version: 1,
+						flags: 0
+					}
+				}
+			],
+			timestamp: "2025-06-08T03:49:08.500000+00:00",
+			edited_timestamp: null,
+			flags: 0,
+			components: [],
+			id: "1381117821190279271",
+			channel_id: "1099031887500034088",
+			author: {
+				id: "771520384671416320",
+				username: "Bojack Horseman",
+				avatar: "d14f47194b6ebe4da2e18a56fc6dacfd",
+				discriminator: "9703",
+				public_flags: 0,
+				flags: 0,
+				bot: true,
+				banner: null,
+				accent_color: null,
+				global_name: null,
+				avatar_decoration_data: null,
+				collectibles: null,
+				banner_color: null,
+				clan: null,
+				primary_guild: null
+			},
+			pinned: false,
+			mention_everyone: false,
+			tts: false
 		}
 	},
 	message_update: {