commands/fun/tweet.js

@@ -1,6 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { EmbedBuilder } from 'discord.js';
-import { TwitterApi } from 'twitter-api-v2';
+import Twit from 'twit';
 import fetch from 'node-fetch';
 import os from 'node:os';
 import fs from 'node:fs';
@@ -114,11 +114,11 @@ export default {
 		}
 
 
-		const userClient = new TwitterApi({
+		const T = new Twit({
-			appKey: twiConsumer,
+			consumer_key: twiConsumer,
-			appSecret: twiConsumerSecret,
+			consumer_secret: twiConsumerSecret,
-			accessToken: twiToken,
+			access_token: twiToken,
-			accessSecret: twiTokenSecret,
+			access_token_secret: twiTokenSecret,
 		});
 
 		try {
@@ -140,9 +140,7 @@ export default {
 						return interaction.editReply({ content: 'Gifs can\'t be larger than 15 MB!' });
 					}
 
-					const image = await userClient.v1.uploadMedia(`${os.tmpdir()}/${attachment.name}`);
+					const b64Image = fs.readFileSync(`${os.tmpdir()}/${attachment.name}`, { encoding: 'base64' });
-					Tweet(image);
-					/*
 					T.post('media/upload', { media_data: b64Image }, function(err, data) {
 						if (err) {
 							console.log('OH NO AN ERROR!!!!!!!');
@@ -153,7 +151,6 @@ export default {
 							Tweet(data);
 						}
 					});
-					*/
 				}
 				else {
 					await interaction.editReply({ content: 'File type not supported, you can only send jpg/png/gif' });
@@ -170,22 +167,44 @@ export default {
 			return;
 		}
 
-		async function Tweet(img) {
+		function Tweet(data) {
-			console.log(img);
+			let options = {
-			let options = null;
+				status: tweet,
-			if (img) {
+			};
-				options = { media: { media_ids: new Array(img) } };
+
+			if (data && tweet) {
+				options = {
+					status: tweet,
+					media_ids: new Array(data.media_id_string),
+				};
+			}
+			else if (data) {
+				options = {
+					media_ids: new Array(data.media_id_string),
+				};
 			}
-			const tweeted = await userClient.v2.tweet(tweet, options);
 
-			console.log(tweeted);
+			T.post('statuses/update', options, function(err, response) {
+				if (err) {
+					// Rate limit exceeded
+					if (err.code == 88) return interaction.editReply({ content: err.interaction });
+					// Tweet needs to be a bit shorter.
+					if (err.code == 186) return interaction.editReply({ content: `${err.interaction} Your interaction was ${tweet.length} characters, you need to remove ${tweet.length - 280} characters (This count may be inaccurate if your interaction contained link)` });
+					// Status is a duplicate.
+					if (err.code == 187) return interaction.editReply({ content: err.interaction });
+					// To protect our users from spam and other malicious activity, this account is temporarily locked.
+					if (err.code == 326) return interaction.editReply({ content: err.interaction });
+					console.error('OH NO!!!!');
+					console.error(err);
+					return interaction.editReply({ content: 'OH NO!!! AN ERROR HAS occurred!!! please hold on while i find what\'s causing this issue!' });
+				}
 
-
+				const tweetid = response.id_str;
-			const tweetid = tweeted.data.id;
 				const FunnyWords = ['oppaGangnamStyle', '69', '420', 'cum', 'funnyMan', 'GUCCISmartToilet', 'TwitterForClowns', 'fart', 'ok', 'hi', 'howAreYou', 'WhatsNinePlusTen', '21'];
 				const TweetLink = `https://twitter.com/${FunnyWords[Math.floor((Math.random() * FunnyWords.length))]}/status/${tweetid}`;
 
-			let channel = await client.channels.resolve(twiChannel);
+				// Im too lazy for now to make an entry in config.json
+				let channel = client.channels.resolve(twiChannel);
 				channel.send(TweetLink);
 
 				const Embed = new EmbedBuilder()
@@ -212,9 +231,10 @@ export default {
 
 				if (attachment) Embed.setImage(attachment.url);
 
-			channel = await client.channels.resolve(twiLogChannel);
+				channel = client.channels.resolve(twiLogChannel);
 				channel.send({ embeds: [Embed] });
 				return interaction.editReply({ content: `Go see ur epic tweet ${TweetLink}` });
+			});
 		}
 	},
 };

events/client/status.js

@@ -1,6 +1,5 @@
 import { ActivityType } from 'discord.js';
 import game from '../../json/playing.json' assert {type: 'json'};
-import music from '../../json/listening.json' assert {type: 'json'};
 import watch from '../../json/watching.json' assert {type: 'json'};
 
 export default {
@@ -15,7 +14,7 @@ export default {
 		}, 1800000);
 
 		async function setStatus() {
-			const random = Math.floor((Math.random() * 3));
+			const random = Math.floor((Math.random() * 2));
 			let types, status;
 			// Random "Watching" status taken from json
 			if (random === 0) {
@@ -36,15 +35,6 @@ export default {
 				console.log(`Setting status to: ${status}`);
 				types = [ ActivityType.Playing, ActivityType.Competing ];
 			}
-			else if (random === 2) {
-				console.log('Status type: \x1b[32mPlaying\x1b[0m');
-
-				status = music[Math.floor((Math.random() * music.length))];
-				status = status + ' | Now with slash commands!';
-
-				console.log(`Setting status to: ${status}`);
-				types = [ ActivityType.Listening ];
-			}
 			await client.user.setActivity(status, { type: types[Math.floor((Math.random() * types.length))] });
 		}
 	},

json/listening.json

@@ -1,3 +0,0 @@
-[
-	"psychometricBussdown by oddballTheatre"
-]

package-lock.json

@@ -19,7 +19,7 @@
         "safe-regex": "github:davisjam/safe-regex",
         "sequelize": "^6.21.3",
         "turndown": "^7.1.1",
-        "twitter-api-v2": "^1.15.0",
+        "twit": "^1.1.20",
         "ytpplus-node": "github:Supositware/ytpplus-node"
       },
       "devDependencies": {
@@ -5159,6 +5159,11 @@
         "set-blocking": "^2.0.0"
       }
     },
+    "node_modules/oauth": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.9.tgz",
+      "integrity": "sha512-kjdfbdtIFcfvHTdvh+pbR5RMOxrihCmMtDjOCAieetr4NoUOuRjl1q9gyGnvpPNDOalH8moHqur150XYGPQFeA=="
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -6817,10 +6822,16 @@
         "domino": "^2.1.6"
       }
     },
-    "node_modules/twitter-api-v2": {
+    "node_modules/twit": {
-      "version": "1.15.0",
+      "version": "1.1.20",
-      "resolved": "https://registry.npmjs.org/twitter-api-v2/-/twitter-api-v2-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/twit/-/twit-1.1.20.tgz",
-      "integrity": "sha512-Cqg3pIGhSwPyFBndpBrucdeNXecNFnYcXy3ixQ4brJHd/3k1CAtBVcX0e3s6jRYl/QIx5BmyGXS/SHEGtYZ3gw=="
+      "integrity": "sha512-5Wb4b+1mqSxOXGrTe5O4GIB6/IQnh5anAub34M+VfAdA1g+9QfUuod4C94xf9NNcaz+rNZ/3LRUSTpn8wLMnYA==",
+      "dependencies": {
+        "oauth": "0.9.9"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
     },
     "node_modules/type": {
       "version": "1.2.0",

package.json

@@ -27,7 +27,7 @@
     "safe-regex": "github:davisjam/safe-regex",
     "sequelize": "^6.21.3",
     "turndown": "^7.1.1",
-    "twitter-api-v2": "^1.15.0",
+    "twit": "^1.1.20",
     "ytpplus-node": "github:Supositware/ytpplus-node"
   },
   "devDependencies": {