mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	compose_state: Rename private_message_recipient to clarify it stores emails.
This will add clarity as we move towards using ids more and emails less.
This commit is contained in:
		@@ -109,7 +109,7 @@ function assert_hidden(sel) {
 | 
			
		||||
    assert.ok(!$(sel).visible());
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function override_private_message_recipient({override}) {
 | 
			
		||||
function override_private_message_recipient_emails({override}) {
 | 
			
		||||
    let recipient;
 | 
			
		||||
    override(compose_pm_pill, "set_from_emails", (value) => {
 | 
			
		||||
        recipient = value;
 | 
			
		||||
@@ -146,7 +146,7 @@ test("initial_state", () => {
 | 
			
		||||
 | 
			
		||||
test("start", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
    mock_banners();
 | 
			
		||||
    override_private_message_recipient({override});
 | 
			
		||||
    override_private_message_recipient_emails({override});
 | 
			
		||||
    override_rewire(compose_actions, "autosize_message_content", noop);
 | 
			
		||||
    override_rewire(compose_actions, "expand_compose_box", noop);
 | 
			
		||||
    override_rewire(compose_actions, "complete_starting_tasks", noop);
 | 
			
		||||
@@ -259,7 +259,7 @@ test("start", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
    assert_hidden("input#stream_message_recipient_topic");
 | 
			
		||||
    assert_visible("#compose-direct-recipient");
 | 
			
		||||
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient(), "foo@example.com");
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient_emails(), "foo@example.com");
 | 
			
		||||
    assert.equal($("textarea#compose-textarea").val(), "hello");
 | 
			
		||||
    assert.equal(compose_state.get_message_type(), "private");
 | 
			
		||||
    assert.ok(compose_state.composing());
 | 
			
		||||
@@ -272,7 +272,7 @@ test("start", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
 | 
			
		||||
    start(opts);
 | 
			
		||||
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient(), "");
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient_emails(), "");
 | 
			
		||||
    assert.equal(compose_state.get_message_type(), "private");
 | 
			
		||||
    assert.ok(compose_state.composing());
 | 
			
		||||
 | 
			
		||||
@@ -310,7 +310,7 @@ test("respond_to_message", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
 | 
			
		||||
    override_rewire(compose_recipient, "on_compose_select_recipient_update", noop);
 | 
			
		||||
    override_rewire(compose_recipient, "check_posting_policy_for_compose_box", noop);
 | 
			
		||||
    override_private_message_recipient({override});
 | 
			
		||||
    override_private_message_recipient_emails({override});
 | 
			
		||||
    mock_template("inline_decorated_channel_name.hbs", false, noop);
 | 
			
		||||
 | 
			
		||||
    override(realm, "realm_direct_message_permission_group", nobody.id);
 | 
			
		||||
@@ -336,7 +336,7 @@ test("respond_to_message", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    respond_to_message(opts);
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient(), "alice@example.com");
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient_emails(), "alice@example.com");
 | 
			
		||||
 | 
			
		||||
    // Test stream
 | 
			
		||||
    const denmark = {
 | 
			
		||||
@@ -373,7 +373,7 @@ test("reply_with_mention", ({override, override_rewire, mock_template}) => {
 | 
			
		||||
    $elem.set_find_results(".message-textarea", $textarea);
 | 
			
		||||
    $elem.set_find_results(".message-limit-indicator", $indicator);
 | 
			
		||||
 | 
			
		||||
    override_private_message_recipient({override});
 | 
			
		||||
    override_private_message_recipient_emails({override});
 | 
			
		||||
    override_rewire(compose_recipient, "check_posting_policy_for_compose_box", noop);
 | 
			
		||||
    mock_template("inline_decorated_channel_name.hbs", false, noop);
 | 
			
		||||
 | 
			
		||||
@@ -448,7 +448,7 @@ test("quote_message", ({disallow, override, override_rewire}) => {
 | 
			
		||||
 | 
			
		||||
    override_rewire(compose_actions, "complete_starting_tasks", noop);
 | 
			
		||||
    override_rewire(compose_actions, "clear_textarea", noop);
 | 
			
		||||
    override_private_message_recipient({override});
 | 
			
		||||
    override_private_message_recipient_emails({override});
 | 
			
		||||
 | 
			
		||||
    let selected_message;
 | 
			
		||||
    override(message_lists.current, "get", (id) => (id === 100 ? selected_message : undefined));
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ const {set_realm} = zrequire("state_data");
 | 
			
		||||
const realm = {};
 | 
			
		||||
set_realm(realm);
 | 
			
		||||
 | 
			
		||||
run_test("private_message_recipient", ({override}) => {
 | 
			
		||||
run_test("private_message_recipient_emails", ({override}) => {
 | 
			
		||||
    let emails;
 | 
			
		||||
    override(compose_pm_pill, "set_from_emails", (value) => {
 | 
			
		||||
        emails = value;
 | 
			
		||||
@@ -23,8 +23,8 @@ run_test("private_message_recipient", ({override}) => {
 | 
			
		||||
 | 
			
		||||
    override(compose_pm_pill, "get_emails", () => emails);
 | 
			
		||||
 | 
			
		||||
    compose_state.private_message_recipient("fred@fred.org");
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient(), "fred@fred.org");
 | 
			
		||||
    compose_state.private_message_recipient_emails("fred@fred.org");
 | 
			
		||||
    assert.equal(compose_state.private_message_recipient_emails(), "fred@fred.org");
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
run_test("has_full_recipient", ({override}) => {
 | 
			
		||||
@@ -51,9 +51,9 @@ run_test("has_full_recipient", ({override}) => {
 | 
			
		||||
    assert.equal(compose_state.has_full_recipient(), true);
 | 
			
		||||
 | 
			
		||||
    compose_state.set_message_type("private");
 | 
			
		||||
    compose_state.private_message_recipient("");
 | 
			
		||||
    compose_state.private_message_recipient_emails("");
 | 
			
		||||
    assert.equal(compose_state.has_full_recipient(), false);
 | 
			
		||||
 | 
			
		||||
    compose_state.private_message_recipient("foo@zulip.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("foo@zulip.com");
 | 
			
		||||
    assert.equal(compose_state.has_full_recipient(), true);
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
@@ -229,7 +229,7 @@ test_ui("validate", ({mock_template, override}) => {
 | 
			
		||||
 | 
			
		||||
    initialize_pm_pill(mock_template);
 | 
			
		||||
    add_content_to_compose_box();
 | 
			
		||||
    compose_state.private_message_recipient("");
 | 
			
		||||
    compose_state.private_message_recipient_emails("");
 | 
			
		||||
    let pm_recipient_error_rendered = false;
 | 
			
		||||
    override(realm, "realm_direct_message_permission_group", everyone.id);
 | 
			
		||||
    override(realm, "realm_direct_message_initiator_group", everyone.id);
 | 
			
		||||
@@ -246,7 +246,7 @@ test_ui("validate", ({mock_template, override}) => {
 | 
			
		||||
    pm_recipient_error_rendered = false;
 | 
			
		||||
 | 
			
		||||
    people.add_active_user(bob);
 | 
			
		||||
    compose_state.private_message_recipient("bob@example.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("bob@example.com");
 | 
			
		||||
    assert.ok(compose_validate.validate());
 | 
			
		||||
    assert.ok(!pm_recipient_error_rendered);
 | 
			
		||||
 | 
			
		||||
@@ -280,7 +280,7 @@ test_ui("validate", ({mock_template, override}) => {
 | 
			
		||||
 | 
			
		||||
    initialize_pm_pill(mock_template);
 | 
			
		||||
    add_content_to_compose_box();
 | 
			
		||||
    compose_state.private_message_recipient("welcome-bot@example.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("welcome-bot@example.com");
 | 
			
		||||
    $("#send_message_form").set_find_results(".message-textarea", $("textarea#compose-textarea"));
 | 
			
		||||
    assert.ok(compose_validate.validate());
 | 
			
		||||
 | 
			
		||||
@@ -301,7 +301,7 @@ test_ui("validate", ({mock_template, override}) => {
 | 
			
		||||
        return "<banner-stub>";
 | 
			
		||||
    });
 | 
			
		||||
    initialize_pm_pill(mock_template);
 | 
			
		||||
    compose_state.private_message_recipient("welcome-bot@example.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("welcome-bot@example.com");
 | 
			
		||||
    $("textarea#compose-textarea").toggleClass = (classname, value) => {
 | 
			
		||||
        assert.equal(classname, "invalid");
 | 
			
		||||
        assert.equal(value, expected_invalid_state);
 | 
			
		||||
@@ -851,7 +851,7 @@ test_ui("test_warn_if_guest_in_dm_recipient", ({mock_template, override}) => {
 | 
			
		||||
 | 
			
		||||
    compose_state.set_message_type("private");
 | 
			
		||||
    initialize_pm_pill(mock_template);
 | 
			
		||||
    compose_state.private_message_recipient("guest@example.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("guest@example.com");
 | 
			
		||||
    const classname = compose_banner.CLASSNAMES.guest_in_dm_recipient_warning;
 | 
			
		||||
    let $banner = $(`#compose_banners .${CSS.escape(classname)}`);
 | 
			
		||||
 | 
			
		||||
@@ -883,7 +883,7 @@ test_ui("test_warn_if_guest_in_dm_recipient", ({mock_template, override}) => {
 | 
			
		||||
    people.add_active_user(new_guest);
 | 
			
		||||
 | 
			
		||||
    initialize_pm_pill(mock_template);
 | 
			
		||||
    compose_state.private_message_recipient("guest@example.com, new_guest@example.com");
 | 
			
		||||
    compose_state.private_message_recipient_emails("guest@example.com, new_guest@example.com");
 | 
			
		||||
    $banner = $(`#compose_banners .${CSS.escape(classname)}`);
 | 
			
		||||
    $banner.length = 1;
 | 
			
		||||
    let is_updated = false;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user