From c5b7a78ae2c71dc352764093b5268bbf43d50b24 Mon Sep 17 00:00:00 2001
From: Chris Bobbe <cbobbe@zulip.com>
Date: Tue, 23 Apr 2024 14:54:47 -0700
Subject: [PATCH] internalLinks [nfc]: Inline
 internal_url.by_stream{,_topic}_url

This refactor will help with #5861, but Tim has reminded me that
we're not ready to address #5861 until a release addressing #5860
(as we did in the previous commit) has been out for a while:
  https://chat.zulip.org/#narrow/stream/378-api-design/topic/URLs.20for.20stream.20to.20channel.20rename/near/1786615
---
 src/utils/internalLinks.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/utils/internalLinks.js b/src/utils/internalLinks.js
index 3559dc7964..4b7bf55bbc 100644
--- a/src/utils/internalLinks.js
+++ b/src/utils/internalLinks.js
@@ -242,7 +242,9 @@ export const getStreamTopicUrl = (
   streamsById: Map<number, Stream>,
 ): URL => {
   const maybe_get_stream_name = id => streamsById.get(id)?.name;
-  const path = internal_url.by_stream_topic_url(streamId, topic, maybe_get_stream_name);
+  const encodedStreamId = internal_url.encode_stream_id(streamId, maybe_get_stream_name);
+  const encodedTopic = internal_url.encodeHashComponent(topic);
+  const path = `#narrow/stream/${encodedStreamId}/topic/${encodedTopic}`;
   return new URL(path, realm);
 };
 
@@ -252,7 +254,7 @@ export const getStreamUrl = (
   streamsById: Map<number, Stream>,
 ): URL => {
   const maybe_get_stream_name = id => streamsById.get(streamId)?.name;
-  const path = internal_url.by_stream_url(streamId, maybe_get_stream_name);
+  const path = `#narrow/stream/${internal_url.encode_stream_id(streamId, maybe_get_stream_name)}`;
   return new URL(path, realm);
 };