From 57f729de247f5f51e5a55073b99c9f8320d51870 Mon Sep 17 00:00:00 2001
From: Skylar Grant <sky@vfsh.dev>
Date: Sun, 22 Sep 2024 19:19:16 -0400
Subject: [PATCH] Update to use new TenorJSv2

---
 dot-commands/gif.js | 29 ++++++++---------------------
 package.json        |  3 ++-
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/dot-commands/gif.js b/dot-commands/gif.js
index c7dedd7..207ed79 100644
--- a/dot-commands/gif.js
+++ b/dot-commands/gif.js
@@ -1,7 +1,9 @@
 const fn = require('../functions');
 const axios = require('axios');
 const dotenv = require('dotenv').config();
+const Tenor = require('tenorjs-v2');
 
+const tenor = new Tenor(process.env.tenorAPIKey);
 // TODO: Tenor has changed API versions, switch from TenorJS (unmaintained) to axios for
 // 		general API usage. See: https://github.com/Jinzulen/TenorJS/issues/12
 //		see also: https://developers.google.com/tenor/guides/migrate-from-v1
@@ -15,32 +17,17 @@ module.exports = {
 		const client = message.client;
 		if (!client.gifs.has(commandData.args)) {
 			if (process.env.isDev) console.log('https://tenor.googleapis.com/v2/search?' + `&q=${commandData.args}` + `&key=${process.env.tenorAPIKey}` + '&limit=1&contentfilter=off');
-			const q = await axios.get(
-				'https://tenor.googleapis.com/v2/search?' +
-				`&q=${commandData.args}` +
-				`&key=${process.env.tenorAPIKey}` +
-				'&limit=1' +
-				`&contentfilter=off`
-			).then(res => {
-				if (process.env.isDev) console.log(res.data.results);
-				if (res.data.results[0] == undefined) {
+			tenor.search(commandData.args, "1").then(res => {
+				if (res[0] == undefined) {
 					message.reply('Sorry I was unable to find a GIF of ' + commandData.args);
 					return;
 				};
-				commandData.embed_url = res.data.results[0].url;
+				commandData.embed_url = res[0].mediaUrl;
+				// message.reply(fn.embeds.gif(commandData));
+				// message.channel.send(`> ${commandData.author} - ${commandData.args}.gif`);
+				// message.channel.send(commandData.embed_url);
 				message.reply(commandData.embed_url);
 			}).catch(err => console.error(err));
-			// tenor.Search.Query(commandData.args, "1").then(res => {
-			// 	if (res[0] == undefined) {
-			// 		message.reply('Sorry I was unable to find a GIF of ' + commandData.args);
-			// 		return;
-			// 	};
-			// 	commandData.embed_url = res[0].media[0].gif.url;
-			// 	// message.reply(fn.embeds.gif(commandData));
-			// 	// message.channel.send(`> ${commandData.author} - ${commandData.args}.gif`);
-			// 	// message.channel.send(commandData.embed_url);
-			// 	message.reply(commandData.embed_url);
-			// }).catch(err => console.error(err));
 		} else {
 			// message.reply(commandData.args + ' requested by ' + message.author.username + '\n' + client.gifs.get(commandData.args).embed_url);
 			commandData.embed_url = client.gifs.get(commandData.args).embed_url;
diff --git a/package.json b/package.json
index f0d33ec..580c68c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "dotenv": "^10.0.0",
     "fuzzy-search": "^3.2.1",
     "mysql": "^2.18.1",
-    "tenorjs": "1.0.10"
+    "tenorjs": "1.0.10",
+    "tenorjs-v2": "^1.0.1"
   },
   "engines": {
     "node": "^20.x"