paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-17 20:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_data: Remove is_stream_muted_by_name to favor stream ids.

Browse Source
This commit is contained in:
evykassirer
2024-08-03 12:15:23 -07:00
committed by Tim Abbott
parent fd5112fbb2
commit 90cced31af
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/topic_generator.ts
View File

@@ -67,13 +67,13 @@ export function get_next_topic(
let my_streams = stream_list_sort.get_streams();
my_streams = my_streams.filter((stream_name) => {
if (!stream_data.is_stream_muted_by_name(stream_name)) {
const stream_id = stream_data.get_stream_id(stream_name);
assert(stream_id !== undefined);
if (!stream_data.is_muted(stream_id)) {
return true;
}
if (only_followed_topics) {
// We can use Shift + N to go to unread followed topic in muted stream.
const stream_id = stream_data.get_stream_id(stream_name);
assert(stream_id !== undefined);
const topics = stream_topic_history.get_recent_topic_names(stream_id);
return topics.some((topic) => user_topics.is_topic_followed(stream_id, topic));
}
@@ -83,8 +83,6 @@ export function get_next_topic(
return true;
}
// We can use N to go to next unread unmuted/followed topic in a muted stream .
const stream_id = stream_data.get_stream_id(stream_name);
assert(stream_id !== undefined);
const topics = stream_topic_history.get_recent_topic_names(stream_id);
return topics.some((topic) => user_topics.is_topic_unmuted_or_followed(stream_id, topic));
});
@@ -110,7 +108,7 @@ export function get_next_topic(
/* istanbul ignore next */
return topics.filter((topic) => !user_topics.is_topic_muted(stream_id, topic));
} else if (stream_data.is_stream_muted_by_name(stream_name)) {
} else if (stream_data.is_muted(stream_id)) {
return topics.filter((topic) =>
user_topics.is_topic_unmuted_or_followed(stream_id, topic),
);