From d3d9811276687621a199be16ad39ddbbd2548ac2 Mon Sep 17 00:00:00 2001 From: diamondburned Date: Sat, 11 Jul 2020 00:01:02 -0700 Subject: [PATCH] Gateway: Added Relationship events and handlers; minor reformatting --- gateway/events.go | 4 ++-- gateway/events_map.go | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/gateway/events.go b/gateway/events.go index d62da3a..f824983 100644 --- a/gateway/events.go +++ b/gateway/events.go @@ -324,10 +324,10 @@ type ( ) type ( - RelationshipAdd struct { + RelationshipAddEvent struct { Relationship } - RelationshipRemove struct { + RelationshipRemoveEvent struct { Relationship } ) diff --git a/gateway/events_map.go b/gateway/events_map.go index 7f65c5b..7e36669 100644 --- a/gateway/events_map.go +++ b/gateway/events_map.go @@ -22,10 +22,8 @@ var EventCreator = map[string]func() Event{ "GUILD_BAN_ADD": func() Event { return new(GuildBanAddEvent) }, "GUILD_BAN_REMOVE": func() Event { return new(GuildBanRemoveEvent) }, - "GUILD_EMOJIS_UPDATE": func() Event { return new(GuildEmojisUpdateEvent) }, - "GUILD_INTEGRATIONS_UPDATE": func() Event { - return new(GuildIntegrationsUpdateEvent) - }, + "GUILD_EMOJIS_UPDATE": func() Event { return new(GuildEmojisUpdateEvent) }, + "GUILD_INTEGRATIONS_UPDATE": func() Event { return new(GuildIntegrationsUpdateEvent) }, "GUILD_MEMBER_ADD": func() Event { return new(GuildMemberAddEvent) }, "GUILD_MEMBER_REMOVE": func() Event { return new(GuildMemberRemoveEvent) }, @@ -63,16 +61,11 @@ var EventCreator = map[string]func() Event{ "WEBHOOKS_UPDATE": func() Event { return new(WebhooksUpdateEvent) }, - "USER_UPDATE": func() Event { - return new(UserUpdateEvent) - }, - "USER_SETTINGS_UPDATE": func() Event { - return new(UserSettingsUpdateEvent) - }, - "USER_GUILD_SETTINGS_UPDATE": func() Event { - return new(UserGuildSettingsUpdateEvent) - }, - "USER_NOTE_UPDATE": func() Event { - return new(UserNoteUpdateEvent) - }, + "USER_UPDATE": func() Event { return new(UserUpdateEvent) }, + "USER_SETTINGS_UPDATE": func() Event { return new(UserSettingsUpdateEvent) }, + "USER_GUILD_SETTINGS_UPDATE": func() Event { return new(UserGuildSettingsUpdateEvent) }, + "USER_NOTE_UPDATE": func() Event { return new(UserNoteUpdateEvent) }, + + "RELATIONSHIP_ADD": func() Event { return new(RelationshipAddEvent) }, + "RELATIONSHIP_REMOVE": func() Event { return new(RelationshipRemoveEvent) }, }