Skip to content

Commit 4e52569

Browse files
authored
Merge pull request from GHSA-qmhj-m29v-gvmr
Fix issue with HTTP bot slash commands
2 parents 37be456 + 22d0e11 commit 4e52569

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

discord/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
__author__ = "Pycord Development"
1414
__license__ = "MIT"
1515
__copyright__ = "Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development"
16-
__version__ = "2.0.0"
16+
__version__ = "2.0.1"
1717

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

@@ -75,6 +75,6 @@ class VersionInfo(NamedTuple):
7575
serial: int
7676

7777

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

8080
logging.getLogger(__name__).addHandler(logging.NullHandler())

discord/interactions.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,18 @@ def _from_data(self, data: InteractionPayload):
180180

181181
# TODO: there's a potential data loss here
182182
if self.guild_id:
183-
guild = self.guild or Object(id=self.guild_id)
183+
guild = self.guild or self._state._get_guild(self.guild_id) or Object(id=self.guild_id)
184184
try:
185185
member = data["member"] # type: ignore
186186
except KeyError:
187187
pass
188188
else:
189-
cache_flag = self._state.member_cache_flags.interaction
190-
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
191189
self._permissions = int(member.get("permissions", 0))
190+
if not isinstance(guild, Object):
191+
cache_flag = self._state.member_cache_flags.interaction
192+
self.user = guild._get_and_update_member(member, int(member["user"]["id"]), cache_flag)
193+
else:
194+
self.user = Member(state=self._state, data=member, guild=guild)
192195
else:
193196
try:
194197
self.user = User(state=self._state, data=data["user"])

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
extras_require=extras_require,
105105
python_requires=">=3.8.0",
106106
classifiers=[
107-
"Development Status :: 4 - Beta",
107+
"Development Status :: 5 - Production/Stable",
108108
"License :: OSI Approved :: MIT License",
109109
"Intended Audience :: Developers",
110110
"Natural Language :: English",

0 commit comments

Comments
 (0)