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

topic_generator: Rearrange checks inside if statement.

Browse Source 
Primary objective is to remove the call to narrow_state.active,
in doing so, I rearranged the conditions a bit.
This commit is contained in:
Aman Agrawal 2024-02-03 07:51:00 +00:00 committed by Tim Abbott
parent adedc0283f
commit e923c593f6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/topic_generator.ts
View File

@ -91,14 +91,16 @@ export function get_next_topic(
function get_unmuted_topics(stream_name: string): string[] {
const stream_id = stream_data.get_stream_id(stream_name);
const narrowed_steam_id = narrow_state.stream_id();
assert(stream_id !== undefined);
const topics = stream_topic_history.get_recent_topic_names(stream_id);
const narrowed_topic = narrow_state.topic();
if (
narrow_state.active() &&
narrow_state.stream_id() === stream_id &&
narrowed_steam_id !== undefined &&
narrowed_topic !== undefined &&
narrowed_steam_id === stream_id &&
_.isEqual(narrow_state.filter()?.sorted_term_types(), ["stream", "topic"]) &&
narrow_state.topic() !== undefined &&
!user_topics.is_topic_unmuted_or_followed(stream_id, narrow_state.topic()!)
!user_topics.is_topic_unmuted_or_followed(stream_id, narrowed_topic)
) {
// Here we're using N within a muted stream starting from
// a muted topic; advance to the next not-explicitly-muted