rework: slash commands and components

Nightorn · Mar 27, 2022 · cd07022 · cd07022
1 parent 3fd28cb
commit cd07022
Show file tree

Hide file tree

Showing 173 changed files with 1,658 additions and 1,431 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.env.example b/.env.example
@@ -17,7 +17,6 @@ API_OMDB=
 API_OSU=
 API_PEXELS=
 API_TENOR=
-API_YANDEX=
 
 MYSQL_HOST=
 MYSQL_USER=

diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/assets/data/actiontext.json b/assets/data/actiontext.json
diff --git a/assets/data/aldebaranPermissions.json b/assets/data/aldebaranPermissions.json
diff --git a/assets/data/categories.json b/assets/data/categories.json
diff --git a/assets/data/drpg/bases.json b/assets/data/drpg/bases.json
diff --git a/assets/data/drpg/itemList.json b/assets/data/drpg/itemList.json
diff --git a/assets/data/drpg/locations.json b/assets/data/drpg/locations.json
diff --git a/assets/data/drpgbasexp.json b/assets/data/drpgbasexp.json
diff --git a/assets/data/drpgquestinfo.json b/assets/data/drpgquestinfo.json
diff --git a/assets/data/imageurls.json b/assets/data/imageurls.json
diff --git a/assets/data/staffRoles.json b/assets/data/staffRoles.json
diff --git a/assets/data/variables.json b/assets/data/variables.json
diff --git a/assets/emojis/fish.png b/assets/emojis/fish.png
diff --git a/assets/emojis/leaves.png b/assets/emojis/leaves.png
diff --git a/assets/emojis/pickaxe.png b/assets/emojis/pickaxe.png
diff --git a/assets/emojis/tree.png b/assets/emojis/tree.png
diff --git a/assets/fonts/Exo2-Regular.ttf b/assets/fonts/Exo2-Regular.ttf
diff --git a/assets/locales/en.json b/assets/locales/en.json
diff --git a/assets/locales/fr.json b/assets/locales/fr.json
diff --git a/config/aldebaranTeam.json b/config/aldebaranTeam.json
diff --git a/config/presence.json b/config/presence.json
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aldebaran",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Utility",
   "main": "src/app.ts",
   "dependencies": {

diff --git a/src/api/api.ts b/src/api/api.ts
diff --git a/src/api/graphql/schema.graphql b/src/api/graphql/schema.graphql
diff --git a/src/api/graphql/types/PageInfo.ts b/src/api/graphql/types/PageInfo.ts
diff --git a/src/api/graphql/types/SocialProfile.ts b/src/api/graphql/types/SocialProfile.ts
diff --git a/src/api/graphql/types/common/DiscordStructWithSettings.ts b/src/api/graphql/types/common/DiscordStructWithSettings.ts
diff --git a/src/api/graphql/types/guild/Guild.ts b/src/api/graphql/types/guild/Guild.ts
diff --git a/src/api/graphql/types/guild/GuildsConnection.ts b/src/api/graphql/types/guild/GuildsConnection.ts
diff --git a/src/api/graphql/types/guild/GuildsConnectionEdge.ts b/src/api/graphql/types/guild/GuildsConnectionEdge.ts
diff --git a/src/api/graphql/types/user/User.ts b/src/api/graphql/types/user/User.ts
diff --git a/src/api/graphql/types/user/UsersConnection.ts b/src/api/graphql/types/user/UsersConnection.ts
diff --git a/src/api/graphql/types/user/UsersConnectionEdge.ts b/src/api/graphql/types/user/UsersConnectionEdge.ts
diff --git a/src/api/graphql/utils/fetchDBValue.ts b/src/api/graphql/utils/fetchDBValue.ts
diff --git a/src/api/graphql/utils/fetchDSMValue.ts b/src/api/graphql/utils/fetchDSMValue.ts
diff --git a/src/api/interfaces/OAuth2Client.ts b/src/api/interfaces/OAuth2Client.ts
diff --git a/src/api/middlewares/oauth2/model.ts b/src/api/middlewares/oauth2/model.ts
diff --git a/src/api/public/css/style.css b/src/api/public/css/style.css
diff --git a/src/api/public/img/alde.png b/src/api/public/img/alde.png
diff --git a/src/api/public/img/aldebg.png b/src/api/public/img/aldebg.png
diff --git a/src/api/routes/discord/callback.ts b/src/api/routes/discord/callback.ts
diff --git a/src/api/routes/oauth/authorize.ts b/src/api/routes/oauth/authorize.ts
diff --git a/src/api/routes/oauth/token.ts b/src/api/routes/oauth/token.ts
diff --git a/src/api/util/Constants.ts b/src/api/util/Constants.ts
diff --git a/src/api/util/validateSession.ts b/src/api/util/validateSession.ts
diff --git a/src/api/views/authorize.pug b/src/api/views/authorize.pug
diff --git a/src/bot.ts b/src/bot.ts
diff --git a/src/commands/commands.ts b/src/commands/commands.ts
@@ -1,5 +1,7 @@
 import CommandHandler from "../handlers/CommandHandler.js";
+import DiscordMessageContext from "../structures/contexts/DiscordMessageContext.js";
 import AldebaranClient from "../structures/djs/Client.js";
+import { Platform } from "../utils/Constants.js";
 import executeSocial from "../utils/executeSocial.js";
 
 // Developer
@@ -49,7 +51,6 @@ import UserCommand from "./general/user.js";
 import BirbCommand from "./image/birb.js";
 import BunnyCommand from "./image/bunny.js";
 import CatCommand from "./image/cat.js";
-import CuteagCommand from "./image/cuteag.js";
 import DogCommand from "./image/dog.js";
 import DuckCommand from "./image/duck.js";
 import HedgehogCommand from "./image/hedgehog.js";
@@ -58,6 +59,7 @@ import NekoCommand from "./image/neko.js";
 import PandaCommand from "./image/panda.js";
 import PepeCommand from "./image/pepe.js";
 import RandimalCommand from "./image/randimal.js";
+import RCGPCommand from "./image/rcgp.js";
 
 // NSFW
 import LewdCommand from "./nsfw/lewd.js";
@@ -87,8 +89,6 @@ import TickleCommand from "./social/tickle.js";
 // Utilities
 import CurconvCommand from "./utilities/curconv.js";
 import MathCommand from "./utilities/math.js";
-import TranslateCommand from "./utilities/translate.js";
-import MessageContext from "../structures/aldebaran/MessageContext.js";
 
 export default () => {
 	const commandHandler = CommandHandler.getInstance();
@@ -116,13 +116,18 @@ export default () => {
 				super(client, {
 					name,
 					description,
-					args: { user: { as: "user" } }
+					args: { user: {
+						as: "user",
+						desc: "The user you want to socialize with",
+						optional: true
+					} },
+					platforms: ["DISCORD"]
 				});
 			}
 
 			// eslint-disable-next-line class-methods-use-this
-			run(ctx: MessageContext) {
-				executeSocial(ctx);
+			run(ctx: DiscordMessageContext, platform: Platform) {
+				executeSocial(ctx, platform);
 			}
 		});
 	}
@@ -149,11 +154,11 @@ export default () => {
 		TimeCommand,
 		UserCommand,
 		BirbCommand,
-		CuteagCommand,
 		DogCommand,
 		LizardCommand,
 		NekoCommand,
 		PandaCommand,
+		RCGPCommand,
 		LewdCommand,
 		XboobsCommand,
 		XkittyCommand,
@@ -224,8 +229,4 @@ export default () => {
 	if (process.env.API_FIXER) {
 		commandHandler.register(CurconvCommand);
 	}
-
-	if (process.env.API_YANDEX) {
-		commandHandler.register(TranslateCommand);
-	}
 };
diff --git a/src/commands/developer/admin.ts b/src/commands/developer/admin.ts
@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import MessageContext from "../../structures/aldebaran/MessageContext.js";
+import MessageContext from "../../structures/contexts/MessageContext.js";
 import { Command } from "../../groups/DeveloperCommand.js";
 import AldebaranClient from "../../structures/djs/Client.js";
 
@@ -14,8 +14,8 @@ export default class AdminCommand extends Command {
 	constructor(client: AldebaranClient) {
 		super(client, {
 			description: "Admin Portal Command",
-			allowIndexCommand: true,
-			perms: { aldebaran: ["EDIT_USERS"] }
+			perms: { aldebaran: ["EDIT_USERS"] },
+			platforms: ["DISCORD"]
 		});
 		this.registerSubcommands(
 			mod,
@@ -30,10 +30,7 @@ export default class AdminCommand extends Command {
 	// eslint-disable-next-line class-methods-use-this
 	async run(ctx: MessageContext) {
 		const embed = new MessageEmbed()
-			.setAuthor(
-				ctx.message.author.username,
-				ctx.message.author.displayAvatarURL()
-			)
+			.setAuthor(ctx.author.username, ctx.author.avatarURL)
 			.setTitle("Warning")
 			.setDescription("The admin action specified is invalid.")
 			.setColor("ORANGE");

diff --git a/src/commands/developer/admin/mod.ts b/src/commands/developer/admin/mod.ts
@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import MessageContext from "../../../structures/aldebaran/MessageContext.js";
+import MessageContext from "../../../structures/contexts/MessageContext.js";
 import { Command } from "../../../groups/DeveloperCommand.js";
 import AldebaranClient from "../../../structures/djs/Client.js";
 import { SettingsModel, GuildSetting, UserSetting } from "../../../utils/Constants.js";
@@ -25,8 +25,8 @@ export default class ModSubcommand extends Command {
 						await user.changeSetting(args[1] as UserSetting, args[2]);
 						const embed = new MessageEmbed()
 							.setAuthor(
-								ctx.message.author.username,
-								ctx.message.author.displayAvatarURL()
+								ctx.author.username,
+								ctx.author.avatarURL
 							)
 							.setTitle("Changes Done")
 							.setDescription("The changes have successfully been applied. Please note that this command does not check for valid properties/values, make sure the user modded has the correct settings.")
@@ -38,8 +38,8 @@ export default class ModSubcommand extends Command {
 							await guild.changeSetting(args[1] as GuildSetting, args[2]);
 							const embed = new MessageEmbed()
 								.setAuthor(
-									ctx.message.author.username,
-									ctx.message.author.displayAvatarURL()
+									ctx.author.username,
+									ctx.author.avatarURL
 								)
 								.setTitle("Changes Done")
 								.setDescription("The changes have successfully been applied. Please note that this command does not check for valid properties/values, make sure the guild modded has the correct settings.")
@@ -48,8 +48,8 @@ export default class ModSubcommand extends Command {
 						} else {
 							const embed = new MessageEmbed()
 								.setAuthor(
-									ctx.message.author.username,
-									ctx.message.author.displayAvatarURL()
+									ctx.author.username,
+									ctx.author.avatarURL
 								)
 								.setTitle("Warning")
 								.setDescription(`The ID specified does not correspond to a valid user or a guild where ${ctx.client.user!.username} is.`)
@@ -60,8 +60,8 @@ export default class ModSubcommand extends Command {
 				} else {
 					const embed = new MessageEmbed()
 						.setAuthor(
-							ctx.message.author.username,
-							ctx.message.author.displayAvatarURL()
+							ctx.author.username,
+							ctx.author.avatarURL
 						)
 						.setTitle("Warning")
 						.setDescription("You need to specify the value of the settings you want to change.")
@@ -71,8 +71,8 @@ export default class ModSubcommand extends Command {
 			} else {
 				const embed = new MessageEmbed()
 					.setAuthor(
-						ctx.message.author.username,
-						ctx.message.author.displayAvatarURL()
+						ctx.author.username,
+						ctx.author.avatarURL
 					)
 					.setTitle("Warning")
 					.setDescription("You need to specify the property of the settings you want to change.")
@@ -82,8 +82,8 @@ export default class ModSubcommand extends Command {
 		} else {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription("You need to specify the ID of the user or the guild you want to change the settings of.")

diff --git a/src/commands/developer/admin/restart.ts b/src/commands/developer/admin/restart.ts
@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import MessageContext from "../../../structures/aldebaran/MessageContext.js";
+import MessageContext from "../../../structures/contexts/MessageContext.js";
 import { Command } from "../../../groups/DeveloperCommand.js";
 import AldebaranClient from "../../../structures/djs/Client.js";
 

diff --git a/src/commands/developer/admin/serverlist.ts b/src/commands/developer/admin/serverlist.ts
@@ -1,19 +1,21 @@
 import { Collection, Guild, Snowflake } from "discord.js";
-import MessageContext from "../../../structures/aldebaran/MessageContext.js";
 import { Command, Embed } from "../../../groups/DeveloperCommand.js";
 import AldebaranClient from "../../../structures/djs/Client.js";
 import { paginate } from "../../../utils/Methods.js";
+import DiscordMessageContext from "../../../structures/contexts/DiscordMessageContext.js";
+import DiscordSlashMessageContext from "../../../structures/contexts/DiscordSlashMessageContext.js";
 
 export default class ServerlistSubcommand extends Command {
 	constructor(client: AldebaranClient) {
 		super(client, {
 			description: "Lists the servers the bot is in",
-			perms: { aldebaran: ["VIEW_SERVERLIST"] }
+			perms: { aldebaran: ["VIEW_SERVERLIST"] },
+			platforms: ["DISCORD", "DISCORD_SLASH"]
 		});
 	}
 
 	// eslint-disable-next-line class-methods-use-this
-	async run(ctx: MessageContext) {
+	async run(ctx: DiscordMessageContext | DiscordSlashMessageContext) {
 		const list: string[] = [];
 		ctx.client.shard!.fetchClientValues("guilds.cache").then(collected => {
 			(collected as Collection<Snowflake, Guild>[])

diff --git a/src/commands/developer/admin/setperm.ts b/src/commands/developer/admin/setperm.ts
@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import MessageContext from "../../../structures/aldebaran/MessageContext.js";
+import MessageContext from "../../../structures/contexts/MessageContext.js";
 import { PermissionString } from "../../../utils/Constants.js";
 import { Command } from "../../../groups/DeveloperCommand.js";
 import AldebaranPermissions from "../../../structures/aldebaran/AldebaranPermissions.js";
@@ -19,8 +19,8 @@ export default class SetpermSubcommand extends Command {
 		if (args[0] === undefined) {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription("You need to specify the ID of the user you want to change the permissions of.")
@@ -30,8 +30,8 @@ export default class SetpermSubcommand extends Command {
 		if (args[1] === undefined) {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription("You need to specify the operation you want to perform (ADD or REMOVE)")
@@ -41,8 +41,8 @@ export default class SetpermSubcommand extends Command {
 		if (args[1].toLowerCase() !== "add" && args[1].toLowerCase() !== "remove") {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription("You need to specify either ADD or REMOVE as the operation.")
@@ -52,8 +52,8 @@ export default class SetpermSubcommand extends Command {
 		if (args[2] === undefined) {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription(`You need to specify the ${ctx.client.name} permissions you want to set (seperated by spaces). (See \`assets/data/aldebaranPermissions.json\` for valid flags.)`)
@@ -66,8 +66,8 @@ export default class SetpermSubcommand extends Command {
 				.includes(permission)) as PermissionString[];
 			const embedFailure = (error: Error) => new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription(`Something went wrong: \n\`${error}\``)
@@ -78,8 +78,8 @@ export default class SetpermSubcommand extends Command {
 						await user.addPermissions(permissions);
 						const embedAddSuccess = new MessageEmbed()
 							.setAuthor(
-								ctx.message.author.username,
-								ctx.message.author.displayAvatarURL()
+								ctx.author.username,
+								ctx.author.avatarURL
 							)
 							.setTitle("Success")
 							.setDescription(`Successfully added:\n\`${permissions.join(", ")}\`\n to ${user.username}.`)
@@ -95,8 +95,8 @@ export default class SetpermSubcommand extends Command {
 						await user.removePermissions(permissions);
 						const embedRemoveSuccess = new MessageEmbed()
 							.setAuthor(
-								ctx.message.author.username,
-								ctx.message.author.displayAvatarURL()
+								ctx.author.username,
+								ctx.author.avatarURL
 							)
 							.setTitle("Success")
 							.setDescription(`Successfully removed:\n\`${permissions.join(", ")}\`\n from ${user.username}.`)
@@ -113,8 +113,8 @@ export default class SetpermSubcommand extends Command {
 		}).catch(() => {
 			const embed = new MessageEmbed()
 				.setAuthor(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				)
 				.setTitle("Warning")
 				.setDescription("The ID specified does not correspond to a valid user.")

diff --git a/src/commands/developer/admin/timeout.ts b/src/commands/developer/admin/timeout.ts
@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import MessageContext from "../../../structures/aldebaran/MessageContext.js";
+import MessageContext from "../../../structures/contexts/MessageContext.js";
 import { Command } from "../../../groups/DeveloperCommand.js";
 import AldebaranClient from "../../../structures/djs/Client.js";
 
@@ -33,7 +33,7 @@ export default class TimeoutSubcommand extends Command {
 							.addField("Reason", args.join(" "), true)
 							.addField("Server Invite", "https://discord.gg/3x6rXAv", true)
 							.setColor("RED")
-							.setFooter(`Action taken by ${ctx.message.author.tag}`, ctx.message.author.displayAvatarURL());
+							.setFooter(`Action taken by ${ctx.author.user.tag}`, ctx.author.avatarURL);
 						user.user.send({ embeds: [embed] });
 					}).catch((err: Error) => {
 						console.error(err);
@@ -46,8 +46,8 @@ export default class TimeoutSubcommand extends Command {
 					.setDescription("This ID does not correspond to any Discord user. Make sure you did not make a mistake typing it.")
 					.setColor("RED")
 					.setFooter(
-						ctx.message.author.username,
-						ctx.message.author.displayAvatarURL()
+						ctx.author.username,
+						ctx.author.avatarURL
 					);
 				ctx.reply(embed);
 			});
@@ -57,8 +57,8 @@ export default class TimeoutSubcommand extends Command {
 				.setDescription("This command requires three arguments in order to work, the user to timeout, the length and the reason of it.")
 				.setColor("RED")
 				.setFooter(
-					ctx.message.author.username,
-					ctx.message.author.displayAvatarURL()
+					ctx.author.username,
+					ctx.author.avatarURL
 				);
 			ctx.reply(embed);
 		}