[FEAT] AutoVoiceChannel - copy permissions from the "Join to Create" channel

Author: earnestangel

src/avc/avc.service.spec.ts

@@ -2,7 +2,12 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { AvcService } from './avc.service';
 import { DiscordService } from '#discord/discord.service';
 import { DatabaseService } from '#database/database.service';
-import { VoiceState, Guild, ChannelType, PermissionsBitField } from 'discord.js';
+import {
+  VoiceState,
+  Guild,
+  ChannelType,
+  PermissionsBitField,
+} from 'discord.js';
 import { VoiceChannel } from '#database/entities/voice-channel.entity';
 
 describe('AvcService', () => {
@@ -166,23 +171,31 @@ describe('AvcService', () => {
       expect(databaseService.voiceChannelRepository.find).toHaveBeenCalledWith({
         where: { guild: { id: guild.id } },
       });
-      expect((service as any).removeVoiceChannelFromDatabase).toHaveBeenCalledWith(
-        voiceChannels[0],
+      expect(
+        (service as any).removeVoiceChannelFromDatabase,
+      ).toHaveBeenCalledWith(voiceChannels[0]);
+      expect((service as any).removeEmptyChildChannels).toHaveBeenCalledWith(
+        guild,
       );
-      expect((service as any).removeEmptyChildChannels).toHaveBeenCalledWith(guild);
     });
   });
-  
+
   describe('createDiscordVoiceChannel', () => {
     it('should create a new Discord voice channel', async () => {
       const guild = { channels: { create: jest.fn() } } as any;
-      const newState = { member: { user: { username: 'test' } }, channel: { position: 1, parent: {} } } as VoiceState;
+      const newState = {
+        member: { user: { username: 'test' } },
+        channel: { position: 1, parent: {} },
+      } as VoiceState;
       const newChannel = { id: '456', name: "test's Channel" };
-      
+
       guild.channels.create.mockResolvedValue(newChannel);
-      
-      const result = await (service as any).createDiscordVoiceChannel(guild, newState);
-      
+
+      const result = await (service as any).createDiscordVoiceChannel(
+        guild,
+        newState,
+      );
+
       expect(guild.channels.create).toHaveBeenCalledWith({
         type: ChannelType.GuildVoice,
         name: "test's Channel",
@@ -192,114 +205,153 @@ describe('AvcService', () => {
       expect(result).toEqual(newChannel);
     });
   });
-  
+
   describe('setChannelPermissions', () => {
     it('should set permissions for the new voice channel', async () => {
-      const channel = { permissionOverwrites: { set: jest.fn() } } as any;
-      const newState = { member: { id: 'member1' }, guild: { id: 'guild1' } } as VoiceState;
-      
-      await (service as any).setChannelPermissions(channel, newState);
-      
-      expect(channel.permissionOverwrites.set).toHaveBeenCalledWith([
+      const channel = {
+        permissionOverwrites: {
+          set: jest.fn(),
+          edit: jest.fn(),
+        },
+      } as any;
+
+      const parentOverwrites = [
         {
           id: 'member1',
-          allow: [
-            PermissionsBitField.Flags.ManageChannels,
-            PermissionsBitField.Flags.ViewChannel,
-            PermissionsBitField.Flags.Connect,
-            PermissionsBitField.Flags.Speak,
-          ],
+          allow: [PermissionsBitField.Flags.ViewChannel],
+          deny: [],
+          type: 1,
         },
         {
           id: 'guild1',
-          allow: [
-            PermissionsBitField.Flags.ViewChannel,
-            PermissionsBitField.Flags.Connect,
-            PermissionsBitField.Flags.Speak,
-          ],
+          allow: [PermissionsBitField.Flags.ViewChannel],
+          deny: [],
+          type: 0,
+        },
+      ];
+
+      const newState = {
+        member: { id: 'member1' },
+        guild: { id: 'guild1' },
+        channel: {
+          permissionOverwrites: {
+            cache: {
+              map: jest.fn().mockReturnValue(parentOverwrites),
+            },
+          },
         },
-      ]);
+      } as unknown as VoiceState;
+
+      await (service as any).setChannelPermissions(channel, newState);
+
+      // Verify parent permissions are copied
+      expect(newState.channel.permissionOverwrites.cache.map).toHaveBeenCalled();
+      expect(channel.permissionOverwrites.set).toHaveBeenCalledWith(parentOverwrites);
+
+      // Verify member-specific permissions are set
+      expect(channel.permissionOverwrites.edit).toHaveBeenCalledWith('member1', {
+        ViewChannel: true,
+        Connect: true,
+        Speak: true,
+        ManageChannels: true,
+      });
     });
   });
-  
+
   describe('saveVoiceChannelToDatabase', () => {
     it('should save the new voice channel to the database', async () => {
       const channel = { id: '456', name: "test's Channel" } as any;
       const voiceChannel = { id: '123' } as VoiceChannel;
       const guild = { id: 'guild1' } as any;
-      
-      await (service as any).saveVoiceChannelToDatabase(channel, voiceChannel, guild);
-      
-      expect(databaseService.voiceChannelRepository.insert).toHaveBeenCalledWith({
+
+      await (service as any).saveVoiceChannelToDatabase(
+        channel,
+        voiceChannel,
+        guild,
+      );
+
+      expect(
+        databaseService.voiceChannelRepository.insert,
+      ).toHaveBeenCalledWith({
         id: '456',
         name: "test's Channel",
         parentId: '123',
         guild: { id: 'guild1' },
       });
     });
   });
-  
+
   describe('moveUserToChannel', () => {
     it('should move the user to the new channel', async () => {
       const newState = { member: { voice: { setChannel: jest.fn() } } } as any;
       const newChannel = { id: '456' } as any;
-      
+
       await (service as any).moveUserToChannel(newState, newChannel);
-      
+
       expect(newState.member.voice.setChannel).toHaveBeenCalledWith(newChannel);
     });
   });
-  
+
   describe('removeVoiceChannelFromDatabase', () => {
     it('should remove the voice channel from the database', async () => {
       const voiceChannel = { id: '123' } as VoiceChannel;
-      
+
       await (service as any).removeVoiceChannelFromDatabase(voiceChannel);
-      
-      expect(databaseService.voiceChannelRepository.remove).toHaveBeenCalledWith(voiceChannel);
+
+      expect(
+        databaseService.voiceChannelRepository.remove,
+      ).toHaveBeenCalledWith(voiceChannel);
     });
   });
-  
+
   describe('updateChannelNameIfNeeded', () => {
     it('should update the channel name if it has changed', async () => {
       const guild = { channels: { cache: new Map() } } as any;
       const voiceChannel = { id: '123', name: 'oldName' } as VoiceChannel;
       const channel = { id: '123', name: 'newName' } as any;
-      
+
       guild.channels.cache.set('123', channel);
-      
+
       await (service as any).updateChannelNameIfNeeded(guild, voiceChannel);
-      
+
       expect(databaseService.voiceChannelRepository.save).toHaveBeenCalledWith({
         ...voiceChannel,
         name: 'newName',
       });
     });
   });
-  
+
   describe('removeEmptyChildChannels', () => {
     it('should remove empty child channels from the database and Discord', async () => {
       const guild = { id: 'guild1', channels: { cache: new Map() } } as any;
       const voiceChannels = [{ id: '123', parentId: '0' }] as VoiceChannel[];
-      const channel = { id: '123', members: { size: 0 }, delete: jest.fn() } as any;
-      
+      const channel = {
+        id: '123',
+        members: { size: 0 },
+        delete: jest.fn(),
+      } as any;
+
       guild.channels.cache.set('123', channel);
-      jest.spyOn(databaseService.voiceChannelRepository, 'find').mockResolvedValue(voiceChannels);
-      
+      jest
+        .spyOn(databaseService.voiceChannelRepository, 'find')
+        .mockResolvedValue(voiceChannels);
+
       await (service as any).removeEmptyChildChannels(guild);
-      
-      expect(databaseService.voiceChannelRepository.remove).toHaveBeenCalledWith(voiceChannels[0]);
+
+      expect(
+        databaseService.voiceChannelRepository.remove,
+      ).toHaveBeenCalledWith(voiceChannels[0]);
       expect(channel.delete).toHaveBeenCalled();
     });
   });
-  
+
   describe('updateVoiceChannelName', () => {
     it('should update the voice channel name in the database', async () => {
       const voiceChannel = { id: '123', name: 'oldName' } as VoiceChannel;
       const newName = 'newName';
-      
+
       await (service as any).updateVoiceChannelName(voiceChannel, newName);
-      
+
       expect(databaseService.voiceChannelRepository.save).toHaveBeenCalledWith({
         ...voiceChannel,
         name: newName,

src/avc/avc.service.ts

@@ -2,7 +2,7 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { DiscordService } from '#discord/discord.service';
 import { VoiceChannel } from '#database/entities/voice-channel.entity';
 import { Not } from 'typeorm';
-import { ChannelType, PermissionsBitField, VoiceState } from 'discord.js';
+import { ChannelType, VoiceState } from 'discord.js';
 import { DiscordGuild, DiscordVoiceChannel } from '#command/command.types';
 import { DatabaseService } from '#database/database.service';
 
@@ -94,32 +94,36 @@ export class AvcService {
 
   /**
    * Sets the permissions for the new voice channel.
+   * Now copies the "Join to Create" channel's permissions.
    * @param channel The new voice channel.
    * @param newState The new voice state of the user.
    */
   private async setChannelPermissions(
     channel: DiscordVoiceChannel,
     newState: VoiceState,
   ) {
-    await channel.permissionOverwrites.set([
-      {
-        id: newState.member.id,
-        allow: [
-          PermissionsBitField.Flags.ManageChannels,
-          PermissionsBitField.Flags.ViewChannel,
-          PermissionsBitField.Flags.Connect,
-          PermissionsBitField.Flags.Speak,
-        ],
-      },
-      {
-        id: newState.guild.id,
-        allow: [
-          PermissionsBitField.Flags.ViewChannel,
-          PermissionsBitField.Flags.Connect,
-          PermissionsBitField.Flags.Speak,
-        ],
-      },
-    ]);
+    const parentChannel = newState.channel; // This is the Join to Create channel
+
+    // Clone parent permission overwrites
+    const parentOverwrites = parentChannel.permissionOverwrites.cache.map(
+      (overwrite) => ({
+        id: overwrite.id,
+        allow: overwrite.allow,
+        deny: overwrite.deny,
+        type: overwrite.type,
+      }),
+    );
+
+    // Apply parent permissions
+    await channel.permissionOverwrites.set(parentOverwrites);
+
+    // Then add or override specific user and guild permissions
+    await channel.permissionOverwrites.edit(newState.member.id, {
+      ViewChannel: true,
+      Connect: true,
+      Speak: true,
+      ManageChannels: true,
+    });
   }
 
   /**