Merge pull request #1130 from prsm/develop

feat: various qol changes

Author: jonasschultheiss

.env.example

@@ -1,16 +1,7 @@
-POSTGRES_USER=root
-POSTGRES_PASSWORD=database_password
-POSTGRES_DB=db
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@bot-database:5432/${POSTGRES_DB}?connect_timeout=300
-APP_ENV=development
 DISCORD_TOKEN=""
 DISCORD_GUILD_ID=""
 DISCORD_EVENT_CATEGORY_ID=""
 DISCORD_ARCHIVE_CATEGORY_ID=""
 DISCORD_PLAYER_ROLE_ID=""
 DISCORD_MEMBER_ROLE_ID=""
-DISCORD_VOICE_CATEGORY_ID=""
-DISCORD_DYNAMIC_ROLES_DIVIDER_ID=""
-DISCORD_DYNAMIC_ROLES_CATEGORY_ID=""
-DISCORD_RETIRED_DYNAMIC_ROLES_CATEGORY_ID=""
-DISCORD_MOD_ROLE_ID=""
+DISCORD_VOICE_CATEGORY_ID=""

.nvmrc

@@ -1 +1 @@
-20.18.0
+22.11.0

package.json

@@ -68,8 +68,8 @@
     "@types/supertest": "6.0.2",
     "@typescript-eslint/eslint-plugin": "8.10.0",
     "@typescript-eslint/parser": "8.10.0",
-    "eslint": "9.13.0",
-    "eslint-config-prettier": "9.1.0",
+    "eslint": "8.57.1",
+    "eslint-config-prettier": "8.10.0",
     "eslint-plugin-prettier": "5.2.1",
     "husky": "9.1.6",
     "jest": "29.7.0",

pnpm-lock.yaml

@@ -20,7 +20,7 @@ import configuration from './config/configuration';
             status: 'online',
             activities: [
               {
-                name: 'Pac-Man',
+                name: 'CS2 on de_cache',
                 type: ActivityType.Playing
               }
             ]

src/app.module.ts

@@ -17,7 +17,7 @@ export class ChannelsGateway {
       await this.channelsService.initVoiceChannels();
       this.logger.log(`Successfully initialized dynamic voice channels`);
     } catch (error) {
-      this.logger.log(`Failed to initialize dynamic voice channels`);
+      this.logger.error(`Failed to initialize dynamic voice channels:`, error);
     }
   }
 
@@ -27,6 +27,7 @@ export class ChannelsGateway {
       await this.channelsService.handleOnVoiceStateUpdate(oldState, newState);
       this.logger.log(`Successfully handled voice state update`);
     } catch (error) {
+      console.log('🚀 ~ ChannelsGateway ~ onVoiceStateUpdate ~ error:', error);
       this.logger.log(`Failed to handle voice state update`);
     }
   }

src/bot/channels/channels.gateway.ts

@@ -78,7 +78,9 @@ export class ChannelsService extends GuildService {
   private async getCategoryChannels(): Promise<VoiceChannel[]> {
     const guild = await this.getGuild();
     const allChannels = Array.from(guild.channels.cache.values());
-    return allChannels.filter(channel => channel.parentId === this.getVoiceCategoryId()) as VoiceChannel[];
+    return allChannels.filter(
+      channel => channel.parentId === this.getVoiceCategoryId() && channel.type === ChannelType.GuildVoice
+    ) as VoiceChannel[];
   }
 
   private async getMaxBitrate(): Promise<number> {
@@ -160,7 +162,7 @@ export class ChannelsService extends GuildService {
         type: ChannelType.GuildVoice,
         parent: this.getVoiceCategoryId(),
         position: index,
-        // topic: `dynamically created voice channel number ${index + 1}`,
+        // topic: `i love apples`,
         bitrate: await this.getMaxBitrate()
       });
 
@@ -178,8 +180,8 @@ export class ChannelsService extends GuildService {
   private async updateChannel(channel: VoiceBasedChannel, index: number): Promise<void> {
     try {
       const updatedChannel = await channel.edit({
-        name: `voice ${index + 1}`,
-        topic: `dynamically created voice channel number ${index + 1}`
+        name: `voice ${index + 1}`
+        // topic: `i love apples`
       });
 
       this.logger.log(`Renamed channel ${channel.name} to ${updatedChannel.name}`);
@@ -195,13 +197,26 @@ export class ChannelsService extends GuildService {
 
   private async deleteChannel(channel: VoiceBasedChannel): Promise<void> {
     try {
-      await channel.delete();
+      const botMember = channel.guild.members.me;
+
+      if (!botMember.permissions.has('ManageChannels')) {
+        this.logger.error('Bot lacks ManageChannels permission at server level');
+        return;
+      }
 
+      if (!channel.permissionsFor(botMember).has('ManageChannels')) {
+        this.logger.error(`Bot lacks ManageChannels permission for channel ${channel.name}`);
+        return;
+      }
+
+      await channel.delete();
       this.logger.log(`Deleted channel ${channel.name}`);
     } catch (e) {
       const error = e as DiscordAPIError;
       if (error.code === 10003) {
         this.logger.log('Channel not found');
+      } else if (error.code === 50013) {
+        this.logger.error(`Missing permissions to delete channel ${channel.name}`);
       } else {
         throw error;
       }

src/bot/channels/channels.service.ts

@@ -31,7 +31,8 @@ export class LockChannelCommand implements DiscordTransformedCommand<LockChannel
       await interaction.reply(await this.channelsService.handleLockChannel(voice, lockChannelDto));
       this.logger.log(`Lock command executed successfully`);
     } catch (error) {
-      this.logger.log(`Failed to execute lock command`);
+      const e = error as Error;
+      this.logger.error(`Failed to execute lock command: ${e.message}`);
     }
   }
 }

src/bot/channels/commands/lock-channel.command.ts

@@ -16,8 +16,9 @@ export class EventsGateway {
     try {
       await this.eventsService.handleOnCreate(event);
       this.logger.log(`Event ${event.name} created successfully`);
-    } catch (error) {
-      this.logger.log(`Failed to create event ${event.name}`);
+    } catch (e) {
+      const error = e as Error;
+      this.logger.error(`Failed to create event ${event.name}: ${error.message}`);
     }
   }
 
@@ -26,8 +27,9 @@ export class EventsGateway {
     try {
       await this.eventsService.handleOnUpdate(oldEvent, newEvent);
       this.logger.log(`Event ${newEvent.name} updated successfully`);
-    } catch (error) {
-      this.logger.log(`Failed to update event ${oldEvent.name}`);
+    } catch (e) {
+      const error = e as Error;
+      this.logger.error(`Failed to update event ${oldEvent.name}: ${error.message}`);
     }
   }
 
@@ -36,28 +38,31 @@ export class EventsGateway {
     try {
       await this.eventsService.handleOnDelete(event);
       this.logger.log(`Event ${event.name} deleted successfully`);
-    } catch (error) {
-      this.logger.log(`Failed to delete event ${event.name}`);
+    } catch (e) {
+      const error = e as Error;
+      this.logger.error(`Failed to delete event ${event.name}: ${error.message}`);
     }
   }
 
   @On('guildScheduledEventUserAdd')
   async onUserAdd(event: GuildScheduledEvent, user: User): Promise<void> {
     try {
       await this.eventsService.handleOnUserAdd(event, user);
-      this.logger.log(`${user.username} was added to Event ${event.name} successfully`);
-    } catch (error) {
-      this.logger.log(`Failed to add ${user.username} to Event ${event.name}`);
+      this.logger.log(`User ${user.username} was added to event ${event.name} successfully`);
+    } catch (e) {
+      const error = e as Error;
+      this.logger.error(`Failed to add user ${user.username} to event ${event.name}: ${error.message}`);
     }
   }
 
   @On('guildScheduledEventUserRemove')
   async onUserRemove(event: GuildScheduledEvent, user: User): Promise<void> {
     try {
       await this.eventsService.handleOnUserRemove(event, user);
-      this.logger.log(`${user.username} was removed to Event ${event.name} successfully`);
-    } catch (error) {
-      this.logger.log(`Failed to remove ${user.username} to Event ${event.name}`);
+      this.logger.log(`User ${user.username} was removed from event ${event.name} successfully`);
+    } catch (e) {
+      const error = e as Error;
+      this.logger.error(`Failed to remove user ${user.username} from event ${event.name}: ${error.message}`);
     }
   }
 }

src/bot/events/events.gateway.ts

@@ -9,9 +9,6 @@ export class GuildService {
   private static memberRoleId: string;
   private static playerRoleId: string;
   private static voiceCategoryId: string;
-  private static dynamicRolesDividerId: string;
-  private static dynamicRolesCategoryId: string;
-  private static retiredDynamicRolesCategoryId: string;
 
   constructor(
     private readonly client: Client,
@@ -23,11 +20,6 @@ export class GuildService {
     GuildService.memberRoleId = this.configService.getOrThrow<string>('discord.memberRoleId');
     GuildService.playerRoleId = this.configService.getOrThrow<string>('discord.playerRoleId');
     GuildService.voiceCategoryId = this.configService.getOrThrow<string>('discord.voiceCategoryId');
-    GuildService.dynamicRolesDividerId = this.configService.getOrThrow<string>('discord.dynamicRolesDividerId');
-    GuildService.dynamicRolesCategoryId = this.configService.getOrThrow<string>('discord.dynamicRolesCategoryId');
-    GuildService.retiredDynamicRolesCategoryId = this.configService.getOrThrow<string>(
-      'discord.retiredDynamicRolesCategoryId'
-    );
   }
 
   protected async getGuild(): Promise<Guild> {
@@ -61,16 +53,4 @@ export class GuildService {
   protected getVoiceCategoryId(): string {
     return GuildService.voiceCategoryId;
   }
-
-  protected getdynamicRolesDividerId(): string {
-    return GuildService.dynamicRolesDividerId;
-  }
-
-  protected getDynamicRolesCategoryId(): string {
-    return GuildService.dynamicRolesCategoryId;
-  }
-
-  protected getRetiredDynamicRolesCategoryId(): string {
-    return GuildService.retiredDynamicRolesCategoryId;
-  }
 }