Merge branch 'main' of https://git.radium.wtf/st/twitter

.gitignore

@@ -141,4 +141,6 @@ dist
 
 # Vite logs files
 vite.config.js.timestamp-*
-vite.config.ts.timestamp-*
+
+items.json
+db.json

db.json

@@ -1,11 +0,0 @@
-{
-  "autoroles": {
-    "1133441692196950101": "1192595134026616894"
-  },
-  "autobans": {
-    "1133441692196950101": "1264634623950848158"
-  },
-  "prefixes": {
-    "1362160460253761536": "*"
-  }
-}

src/commands/games/roblox.js

@@ -48,7 +48,7 @@ module.exports = {
     name: 'rbx',
     description: `various commands related to roblox`,
     aliases: ['roblox'],
-    usage: `rbx user <username>\n${env.PREFIX}rbx item <item id>\n${env.PREFIX}rbx group <group id>\n${env.PREFIX}rbx game <game id>\n${env.PREFIX}rbx avatar <username>`,
+    usage: 'rbx user <username>\n.rbx item <item id>\n.rbx group <group id>\n.rbx game <game id>',
 
     async execute(client, message) {
         var embed = {};
@@ -206,48 +206,6 @@ module.exports = {
                     timestamp: new Date(),
                 }
             }
-        } else if (subcommand === 'avatar') {
-            try {
-                const user = data.data[0];
-                const a_res = await fetch(`https://thumbnails.roproxy.com/v1/users/avatar?userIds=${user.id}&size=720x720&format=Png&isCircular=false`, {
-                    method: 'GET',
-                    headers: { 'Content-Type': 'application/json' }
-                });
-                const a_data = await a_res.json();
-                logger.debug(`[rbx] fetched avatar for "${argument}": ${JSON.stringify(a_data)}`);
-
-                embed = {
-                    color: 0x8aa2b3,
-                    author: {
-                        name: message.author.username,
-                        icon_url: message.author.displayAvatarURL(),
-                    },
-                    description: `**${user.displayName}**'s avatar`,
-                    footer: {
-                        text: `twitter @ ${message.guild.name}`,
-                        icon_url: client.user.displayAvatarURL(),
-                    },
-                    image: {
-                        url: `${a_data.data[0].imageUrl}`
-                    },
-                    timestamp: new Date(),
-                };
-            } catch (err) {
-                logger.error(`[rbx] failed to fetch avatar for user id "${argument}":`, err);
-                embed = {
-                    color: 0x8aa2b3,
-                    author: {
-                        name: message.author.username,
-                        icon_url: message.author.displayAvatarURL(),
-                    },
-                    description: `<:no:1481811955592466492> could not fetch avatar data for user "${argument}"!`,
-                    footer: {
-                        text: `twitter @ ${message.guild.name}`,
-                        icon_url: client.user.displayAvatarURL(),
-                    },
-                    timestamp: new Date(),
-                };
-            }
         } else if (subcommand === 'item') {
             try {
                 const res = await fetch(`https://economy.roproxy.com/v2/assets/${argument}/details`, {

src/commands/moderation/autoban.js

@@ -100,3 +100,105 @@ module.exports = {
         }
     },
 };
+'use strict';
+
+const { time } = require("discord.js");
+const fs = require('fs');
+const path = require('path');
+
+module.exports = {
+    name: 'autoban',
+    description: `automatically ban a user if they join the server`,
+    aliases: ['ab', 'banish'],
+    usage: 'ban <user> [reason] [duration]',
+
+    async execute(client, message, args) {
+        if (!message.member.permissions.has('BanMembers')) {
+            return message.reply({
+                content: null, embeds: [{
+                    color: 0x8aa2b3,
+                    author: {
+                        name: message.author.username,
+                        icon_url: message.author.displayAvatarURL(),
+                    },
+                    description: '<:no:1481811955592466492> you do not have permission to use this command!',
+                    footer: {
+                        text: `twitter @ ${message.guild.name}`,
+                        icon_url: client.user.displayAvatarURL(),
+                    },
+                    timestamp: new Date(),
+                }]
+            });
+        }
+
+        const user = message.mentions.users.first() || await client.users.fetch(args[0]).catch(() => null);
+        if (!user) {
+            return message.reply({
+                content: null, embeds: [{
+                    color: 0x8aa2b3,
+                    author: {
+                        name: message.author.username,
+                        icon_url: message.author.displayAvatarURL(),
+                    },
+                    description: '<:no:1481811955592466492> please specify a user to autoban!',
+                    footer: {
+                        text: `twitter @ ${message.guild.name}`,
+                        icon_url: client.user.displayAvatarURL(),
+                    },
+                    timestamp: new Date(),
+                }]
+            });
+        }
+
+        const reason = args.slice(1).join(' ') || 'autobanned (twitter)';
+
+        const dbPath = path.join(__dirname, '..', '..', '..', 'db.json');
+
+        let db = {};
+        if (fs.existsSync(dbPath)) {
+            db = JSON.parse(fs.readFileSync(dbPath, 'utf8'));
+        }
+
+        if (!db.autobans) {
+            db.autobans = {};
+        }
+
+        db.autobans[message.guild.id] = user.id;
+
+        try {
+            await fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
+            message.reply({
+                content: null, embeds: [{
+                    color: 0x8aa2b3,
+                    author: {
+                        name: message.author.username,
+                        icon_url: message.author.displayAvatarURL(),
+                    },
+                    description: `<:check:1481811973447356496> ${user.username} has been added to the autoban list!`,
+                    footer: {
+                        text: `twitter @ ${message.guild.name}`,
+                        icon_url: client.user.displayAvatarURL(),
+                    },
+                    timestamp: new Date(),
+                }]
+            });
+        } catch (error) {
+            console.error(error);
+            message.reply({
+                content: null, embeds: [{
+                    color: 0x8aa2b3,
+                    author: {
+                        name: message.author.username,
+                        icon_url: message.author.displayAvatarURL(),
+                    },
+                    description: '<:no:1481811955592466492> an error occurred while trying to add the user to the autoban list!',
+                    footer: {
+                        text: `twitter @ ${message.guild.name}`,
+                        icon_url: client.user.displayAvatarURL(),
+                    },
+                    timestamp: new Date(),
+                }]
+            });
+        }
+    },
+};

src/commands/moderation/ban.js

@@ -5,8 +5,8 @@ const { time } = require("discord.js");
 module.exports = {
     name: 'ban',
     description: `ban a user from the current server`,
-    aliases: ['b'],
+    aliases: ['banish'],
-    usage: 'ban <user> [reason]',
+    usage: 'ban <user> [reason] [duration]',
 
     async execute(client, message, args) {
         if (!message.member.permissions.has('BanMembers')) {