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

settings: Use new pills UI for DM permission settings.

Browse Source 
We now use pills UI for direct_message_initiator_group
and direct_message_permission_group setting.
This commit is contained in:
Sahil Batra
2024-10-29 18:59:02 +05:30
committed by Tim Abbott
parent 5fbc46f82c
commit dce229ba17
11 changed files with 96 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/people.ts
View File

@@ -17,7 +17,7 @@ import * as settings_data from "./settings_data";
import type {StateData, profile_datum_schema, user_schema} from "./state_data";
import {current_user, realm} from "./state_data";
import * as timerender from "./timerender";
import {is_user_in_group} from "./user_groups";
import {is_user_in_setting_group} from "./user_groups";
import {user_settings} from "./user_settings";
import * as util from "./util";
@@ -767,9 +767,8 @@ export function should_add_guest_user_indicator(user_id: number): boolean {
}
export function user_can_initiate_direct_message_thread(recipient_ids_string: string): boolean {
const direct_message_initiator_group_id = realm.realm_direct_message_initiator_group;
const recipient_ids = user_ids_string_to_ids_array(recipient_ids_string);
if (is_user_in_group(direct_message_initiator_group_id, my_user_id)) {
if (is_user_in_setting_group(realm.realm_direct_message_initiator_group, my_user_id)) {
return true;
}
for (const recipient of recipient_ids) {
@@ -781,9 +780,8 @@ export function user_can_initiate_direct_message_thread(recipient_ids_string: st
}
export function user_can_direct_message(recipient_ids_string: string): boolean {
const direct_message_permission_group_id = realm.realm_direct_message_permission_group;
const recipient_ids = user_ids_string_to_ids_array(recipient_ids_string);
if (is_user_in_group(direct_message_permission_group_id, my_user_id)) {
if (is_user_in_setting_group(realm.realm_direct_message_permission_group, my_user_id)) {
return true;
}
@@ -792,7 +790,7 @@ export function user_can_direct_message(recipient_ids_string: string): boolean {
if (is_valid_bot_user(recipient_id) || recipient_id === my_user_id) {
continue;
}
if (is_user_in_group(direct_message_permission_group_id, recipient_id)) {
if (is_user_in_setting_group(realm.realm_direct_message_permission_group, recipient_id)) {
return true;
}
other_human_recipients_exist = true;