From a95a31e96db40f7ba1e252e4aa8bd231bdece732 Mon Sep 17 00:00:00 2001 From: Nan R Date: Fri, 1 Apr 2022 00:37:48 +0200 Subject: [PATCH 1/4] feat: Add url property for message objects --- interactions/api/models/message.py | 13 +++++++++++++ interactions/api/models/message.pyi | 2 ++ 2 files changed, 15 insertions(+) diff --git a/interactions/api/models/message.py b/interactions/api/models/message.py index 0e1b0b28a..878fe08af 100644 --- a/interactions/api/models/message.py +++ b/interactions/api/models/message.py @@ -672,6 +672,19 @@ async def get_from_url(cls, url: str, client: "HTTPClient") -> "Message": # noq ) return cls(**_message, _client=client) + @property + def url(self) -> str: + """ + Returns the URL of the message. + + :return: The URL of said message + :rtype: str + """ + guild = "@me" + if self.guild_id: + guild = str(self.guild_id) + return f"https://discord.com/channels/{guild}/{self.channel_id}/{self.id}" + class Emoji(DictSerializerMixin): """ diff --git a/interactions/api/models/message.pyi b/interactions/api/models/message.pyi index a0e1e2b3b..b9a12af3f 100644 --- a/interactions/api/models/message.pyi +++ b/interactions/api/models/message.pyi @@ -298,3 +298,5 @@ class Embed(DictSerializerMixin): def set_image(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... def set_video(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... def set_thumbnail(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... + @property + def url(self) -> str: ... \ No newline at end of file From c72abb47f43d4aec623caceab70c6d53f21f6768 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 22:42:09 +0000 Subject: [PATCH 2/4] ci: correct from checks. --- interactions/api/models/message.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interactions/api/models/message.pyi b/interactions/api/models/message.pyi index b9a12af3f..46ca5bbca 100644 --- a/interactions/api/models/message.pyi +++ b/interactions/api/models/message.pyi @@ -299,4 +299,4 @@ class Embed(DictSerializerMixin): def set_video(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... def set_thumbnail(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... @property - def url(self) -> str: ... \ No newline at end of file + def url(self) -> str: ... From 8a3cc5246eb9d565c243ce88093775f44d71e009 Mon Sep 17 00:00:00 2001 From: Nan R <88463477+Nanrech@users.noreply.github.com> Date: Fri, 1 Apr 2022 00:44:47 +0200 Subject: [PATCH 3/4] Update interactions/api/models/message.py Co-authored-by: EdVraz <88881326+EdVraz@users.noreply.github.com> --- interactions/api/models/message.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/interactions/api/models/message.py b/interactions/api/models/message.py index 878fe08af..5ec347d45 100644 --- a/interactions/api/models/message.py +++ b/interactions/api/models/message.py @@ -680,9 +680,7 @@ def url(self) -> str: :return: The URL of said message :rtype: str """ - guild = "@me" - if self.guild_id: - guild = str(self.guild_id) + guild = self.guild_id if self.guild_id else "@me" return f"https://discord.com/channels/{guild}/{self.channel_id}/{self.id}" From 6c416530ff3dcefbb7a8757ec4561eb426766074 Mon Sep 17 00:00:00 2001 From: Nan R Date: Fri, 1 Apr 2022 00:48:51 +0200 Subject: [PATCH 4/4] Update message.pyi --- interactions/api/models/message.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interactions/api/models/message.pyi b/interactions/api/models/message.pyi index b9a12af3f..5f1107972 100644 --- a/interactions/api/models/message.pyi +++ b/interactions/api/models/message.pyi @@ -170,6 +170,8 @@ class Message(DictSerializerMixin): url: str, client: HTTPClient, ) -> "Message": ... + @property + def url(self) -> str: ... class Emoji(DictSerializerMixin): _client: HTTPClient @@ -298,5 +300,3 @@ class Embed(DictSerializerMixin): def set_image(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... def set_video(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... def set_thumbnail(self, url: str, proxy_url: Optional[str] = None, height: Optional[int] = None, width: Optional[int] = None) -> None: ... - @property - def url(self) -> str: ... \ No newline at end of file