@@ -186,17 +186,16 @@ def _check():
186
186
client : "Client"
187
187
obj : Union [Type [_T ], Type [List [_T ]]]
188
188
kwargs = _resolve_kwargs (obj , ** kwargs )
189
- http_name = f"get_{ obj .__name__ .lower ()} "
190
- kwarg_name = f"{ obj .__name__ .lower ()} _id"
189
+
190
+ force_arg = kwargs .pop ("force" , None )
191
+ force_cache = force_arg == "cache"
192
+ force_http = force_arg == "http"
191
193
192
194
if isinstance (obj , _GenericAlias ) or _check ():
193
195
_obj : Type [_T ] = get_args (obj )[0 ]
196
+ http_name = f"get_{ _obj .__name__ .lower ()} "
197
+ kwarg_name = f"{ _obj .__name__ .lower ()} _ids"
194
198
_objects : List [Union [_obj , Coroutine ]] = []
195
- kwarg_name += "s"
196
-
197
- force_arg = kwargs .pop ("force" , None )
198
- force_cache = force_arg == "cache"
199
- force_http = force_arg == "http"
200
199
201
200
if not force_http :
202
201
_objects = _get_cache (_obj , client , kwarg_name , _list = True , ** kwargs )
@@ -211,7 +210,7 @@ def _check():
211
210
_objects .clear ()
212
211
_func = getattr (client ._http , http_name )
213
212
for _id in kwargs .get (kwarg_name ):
214
- _kwargs = kwargs
213
+ _kwargs = kwargs . copy ()
215
214
_kwargs .pop (kwarg_name )
216
215
_kwargs [kwarg_name [:- 1 ]] = _id
217
216
_objects .append (_func (** _kwargs ))
@@ -222,18 +221,17 @@ def _check():
222
221
for _index , __obj in enumerate (_objects ):
223
222
if __obj is None :
224
223
_id = kwargs .get (kwarg_name )[_index ]
225
- _kwargs = kwargs
224
+ _kwargs = kwargs . copy ()
226
225
_kwargs .pop (kwarg_name )
227
226
_kwargs [kwarg_name [:- 1 ]] = _id
228
227
_request = _func (** _kwargs )
229
228
_objects [_index ] = _request
230
229
return _http_request (_obj , http = client ._http , request = _objects )
231
230
232
- _obj : Optional [_T ] = None
231
+ http_name = f"get_{ obj .__name__ .lower ()} "
232
+ kwarg_name = f"{ obj .__name__ .lower ()} _id"
233
233
234
- force_arg = kwargs .pop ("force" , None )
235
- force_cache = force_arg == "cache"
236
- force_http = force_arg == "http"
234
+ _obj : Optional [_T ] = None
237
235
238
236
if not force_http :
239
237
_obj = _get_cache (obj , client , kwarg_name , ** kwargs )
0 commit comments