Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Lauryn Menard 2024-10-08 17:52:16 +02:00 committed by Tim Abbott
parent 7289d43f74
commit 93c172ee3f
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
web/src/message_fetch.ts
View File

@ -321,6 +321,16 @@ export function load_messages(opts: MessageFetchOptions, attempt = 1): void {
if (page_params.narrow !== undefined) { if (page_params.narrow !== undefined) {
narrow_data = [...narrow_data, ...page_params.narrow]; 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 // 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 // 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 // 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({ void channel.get({
url: "/json/messages", url: "/json/messages",
data, data,