CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-30 21:11:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

filter: Use encoding for channel/topic narrow for url redirect.

Browse Source 
Earlier, when generating redirect url for search exit, we did not
encode the url in case of topic narrows. We expect some characters
to be replaced when generating hash.

This commit encodes the url for channels and topic narrows and
prevents redirecting to broken hashes.
This commit is contained in:
Pratik Chanda 2025-08-29 02:01:11 +05:30 committed by Tim Abbott
parent 41e8d79e00
commit acc5cffae4
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/src/filter.ts
View File

@ -1,6 +1,7 @@
import _ from "lodash";
import assert from "minimalistic-assert";
import * as internal_url from "../shared/src/internal_url.ts";
import * as resolved_topic from "../shared/src/resolved_topic.ts";
import render_search_description from "../templates/search_description.hbs";
@ -18,6 +19,7 @@ import type {UserPillItem} from "./search_suggestion.ts";
import {current_user, realm} from "./state_data.ts";
import type {NarrowTerm} from "./state_data.ts";
import * as stream_data from "./stream_data.ts";
import * as sub_store from "./sub_store.ts";
import * as user_topics from "./user_topics.ts";
import * as util from "./util.ts";
@ -1311,12 +1313,12 @@ export class Filter {
if (!sub) {
return "#";
}
return (
"/#narrow/channel/" +
stream_data.id_to_slug(sub.stream_id) +
"/topic/" +
this.operands("topic")[0]
);
return `/${internal_url.by_stream_topic_url(
sub.stream_id,
this.operands("topic")[0]!,
sub_store.maybe_get_stream_name,
)}`;
}
// eliminate "complex filters"
@ -1332,7 +1334,10 @@ export class Filter {
if (!sub) {
return "#";
}
return "/#narrow/channel/" + stream_data.id_to_slug(sub.stream_id);
return `/${internal_url.by_stream_url(
sub.stream_id,
sub_store.maybe_get_stream_name,
)}`;
}
case "is-dm":
return "/#narrow/is/dm";

22
web/tests/filter.test.cjs
View File

@ -2400,6 +2400,14 @@ test("navbar_helpers", ({override}) => {
{operator: "channel", operand: invalid_channel_id.toString()},
{operator: "topic", operand: "bar"},
];
// channel/topic name using special character for url encoding.
const special_sub_id = new_stream_id();
make_sub("Foo2.0", special_sub_id);
const char_channel_term = [{operator: "channel", operand: special_sub_id.toString()}];
const char_channel_topic_term = [
{operator: "channel", operand: special_sub_id.toString()},
{operator: "topic", operand: "bar2.0"},
];
const public_sub_id = new_stream_id();
make_private_sub("psub", public_sub_id);
const private_channel_term = [{operator: "channel", operand: public_sub_id.toString()}];
@ -2526,6 +2534,20 @@ test("navbar_helpers", ({override}) => {
title: "Foo",
redirect_url_with_search: `/#narrow/channel/${foo_stream_id}-Foo/topic/bar`,
},
{
terms: char_channel_term,
is_common_narrow: true,
zulip_icon: "hashtag",
title: "Foo2.0",
redirect_url_with_search: `/#narrow/channel/${special_sub_id}-Foo2.2E0`,
},
{
terms: char_channel_topic_term,
is_common_narrow: true,
zulip_icon: "hashtag",
title: "Foo2.0",
redirect_url_with_search: `/#narrow/channel/${special_sub_id}-Foo2.2E0/topic/bar2.2E0`,
},
{
terms: invalid_channel_with_topic,
is_common_narrow: true,