paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Rename is_member_of function to is_direct_member_of.

Browse Source
This commit is contained in:
Sahil Batra
2022-05-04 17:04:25 +05:30
committed by Tim Abbott
parent a5b3510cb3
commit 6bca2453cf
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/markdown_config.js
View File

@@ -68,7 +68,7 @@ export const get_helpers = () => ({
// user groups
get_user_group_from_name: (name) => user_group(user_groups.get_user_group_from_name(name)),
is_member_of_user_group: user_groups.is_member_of,
is_member_of_user_group: user_groups.is_direct_member_of,
// stream hashes
get_stream_by_name: (name) => stream(stream_data.get_sub(name)),

2
static/js/rendered_markdown.js
View File

@@ -113,7 +113,7 @@ export const update_elements = ($content) => {
const my_user_id = people.my_current_user_id();
// Mark user group you're a member of.
if (user_groups.is_member_of(user_group_id, my_user_id)) {
if (user_groups.is_direct_member_of(user_group_id, my_user_id)) {
$(this).addClass("user-mention-me");
}

2
static/js/settings_user_groups.js
View File

@@ -47,7 +47,7 @@ export function can_edit(group_id) {
return true;
}
return user_groups.is_member_of(group_id, people.my_current_user_id());
return user_groups.is_direct_member_of(group_id, people.my_current_user_id());
}
export function populate_user_groups() {

6
static/js/user_groups.ts
View File

@@ -79,7 +79,7 @@ export function get_realm_user_groups(): UserGroup[] {
return user_groups.filter((group) => !group.is_system_group);
}
export function is_member_of(user_group_id: number, user_id: number): boolean {
export function is_direct_member_of(user_group_id: number, user_id: number): boolean {
const user_group = user_group_by_id_dict.get(user_group_id);
if (user_group === undefined) {
blueslip.error(`Could not find user group with ID ${user_group_id}`);
@@ -148,6 +148,8 @@ export function is_user_group(item: User | UserGroup): item is UserGroup {
export function get_user_groups_of_user(user_id: number): UserGroup[] {
const user_groups_realm = get_realm_user_groups();
const groups_of_user = user_groups_realm.filter((group) => is_member_of(group.id, user_id));
const groups_of_user = user_groups_realm.filter((group) =>
is_direct_member_of(group.id, user_id),
);
return groups_of_user;
}