Skip to content

Commit 01cf7f3

Browse files
authored
fix(state): prevent DeprecationWarning on shard reconnect (#1267)
1 parent eea6e6b commit 01cf7f3

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

changelog/1267.bugfix.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Prevent :class:`py:DeprecationWarning` related to :attr:`Message.interaction` field on shard reconnect.

disnake/message.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1446,8 +1446,8 @@ def _rebind_cached_references(self, new_guild: Guild, new_channel: GuildMessagea
14461446
# updated later in _update_member_references, after re-chunking
14471447
if isinstance(self.author, Member):
14481448
self.author.guild = new_guild
1449-
if self.interaction and isinstance(self.interaction.user, Member):
1450-
self.interaction.user.guild = new_guild
1449+
if self._interaction and isinstance(self._interaction.user, Member):
1450+
self._interaction.user.guild = new_guild
14511451

14521452
@utils.cached_slot_property("_cs_raw_mentions")
14531453
def raw_mentions(self) -> List[int]:

disnake/state.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2433,10 +2433,10 @@ def _update_member_references(self) -> None:
24332433
if new_author is not None and new_author is not msg.author:
24342434
msg.author = new_author
24352435

2436-
if msg.interaction is not None and isinstance(msg.interaction.user, Member):
2437-
new_author = msg.guild.get_member(msg.interaction.user.id)
2438-
if new_author is not None and new_author is not msg.interaction.user:
2439-
msg.interaction.user = new_author
2436+
if msg._interaction is not None and isinstance(msg._interaction.user, Member):
2437+
new_author = msg.guild.get_member(msg._interaction.user.id)
2438+
if new_author is not None and new_author is not msg._interaction.user:
2439+
msg._interaction.user = new_author
24402440

24412441
async def chunker(
24422442
self,

0 commit comments

Comments
 (0)