paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

narrow: Mark as read when narrowing by_topic or by_recipient.

Browse Source 
In commit a93598c22e, we removed, in `narrow.by_topic` and
`narrow_by_recipient`, calls to `unread_ops.notify_server_message_read`
because that would have marked messages as read for users who had
set their preference in the web-app to never mark messages as read.

We add those calls back now, but with a check for that user setting.
This commit is contained in:
Lauryn Menard
2023-05-30 19:28:05 +02:00
committed by Tim Abbott
parent f45a6a6d99
commit 892c5f48f7
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/src/narrow.js
View File

@@ -37,6 +37,7 @@ import * as resize from "./resize";
import * as search from "./search";
import * as search_pill from "./search_pill";
import * as search_pill_widget from "./search_pill_widget";
import {web_mark_read_on_scroll_policy_values} from "./settings_config";
import * as spectators from "./spectators";
import * as stream_data from "./stream_data";
import * as stream_list from "./stream_list";
@@ -46,6 +47,7 @@ import * as typing_events from "./typing_events";
import * as unread from "./unread";
import * as unread_ops from "./unread_ops";
import * as unread_ui from "./unread_ui";
import {user_settings} from "./user_settings";
import * as util from "./util";
import * as widgetize from "./widgetize";
@@ -902,6 +904,17 @@ export function by_topic(target_id, opts) {
return;
}
if (
user_settings.web_mark_read_on_scroll_policy !==
web_mark_read_on_scroll_policy_values.never.code
) {
// We don't check message_list.can_mark_messages_read
// here because the target message_list isn't initialized;
// but the targeted message is about to be marked read
// in the new view.
unread_ops.notify_server_message_read(original);
}
const search_terms = [
{operator: "stream", operand: original.stream},
{operator: "topic", operand: original.topic},
@@ -910,12 +923,22 @@ export function by_topic(target_id, opts) {
activate(search_terms, opts);
}
// Called for the 'narrow by stream' hotkey.
export function by_recipient(target_id, opts) {
opts = {then_select_id: target_id, ...opts};
// don't use message_lists.current as it won't work for muted messages or for out-of-narrow links
const message = message_store.get(target_id);
if (
user_settings.web_mark_read_on_scroll_policy !==
web_mark_read_on_scroll_policy_values.never.code
) {
// We don't check message_list.can_mark_messages_read
// here because the target message_list isn't initialized;
// but the targeted message is about to be marked read
// in the new view.
unread_ops.notify_server_message_read(message);
}
switch (message.type) {
case "private":
by("dm", message.reply_to, opts);