paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 19:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

scheduled_message: Rename data object for clarity.

Browse Source 
This helps identify value stored in the object without additional
comment.
This commit is contained in:
Aman Agrawal
2025-06-30 12:37:11 +05:30
committed by Tim Abbott
parent d2035c6cb0
commit 856f6e06a9
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/scheduled_messages.ts
View File

@@ -18,8 +18,7 @@ type SendOption = Partial<Record<TimeKey, {text: string; stamp: number}>>;
export const MINIMUM_SCHEDULED_MESSAGE_DELAY_SECONDS = 5 * 60; export const MINIMUM_SCHEDULED_MESSAGE_DELAY_SECONDS = 5 * 60;
// scheduled_messages_data is a map where key=scheduled_message_id and value=scheduled_messages export const scheduled_messages_by_id = new Map<number, ScheduledMessage>();
export const scheduled_messages_data = new Map<number, ScheduledMessage>();
let selected_send_later_timestamp: number | undefined; let selected_send_later_timestamp: number | undefined;
@@ -54,22 +53,22 @@ function compute_send_times(now = new Date()): Record<TimeKey, number> {
export function add_scheduled_messages(scheduled_messages: ScheduledMessage[]): void { export function add_scheduled_messages(scheduled_messages: ScheduledMessage[]): void {
for (const scheduled_message of scheduled_messages) { for (const scheduled_message of scheduled_messages) {
scheduled_messages_data.set(scheduled_message.scheduled_message_id, scheduled_message); scheduled_messages_by_id.set(scheduled_message.scheduled_message_id, scheduled_message);
} }
} }
export function remove_scheduled_message(scheduled_message_id: number): void { export function remove_scheduled_message(scheduled_message_id: number): void {
if (scheduled_messages_data.has(scheduled_message_id)) { if (scheduled_messages_by_id.has(scheduled_message_id)) {
scheduled_messages_data.delete(scheduled_message_id); scheduled_messages_by_id.delete(scheduled_message_id);
} }
} }
export function update_scheduled_message(scheduled_message: ScheduledMessage): void { export function update_scheduled_message(scheduled_message: ScheduledMessage): void {
if (!scheduled_messages_data.has(scheduled_message.scheduled_message_id)) { if (!scheduled_messages_by_id.has(scheduled_message.scheduled_message_id)) {
return; return;
} }
scheduled_messages_data.set(scheduled_message.scheduled_message_id, scheduled_message); scheduled_messages_by_id.set(scheduled_message.scheduled_message_id, scheduled_message);
} }
export function delete_scheduled_message(scheduled_msg_id: number, success?: () => void): void { export function delete_scheduled_message(scheduled_msg_id: number, success?: () => void): void {
@@ -80,7 +79,7 @@ export function delete_scheduled_message(scheduled_msg_id: number, success?: ()
} }
export function get_count(): number { export function get_count(): number {
return scheduled_messages_data.size; return scheduled_messages_by_id.size;
} }
export function get_filtered_send_opts(date: Date): { export function get_filtered_send_opts(date: Date): {

2
web/src/scheduled_messages_feed_ui.ts
View File

@@ -8,7 +8,7 @@ import type {ScheduledMessage} from "./scheduled_messages.ts";
import * as util from "./util.ts"; import * as util from "./util.ts";
function get_scheduled_messages_matching_narrow(): ScheduledMessage[] { function get_scheduled_messages_matching_narrow(): ScheduledMessage[] {
const scheduled_messages_list = [...scheduled_messages.scheduled_messages_data.values()]; const scheduled_messages_list = [...scheduled_messages.scheduled_messages_by_id.values()];
const filter = narrow_state.filter(); const filter = narrow_state.filter();
const is_conversation_view = const is_conversation_view =
filter === undefined filter === undefined

6
web/src/scheduled_messages_overlay_ui.ts
View File

@@ -39,7 +39,7 @@ type ScheduledMessageRenderContext = ScheduledMessage &
export const keyboard_handling_context = { export const keyboard_handling_context = {
get_items_ids() { get_items_ids() {
const scheduled_messages_ids = []; const scheduled_messages_ids = [];
const sorted_messages = sort_scheduled_messages(scheduled_messages.scheduled_messages_data); const sorted_messages = sort_scheduled_messages(scheduled_messages.scheduled_messages_by_id);
for (const message of sorted_messages) { for (const message of sorted_messages) {
scheduled_messages_ids.push(message.scheduled_message_id.toString()); scheduled_messages_ids.push(message.scheduled_message_id.toString());
} }
@@ -139,7 +139,7 @@ export function launch(): void {
}); });
const rendered_list = render_scheduled_message({ const rendered_list = render_scheduled_message({
scheduled_messages_data: format(scheduled_messages.scheduled_messages_data), scheduled_messages_data: format(scheduled_messages.scheduled_messages_by_id),
}); });
const $messages_list = $("#scheduled_messages_overlay .overlay-messages-list"); const $messages_list = $("#scheduled_messages_overlay .overlay-messages-list");
$messages_list.append($(rendered_list)); $messages_list.append($(rendered_list));
@@ -153,7 +153,7 @@ export function rerender(): void {
return; return;
} }
const rendered_list = render_scheduled_message({ const rendered_list = render_scheduled_message({
scheduled_messages_data: format(scheduled_messages.scheduled_messages_data), scheduled_messages_data: format(scheduled_messages.scheduled_messages_by_id),
}); });
const $messages_list = $("#scheduled_messages_overlay .overlay-messages-list"); const $messages_list = $("#scheduled_messages_overlay .overlay-messages-list");
$messages_list.find(".scheduled-message-row").remove(); $messages_list.find(".scheduled-message-row").remove();

2
web/src/scheduled_messages_ui.ts
View File

@@ -120,7 +120,7 @@ export function edit_scheduled_message(
scheduled_message_id: number, scheduled_message_id: number,
should_narrow_to_recipient = true, should_narrow_to_recipient = true,
): void { ): void {
const scheduled_msg = scheduled_messages.scheduled_messages_data.get(scheduled_message_id); const scheduled_msg = scheduled_messages.scheduled_messages_by_id.get(scheduled_message_id);
assert(scheduled_msg !== undefined); assert(scheduled_msg !== undefined);
scheduled_messages.delete_scheduled_message(scheduled_message_id, () => { scheduled_messages.delete_scheduled_message(scheduled_message_id, () => {