@@ -265,28 +265,13 @@ async def send(
265265 for file in files :
266266 file .close ()
267267 if not hidden :
268- try :
269- self .menu_messages = (
270- self .data ["resolved" ]["messages" ] if "resolved" in self .data .keys () else None
271- )
272- except : # noqa
273- self .menu_messages = None
274- if self .menu_messages :
275- smsg = model .SlashMessage (
276- state = self .bot ._connection ,
277- data = resp ,
278- channel = self .channel or discord .Object (id = self .channel_id ),
279- _http = self ._http ,
280- interaction_token = self ._token ,
281- )
282- else :
283- smsg = model .SlashMessage (
284- state = self .bot ._connection ,
285- data = resp ,
286- channel = self .channel or discord .Object (id = self .channel_id ),
287- _http = self ._http ,
288- interaction_token = self ._token ,
289- )
268+ smsg = model .SlashMessage (
269+ state = self .bot ._connection ,
270+ data = resp ,
271+ channel = self .channel or discord .Object (id = self .channel_id ),
272+ _http = self ._http ,
273+ interaction_token = self ._token ,
274+ )
290275 if delete_after :
291276 self .bot .loop .create_task (smsg .delete (delay = delete_after ))
292277 if initial_message :
@@ -670,43 +655,38 @@ def __init__(
670655 logger ,
671656 ):
672657 super ().__init__ (_http = _http , _json = _json , _discord = _discord , logger = logger )
673- self .target_id = self .data ["target_id" ]
674658 self .context_type = _json ["type" ]
675659 self ._resolved = self .data ["resolved" ] if "resolved" in self .data .keys () else None
660+ self .target = {"id" : self .data ["target_id" ], "message" : None }
676661
677- try :
678- self .menu_authors = (
679- self .data ["resolved" ]["members" ] if "resolved" in self .data .keys () else None
680- )
681- except : # noqa
682- self .menu_authors = None
683-
684- self .context_message = (
685- [msg for msg in self .menu_messages ][0 ] if self .menu_messages is not None else []
686- )
687- self .context_author = (
688- [user for user in self .menu_authors ][0 ] if self .menu_authors is not None else []
689- )
690-
691- if self .guild and self .context_author :
692- print (self .context_author )
693- self .context_author = discord .Member (
694- data = self .context_author , state = self .bot ._connection , guild = self .guild
695- )
696-
697- try :
698- if self .menu_messages is None :
699- self .menu_messages = model .SlashMessage (
662+ if self ._resolved is not None :
663+ if self .context_type in [3 , "3" ]:
664+ self .target ["message" ] = model .SlashMessage (
700665 state = self .bot ._connection ,
701666 channel = _discord .get_channel (self .channel_id ),
702- data = self .context_message ,
667+ data = [ msg for msg in self ._resolved [ "messages" ]][ 0 ] ,
703668 _http = _http ,
704669 interaction_token = self ._token ,
705670 )
706- else :
707- raise KeyError
708- except : # noqa
709- return
671+
672+ try :
673+ if self .guild and self ._resolved ["members" ]:
674+ _member = True
675+ self .target ["author" ] = discord .Member (
676+ data = [auth for auth in self ._resolved ["members" ]][0 ],
677+ state = self .bot ._connection ,
678+ guild = self .guild
679+ )
680+ except KeyError : # noqa
681+ pass
682+ try :
683+ if self ._resolved ["users" ]:
684+ self .target ["author" ] = discord .User (
685+ data = [auth for auth in self ._resolved ["users" ]][0 ],
686+ state = self .bot_connection
687+ )
688+ except KeyError : # noqa
689+ pass
710690
711691 @property
712692 def cog (self ) -> typing .Optional [commands .Cog ]:
0 commit comments