From 1594011b67a83ebffd4225a9d8187ba331e4976d Mon Sep 17 00:00:00 2001 From: nimishmedatwal Date: Tue, 2 Apr 2024 16:40:48 +0530 Subject: [PATCH] left_sidebar: Rename All messages to Global Feed. Fixes part of #27802. --- docs/contributing/code-reviewing.md | 2 +- docs/overview/architecture-overview.md | 2 +- docs/subsystems/pointer.md | 6 ++-- docs/testing/manual-testing.md | 4 +-- docs/translating/polish.md | 4 +-- help/all-messages.md | 4 +-- help/archive-a-stream.md | 2 +- help/configure-default-new-user-settings.md | 2 +- help/configure-home-view.md | 8 ++--- help/inbox.md | 2 +- help/include/all-messages.md | 6 ++-- help/include/go-to-all-messages.md | 2 +- help/include/mute-unmute-intro.md | 2 +- help/include/sidebar_index.md | 2 +- help/keyboard-shortcuts.md | 2 +- help/marking-messages-as-read.md | 4 +-- help/mute-a-user.md | 4 +-- help/reading-strategies.md | 2 +- help/recent-conversations.md | 2 +- .../case-studies/end-point-case-study.md | 4 +-- .../case-studies/gut-contact-case-study.md | 2 +- web/e2e-tests/compose.test.ts | 2 +- web/e2e-tests/message-basics.test.ts | 2 +- web/e2e-tests/stars.test.ts | 2 +- web/src/compose_closed_ui.js | 2 +- web/src/compose_tooltips.ts | 4 ++- web/src/filter.ts | 8 ++--- .../left_sidebar_navigation_area_popovers.js | 2 +- web/src/message_fetch.js | 2 +- web/src/message_view_header.ts | 2 +- web/src/narrow.js | 30 ++++++++++--------- web/src/narrow_state.ts | 2 +- web/src/narrow_title.ts | 3 +- web/src/settings_config.ts | 2 +- web/src/todo_widget.js | 5 ++-- web/src/user_topics_ui.js | 2 +- web/src/widgetize.ts | 2 +- web/templates/left_sidebar.hbs | 2 +- .../left_sidebar_all_messages_popover.hbs | 2 +- web/templates/tooltip_templates.hbs | 2 +- web/tests/filter.test.js | 4 +-- web/tests/hotkey.test.js | 2 +- web/tests/narrow.test.js | 2 +- web/tests/narrow_state.test.js | 2 +- zerver/lib/markdown/help_relative_links.py | 4 +-- zerver/openapi/zulip.yaml | 12 ++++---- 46 files changed, 87 insertions(+), 85 deletions(-) diff --git a/docs/contributing/code-reviewing.md b/docs/contributing/code-reviewing.md index 35485d5b70..5467be7bfa 100644 --- a/docs/contributing/code-reviewing.md +++ b/docs/contributing/code-reviewing.md @@ -266,7 +266,7 @@ Some scenarios to consider: - Try clicking on any interactive elements, multiple times, in a variety of orders. - If the feature affects the **message view**, try it out in different types of - narrows: topic, stream, All messages, direct messages. + narrows: topic, stream, Combined feed, direct messages. - If the feature affects the **compose box** in the web app, try both ways of [resizing the compose box](https://zulip.com/help/resize-the-compose-box). Test both stream messages and direct messages. diff --git a/docs/overview/architecture-overview.md b/docs/overview/architecture-overview.md index d08e6b784a..6455d6be1e 100644 --- a/docs/overview/architecture-overview.md +++ b/docs/overview/architecture-overview.md @@ -280,7 +280,7 @@ self-explanatory names. - **ellipsis**: A small vertical three dot icon (technically called as ellipsis-v), present in sidebars as a menu icon. - It offers contextual options for global filters (All messages + It offers contextual options for global filters (Combined feed and Starred messages), stream filters and topics in left sidebar and users in right sidebar. To avoid visual clutter ellipsis only appears in the web UI upon hover. diff --git a/docs/subsystems/pointer.md b/docs/subsystems/pointer.md index b6906a7d00..4b99022643 100644 --- a/docs/subsystems/pointer.md +++ b/docs/subsystems/pointer.md @@ -54,11 +54,11 @@ streams.) ### Unnarrow: previous sequence When you unnarrow using e.g. the `a` key, you will automatically be -taken to the same message that was selected in the All messages view before +taken to the same message that was selected in the Combined feed view before you narrowed, unless in the narrow you read new messages, in which case you will be jumped forward to the first unread and non-muted -message in the All messages view (or the bottom of the feed if there is -none). This makes for a nice experience reading threads via the All messages +message in the Combined feed view (or the bottom of the feed if there is +none). This makes for a nice experience reading threads via the Combined feed view in sequence. ### Forced reload: state preservation diff --git a/docs/testing/manual-testing.md b/docs/testing/manual-testing.md index 138cec4165..2462d83d9a 100644 --- a/docs/testing/manual-testing.md +++ b/docs/testing/manual-testing.md @@ -53,7 +53,7 @@ Try using all the navigation hotkeys: Try narrowing from the message view: - Hotkeys - - use a to go to All messages + - use a to go to Combined feed - use s to narrow to a stream (select message first and verify in sidebar) - use S to narrow to the topic (and verify in sidebar) @@ -184,7 +184,7 @@ For each of the above types of messages, you will want to cycle through the following views for Cordelia (and have Hamlet send new messages after each narrow): -- Go to All messages view. +- Go to Combined feed view. - Go to All direct messages view. - Go to Direct messages w/Hamlet. - Go to Direct messages w/Hamlet and Othello. diff --git a/docs/translating/polish.md b/docs/translating/polish.md index f57899a620..fa859222a3 100644 --- a/docs/translating/polish.md +++ b/docs/translating/polish.md @@ -48,11 +48,11 @@ You can set your own alert words for Zulip messages. > Możesz ustawić powiadomienia dla wybranych fraz w Zulipie. -**All messages**: wszystkie wiadomości +**Combined feed**: wszystkie wiadomości example: -You can see all messages in unmuted streams and topics with "All messages". +You can see all messages in unmuted streams and topics with "Combined feed". > Możesz zobaczyć pełną listę wiadomości poprzez widok "Wszystkie wiadomości". diff --git a/help/all-messages.md b/help/all-messages.md index 54ceca76dc..9d1fb9f088 100644 --- a/help/all-messages.md +++ b/help/all-messages.md @@ -1,4 +1,4 @@ -# All messages +# Combined feed {!all-messages.md!} @@ -6,7 +6,7 @@ Use S (go to stream) or Shift + S (go to conversation) to zoom in, and A to - get back to **All messages**. + get back to **Combined feed**. ## Related articles diff --git a/help/archive-a-stream.md b/help/archive-a-stream.md index 90f6108beb..9dcab4c700 100644 --- a/help/archive-a-stream.md +++ b/help/archive-a-stream.md @@ -4,7 +4,7 @@ Archiving a stream will immediately unsubscribe all users from the stream, remove the stream from search and other typeaheads, and remove the stream's -messages from **All messages**. +messages from **Combined feed**. Archiving a stream does not delete a stream's messages. Users will still be able to find any given message by searching for it. However, links to diff --git a/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md index 80168bbe3d..0990d6f210 100644 --- a/help/configure-default-new-user-settings.md +++ b/help/configure-default-new-user-settings.md @@ -27,7 +27,7 @@ preference settings, including the following: * [Home view](/help/configure-home-view) ([Inbox](/help/inbox) vs. [Recent conversations](/help/recent-conversations) vs. - [All messages](/help/reading-strategies#all-messages)) + [Combined feed](/help/reading-strategies#combined-feed)) * Notification settings: * What types of messages [trigger notifications][default-notifications] diff --git a/help/configure-home-view.md b/help/configure-home-view.md index c99771d7c9..03ba76d8a5 100644 --- a/help/configure-home-view.md +++ b/help/configure-home-view.md @@ -7,7 +7,7 @@ keyboard shortcuts. The home views available in Zulip are [**Inbox**](/help/inbox), [Recent conversations](/help/recent-conversations), and -[All messages](/help/all-messages). See +[Combined feed](/help/all-messages). See [Reading strategies](/help/reading-strategies) for recommendations on how to use these views. @@ -22,14 +22,14 @@ Organization administrators can [configure the home view for their organization](/help/configure-default-new-user-settings) to [**Inbox**](/help/inbox), [**Recent conversations**](/help/recent-conversations), or -[**All messages**](/help/all-messages). +[**Combined feed**](/help/all-messages). - The **Inbox** view works best if you regularly clear all unread messages in streams you follow. - **Recent conversations** works well for getting an overview of recent activity. -- **All messages** is convenient for low-traffic organizations, or for skimming +- **Combined feed** is convenient for low-traffic organizations, or for skimming messages as they come in. You can customize your personal home view regardless of @@ -80,5 +80,5 @@ shortcut. * [Reading strategies](/help/reading-strategies) * [Recent conversations](/help/recent-conversations) -* [All messages](/help/all-messages) +* [Combined feed](/help/all-messages) * [Keyboard shortcuts](/help/keyboard-shortcuts) diff --git a/help/inbox.md b/help/inbox.md index 8e0b6978a8..0cd778437f 100644 --- a/help/inbox.md +++ b/help/inbox.md @@ -51,7 +51,7 @@ In the web app, you can control whether the **Inbox** includes all topics, just * [Reading strategies](/help/reading-strategies) * [Recent conversations](/help/recent-conversations) -* [All messages](/help/all-messages) +* [Combined feed](/help/all-messages) * [Mute or unmute a stream](/help/mute-a-stream) * [Mute or unmute a topic](/help/mute-a-topic) * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams) diff --git a/help/include/all-messages.md b/help/include/all-messages.md index fda879fed1..364a80974d 100644 --- a/help/include/all-messages.md +++ b/help/include/all-messages.md @@ -1,8 +1,8 @@ -The **All messages** view is a feed of all the unmuted messages you have +The **Combined feed** view is a feed of all the unmuted messages you have received, which combines stream messages and direct messages. It's a great way to see new messages as they come in. -You can configure **All messages** to be the [home +You can configure **Combined feed** to be the [home view](/help/configure-home-view#configure-home-view) for the Zulip web app. {start_tabs} @@ -13,7 +13,7 @@ view](/help/configure-home-view#configure-home-view) for the Zulip web app. {tab|mobile} -1. Tap the **All messages** +1. Tap the **Combined feed** (globe) tab in the upper left corner of the app. diff --git a/help/include/go-to-all-messages.md b/help/include/go-to-all-messages.md index b4bd03454b..7ac7a6543f 100644 --- a/help/include/go-to-all-messages.md +++ b/help/include/go-to-all-messages.md @@ -1,4 +1,4 @@ -1. Click on **All messages** +1. Click on **Combined feed** (or if the **views** section is collapsed) in the left sidebar, or use the A keyboard shortcut. diff --git a/help/include/mute-unmute-intro.md b/help/include/mute-unmute-intro.md index d7832d269a..ec48c36b39 100644 --- a/help/include/mute-unmute-intro.md +++ b/help/include/mute-unmute-intro.md @@ -8,7 +8,7 @@ Muting has the following effects: - Messages in muted topics do not generate notifications (including [alert word](/help/dm-mention-alert-notifications#alert-words) notifications), unless you are [mentioned](/help/mention-a-user-or-group). -- Messages in muted topics do not appear in the [**All messages** +- Messages in muted topics do not appear in the [**Combined feed** view](/help/all-messages) or the mobile **Inbox** view. - Muted topics appear in the [**Recent conversations** view](/help/recent-conversations) only if the **Include muted** filter is diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index d6c0fc17c2..279b1d26f0 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -96,7 +96,7 @@ * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) * [Recent conversations](/help/recent-conversations) -* [All messages](/help/all-messages) +* [Combined feed](/help/all-messages) * [Message actions](/help/message-actions) * [Marking messages as read](/help/marking-messages-as-read) * [Marking messages as unread](/help/marking-messages-as-unread) diff --git a/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md index d87c3d5429..269023c061 100644 --- a/help/keyboard-shortcuts.md +++ b/help/keyboard-shortcuts.md @@ -103,7 +103,7 @@ in the Zulip app to add more to your repertoire as needed. * **Cycle between stream views**: Shift + A (previous) and Shift + D (next) -* **Go to All messages**: A — Shows all unmuted messages. +* **Go to Combined feed**: A — Shows all unmuted messages. * **Go to the conversation you are composing to**: Ctrl + . diff --git a/help/marking-messages-as-read.md b/help/marking-messages-as-read.md index 346eda2116..9696f0b102 100644 --- a/help/marking-messages-as-read.md +++ b/help/marking-messages-as-read.md @@ -69,7 +69,7 @@ stream or topic as read**. {tab|via-left-sidebar} -1. Hover over a stream, topic, or **All messages** in the left sidebar. +1. Hover over a stream, topic, or **Combined feed** in the left sidebar. 1. Click on the **ellipsis** (). @@ -100,7 +100,7 @@ stream or topic as read**. {tab|mobile} -1. Tap a stream, topic, or the **All messages** +1. Tap a stream, topic, or the **Combined feed** (globe) tab. diff --git a/help/mute-a-user.md b/help/mute-a-user.md index db9371b1b9..70bf7d845b 100644 --- a/help/mute-a-user.md +++ b/help/mute-a-user.md @@ -8,11 +8,11 @@ You can mute any user you do not wish to interact with. Muting someone will have the following effects: -* All messages sent by a muted user will automatically be [marked as +* Combined feed sent by a muted user will automatically be [marked as read](/help/marking-messages-as-read) for you, and will never generate any desktop, email, or mobile push notifications. -* All messages sent by muted users, including the name, profile +* Combined feed sent by muted users, including the name, profile picture, and message content, are hidden behind a **Click here to reveal** banner. A revealed message can later be [re-hidden](/help/mute-a-user#re-hide-a-message-that-has-been-revealed). diff --git a/help/reading-strategies.md b/help/reading-strategies.md index f2fb17df7f..be7bb11562 100644 --- a/help/reading-strategies.md +++ b/help/reading-strategies.md @@ -45,7 +45,7 @@ workflows: ## Combined views -### All messages +### Combined feed {!all-messages.md!} diff --git a/help/recent-conversations.md b/help/recent-conversations.md index b7fc0c295a..2a60bc9e4f 100644 --- a/help/recent-conversations.md +++ b/help/recent-conversations.md @@ -37,5 +37,5 @@ containing the most recent messages. * [Reading conversations](/help/reading-conversations) * [Reading strategies](/help/reading-strategies) * [Inbox](/help/inbox) -* [All messages](/help/all-messages) +* [Combined feed](/help/all-messages) * [Configure home view](/help/configure-home-view) diff --git a/templates/corporate/case-studies/end-point-case-study.md b/templates/corporate/case-studies/end-point-case-study.md index 7500b28574..7945c8d913 100644 --- a/templates/corporate/case-studies/end-point-case-study.md +++ b/templates/corporate/case-studies/end-point-case-study.md @@ -52,7 +52,7 @@ explored all the leading open-source team chat products. They found that while Mattermost and Rocket.Chat were similar to Slack (but felt less polished), Zulip stood out. “Zulip had all the modern features we were looking for, like reliable, flexible notifications. At the same time, the [extensive keyboard -shortcuts](/help/keyboard-shortcuts) and the ‘All messages’ +shortcuts](/help/keyboard-shortcuts) and the ‘Combined feed’ view offered a UI that the IRC fans loved.” When End Point moved to Zulip, it was an immediate improvement over the @@ -118,7 +118,7 @@ Jensen](https://www.endpointdev.com/team/jon-jensen/) has experienced them all. “It is amazing that companies would use Teams in its current state,” Jon says, a bit exasperated. “The UI is slow and inconsistent, and you have to do so much clicking to get anywhere. Compared to Zulip, it’s missing key features like the -‘All messages’ view and topics.” +‘Combined feed’ view and topics.” > “It is amazing that companies would use Teams in its current state. The UI is > slow and inconsistent, and compared to Zulip, it’s missing key features.” diff --git a/templates/corporate/case-studies/gut-contact-case-study.md b/templates/corporate/case-studies/gut-contact-case-study.md index 933735ea3d..3feff4a049 100644 --- a/templates/corporate/case-studies/gut-contact-case-study.md +++ b/templates/corporate/case-studies/gut-contact-case-study.md @@ -79,7 +79,7 @@ customer, where team leaders post daily updates. For agents, may of whom are not fully comfortable with modern software, Zulip being easy to use is invaluable. "We checked out Microsoft Teams and Mattermost, and most of our users didn’t like these programs, because they didn’t know how -to work with them,” Erik says. “In Zulip, agents love the “All messages” view,” +to work with them,” Erik says. “In Zulip, agents love the “Combined feed” view,” which combines direct messages and stream messages into a single feed. “Unlike other chat apps, you don’t have to click on each channel separately to see unreads,” Erik explains. diff --git a/web/e2e-tests/compose.test.ts b/web/e2e-tests/compose.test.ts index 6ba34d429b..3c3e6c3381 100644 --- a/web/e2e-tests/compose.test.ts +++ b/web/e2e-tests/compose.test.ts @@ -135,7 +135,7 @@ async function test_send_multirecipient_pm_from_cordelia_pm_narrow(page: Page): content: multiple_recipients_pm, }); - // Go back to all messages view and make sure all messages are loaded. + // Go back to the combined feed view and make sure all messages are loaded. await page.click("#left-sidebar-navigation-list .top_left_all_messages"); await page.waitForSelector(".message-list .message_row", {visible: true}); diff --git a/web/e2e-tests/message-basics.test.ts b/web/e2e-tests/message-basics.test.ts index 15f1eb5f2f..5ed5721dec 100644 --- a/web/e2e-tests/message-basics.test.ts +++ b/web/e2e-tests/message-basics.test.ts @@ -110,7 +110,7 @@ async function un_narrow(page: Page): Promise { await page.waitForSelector(".message-list .message_row", {visible: true}); // Assert that there is only one message list. assert.equal((await page.$$(".message-list")).length, 1); - assert.strictEqual(await page.title(), "All messages - Zulip Dev - Zulip"); + assert.strictEqual(await page.title(), "Combined feed - Zulip Dev - Zulip"); } async function un_narrow_by_clicking_org_icon(page: Page): Promise { diff --git a/web/e2e-tests/stars.test.ts b/web/e2e-tests/stars.test.ts index 862a85f782..b3b8d026ba 100644 --- a/web/e2e-tests/stars.test.ts +++ b/web/e2e-tests/stars.test.ts @@ -32,7 +32,7 @@ async function test_narrow_to_starred_messages(page: Page): Promise { const message_list_id = await common.get_current_msg_list_id(page, true); await common.check_messages_sent(page, message_list_id, [["Verona > stars", [message]]]); - // Go back to all messages narrow. + // Go back to the combined feed view. await page.click("#left-sidebar-navigation-list .top_left_all_messages"); await page.waitForSelector(".message-list .message_row", {visible: true}); } diff --git a/web/src/compose_closed_ui.js b/web/src/compose_closed_ui.js index f552033a27..46420489ba 100644 --- a/web/src/compose_closed_ui.js +++ b/web/src/compose_closed_ui.js @@ -175,7 +175,7 @@ export function initialize() { $(document).on("message_selected.zulip", () => { if (narrow_state.is_message_feed_visible()) { // message_selected events can occur with Recent Conversations - // open due to "All messages" loading in the background, + // open due to the combined feed view loading in the background, // so we only update if message feed is visible. update_reply_recipient_label(); } diff --git a/web/src/compose_tooltips.ts b/web/src/compose_tooltips.ts index 883aa227c6..0180859196 100644 --- a/web/src/compose_tooltips.ts +++ b/web/src/compose_tooltips.ts @@ -162,7 +162,9 @@ export function initialize(): void { let display_current_view; if (narrow_state.is_message_feed_visible()) { if (narrow_filter === undefined) { - display_current_view = $t({defaultMessage: "Currently viewing all messages."}); + display_current_view = $t({ + defaultMessage: "Currently viewing your combined feed.", + }); } else if ( _.isEqual(narrow_filter.sorted_term_types(), ["channel"]) && compose_state.get_message_type() === "stream" && diff --git a/web/src/filter.ts b/web/src/filter.ts index bb17fc4cd3..7804c12cd4 100644 --- a/web/src/filter.ts +++ b/web/src/filter.ts @@ -574,7 +574,7 @@ export class Filter { const parts: Part[] = []; if (terms.length === 0) { - parts.push({type: "plain_text", content: "all messages"}); + parts.push({type: "plain_text", content: "combined feed"}); return parts; } @@ -712,7 +712,7 @@ export class Filter { } is_in_home(): boolean { - // All messages view. + // Combined feed view return this._terms.length === 1 && this.has_operand("in", "home"); } @@ -852,7 +852,7 @@ export class Filter { // This is used to control the behaviour for "exiting search" // within a narrow (E.g. a stream/topic + search) to bring you to // the containing common narrow (stream/topic, in the example) - // rather than "All messages". + // rather than the "Combined feed" view. // // Note from tabbott: The slug-based approach may not be ideal; we // may be able to do better another way. @@ -1023,7 +1023,7 @@ export class Filter { if (term_types.length === 1) { switch (term_types[0]) { case "in-home": - return $t({defaultMessage: "All messages"}); + return $t({defaultMessage: "Combined feed"}); case "in-all": return $t({defaultMessage: "All messages including muted streams"}); case "channels-public": diff --git a/web/src/left_sidebar_navigation_area_popovers.js b/web/src/left_sidebar_navigation_area_popovers.js index 8dafc4e47b..1fb75d748b 100644 --- a/web/src/left_sidebar_navigation_area_popovers.js +++ b/web/src/left_sidebar_navigation_area_popovers.js @@ -146,7 +146,7 @@ export function initialize() { }, }); - // All messages popover + // Combined feed popover popover_menus.register_popover_menu(".all-messages-sidebar-menu-icon", { ...popover_menus.left_sidebar_tippy_options, onMount(instance) { diff --git a/web/src/message_fetch.js b/web/src/message_fetch.js index 6f588812ce..0d292a6c0b 100644 --- a/web/src/message_fetch.js +++ b/web/src/message_fetch.js @@ -304,7 +304,7 @@ export function load_messages(opts, attempt = 1) { const web_public_narrow = {negated: false, operator: "channels", operand: "web-public"}; if (!data.narrow) { - /* For the "All messages" feed, this will be the only operator. */ + /* 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 diff --git a/web/src/message_view_header.ts b/web/src/message_view_header.ts index 04fe2e14ca..4e821ec463 100644 --- a/web/src/message_view_header.ts +++ b/web/src/message_view_header.ts @@ -49,7 +49,7 @@ function get_message_view_header_context(filter: Filter | undefined): MessageVie } if (filter === undefined) { return { - title: $t({defaultMessage: "All messages"}), + title: $t({defaultMessage: "Combined feed"}), zulip_icon: "all-messages", }; } diff --git a/web/src/narrow.js b/web/src/narrow.js index 594403610d..ed7a1b8a1c 100644 --- a/web/src/narrow.js +++ b/web/src/narrow.js @@ -87,11 +87,9 @@ export function save_narrow(terms) { } export function activate(raw_terms, opts) { - /* Main entry point for switching to a new view / message list - (including all messages and home views). + /* Main entry point for switching to a new view / message list. - The name is based on "narrowing to a subset of the user's - messages.". Supported parameters: + Supported parameters: raw_terms: Narrowing/search terms; used to construct a Filter object that decides which messages belong in the @@ -120,7 +118,7 @@ export function activate(raw_terms, opts) { or rerendering due to server-side changes. */ - // The empty narrow is the All messages view. + // No operators is an alias for the Combined Feed view. if (raw_terms.length === 0) { raw_terms = [{operator: "is", operand: "home"}]; } @@ -128,14 +126,13 @@ export function activate(raw_terms, opts) { const is_narrowed_to_all_messages_view = narrow_state.filter()?.is_in_home(); if (has_visited_all_messages && is_narrowed_to_all_messages_view && filter.is_in_home()) { - // If we're already looking at the All messages view, exit without doing any work. + // If we're already looking at the combined feed, exit without doing any work. return; } if (filter.is_in_home() && message_scroll_state.actively_scrolling) { - // `All messages` narrow. // TODO: Figure out why puppeteer test for this fails when run for narrows - // other than `All messages`. + // other than `Combined feed`. // There is no way to intercept in-flight scroll events, and they will // cause you to end up in the wrong place if you are actively scrolling @@ -146,7 +143,8 @@ export function activate(raw_terms, opts) { return; } - // Use to determine if user read any unread messages in non-All Messages narrow. + // Use to determine if user read any unread messages outside the combined feed. + // BUG: This doesn't check for the combined feed? const was_narrowed_already = narrow_state.filter() !== undefined; // Since narrow.activate is called directly from various @@ -155,7 +153,9 @@ export function activate(raw_terms, opts) { if ( page_params.is_spectator && raw_terms.length && - // Allow spectator to access all messages view. + // TODO: is:home is currently not permitted for spectators + // because they can't mute things; maybe that's the wrong + // policy? !filter.is_in_home() && raw_terms.some( (raw_term) => !hash_parser.allowed_web_public_narrows.includes(raw_term.operator), @@ -493,9 +493,11 @@ export function activate(raw_terms, opts) { then_select_offset = message_lists.current.pre_narrow_offset; id_info.final_select_id = message_lists.current.selected_id(); } - // We are navigating to the All messages view from another narrow, so we reset the - // reading state to allow user to read messages again in All messages view if user has - // marked some messages as unread in the last All messages session and thus prevented reading. + // We are navigating to the combined feed from another + // narrow, so we reset the reading state to allow user to + // read messages again in the combined feed if user has + // marked some messages as unread in the last combined + // feed session and thus prevented reading. message_lists.current.resume_reading(); // Reset the collapsed status of messages rows. condense.condense_and_collapse(message_lists.current.view.$list.find(".message_row")); @@ -504,7 +506,7 @@ export function activate(raw_terms, opts) { message_feed_top_notices.update_top_of_narrow_notices(msg_list); // We may need to scroll to the selected message after swapping - // the currently displayed center panel to All messages. + // the currently displayed center panel to the combined feed. message_viewport.maybe_scroll_to_selected(); } else { select_immediately = id_info.local_select_id !== undefined; diff --git a/web/src/narrow_state.ts b/web/src/narrow_state.ts index 4237ef2d7a..ccb2451de0 100644 --- a/web/src/narrow_state.ts +++ b/web/src/narrow_state.ts @@ -11,7 +11,7 @@ import * as unread from "./unread"; export let has_shown_message_list_view = false; export function filter(): Filter | undefined { - // `All messages`, `Recent Conversations` and `Inbox` return undefined; + // `Combined feed`, `Recent Conversations` and `Inbox` return undefined; if (message_lists.current === undefined || message_lists.current.data.filter.is_in_home()) { return undefined; } diff --git a/web/src/narrow_title.ts b/web/src/narrow_title.ts index 88af12c9f7..99455d2f1e 100644 --- a/web/src/narrow_title.ts +++ b/web/src/narrow_title.ts @@ -16,8 +16,7 @@ export let narrow_title = "home"; export function compute_narrow_title(filter?: Filter): string { if (filter === undefined) { - // "All messages" and "Recent conversations" views have - // an `undefined` filter. + // Views without a message feed in the center pane. if (recent_view_util.is_visible()) { return $t({defaultMessage: "Recent conversations"}); } diff --git a/web/src/settings_config.ts b/web/src/settings_config.ts index 88d1436712..31a6c3a608 100644 --- a/web/src/settings_config.ts +++ b/web/src/settings_config.ts @@ -99,7 +99,7 @@ export const web_home_view_values = { }, all_messages: { code: "all_messages", - description: $t({defaultMessage: "All messages"}), + description: $t({defaultMessage: "Combined feed"}), }, }; diff --git a/web/src/todo_widget.js b/web/src/todo_widget.js index 77041b4a76..9ca457b1f3 100644 --- a/web/src/todo_widget.js +++ b/web/src/todo_widget.js @@ -137,9 +137,8 @@ export class TaskData { }, inbound: (sender_id, data) => { - // All messages readers may add tasks. - // for legacy reasons, the inbound idx is - // called key in the event + // All readers may add tasks. For legacy reasons, the + // inbound idx is called key in the event. const idx = data.key; const task = data.task; const desc = data.desc; diff --git a/web/src/user_topics_ui.js b/web/src/user_topics_ui.js index ef17e729cf..5993574c2f 100644 --- a/web/src/user_topics_ui.js +++ b/web/src/user_topics_ui.js @@ -47,7 +47,7 @@ export function handle_topic_updates(user_topic_event) { } setTimeout(0, () => { - /* Rerender "all messages" if necessary, but defer until after + /* Rerender the combined feed view if necessary, but defer until after * the browser has rendered the DOM updates scheduled above. */ if (message_lists.current !== message_lists.home) { message_lists.home.update_muting_and_rerender(); diff --git a/web/src/widgetize.ts b/web/src/widgetize.ts index 349c566c00..cbbbad2aed 100644 --- a/web/src/widgetize.ts +++ b/web/src/widgetize.ts @@ -50,7 +50,7 @@ function set_widget_in_message($row: JQuery, $widget_elem: JQuery): void { // Avoid adding the $widget_elem if it already exists. // This can happen when the app loads in the "Recent Conversations" - // view and the user changes the view to "All messages". + // view and the user changes the view to "Combined feed". // This is important since jQuery removes all the event handlers // on `empty()`ing an element. if ($content_holder.find(".widget-content").length === 0) { diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs index 3ada58b7f4..34981353dd 100644 --- a/web/templates/left_sidebar.hbs +++ b/web/templates/left_sidebar.hbs @@ -81,7 +81,7 @@ {{~!-- squash whitespace --~}} - {{t 'All messages' }} + {{t 'Combined feed' }} diff --git a/web/templates/popovers/left_sidebar_all_messages_popover.hbs b/web/templates/popovers/left_sidebar_all_messages_popover.hbs index ab3b080f75..c2e9cbb80e 100644 --- a/web/templates/popovers/left_sidebar_all_messages_popover.hbs +++ b/web/templates/popovers/left_sidebar_all_messages_popover.hbs @@ -13,7 +13,7 @@ {{#tr}} - Make all messages my home view + Make combined feed my home view {{/tr}} diff --git a/web/templates/tooltip_templates.hbs b/web/templates/tooltip_templates.hbs index 6bf9c86cbd..4f42614b4f 100644 --- a/web/templates/tooltip_templates.hbs +++ b/web/templates/tooltip_templates.hbs @@ -93,7 +93,7 @@