feat: add blacklists (#81)

* Create blacklist.ts

* Create blacklist.ts

* Create blacklist.ts

* Create blacklist.ts

* feat: start with blacklist command

* feat: command shortening

* fix: ts errors

* feat: move back to cjs

* feat: add blacklist command

* feat: add CI (#84)

* Create commit-msg

* Create pre-commit

* Create .commitlintrc.json

* Create .editorconfig

* Create .eslintrc.json

* Create .eslintignore

* Create .gitattributes

* Create tsconfig.eslint.json

* Update package.json

* Create .lintstagedrc.json

* Create eslint.json

* Create tsc.json

* Create continuous-integration.yml

* Update package.json

* Create extensions.json

* Create settings.json

* feat: update lock file

* feat: add eslint-plugin-prettier

* fix: eslint errors

* fix: more eslint errors

* Create blacklist.ts

* feat: start with blacklist command

* feat: command shortening

* fix: ts errors

* feat: move back to cjs

* feat: add blacklist command

* fix: eslint errors

* feat: NotBlacklisted

* fix: eslint errors

* feat: add NotBlacklisted precondition to commands

* fix: ts errors

* fix: ts errors

* feat: add blacklisted check

Co-authored-by: Jaron <jaron_zijlstra@outlook.com>
Co-authored-by: Jaron <60853956+JaronZ@users.noreply.github.com>

package.json

@@ -2,7 +2,7 @@
   "name": "ourtube",
   "version": "1.0.0",
   "description": "A music discord bot written in discord.js",
-  "main": "dist/sharder.mjs",
+  "main": "dist/sharder.js",
   "directories": {
     "lib": "src"
   },
@@ -15,8 +15,8 @@
     "build": "yarn clean && tsup && tsc --p tsconfig.lang.json",
     "lint": "eslint src scripts --ext mjs,ts --fix",
     "format": "prettier --write **/*.{ts,js,json,yml,yaml}",
-    "prepare": "husky install",
-    "start": "yarn build && node dist/sharder.mjs"
+	"prepare": "husky install",
+    "start": "yarn build && node ."
   },
   "repository": {
     "type": "git",

src/augment.d.ts

@@ -1,9 +1,11 @@
+import type {PrismaClient} from "@prisma/client";
 import {Player} from "discord-player";
 
 export * from "@sapphire/pieces";
 declare module "@sapphire/pieces" {
 	export interface Container {
 		player: Player;
+		prisma: PrismaClient;
 	}
 }
 

src/bot.ts

@@ -5,12 +5,14 @@ import {container, LogLevel, SapphireClient} from "@sapphire/framework";
 import "@sapphire/plugin-logger/register";
 import "@sapphire/plugin-i18next/register";
 import "./container";
+import {PrismaClient} from "@prisma/client";
 config();
 
 const client = new SapphireClient({
 	intents: ["GUILDS", "GUILD_VOICE_STATES"]
 });
 container.player = new Player(client);
 container.logger = new Logger(container, {level: LogLevel.Debug});
+container.prisma = new PrismaClient();
 
-void client.login(process.env.TOKEN);
+void client.login(process.env.TOKEN).finally(() => container.prisma.$disconnect());

src/commands/blacklist.ts

@@ -0,0 +1,60 @@
+import {SlashCommandBuilder} from "@discordjs/builders";
+import {ApplyOptions} from "@sapphire/decorators";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
+import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
+
+@ApplyOptions<CommandOptions>({
+	description: "blacklist"
+})
+export class BlacklistCommand extends Command {
+	public registerApplicationCommands(registry: ApplicationCommandRegistry) {
+		registry.registerChatInputCommand(
+			new SlashCommandBuilder()
+				.setName(this.name)
+				.setDescription(this.description)
+				.addUserOption(input => input.setName("user").setDescription("the user to blacklist").setRequired(true))
+				.addStringOption(input =>
+					input.setName("reason").setDescription("reason why for being blacklisted").setRequired(true)
+				),
+			{
+				guildIds: ["863878432697614337"]
+			}
+		);
+	}
+
+	public async chatInputRun(interaction: CommandInteraction) {
+		await interaction.deferReply();
+
+		const user = interaction.options.getUser("user", true);
+		const reason = interaction.options.getString("reason", true);
+
+		if (await this.container.prisma.blacklist.findUnique({where: {user: user.id}})) {
+			return interaction.editReply({
+				embeds: [
+					new MessageEmbed()
+						.setColor("RED")
+						.setTitle("User already blacklisted")
+						.setDescription(`${user} is already blacklisted.`)
+				]
+			});
+		}
+
+		await this.container.prisma.blacklist.create({
+			data: {
+				user: user.id,
+				reason,
+				author: interaction.user.id
+			}
+		});
+
+		return interaction.editReply({
+			embeds: [
+				new MessageEmbed()
+					.setColor("GREEN")
+					.setTitle("User blacklisted")
+					.setDescription(`${user} has been blacklisted`)
+			]
+		});
+	}
+}

src/commands/clear.ts

@@ -1,7 +1,9 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
+
 @ApplyOptions<CommandOptions>({
 	description: "clear the queue",
 	preconditions: ["GuildOnly", "BotInVoice", "InSameVoice"]

src/commands/disconnect.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "let the bot disconnect from the currently joined voice channel",

src/commands/invite.ts

@@ -1,8 +1,9 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {stripIndents} from "common-tags";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "get the invite link of the bot"

src/commands/join.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, GuildMember, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "let the bot join your voice channel",

src/commands/nowPlaying.ts

@@ -1,8 +1,9 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {stripIndents} from "common-tags";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "show the current playing song",

src/commands/pause.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "pause the current song",

src/commands/play.ts

@@ -1,9 +1,10 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions, SapphireClient} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions, SapphireClient} from "@sapphire/framework";
 import {QueryType} from "discord-player";
 import {CommandInteraction, MessageEmbed} from "discord.js";
 import type {JoinCommand} from "./join";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "play a song",

src/commands/queue.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "show the current queue",

src/commands/remove.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "remove a song from the current queue",

src/commands/resume.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "resume the current song",

src/commands/seek.ts

@@ -1,9 +1,10 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
 import {Duration} from "@sapphire/time-utilities";
 import {stripIndents} from "common-tags";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "seek to a specific time in the current song"

src/commands/skip.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "skip the current song"

src/commands/support.ts

@@ -1,7 +1,8 @@
 import {SlashCommandBuilder} from "@discordjs/builders";
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "get the invite link of the support server"

src/commands/volume.ts

@@ -1,6 +1,7 @@
 import {ApplyOptions} from "@sapphire/decorators";
-import {ApplicationCommandRegistry, Command, CommandOptions} from "@sapphire/framework";
+import type {ApplicationCommandRegistry, CommandOptions} from "@sapphire/framework";
 import {CommandInteraction, MessageEmbed} from "discord.js";
+import {Command} from "../lib/Command";
 
 @ApplyOptions<CommandOptions>({
 	description: "set the volume of the player",

src/lib/Command.ts

@@ -0,0 +1,10 @@
+import {Command as SapphireCommand, PieceContext} from "@sapphire/framework";
+
+export abstract class Command extends SapphireCommand {
+	public constructor(context: PieceContext, options: SapphireCommand.Options) {
+		super(context, {
+			...options,
+			preconditions: [...(options.preconditions ?? []), "NotBlacklisted"]
+		});
+	}
+}

src/preconditions/NotBlacklisted.ts

@@ -0,0 +1,20 @@
+import {Precondition} from "@sapphire/framework";
+import type {CommandInteraction} from "discord.js";
+
+export class NotBlacklistedPrecondition extends Precondition {
+	public async chatInputRun(interaction: CommandInteraction) {
+		return (await this.container.prisma.blacklist.findUnique({
+			where: {
+				user: interaction.user.id
+			}
+		}))
+			? this.error({message: "You are blacklisted"})
+			: this.ok();
+	}
+}
+
+declare module "@sapphire/framework" {
+	interface Preconditions {
+		NotBlacklisted: never;
+	}
+}

src/sharder.ts

@@ -11,7 +11,7 @@ const logger = new Logger(container, {
 
 const logShardEvent = (shard: Shard, event: string) => logger.debug(`Shard ${shard.id} ${event}`);
 
-new ShardingManager(join(__dirname, "bot.mjs"), {
+new ShardingManager(join(__dirname, "bot.js"), {
 	token: process.env.TOKEN,
 	mode: "worker"
 })

tsup.config.ts

@@ -4,7 +4,7 @@ export const tsup: Options = {
 	clean: true,
 	dts: false,
 	entryPoints: ["src/sharder.ts", "src/bot.ts", "src/commands/**/*.ts", "src/listeners/**/*.ts", "src/preconditions/**/*.ts"],
-	format: ["esm"],
+	format: ["cjs"],
 	minify: true,
 	skipNodeModulesBundle: true,
 	sourcemap: false,