Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

compose_call: Base meeting name on compose state.

0xthedance092bb27b5cbe
diff --git a/web/src/compose_call_ui.ts b/web/src/compose_call_ui.ts
index 6f9ba10d393..fffa41a2b97 100644
--- a/web/src/compose_call_ui.ts
+++ b/web/src/compose_call_ui.ts
@@ -5,9 +5,16 @@ import * as channel from "./channel.ts";
import * as compose_banner from "./compose_banner.ts";
import * as compose_call from "./compose_call.ts";
import {compose_call_session_manager} from "./compose_call_session.ts";
-import {get_recipient_label} from "./compose_closed_ui.ts";
+import {
+ type RecipientLabel,
+ get_channel_recipient_label,
+ get_direct_message_recipient_label,
+} from "./compose_closed_ui.ts";
+import * as compose_state from "./compose_state.ts";
import * as compose_ui from "./compose_ui.ts";
import {$t, $t_html} from "./i18n.ts";
+import * as message_store from "./message_store.ts";
+import * as people from "./people.ts";
import * as rows from "./rows.ts";
import {current_user, realm} from "./state_data.ts";
import * as ui_report from "./ui_report.ts";
@@ -19,6 +26,48 @@ const call_response_schema = z.object({
url: z.string(),
});
+// Builds the meeting/room name label for some video providers from
+// the current compose target or, when editing, from the message
+// being edited.
+export let get_recipient_label_for_call = (
+ edit_message_id: string | undefined,
+): RecipientLabel | undefined => {
+ if (edit_message_id !== undefined) {
+ const message = message_store.get(Number(edit_message_id));
+ if (message === undefined) {
+ return undefined;
+ }
+ if (message.is_stream) {
+ return get_channel_recipient_label(message.stream_id, message.topic);
+ }
+ return get_direct_message_recipient_label(
+ people.user_ids_string_to_ids_array(message.to_user_ids),
+ );
+ }
+ const message_type = compose_state.get_message_type();
+ if (message_type === "stream") {
+ const stream_id = compose_state.stream_id();
+ if (stream_id === undefined) {
+ return undefined;
+ }
+ return get_channel_recipient_label(stream_id, compose_state.topic());
+ }
+ if (message_type === "private") {
+ const recipient_ids = compose_state.private_message_recipient_ids();
+ if (recipient_ids.length === 0) {
+ return undefined;
+ }
+ return get_direct_message_recipient_label(recipient_ids);
+ }
+ return undefined;
+};
+
+export function rewire_get_recipient_label_for_call(
+ value: typeof get_recipient_label_for_call,
+): void {
+ get_recipient_label_for_call = value;
+}
+
export function update_audio_and_video_chat_button_display(): void {
update_audio_chat_button_display();
update_video_chat_button_display();
@@ -150,7 +199,7 @@ export function generate_and_insert_audio_or_video_call_link(
switch (realm.realm_video_chat_provider) {
case available_providers.big_blue_button?.id: {
const meeting_name =
- `${get_recipient_label()?.label_text ?? ""} meeting`.trimStart();
+ `${get_recipient_label_for_call(edit_message_id)?.label_text ?? ""} meeting`.trimStart();
const request = {
meeting_name,
voice_only: is_audio_call,
@@ -210,7 +259,7 @@ export function generate_and_insert_audio_or_video_call_link(
}
case available_providers.nextcloud_talk?.id: {
const room_name =
- `${get_recipient_label()?.label_text ?? ""} conversation`.trimStart();
+ `${get_recipient_label_for_call(edit_message_id)?.label_text ?? ""} conversation`.trimStart();
const request = {room_name};
const handle_success = (response: unknown): void => {
diff --git a/web/tests/compose_call.test.cjs b/web/tests/compose_call.test.cjs
index 131ddc68598..64c22822265 100644
--- a/web/tests/compose_call.test.cjs
+++ b/web/tests/compose_call.test.cjs
@@ -4,14 +4,17 @@ const assert = require("node:assert/strict");
const events = require("./lib/events.cjs");
const {make_realm} = require("./lib/example_realm.cjs");
+const {make_stream} = require("./lib/example_stream.cjs");
+const {make_user} = require("./lib/example_user.cjs");
const {mock_esm, set_global, with_overrides, zrequire} = require("./lib/namespace.cjs");
const {run_test} = require("./lib/test.cjs");
const {$} = require("./lib/zjquery.cjs");
const {page_params} = require("./lib/zpage_params.cjs");
const channel = mock_esm("../src/channel");
-const compose_closed_ui = mock_esm("../src/compose_closed_ui");
+const compose_state = mock_esm("../src/compose_state");
const compose_ui = mock_esm("../src/compose_ui");
+const message_store = mock_esm("../src/message_store");
mock_esm("../src/resize", {
watch_manual_resize() {},
});
@@ -27,13 +30,29 @@ set_global(
);
const server_events_dispatch = zrequire("server_events_dispatch");
+const compose_call_ui = zrequire("compose_call_ui");
const compose_setup = zrequire("compose_setup");
+const people = zrequire("people");
+const stream_data = zrequire("stream_data");
const {set_current_user, set_realm} = zrequire("state_data");
const realm = make_realm();
set_realm(realm);
-const current_user = {};
+const current_user = make_user({
+ email: "[email protected]",
+ user_id: 1,
+ full_name: "Alice",
+});
set_current_user(current_user);
+people.add_active_user(current_user);
+people.add_active_user(
+ make_user({
+ email: "[email protected]",
+ user_id: 2,
+ full_name: "Bob",
+ }),
+);
+people.initialize_current_user(current_user.user_id);
const realm_available_video_chat_providers = {
disabled: {
@@ -77,7 +96,7 @@ function test(label, f) {
});
}
-test("videos", ({override}) => {
+test("videos", ({override, override_rewire}) => {
override(realm, "realm_video_chat_provider", realm_available_video_chat_providers.disabled.id);
override(window, "to_$", () => $("window-stub"));
@@ -312,7 +331,9 @@ test("videos", ({override}) => {
realm_available_video_chat_providers.big_blue_button.id,
);
- override(compose_closed_ui, "get_recipient_label", () => ({label_text: "a"}));
+ override_rewire(compose_call_ui, "get_recipient_label_for_call", () => ({
+ label_text: "a",
+ }));
let success_callback;
const xhr_object = {abort() {}};
@@ -360,7 +381,7 @@ test("videos", ({override}) => {
const $textarea = $.create("bbb-empty-label-stub");
$textarea.set_parents_result(".message_edit_form", []);
- override(compose_closed_ui, "get_recipient_label", () => ({label_text: ""}));
+ override_rewire(compose_call_ui, "get_recipient_label_for_call", () => undefined);
let checked = false;
channel.get = (options) => {
@@ -452,7 +473,9 @@ test("videos", ({override}) => {
realm_available_video_chat_providers.nextcloud_talk.id,
);
- override(compose_closed_ui, "get_recipient_label", () => ({label_text: "general"}));
+ override_rewire(compose_call_ui, "get_recipient_label_for_call", () => ({
+ label_text: "general",
+ }));
let success_callback;
function call_success_callback() {
assert.ok(success_callback !== undefined);
@@ -486,7 +509,7 @@ test("videos", ({override}) => {
const $textarea = $.create("nextcloud-empty-label-stub");
$textarea.set_parents_result(".message_edit_form", []);
- override(compose_closed_ui, "get_recipient_label", () => ({label_text: ""}));
+ override_rewire(compose_call_ui, "get_recipient_label_for_call", () => undefined);
let checked = false;
channel.post = (options) => {
@@ -503,6 +526,76 @@ test("videos", ({override}) => {
})();
});
+run_test("get_recipient_label_for_call", ({override}) => {
+ const stream = make_stream({
+ subscribed: true,
+ name: "design",
+ stream_id: 200,
+ });
+ stream_data.add_sub_for_tests(stream);
+
+ // --- Compose-box branch (edit_message_id === undefined) ---
+
+ // Stream + non-empty topic.
+ override(compose_state, "get_message_type", () => "stream");
+ override(compose_state, "stream_id", () => stream.stream_id);
+ override(compose_state, "topic", () => "typography");
+ assert.equal(
+ compose_call_ui.get_recipient_label_for_call(undefined).label_text,
+ "#design > typography",
+ );
+
+ // Stream with no stream_id → undefined.
+ override(compose_state, "stream_id", () => undefined);
+ assert.equal(compose_call_ui.get_recipient_label_for_call(undefined), undefined);
+
+ // DM with distinct recipients uses the recipient full names. User 2 is
+ // "Bob", set up at the top of this file.
+ override(compose_state, "get_message_type", () => "private");
+ override(compose_state, "private_message_recipient_ids", () => [2]);
+ override(message_store, "get_pm_full_names", () => "Bob");
+ assert.equal(compose_call_ui.get_recipient_label_for_call(undefined).label_text, "Bob");
+
+ // DM compose with no pills selected yet → undefined, so the meeting-name
+ // fallback produces "meeting" instead of leaking the caller's own name via
+ // sorted_other_user_ids's self-DM fallback.
+ override(compose_state, "private_message_recipient_ids", () => []);
+ assert.equal(compose_call_ui.get_recipient_label_for_call(undefined), undefined);
+
+ // Unknown message type → undefined.
+ override(compose_state, "get_message_type", () => undefined);
+ assert.equal(compose_call_ui.get_recipient_label_for_call(undefined), undefined);
+
+ // --- Edit-form branch (edit_message_id !== undefined) ---
+ // The edit-form path reads from message_store, not compose_state, so we
+ // deliberately don't override compose_state here.
+
+ // Stream edit target uses the message's own stream/topic.
+ override(message_store, "get", () => ({
+ is_stream: true,
+ is_private: false,
+ stream_id: stream.stream_id,
+ topic: "reviews",
+ }));
+ assert.equal(
+ compose_call_ui.get_recipient_label_for_call("42").label_text,
+ "#design > reviews",
+ );
+
+ // DM edit target uses the message's own recipients.
+ override(message_store, "get", () => ({
+ is_stream: false,
+ is_private: true,
+ to_user_ids: "2",
+ }));
+ override(message_store, "get_pm_full_names", () => "Bob");
+ assert.equal(compose_call_ui.get_recipient_label_for_call("43").label_text, "Bob");
+
+ // Unknown/evicted message id → undefined.
+ override(message_store, "get", () => undefined);
+ assert.equal(compose_call_ui.get_recipient_label_for_call("999"), undefined);
+});
+
test("test_video_chat_button_toggle disabled", ({override}) => {
override(realm, "realm_video_chat_provider", realm_available_video_chat_providers.disabled.id);
override(window, "to_$", () => $("window-stub"));