Skip to content

Commit

Permalink
Merge pull request from GHSA-qmhj-m29v-gvmr
Browse files Browse the repository at this point in the history
Fix issue with HTTP bot slash commands
  • Loading branch information
BobDotCom authored Aug 16, 2022
2 parents 37be456 + 22d0e11 commit 4e52569
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions discord/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
__author__ = "Pycord Development"
__license__ = "MIT"
__copyright__ = "Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development"
__version__ = "2.0.0"
__version__ = "2.0.1"

__path__ = __import__("pkgutil").extend_path(__path__, __name__)

Expand Down Expand Up @@ -75,6 +75,6 @@ class VersionInfo(NamedTuple):
serial: int


version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=0, releaselevel="final", serial=0)
version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=1, releaselevel="final", serial=0)

logging.getLogger(__name__).addHandler(logging.NullHandler())
9 changes: 6 additions & 3 deletions discord/interactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,18 @@ def _from_data(self, data: InteractionPayload):

# TODO: there's a potential data loss here
if self.guild_id:
guild = self.guild or Object(id=self.guild_id)
guild = self.guild or self._state._get_guild(self.guild_id) or Object(id=self.guild_id)
try:
member = data["member"] # type: ignore
except KeyError:
pass
else:
cache_flag = self._state.member_cache_flags.interaction
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
self._permissions = int(member.get("permissions", 0))
if not isinstance(guild, Object):
cache_flag = self._state.member_cache_flags.interaction
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
else:
self.user = Member(state=self._state, data=member, guild=guild)
else:
try:
self.user = User(state=self._state, data=data["user"])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
extras_require=extras_require,
python_requires=">=3.8.0",
classifiers=[
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: MIT License",
"Intended Audience :: Developers",
"Natural Language :: English",
Expand Down

0 comments on commit 4e52569

Please sign in to comment.