Skip to content

Implement Interaction.to_dict #1274

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
Lulalaby merged 5 commits into from
May 13, 2022
Merged

Implement Interaction.to_dict #1274

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21f2707
Initial implementation for Interaction.to_dict
Dorukyum Apr 17, 2022
06ed849
Use resolved data to access user and member
Dorukyum May 13, 2022
0c3130c
Store and return message data
Dorukyum May 13, 2022
1bbdd49
Add docstring
Dorukyum May 13, 2022
0218d4c
Merge branch 'master' into interaction.to_dict
Dorukyum May 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
43 changes: 42 additions & 1 deletion discord/interactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class Interaction:
"token",
"version",
"custom_id",
"_message_data",
"_permissions",
"_state",
"_session",
Expand Down Expand Up @@ -165,9 +166,13 @@ def _from_data(self, data: InteractionPayload):

self.message: Optional[Message]
try:
self.message = Message(state=self._state, channel=self.channel, data=data["message"]) # type: ignore
message_data = data["message"]
except KeyError:
self.message = None
self._message_data = None
else:
self.message = Message(state=self._state, channel=self.channel, data=message_data) # type: ignore
self._message_data = message_data

self.user: Optional[Union[User, Member]] = None
self._permissions: int = 0
Expand Down Expand Up @@ -425,6 +430,42 @@ async def delete_original_message(self, *, delay: Optional[float] = None) -> Non
else:
await func

def to_dict(self) -> Dict[str, Any]:
"""Converts this interaction object into a dict."""

data = {
"id": self.id,
"application_id": self.application_id,
"type": self.type.value,
"token": self.token,
"version": self.version,
}

if self.data is not None:
data["data"] = self.data
if (resolved := self.data.get("resolved")) and self.user is not None:
if (users := resolved.get("users")) and (user := users.get(self.user.id)):
data["user"] = user
if (members := resolved.get("members")) and (member := members.get(self.user.id)):
data["member"] = member

if self.guild_id is not None:
data["guild_id"] = self.guild_id

if self.channel_id is not None:
data["channel_id"] = self.channel_id

if self.locale:
data["locale"] = self.locale

if self.guild_locale:
data["guild_locale"] = self.guild_locale

if self._message_data:
data["message"] = self._message_data

return data


class InteractionResponse:
"""Represents a Discord interaction response.
Expand Down