From 9d7f5cb9537aec582a65c2c5a188c8426645b581 Mon Sep 17 00:00:00 2001
From: diamondburned <datutbrus@gmail.com>
Date: Tue, 14 Jul 2020 21:38:31 -0700
Subject: [PATCH] Gateway: Deprecated useless type definitions for embedded
 structs

---
 gateway/events.go     | 16 ++++++++++++----
 state/state_events.go |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gateway/events.go b/gateway/events.go
index e22c9a0..dec4d62 100644
--- a/gateway/events.go
+++ b/gateway/events.go
@@ -20,9 +20,15 @@ type (
 
 // https://discordapp.com/developers/docs/topics/gateway#channels
 type (
-	ChannelCreateEvent     discord.Channel
-	ChannelUpdateEvent     discord.Channel
-	ChannelDeleteEvent     discord.Channel
+	ChannelCreateEvent struct {
+		discord.Channel
+	}
+	ChannelUpdateEvent struct {
+		discord.Channel
+	}
+	ChannelDeleteEvent struct {
+		discord.Channel
+	}
 	ChannelPinsUpdateEvent struct {
 		GuildID   discord.Snowflake `json:"guild_id,omitempty"`
 		ChannelID discord.Snowflake `json:"channel_id,omitempty"`
@@ -54,7 +60,9 @@ type (
 		Channels    []discord.Channel    `json:"channels,omitempty"`
 		Presences   []discord.Presence   `json:"presences,omitempty"`
 	}
-	GuildUpdateEvent discord.Guild
+	GuildUpdateEvent struct {
+		discord.Guild
+	}
 	GuildDeleteEvent struct {
 		ID discord.Snowflake `json:"id"`
 		// Unavailable if false == removed
diff --git a/state/state_events.go b/state/state_events.go
index 5f4100f..caef14e 100644
--- a/state/state_events.go
+++ b/state/state_events.go
@@ -80,7 +80,7 @@ func (s *State) onEvent(iface interface{}) {
 		}
 
 	case *gateway.GuildUpdateEvent:
-		if err := s.Store.GuildSet((*discord.Guild)(ev)); err != nil {
+		if err := s.Store.GuildSet(&ev.Guild); err != nil {
 			s.stateErr(err, "failed to update guild in state")
 		}
 
@@ -151,17 +151,17 @@ func (s *State) onEvent(iface interface{}) {
 		}
 
 	case *gateway.ChannelCreateEvent:
-		if err := s.Store.ChannelSet((*discord.Channel)(ev)); err != nil {
+		if err := s.Store.ChannelSet(&ev.Channel); err != nil {
 			s.stateErr(err, "failed to create a channel in state")
 		}
 
 	case *gateway.ChannelUpdateEvent:
-		if err := s.Store.ChannelSet((*discord.Channel)(ev)); err != nil {
+		if err := s.Store.ChannelSet(&ev.Channel); err != nil {
 			s.stateErr(err, "failed to update a channel in state")
 		}
 
 	case *gateway.ChannelDeleteEvent:
-		if err := s.Store.ChannelRemove((*discord.Channel)(ev)); err != nil {
+		if err := s.Store.ChannelRemove(&ev.Channel); err != nil {
 			s.stateErr(err, "failed to remove a channel in state")
 		}