separate properties

Author: Le0Developer

changes/1877.feature.md

@@ -1 +1,2 @@
-Add `make_link()` function to `MessageReference` class.
+- Add `message_link` property to `MessageReference`
+- Add `channel_link` property to `MessageReference`

hikari/messages.py

@@ -309,17 +309,27 @@ class MessageReference:
     a guild.
     """
 
-    def make_link(self) -> str:
-        """Generate a jump link to the referenced message or channel (in case for follow add messages).
+    @property
+    def message_link(self) -> typing.Optional[str]:
+        """Generate a jump link to the referenced message.
 
-        Returns
-        -------
-        str
-            The jump link to the message reference target.
+        This will be [`None`][] for channel follow add messages. This may
+        point to a deleted message.
+        """
+        if self.id is None:
+            return None
+
+        guild_id_str = "@me" if self.guild_id is None else self.guild_id
+        return f"{urls.BASE_URL}/channels/{guild_id_str}/{self.channel_id}/{self.id}"
+    
+    @property
+    def channel_link(self) -> str:
+        """Generate a jump link to the channel the referenced message was sent in.
+
+        This will always be a valid link.
         """
         guild_id_str = "@me" if self.guild_id is None else self.guild_id
-        message_id_str = "" if self.id is None else f"/{self.id}"
-        return f"{urls.BASE_URL}/channels/{guild_id_str}/{self.channel_id}{message_id_str}"
+        return f"{urls.BASE_URL}/channels/{guild_id_str}/{self.channel_id}"
 
 
 @attrs_extensions.with_copy

tests/hikari/test_messages.py

@@ -143,15 +143,18 @@ def message_reference():
 
 class TestMessageReference:
     def test_make_link_when_guild_is_not_none(self, message_reference):
-        assert message_reference.make_link() == "https://discord.com/channels/123/456/789"
+        assert message_reference.message_link == "https://discord.com/channels/123/456/789"
+        assert message_reference.channel_link == "https://discord.com/channels/123/456"
 
     def test_make_link_when_guild_is_none(self, message_reference):
         message_reference.guild_id = None
-        assert message_reference.make_link() == "https://discord.com/channels/@me/456/789"
+        assert message_reference.message_link == "https://discord.com/channels/@me/456/789"
+        assert message_reference.channel_link == "https://discord.com/channels/@me/456"
 
     def test_make_link_when_id_is_none(self, message_reference):
         message_reference.id = None
-        assert message_reference.make_link() == "https://discord.com/channels/123/456"
+        assert message_reference.message_link is None
+        assert message_reference.channel_link == "https://discord.com/channels/123/456"
 
 
 @pytest.mark.asyncio