Skip to content

Commit 99073f7

Browse files
Fix force http for lists (#1069)
* fix get list when forced * Update interactions/utils/get.py Co-authored-by: EdVraz <88881326+EdVraz@users.noreply.github.com> * Update interactions/utils/get.py Co-authored-by: EdVraz <88881326+EdVraz@users.noreply.github.com> * Update interactions/utils/get.py Co-authored-by: EdVraz <88881326+EdVraz@users.noreply.github.com> Co-authored-by: EdVraz <88881326+EdVraz@users.noreply.github.com>
1 parent c68f50c commit 99073f7

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

interactions/utils/get.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,16 @@ def _check():
186186
client: "Client"
187187
obj: Union[Type[_T], Type[List[_T]]]
188188
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"
191193

192194
if isinstance(obj, _GenericAlias) or _check():
193195
_obj: Type[_T] = get_args(obj)[0]
196+
http_name = f"get_{_obj.__name__.lower()}"
197+
kwarg_name = f"{_obj.__name__.lower()}_ids"
194198
_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"
200199

201200
if not force_http:
202201
_objects = _get_cache(_obj, client, kwarg_name, _list=True, **kwargs)
@@ -211,7 +210,7 @@ def _check():
211210
_objects.clear()
212211
_func = getattr(client._http, http_name)
213212
for _id in kwargs.get(kwarg_name):
214-
_kwargs = kwargs
213+
_kwargs = kwargs.copy()
215214
_kwargs.pop(kwarg_name)
216215
_kwargs[kwarg_name[:-1]] = _id
217216
_objects.append(_func(**_kwargs))
@@ -222,18 +221,17 @@ def _check():
222221
for _index, __obj in enumerate(_objects):
223222
if __obj is None:
224223
_id = kwargs.get(kwarg_name)[_index]
225-
_kwargs = kwargs
224+
_kwargs = kwargs.copy()
226225
_kwargs.pop(kwarg_name)
227226
_kwargs[kwarg_name[:-1]] = _id
228227
_request = _func(**_kwargs)
229228
_objects[_index] = _request
230229
return _http_request(_obj, http=client._http, request=_objects)
231230

232-
_obj: Optional[_T] = None
231+
http_name = f"get_{obj.__name__.lower()}"
232+
kwarg_name = f"{obj.__name__.lower()}_id"
233233

234-
force_arg = kwargs.pop("force", None)
235-
force_cache = force_arg == "cache"
236-
force_http = force_arg == "http"
234+
_obj: Optional[_T] = None
237235

238236
if not force_http:
239237
_obj = _get_cache(obj, client, kwarg_name, **kwargs)

0 commit comments

Comments
 (0)