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

compose-actions: Load compose box for PMs based on org policy.

Browse Source 
If an organization has disabled sending private messages, we do not
want to load the compose box automatically for "pm-with" narrows.

We still open the compose box for private messages narrows with a
single bot user as this is not limited by this organization setting.

Also, if the compose box was active/started in a narrow with a bot
user, but had no content, then we want to close/cancel that in a
new narrow with a person or group.
This commit is contained in:
Lauryn Menard
2022-11-04 18:56:56 +01:00
committed by Tim Abbott
parent 836db701aa
commit 09c4e2f662
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/compose_actions.js
View File

@@ -25,6 +25,7 @@ import * as recent_topics_ui from "./recent_topics_ui";
import * as recent_topics_util from "./recent_topics_util";
import * as reload_state from "./reload_state";
import * as resize from "./resize";
import * as settings_config from "./settings_config";
import * as spectators from "./spectators";
import * as stream_bar from "./stream_bar";
import * as stream_data from "./stream_data";
@@ -636,6 +637,23 @@ export function on_narrow(opts) {
if (opts.trigger === "search" && !opts.private_message_recipient) {
return;
}
// Do not open compose box if organization has disabled sending
// private messages and recipient is not a bot.
if (
page_params.realm_private_message_policy ===
settings_config.private_message_policy_values.disabled.code &&
opts.private_message_recipient
) {
const emails = opts.private_message_recipient.split(",");
if (emails.length !== 1 || !people.get_by_email(emails[0]).is_bot) {
// If we are navigating between private message conversations,
// we want the compose box to close for non-bot users.
if (compose_state.composing()) {
cancel();
}
return;
}
}
start("private");
return;
}