File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -47,16 +47,16 @@ def __init__(self,
4747 self .bot = _discord
4848 self .logger = logger
4949 self .sent = False
50- self .guild : typing .Union [discord .Guild , int ] = _discord .get_guild (int (_json ["guild_id" ]))
50+ self .guild : typing .Union [discord .Guild , int ] = _discord .get_guild (int (_json ["guild_id" ])) if "guild_id" in _json . keys () else None
5151 self .author : typing .Union [discord .Member , int ] = self .guild .get_member (int (_json ["member" ]["user" ]["id" ])) \
52- if self .guild else None
52+ if self .guild and "member" in _json . keys () else self . bot . get_user ( int ( _json [ "user" ][ "id" ])) if self . guild else None
5353 self .channel : typing .Union [discord .TextChannel , int ] = self .guild .get_channel (int (_json ["channel_id" ])) \
5454 if self .guild else None
55- if not self .author :
56- self .author = int (_json ["member" ]["user" ]["id" ])
55+ if not self .author and ( "member" in _json . keys () or "user" in _json . keys ()) :
56+ self .author = int (_json ["member" ]["user" ]["id" ] if "member" in _json . keys () else _json [ "user" ][ "id" ] )
5757 if not self .channel :
5858 self .channel = int (_json ["channel_id" ])
59- if not self .guild :
59+ if not self .guild and "guild_id" in _json . keys () :
6060 # Should be set after every others are set.
6161 self .guild = int (_json ["guild_id" ])
6262
You can’t perform that action at this time.
0 commit comments