From d75178a88fc27776d660557e9456ec24b4cf4a60 Mon Sep 17 00:00:00 2001 From: andrei Date: Mon, 24 Jul 2017 12:34:43 -0700 Subject: [PATCH] [bugfix] roles in GuildRoleCreate have guild_id Previously guild_id sat outside of the object which created a semi-invalid role object without guild information. This would be saved in the guild state. One option for fixing this would just to be fixing the guild_id of the role within the state, however I think it's responible to expect roles passed from the event to have valid context/guild attributes. --- disco/gateway/events.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/disco/gateway/events.py b/disco/gateway/events.py index c08ad2e..7dc6d1f 100644 --- a/disco/gateway/events.py +++ b/disco/gateway/events.py @@ -60,7 +60,13 @@ class GatewayEvent(six.with_metaclass(GatewayEventMeta, Model)): obj[alias] = data - return cls(obj, client) + obj = cls(obj, client) + + if hasattr(cls, '_attach'): + field, to = cls._attach + setattr(getattr(obj, to[0]), to[1], getattr(obj, field)) + + return obj def __getattr__(self, name): try: @@ -108,6 +114,13 @@ def proxy(field): return deco +def attach(field, to=None): + def deco(cls): + cls._attach = (field, to) + return cls + return deco + + class Ready(GatewayEvent): """ Sent after the initial gateway handshake is complete. Contains data required @@ -381,6 +394,7 @@ class GuildMemberUpdate(GatewayEvent): @proxy('role') +@attach('guild_id', to=('role', 'guild_id')) class GuildRoleCreate(GatewayEvent): """ Sent when a role is created.