Approval buttons

README.md

@@ -40,3 +40,40 @@ npm start
 ## Available Commands
 
 - `/ping` - Bot responds with "Pong!"
+
+## Admin commands
+
+- `/approvechannel` - Set the channel for submissions to be forwarded to for approval
+- `/signupchannel` - Set the channel to announce registered members
+- `/acceptedchannel` - Set the channel to announced approved submissions
+
+## Mod commands
+
+- `/create-event` `/edit-event` - Create/Edit an event
+- `/create-team` `/edit-team` - Create/Edit a team
+- `/activate-event` - Activate the event for team commands
+- `/register-team` - Register a team for an event
+
+## Public commands
+
+- `/event` - Information for an event and teams
+- `/team` - Information for a team and members
+- `/register` - Register yourself to the event
+- `/status` - Status for yourself
+
+## Event commands (for participants)
+
+- `/submit` - Submit an image to the event
+
+## Usage
+
+1. Setting up event and team
+   1. /create-event name: CAKE description: yumyum
+   2. /activate-event event: CAKE
+   3. /create-team leader: @ruto name: BESTTEAM
+      - Note: They must already be in discord
+   4. /register-team team: CAKE
+2. Other users must now register
+   1. /register rsn: noah
+3. Mod can now add user to a team
+   1. /addmember team: CAKE user: @Noah

package.json

@@ -15,7 +15,8 @@
     "prisma:generate": "prisma generate",
     "prisma:migrate": "prisma migrate dev",
     "prisma:studio": "prisma studio",
-    "prisma:seed": "node prisma/seed.js"
+    "prisma:seed": "node prisma/seed.js",
+    "commands": "node ./deploy_commands.js"
   },
   "dependencies": {
     "@prisma/client": "^5.10.0",

prisma/migrations/20250415182835_active_event/migration.sql

@@ -0,0 +1,19 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Event" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "startDate" DATETIME NOT NULL,
+    "endDate" DATETIME,
+    "status" TEXT NOT NULL DEFAULT 'PLANNED',
+    "active" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_Event" ("createdAt", "description", "endDate", "id", "name", "startDate", "status", "updatedAt") SELECT "createdAt", "description", "endDate", "id", "name", "startDate", "status", "updatedAt" FROM "Event";
+DROP TABLE "Event";
+ALTER TABLE "new_Event" RENAME TO "Event";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

prisma/migrations/20250415212015_add_rsn_to_participant/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventParticipant" ADD COLUMN "rsn" TEXT;

prisma/migrations/20250416003354_participant_note/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventParticipant" ADD COLUMN "note" TEXT;

prisma/migrations/20250416004724_remove_uuid_for_participant/migration.sql

@@ -0,0 +1,26 @@
+/*
+  Warnings:
+
+  - The primary key for the `EventParticipant` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `id` on the `EventParticipant` table. All the data in the column will be lost.
+
+*/
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_EventParticipant" (
+    "userId" TEXT NOT NULL,
+    "eventId" TEXT NOT NULL,
+    "rsn" TEXT,
+    "note" TEXT,
+    "status" TEXT NOT NULL DEFAULT 'REGISTERED',
+
+    PRIMARY KEY ("userId", "eventId"),
+    CONSTRAINT "EventParticipant_userId_fkey" FOREIGN KEY ("userId") REFERENCES "DiscordUser" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,
+    CONSTRAINT "EventParticipant_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_EventParticipant" ("eventId", "note", "rsn", "status", "userId") SELECT "eventId", "note", "rsn", "status", "userId" FROM "EventParticipant";
+DROP TABLE "EventParticipant";
+ALTER TABLE "new_EventParticipant" RENAME TO "EventParticipant";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

prisma/migrations/20250416005059_fix_participant_relation/migration.sql

@@ -0,0 +1,19 @@
+-- RedefineTables
+PRAGMA defer_foreign_keys=ON;
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_EventParticipant" (
+    "userId" TEXT NOT NULL,
+    "eventId" TEXT NOT NULL,
+    "rsn" TEXT,
+    "note" TEXT,
+    "status" TEXT NOT NULL DEFAULT 'REGISTERED',
+
+    PRIMARY KEY ("userId", "eventId"),
+    CONSTRAINT "EventParticipant_userId_fkey" FOREIGN KEY ("userId") REFERENCES "DiscordUser" ("discordId") ON DELETE RESTRICT ON UPDATE CASCADE,
+    CONSTRAINT "EventParticipant_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_EventParticipant" ("eventId", "note", "rsn", "status", "userId") SELECT "eventId", "note", "rsn", "status", "userId" FROM "EventParticipant";
+DROP TABLE "EventParticipant";
+ALTER TABLE "new_EventParticipant" RENAME TO "EventParticipant";
+PRAGMA foreign_keys=ON;
+PRAGMA defer_foreign_keys=OFF;

prisma/schema.prisma

@@ -33,6 +33,7 @@ model Event {
   startDate   DateTime
   endDate     DateTime?
   status      String    @default("PLANNED") // PLANNED, ONGOING, COMPLETED, CANCELLED
+  active      Boolean   @default(false)
   createdAt   DateTime  @default(now())
   updatedAt   DateTime  @updatedAt
 
@@ -71,14 +72,15 @@ model TeamMember {
 }
 
 model EventParticipant {
-  id      String      @id @default(uuid())
   userId  String
   eventId String
+  rsn     String? // Registered in-game name
+  note    String?
   status  String      @default("REGISTERED") // REGISTERED, INTERESTED, UNPAID
-  user    DiscordUser @relation(fields: [userId], references: [id])
+  user    DiscordUser @relation(fields: [userId], references: [discordId])
   event   Event       @relation(fields: [eventId], references: [id])
 
-  @@unique([userId, eventId])
+  @@id([userId, eventId])
 }
 
 model Submission {

src/commands/admin/acceptedchannel.js

@@ -0,0 +1,43 @@
+import {
+  ChannelType,
+  ChatInputCommandInteraction,
+  PermissionFlagsBits,
+  SlashCommandBuilder,
+} from 'discord.js';
+import { ConfigService } from '#services/configService.js';
+import logger from '#utils/logger.js';
+
+export const data = new SlashCommandBuilder()
+  .setName('acceptedchannel')
+  .setDescription('Get or set the accepted submission channel')
+  .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
+  .addChannelOption((option) =>
+    option
+      .setName('channel')
+      .setDescription('Channel to forward accepted submissions to')
+      .setRequired(false)
+      .addChannelTypes(ChannelType.GuildText)
+  );
+
+/**
+ * @param {ChatInputCommandInteraction} interaction
+ */
+export async function execute(interaction) {
+  const channel = interaction.options.getChannel('channel');
+
+  // if channel doesn't exist, get current channel if it exists
+  if (!channel) {
+    const currentChannel = await ConfigService.getAcceptedChannel(interaction.guildId);
+    if (currentChannel) {
+      await interaction.reply(`Current accepted channel: <#${currentChannel}>`);
+    } else {
+      await interaction.reply('No accepted channel set.');
+    }
+    return;
+  }
+
+  // if channel exists, set it as the accepted channel
+  await ConfigService.setAcceptedChannel(interaction.guildId, channel.id);
+  await interaction.reply(`Accepted channel set to <#${channel.id}>`);
+  logger.info(`Accepted channel set to ${channel.id} for guild ${interaction.guildId}`);
+}

src/commands/admin/approvechannel.js

@@ -1,10 +1,16 @@
-import { ChannelType, ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
+import {
+  ChannelType,
+  ChatInputCommandInteraction,
+  PermissionFlagsBits,
+  SlashCommandBuilder,
+} from 'discord.js';
 import { ConfigService } from '#services/configService.js';
 import logger from '#utils/logger.js';
 
 export const data = new SlashCommandBuilder()
   .setName('approvechannel')
   .setDescription('Get or set the approval submission channel')
+  .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
   .addChannelOption((option) =>
     option
       .setName('channel')
@@ -30,22 +36,6 @@ export async function execute(interaction) {
     return;
   }
 
-  // Check if user has admin permissions
-  // Check custom role first
-  if (!interaction.member.permissions.has('Administrator')) {
-    const customRole = await ConfigService.getAdminRole(interaction.guildId);
-    if (customRole) {
-      const member = await interaction.guild.members.fetch(interaction.user.id);
-      if (!member.roles.cache.has(customRole)) {
-        await interaction.reply('You do not have permission to set the approval channel.');
-        return;
-      }
-    } else {
-      await interaction.reply('You do not have permission to set the approval channel.');
-      return;
-    }
-  }
-
   // if channel exists, set it as the approval channel
   await ConfigService.setApprovalChannel(interaction.guildId, channel.id);
   await interaction.reply(`Approval channel set to <#${channel.id}>`);

src/commands/admin/event/activateevent.js

@@ -0,0 +1,40 @@
+import { ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
+import { EventService } from '#services/eventService.js';
+import logger from '#utils/logger.js';
+
+export const data = new SlashCommandBuilder()
+  .setName('activate-event')
+  .setDescription('Set the event to active for the bot context')
+  .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
+  .addStringOption((option) =>
+    option
+      .setName('event')
+      .setDescription('The event to activate')
+      .setRequired(true)
+      .setAutocomplete(true)
+  );
+
+/**
+ * @param {ChatInputCommandInteraction} interaction
+ */
+export async function execute(interaction) {
+  const eventId = interaction.options.getString('event');
+  try {
+    const event = await EventService.activateEvent(eventId);
+    await interaction.reply(`Event ${event.name} has been activated.`);
+  } catch (error) {
+    logger.error('Error activating event', error);
+    await interaction.reply('An error occurred while activating the event.');
+  }
+}
+
+/**
+ * @param {ChatInputCommandInteraction} interaction
+ */
+export async function autocomplete(interaction) {
+  const focusedValue = interaction.options.getFocused();
+  const events = await EventService.getEvents();
+  const filtered = events.filter((event) => event.name.startsWith(focusedValue));
+  const choices = filtered.map((event) => event).slice(0, 25);
+  await interaction.respond(choices.map((choice) => ({ name: choice.name, value: choice.id })));
+}

src/commands/admin/event/createevent.js

@@ -1,11 +1,11 @@
-import { ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
-import { ConfigService } from '#services/configService.js';
+import { ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import logger from '#utils/logger.js';
 import { EventService } from '#services/eventService.js';
 
 export const data = new SlashCommandBuilder()
   .setName('create-event')
   .setDescription('Create an event')
+  .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
   .addStringOption((option) =>
     option.setName('name').setDescription('The name of the event').setRequired(true)
   )
@@ -23,20 +23,6 @@ export const data = new SlashCommandBuilder()
  * @param {ChatInputCommandInteraction} interaction
  */
 export async function execute(interaction) {
-  if (!interaction.member.permissions.has('Administrator')) {
-    const customRole = await ConfigService.getAdminRole(interaction.guildId);
-    if (customRole) {
-      const member = await interaction.guild.members.fetch(interaction.user.id);
-      if (!member.roles.cache.has(customRole)) {
-        await interaction.reply('You do not have permission to set the approval channel.');
-        return;
-      }
-    } else {
-      await interaction.reply('You do not have permission to set the approval channel.');
-      return;
-    }
-  }
-
   const name = interaction.options.getString('name');
   const description = interaction.options.getString('description');
   const startDate = interaction.options.getString('startdate');

src/commands/admin/event/editevent.js

@@ -1,11 +1,11 @@
-import { ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
-import { ConfigService } from '#services/configService.js';
+import { ChatInputCommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from 'discord.js';
 import logger from '#utils/logger.js';
 import { EventService } from '#services/eventService.js';
 
 export const data = new SlashCommandBuilder()
   .setName('edit-event')
   .setDescription('Edit an event')
+  .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
   .addStringOption((option) =>
     option
       .setName('event')
@@ -42,20 +42,6 @@ export const data = new SlashCommandBuilder()
  * @param {ChatInputCommandInteraction} interaction
  */
 export async function execute(interaction) {
-  if (!interaction.member.permissions.has('Administrator')) {
-    const customRole = await ConfigService.getAdminRole(interaction.guildId);
-    if (customRole) {
-      const member = await interaction.guild.members.fetch(interaction.user.id);
-      if (!member.roles.cache.has(customRole)) {
-        await interaction.reply('You do not have permission to set the approval channel.');
-        return;
-      }
-    } else {
-      await interaction.reply('You do not have permission to set the approval channel.');
-      return;
-    }
-  }
-
   const eventId = interaction.options.getString('event');
   const name = interaction.options.getString('name');
   const description = interaction.options.getString('description');