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

compose: Remove Zephyr mirroring custom logic.

Browse Source 
Followup to https://github.com/zulip/zulip/pull/35921#discussion_r2320358287
This commit is contained in:
Evy Kassirer
2025-09-08 16:06:32 -07:00
committed by Tim Abbott
parent d8c0eb91c1
commit 9a5c41cb9d
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/src/compose.js
View File

@@ -16,7 +16,6 @@ import * as drafts from "./drafts.ts";
import * as echo from "./echo.ts"; import * as echo from "./echo.ts";
import * as message_events from "./message_events.ts"; import * as message_events from "./message_events.ts";
import * as onboarding_steps from "./onboarding_steps.ts"; import * as onboarding_steps from "./onboarding_steps.ts";
import * as people from "./people.ts";
import * as scheduled_messages from "./scheduled_messages.ts"; import * as scheduled_messages from "./scheduled_messages.ts";
import * as sent_messages from "./sent_messages.ts"; import * as sent_messages from "./sent_messages.ts";
import * as server_events_state from "./server_events_state.ts"; import * as server_events_state from "./server_events_state.ts";
@@ -150,26 +149,18 @@ export let send_message = () => {
let message_data; let message_data;
if (message_type === "private") { if (message_type === "private") {
// TODO: this should be collapsed with the code in composebox_typeahead.ts const recipient_emails = compose_state.private_message_recipient_emails();
const recipient = compose_state.private_message_recipient_emails(); const recipient_ids = compose_state.private_message_recipient_ids();
const emails = util.extract_pm_recipients(recipient);
const to_user_ids = people.email_list_to_user_ids_string(emails);
// Note: The `undefined` case is for situations like
// the is_zephyr_mirror_realm case where users may
// be automatically created when you try to send a
// direct message to their email address.
const request_to =
to_user_ids !== undefined ? people.user_ids_string_to_ids_array(to_user_ids) : emails;
message_data = { message_data = {
type: message_type, type: message_type,
content: compose_state.message_content(), content: compose_state.message_content(),
sender_id: current_user.user_id, sender_id: current_user.user_id,
queue_id: server_events_state.queue_id, queue_id: server_events_state.queue_id,
topic: "", topic: "",
to: JSON.stringify(request_to), to: JSON.stringify(recipient_ids),
reply_to: recipient, reply_to: recipient_emails,
private_message_recipient: recipient, private_message_recipient: recipient_emails,
to_user_ids: people.email_list_to_user_ids_string(emails), to_user_ids: util.sorted_ids(recipient_ids).join(","),
draft_id, draft_id,
stream_id: undefined, stream_id: undefined,
}; };
@@ -361,17 +352,7 @@ function schedule_message_to_custom_date() {
let message_to; let message_to;
if (message_type === "private") { if (message_type === "private") {
const recipient = compose_state.private_message_recipient_emails(); message_to = compose_state.private_message_recipient_ids();
const emails = util.extract_pm_recipients(recipient);
const to_user_ids = people.email_list_to_user_ids_string(emails);
message_to = util.extract_pm_recipients(recipient);
// Note: The `undefined` case is for situations like
// the is_zephyr_mirror_realm case where users may
// be automatically created when you try to send a
// direct message to their email address.
if (to_user_ids !== undefined) {
message_to = people.user_ids_string_to_ids_array(to_user_ids);
}
} else { } else {
message_to = compose_state.stream_id(); message_to = compose_state.stream_id();
} }

1
web/tests/compose.test.cjs
View File

@@ -309,6 +309,7 @@ test_ui("send_message", ({override, override_rewire, mock_template}) => {
compose_state.set_message_type("private"); compose_state.set_message_type("private");
override(current_user, "user_id", new_user.user_id); override(current_user, "user_id", new_user.user_id);
override(compose_pm_pill, "get_emails", () => "alice@example.com"); override(compose_pm_pill, "get_emails", () => "alice@example.com");
override(compose_pm_pill, "get_user_ids", () => [alice.user_id]);
const server_message_id = 127; const server_message_id = 127;
override(markdown, "render", noop); override(markdown, "render", noop);