Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge voice and stage channels into one type #311

Closed
wants to merge 3 commits into from
Closed

Merge voice and stage channels into one type #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64306f1
Fix voice and stage channel structure
Sep 7, 2023
27e945b
Merge voice and stage channels into one type
Sep 7, 2023
534bcf4
adjust wording
Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions cache/caches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,8 +724,8 @@ type Caches interface {
// GuildTextChannel returns a discord.GuildTextChannel from the ChannelCache and a bool indicating if it exists.
GuildTextChannel(channelID snowflake.ID) (discord.GuildTextChannel, bool)

// GuildVoiceChannel returns a discord.GuildVoiceChannel from the ChannelCache and a bool indicating if it exists.
GuildVoiceChannel(channelID snowflake.ID) (discord.GuildVoiceChannel, bool)
// GuildVoiceChannel returns a discord.GuildAudioChannel of type discord.ChannelTypeGuildVoice from the ChannelCache and a bool indicating if it exists.
GuildVoiceChannel(channelID snowflake.ID) (discord.GuildAudioChannel, bool)

// GuildCategoryChannel returns a discord.GuildCategoryChannel from the ChannelCache and a bool indicating if it exists.
GuildCategoryChannel(channelID snowflake.ID) (discord.GuildCategoryChannel, bool)
Expand All @@ -742,8 +742,8 @@ type Caches interface {
// GuildPrivateThread returns a discord.GuildThread from the ChannelCache and a bool indicating if it exists.
GuildPrivateThread(channelID snowflake.ID) (discord.GuildThread, bool)

// GuildStageVoiceChannel returns a discord.GuildStageVoiceChannel from the ChannelCache and a bool indicating if it exists.
GuildStageVoiceChannel(channelID snowflake.ID) (discord.GuildStageVoiceChannel, bool)
// GuildStageVoiceChannel returns a discord.GuildAudioChannel of type discord.ChannelTypeGuildStageVoice from the ChannelCache and a bool indicating if it exists.
GuildStageVoiceChannel(channelID snowflake.ID) (discord.GuildAudioChannel, bool)

// GuildForumChannel returns a discord.GuildForumChannel from the ChannelCache and a bool indicating if it exists.
GuildForumChannel(channelID snowflake.ID) (discord.GuildForumChannel, bool)
Expand Down Expand Up @@ -934,7 +934,7 @@ func (c *cachesImpl) GuildAudioChannel(channelID snowflake.ID) (discord.GuildAud
return cCh, true
}
}
return nil, false
return discord.GuildAudioChannel{}, false
}

func (c *cachesImpl) GuildTextChannel(channelID snowflake.ID) (discord.GuildTextChannel, bool) {
Expand All @@ -946,13 +946,11 @@ func (c *cachesImpl) GuildTextChannel(channelID snowflake.ID) (discord.GuildText
return discord.GuildTextChannel{}, false
}

func (c *cachesImpl) GuildVoiceChannel(channelID snowflake.ID) (discord.GuildVoiceChannel, bool) {
if ch, ok := c.Channel(channelID); ok {
if cCh, ok := ch.(discord.GuildVoiceChannel); ok {
return cCh, true
}
func (c *cachesImpl) GuildVoiceChannel(channelID snowflake.ID) (discord.GuildAudioChannel, bool) {
if ch, ok := c.GuildAudioChannel(channelID); ok && ch.Type() == discord.ChannelTypeGuildVoice {
return ch, true
}
return discord.GuildVoiceChannel{}, false
return discord.GuildAudioChannel{}, false
}

func (c *cachesImpl) GuildCategoryChannel(channelID snowflake.ID) (discord.GuildCategoryChannel, bool) {
Expand Down Expand Up @@ -994,13 +992,11 @@ func (c *cachesImpl) GuildPrivateThread(channelID snowflake.ID) (discord.GuildTh
return discord.GuildThread{}, false
}

func (c *cachesImpl) GuildStageVoiceChannel(channelID snowflake.ID) (discord.GuildStageVoiceChannel, bool) {
if ch, ok := c.Channel(channelID); ok {
if cCh, ok := ch.(discord.GuildStageVoiceChannel); ok {
return cCh, true
}
func (c *cachesImpl) GuildStageVoiceChannel(channelID snowflake.ID) (discord.GuildAudioChannel, bool) {
if ch, ok := c.GuildAudioChannel(channelID); ok && ch.Type() == discord.ChannelTypeGuildStageVoice {
return ch, true
}
return discord.GuildStageVoiceChannel{}, false
return discord.GuildAudioChannel{}, false
}

func (c *cachesImpl) GuildForumChannel(channelID snowflake.ID) (discord.GuildForumChannel, bool) {
Expand Down
Loading