Skip to content

Return None from get_or_fetch_member upon unfound members & bad requests #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisLovering merged 3 commits into from
Dec 13, 2022
Merged

Return None from get_or_fetch_member upon unfound members & bad requests #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
068304f
return None is status code is either a 400 or a 404
Dec 12, 2022
8bb16c9
bump version to 9.3.0
Dec 13, 2022
5a2f701
apply Chris' suggestion to improve rendering
Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
Changelog
=========

- :release:`9.3.0 <13th December 2022>`
- :feature:`169` Return :obj:`None` upon receiving a bad request from Discord in :obj:`pydis_core.utils.members.get_or_fetch_member`

- :release:`9.2.0 <17th November 2022>`
- :support:`151` Add support for Python 3.11

Expand Down
14 changes: 8 additions & 6 deletions pydis_core/utils/members.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ async def get_or_fetch_member(guild: discord.Guild, member_id: int) -> typing.Op
"""
if member := guild.get_member(member_id):
log.trace(f"{member} retrieved from cache.")
else:
try:
member = await guild.fetch_member(member_id)
except discord.errors.NotFound:
log.trace(f"Failed to fetch {member_id} from API.")
return member
try:
member = await guild.fetch_member(member_id)
except discord.errors.HTTPException as e:
log.trace(f"Failed to fetch {member_id} from API.")
if e.status in [400, 404]:
return None
log.trace(f"{member} fetched from API.")
raise
log.trace(f"{member} fetched from API.")
return member


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pydis_core"
version = "9.2.0"
version = "9.3.0"
description = "PyDis core provides core functionality and utility to the bots of the Python Discord community."
authors = ["Python Discord <info@pythondiscord.com>"]
license = "MIT"
Expand Down