Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
message_store: Rename topic link maps to outgoing and incoming.
Aman Agrawalf862fd0b9cdf
diff --git a/web/src/message_store.ts b/web/src/message_store.tsindex 90ebed33dc9..52a4668a961 100644--- a/web/src/message_store.ts+++ b/web/src/message_store.ts@@ -502,37 +502,40 @@ function get_or_create_link_map_for_narrow<T>(// lowercased topic name.//// from_stream_id -> lowercased from_topic -> from_message_id -> TopicLink[]-const topic_links_by_from = new Map<number, Map<string, Map<number, TopicLink[]>>>();-export function topic_links_by_from_for_testing(): Map<+const topic_links_outgoing = new Map<number, Map<string, Map<number, TopicLink[]>>>();+export function topic_links_outgoing_for_testing(): Map<number,Map<string, Map<number, TopicLink[]>>> {- return topic_links_by_from;+ return topic_links_outgoing;}// to_stream_id -> lowercased to_topic -> to_message_id -> from_message_id[]// Instead of storing a TopicLink, this only stores the from_message_id// since we can get that message's narrow data from its id.-const topic_links_by_to = new Map<number, Map<string, Map<number, number[]>>>();-export function topic_links_by_to_for_testing(): Map<number, Map<string, Map<number, number[]>>> {- return topic_links_by_to;+const topic_links_incoming = new Map<number, Map<string, Map<number, number[]>>>();+export function topic_links_incoming_for_testing(): Map<+ number,+ Map<string, Map<number, number[]>>+> {+ return topic_links_incoming;}export function clear_topic_links_for_testing(): void {- topic_links_by_from.clear();- topic_links_by_to.clear();+ topic_links_outgoing.clear();+ topic_links_incoming.clear();}// Returns the cross-conversation links found in this narrow, resolved to// each target's current location. The popover view turns these into the// render context for the channel-icon link templates.export function topic_links_from_narrow(stream_id: number, topic: string): TopicLink[] {- const narrow_map = get_link_map_for_narrow(topic_links_by_from, stream_id, topic);+ const narrow_map = get_link_map_for_narrow(topic_links_outgoing, stream_id, topic);if (narrow_map === undefined) {return [];}- // `topic_links_by_from` stores messages by the order they're inserted,+ // `topic_links_outgoing` stores messages by the order they're inserted,// which is the order they're fetched from the server, which isn't necessarily// by most recent, e.g. if a user fetches scrolls back in a conversation to// load more messages. So now we sort them, but we can sort by ID instead of@@ -580,12 +583,12 @@ export function topic_links_from_narrow(stream_id: number, topic: string): Topic}export function topic_links_to_narrow(stream_id: number, topic: string): TopicLink[] {- const narrow_map = get_link_map_for_narrow(topic_links_by_to, stream_id, topic);+ const narrow_map = get_link_map_for_narrow(topic_links_incoming, stream_id, topic);if (narrow_map === undefined) {return [];}- // `topic_links_by_to` stores messages by the order they're inserted,+ // `topic_links_incoming` stores messages by the order they're inserted,// which is the order they're fetched from the server, which isn't necessarily// by most recent, e.g. if a user fetches scrolls back in a conversation to// load more messages. So now we sort them, but we can sort by ID instead of@@ -635,9 +638,9 @@ function update_or_remove_links_to_message(old_message_id: number,new_message_id: number | undefined,): void {- const links_to_narrow = get_link_map_for_narrow(topic_links_by_to, stream_id, topic);+ const links_to_narrow = get_link_map_for_narrow(topic_links_incoming, stream_id, topic);if (links_to_narrow?.has(old_message_id)) {- // Update records in `topic_links_by_to` for messages pointing to the message+ // Update records in `topic_links_incoming` for messages pointing to the message// we're updating.const messages_linking_to_updated_message = links_to_narrow.get(old_message_id)!;links_to_narrow.delete(old_message_id);@@ -653,14 +656,14 @@ function update_or_remove_links_to_message();}- // Update/delete the matching links in `topic_links_by_from`+ // Update/delete the matching links in `topic_links_outgoing`// i.e. links from messages to this updated message, since they need// to point to the correct new message id.for (const message_id of messages_linking_to_updated_message) {const message = get(message_id);assert(message?.type === "stream");const links_from_narrow = get_link_map_for_narrow(- topic_links_by_from,+ topic_links_outgoing,message.stream_id,message.topic,)!;@@ -689,16 +692,16 @@ function update_or_remove_links_from_message(old_message_id: number,new_message_id: number | undefined,): void {- const links_from_narrow = get_link_map_for_narrow(topic_links_by_from, stream_id, topic);+ const links_from_narrow = get_link_map_for_narrow(topic_links_outgoing, stream_id, topic);if (links_from_narrow?.has(old_message_id)) {- // Update records in `topic_links_by_from` from message we're updating.+ // Update records in `topic_links_outgoing` from message we're updating.const messages_linked_from_updated_message = links_from_narrow.get(old_message_id)!;links_from_narrow.delete(old_message_id);if (new_message_id) {links_from_narrow.set(new_message_id, messages_linked_from_updated_message);}- // Delete matching records in `topic_links_by_to`,+ // Delete matching records in `topic_links_incoming`,// i.e. links to messages from this updated message, since they need// to store correct new message id.for (const link of messages_linked_from_updated_message) {@@ -708,7 +711,7 @@ function update_or_remove_links_from_message(const to_message = link.message_id === undefined ? undefined : get(link.message_id);const to_narrow = to_message?.type === "stream" ? to_message : link;const link_map = get_link_map_for_narrow(- topic_links_by_to,+ topic_links_incoming,to_narrow.stream_id,to_narrow.topic,);@@ -812,9 +815,9 @@ export function save_topic_links(message: Message): void {continue;}- // (1) Save link in topic_links_by_from+ // (1) Save link in topic_links_outgoingconst topic_links_from_message_narrow = get_or_create_link_map_for_narrow(- topic_links_by_from,+ topic_links_outgoing,message.stream_id,message.topic,);@@ -827,9 +830,9 @@ export function save_topic_links(message: Message): void {});topic_links_from_message_narrow.set(message.id, topic_links_from_message);- // (2) Save link in topic_links_by_to+ // (2) Save link in topic_links_incomingconst topic_links_to_message_narrow = get_or_create_link_map_for_narrow(- topic_links_by_to,+ topic_links_incoming,to_stream_id,to_topic,);@@ -868,14 +871,14 @@ export function process_topic_edit(opts: {// Move any links from this message stored with the old topicconst links_from_old_narrow = get_link_map_for_narrow(- topic_links_by_from,+ topic_links_outgoing,old_stream_id,old_topic,);const links_from_edited_message = links_from_old_narrow?.get(message_id);if (links_from_edited_message !== undefined) {const new_narrow_link_map = get_or_create_link_map_for_narrow(- topic_links_by_from,+ topic_links_outgoing,new_stream_id,new_topic,);@@ -885,14 +888,14 @@ export function process_topic_edit(opts: {// Move any links to this message stored with the old topicconst links_to_old_narrow = get_link_map_for_narrow(- topic_links_by_to,+ topic_links_incoming,old_stream_id,old_topic,);const links_to_edited_message = links_to_old_narrow?.get(message_id);if (links_to_edited_message !== undefined) {const new_narrow_link_map = get_or_create_link_map_for_narrow(- topic_links_by_to,+ topic_links_incoming,new_stream_id,new_topic,);diff --git a/web/tests/message_store.test.cjs b/web/tests/message_store.test.cjsindex b7af359e994..1a3dd0884da 100644--- a/web/tests/message_store.test.cjs+++ b/web/tests/message_store.test.cjs@@ -587,8 +587,8 @@ test("maybe_update_raw_content", () => {test("save_topic_links", () => {function assert_maps_empty() {- assert.deepEqual(message_store.topic_links_by_to_for_testing(), new Map());- assert.deepEqual(message_store.topic_links_by_from_for_testing(), new Map());+ assert.deepEqual(message_store.topic_links_incoming_for_testing(), new Map());+ assert.deepEqual(message_store.topic_links_outgoing_for_testing(), new Map());}function message_with_content(content) {@@ -630,11 +630,11 @@ test("save_topic_links", () => {let message = message_with_content(`<div><a href='${link}'>a link!</a>`);message_store.save_topic_links(message);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[10, new Map([["hello", new Map([[0, [message.id]]])]])]]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[message.stream_id,@@ -682,11 +682,11 @@ test("save_topic_links", () => {});message_store.save_topic_links(message);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[10, new Map([["hello", new Map([[linked_message.id, [message.id]]])]])]]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[message.stream_id,@@ -792,13 +792,13 @@ test("get and update topic links to/from narrow", () => {"/#narrow/channel/10-design/topic/goodbye/",);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[design.stream_id, new Map([["goodbye", new Map([[NO_MESSAGE_ID, [message1.id]]])]])],]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[development.stream_id,@@ -838,7 +838,7 @@ test("get and update topic links to/from narrow", () => {"/#narrow/channel/10-design/topic/second-goodbye/",);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[design.stream_id,@@ -857,7 +857,7 @@ test("get and update topic links to/from narrow", () => {]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[development.stream_id,@@ -920,7 +920,7 @@ test("get and update topic links to/from narrow", () => {"/#narrow/channel/10-design/topic/hello/",);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[design.stream_id,@@ -934,7 +934,7 @@ test("get and update topic links to/from narrow", () => {]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[development.stream_id,@@ -1032,7 +1032,7 @@ test("get and update topic links to/from narrow", () => {// The high level topic maps will have data from both messages.assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[design.stream_id,@@ -1051,7 +1051,7 @@ test("get and update topic links to/from narrow", () => {]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[development.stream_id,@@ -1149,7 +1149,7 @@ test("get and update topic links to/from narrow", () => {);assert.deepEqual(- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_incoming_for_testing(),new Map([[design.stream_id,@@ -1182,7 +1182,7 @@ test("get and update topic links to/from narrow", () => {]),);assert.deepEqual(- message_store.topic_links_by_from_for_testing(),+ message_store.topic_links_outgoing_for_testing(),new Map([[development.stream_id,@@ -1672,8 +1672,8 @@ test("reify_message_id handles a message that links to itself", () => {message_store.remove([632]);for (const link_map of [- message_store.topic_links_by_from_for_testing(),- message_store.topic_links_by_to_for_testing(),+ message_store.topic_links_outgoing_for_testing(),+ message_store.topic_links_incoming_for_testing(),]) {assert.equal(link_map.get(design.stream_id).get("logo").size, 0);}@@ -1694,6 +1694,6 @@ test("process_topic_edit ignores messages missing from the local cache", () => {new_topic: "moved",});- assert.deepEqual(message_store.topic_links_by_from_for_testing(), new Map());- assert.deepEqual(message_store.topic_links_by_to_for_testing(), new Map());+ assert.deepEqual(message_store.topic_links_outgoing_for_testing(), new Map());+ assert.deepEqual(message_store.topic_links_incoming_for_testing(), new Map());});