Merge pull request #338 from Helloyunho/main

✨ feat: support text in voice channel (Closes #260)

Author: Helloyunho

src/structures/guildVoiceChannel.ts

@@ -14,8 +14,10 @@ import type {
   VoiceChannelJoinOptions,
   VoiceServerData
 } from '../client/voice.ts'
+import { Mixin } from '../../deps.ts'
+import { TextChannel } from './textChannel.ts'
 
-export class VoiceChannel extends GuildChannel {
+export class VoiceChannel extends Mixin(GuildChannel, TextChannel) {
   bitrate!: string
   userLimit!: number
   voiceStates = new GuildChannelVoiceStatesManager(

src/types/channel.ts

@@ -72,7 +72,9 @@ export interface GuildNewsChannelPayload
   extends GuildTextBasedChannelPayload,
     GuildThreadAvailableChannelPayload {}
 
-export interface GuildVoiceChannelPayload extends GuildChannelPayload {
+export interface GuildVoiceChannelPayload
+  extends GuildChannelPayload,
+    GuildTextBasedChannelPayload {
   bitrate: string
   user_limit: number
   video_quality_mode: number
@@ -159,7 +161,9 @@ export interface ModifyGuildNewsChannelPayload
   extends ModifyGuildTextBasedChannelPayload,
     ModifyGuildThreadAvailableChannelPayload {}
 
-export interface ModifyVoiceChannelPayload extends ModifyChannelPayload {
+export interface ModifyVoiceChannelPayload
+  extends ModifyChannelPayload,
+    ModifyGuildTextBasedChannelPayload {
   bitrate?: number | null
   user_limit?: number | null
 }
@@ -208,7 +212,9 @@ export interface ModifyGuildNewsChannelOption
   extends ModifyGuildTextBasedChannelOption,
     ModifyGuildThreadAvailableChannelOption {}
 
-export interface ModifyVoiceChannelOption extends ModifyChannelOption {
+export interface ModifyVoiceChannelOption
+  extends ModifyChannelOption,
+    ModifyGuildTextBasedChannelOption {
   bitrate?: number | null
   userLimit?: number | null
 }

src/types/guild.ts

@@ -200,12 +200,12 @@ export type GuildThreadAvailableChannelPayloads =
 export type GuildTextBasedPayloads =
   | GuildTextBasedChannelPayload
   | GuildTextChannelPayload
+  | GuildVoiceChannelPayload
   | GuildNewsChannelPayload
 
 export type GuildChannelPayloads =
   | GuildTextBasedPayloads
   | GuildThreadAvailableChannelPayloads
-  | GuildVoiceChannelPayload
   | GuildCategoryChannelPayload
 
 export type GuildThreadAvailableChannels =
@@ -218,11 +218,11 @@ export type GuildTextBasedChannels =
   | GuildThreadAvailableChannels
   | GuildTextChannel
   | NewsChannel
+  | VoiceChannel
 
 export type GuildChannels =
   | GuildChannel
   | GuildTextBasedChannels
-  | VoiceChannel
   | CategoryChannel
 
 export interface GuildCreatePayload {

src/utils/channel.ts

@@ -39,6 +39,7 @@ export type EveryTextChannelTypes =
   | DMChannel
   | GroupDMChannel
   | ThreadChannel
+  | VoiceChannel
 
 export type EveryGuildThreadAvailableChannelTypes =
   | GuildTextChannel
@@ -58,20 +59,19 @@ export type EveryTextChannelPayloadTypes =
   | DMChannelPayload
   | GroupDMChannelPayload
   | ThreadChannelPayload
+  | GuildVoiceChannelPayload
 
 export type EveryChannelTypes =
   | Channel
   | GuildChannel
   | CategoryChannel
-  | VoiceChannel
   | StageVoiceChannel
   | EveryTextChannelTypes
   | EveryGuildThreadAvailableChannelTypes
 
 export type EveryChannelPayloadTypes =
   | ChannelPayload
   | GuildCategoryChannelPayload
-  | GuildVoiceChannelPayload
   | GuildStageChannelPayload
   | EveryTextChannelPayloadTypes
   | EveryGuildThreadAvailableChannelPayloadTypes

src/utils/channelTypes.ts

@@ -37,7 +37,8 @@ export function isGuildBasedTextChannel(
     channel.type === ChannelTypes.GUILD_NEWS ||
     channel.type === ChannelTypes.NEWS_THREAD ||
     channel.type === ChannelTypes.PRIVATE_THREAD ||
-    channel.type === ChannelTypes.PUBLIC_THREAD
+    channel.type === ChannelTypes.PUBLIC_THREAD ||
+    channel.type === ChannelTypes.GUILD_VOICE
   )
 }
 
@@ -96,7 +97,8 @@ export function isTextChannel(channel: Channel): channel is TextChannel {
     channel.type === ChannelTypes.GUILD_NEWS ||
     channel.type === ChannelTypes.NEWS_THREAD ||
     channel.type === ChannelTypes.PRIVATE_THREAD ||
-    channel.type === ChannelTypes.PUBLIC_THREAD
+    channel.type === ChannelTypes.PUBLIC_THREAD ||
+    channel.type === ChannelTypes.GUILD_VOICE
   )
 }