embed *VoiceServerUpdate & removed logging

disgoorg · Aug 3, 2021 · 3fc01f3 · 3fc01f3
1 parent 0404ece
commit 3fc01f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/api/voice_dispatch_interceptor.go b/api/voice_dispatch_interceptor.go
@@ -2,32 +2,32 @@ package api
 
 // VoiceServerUpdateEvent sent when a guilds voice server is updated
 type VoiceServerUpdateEvent struct {
-	VoiceServerUpdate *VoiceServerUpdate
-	Disgo             Disgo
+	*VoiceServerUpdate
+	Disgo Disgo
 }
 
 // Guild returns the Guild for this VoiceServerUpdate from the Cache
 func (u *VoiceServerUpdateEvent) Guild() *Guild {
-	return u.Disgo.Cache().Guild(u.VoiceServerUpdate.GuildID)
+	return u.Disgo.Cache().Guild(u.GuildID)
 }
 
 // VoiceStateUpdateEvent sent when someone joins/leaves/moves voice channels
 type VoiceStateUpdateEvent struct {
-	VoiceState *VoiceState
-	Member     *Member `json:"member"`
+	*VoiceState
+	Member *Member `json:"member"`
 }
 
 // Guild returns the Guild for this VoiceStateUpdate from the Cache
 func (u *VoiceStateUpdateEvent) Guild() *Guild {
-	return u.VoiceState.Disgo.Cache().Guild(u.VoiceState.GuildID)
+	return u.Disgo.Cache().Guild(u.GuildID)
 }
 
 // VoiceChannel returns the VoiceChannel for this VoiceStateUpdate from the Cache
 func (u *VoiceStateUpdateEvent) VoiceChannel() *VoiceChannel {
-	if u.VoiceState.ChannelID == nil {
+	if u.ChannelID == nil {
 		return nil
 	}
-	return u.VoiceState.Disgo.Cache().VoiceChannel(*u.VoiceState.ChannelID)
+	return u.Disgo.Cache().VoiceChannel(*u.ChannelID)
 }
 
 // VoiceDispatchInterceptor lets you listen to VoiceServerUpdate & VoiceStateUpdate

diff --git a/internal/entity_builder_impl.go b/internal/entity_builder_impl.go
@@ -243,7 +243,6 @@ func (b *EntityBuilderImpl) CreateMember(guildID api.Snowflake, member *api.Memb
 func (b *EntityBuilderImpl) CreateVoiceState(guildID api.Snowflake, voiceState *api.VoiceState, updateCache api.CacheStrategy) *api.VoiceState {
 	voiceState.Disgo = b.Disgo()
 	voiceState.GuildID = guildID
-	b.Disgo().Logger().Infof("voiceState: %+v", voiceState)
 
 	if updateCache(b.Disgo()) {
 		return b.Disgo().Cache().CacheVoiceState(voiceState)