From 93c172ee3fec13ccbca1d2106e501d9dee3ddb98 Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn@zulip.com>
Date: Tue, 8 Oct 2024 17:52:16 +0200
Subject: [PATCH] message-fetch: Add spectator term when building narrow
 parameter.

Again, since the spectator term is added to the narrow parameter
for all views, then we consolidate that logic when building the
initial narrow data.
---
 web/src/message_fetch.ts | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/web/src/message_fetch.ts b/web/src/message_fetch.ts
index 0c24f49fa3..17e310ac57 100644
--- a/web/src/message_fetch.ts
+++ b/web/src/message_fetch.ts
@@ -321,6 +321,16 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
     if (page_params.narrow !== undefined) {
         narrow_data = [...narrow_data, ...page_params.narrow];
     }
+    if (page_params.is_spectator) {
+        const web_public_narrow: NarrowTerm[] = [
+            {operator: "channels", operand: "web-public", negated: false},
+        ];
+        // This logic is not ideal in that, in theory, an existing `channels`
+        // operator could be present, but not in a useful way. We don't attempt
+        // to validate the narrow is compatible with spectators here; the server
+        // will return an error if appropriate.
+        narrow_data = [...narrow_data, ...web_public_narrow];
+    }
     // We don't pass a narrow for the non-spectator, combined feed view; this
     // is required to display messages if their muted status changes without
     // a new network request, and so we need the server to send the message
@@ -347,35 +357,6 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
         });
     }
 
-    if (page_params.is_spectator) {
-        // This is a bit of a hack; ideally we'd unify this logic in
-        // some way with the above logic, and not need to do JSON
-        // parsing/stringifying here.
-        const web_public_narrow = {negated: false, operator: "channels", operand: "web-public"};
-
-        if (!data.narrow) {
-            /* For the combined feed, this will be the only operator. */
-            data.narrow = JSON.stringify([web_public_narrow]);
-        } else {
-            // Otherwise, we append the operator.  This logic is not
-            // ideal in that in theory an existing `streams:` operator
-            // could be present, but not in a useful way.  We don't
-            // attempt to validate the narrow is compatible with
-            // spectators here; the server will return an error if
-            // appropriate.
-            const narrow_schema = z.array(
-                z.object({
-                    operator: z.string(),
-                    operand: z.union([z.string(), z.number(), z.array(z.number())]),
-                    negated: z.optional(z.boolean()),
-                }),
-            );
-            const parsed_narrow_data = narrow_schema.parse(JSON.parse(data.narrow));
-            parsed_narrow_data.push(web_public_narrow);
-            data.narrow = JSON.stringify(parsed_narrow_data);
-        }
-    }
-
     void channel.get({
         url: "/json/messages",
         data,