From b3d80c4ef069f0f461cd6d0fc9ac6a73419efb01 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Fri, 18 Aug 2023 12:11:47 +0800 Subject: [PATCH] feat: add disableCreateConverseFromGroup in group config --- .../shared/i18n/langs/en-US/translation.json | 2 ++ .../shared/i18n/langs/zh-CN/translation.json | 2 ++ client/shared/model/group.ts | 3 +++ .../components/modals/GroupDetail/Config.tsx | 21 +++++++++++++++++++ .../popover/UserPopover/GroupUserPopover.tsx | 7 +++++-- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/client/shared/i18n/langs/en-US/translation.json b/client/shared/i18n/langs/en-US/translation.json index ef82bb12..18e4a720 100644 --- a/client/shared/i18n/langs/en-US/translation.json +++ b/client/shared/i18n/langs/en-US/translation.json @@ -4,6 +4,7 @@ "k10c018fe": "Teamwork", "k1141d649": "Version update", "k11cef91e": "There are some problems with the page", + "k123852c": "Group privacy control to prevent malicious harassment of users through groups.", "k1252f904": "Gateway", "k131598d0": "A new version is detected, whether to refresh immediately to upgrade to the latest content", "k13ae6a93": "Copy", @@ -294,6 +295,7 @@ "kb6f1c83f": "What do you want to call you?", "kb76d94e0": "Refresh", "kb7a57f24": "Plugin Registry Service", + "kb8021af2": "Disable create converse from group", "kb8185132": "Or", "kb8ec7062": "Email verification passed", "kb96b79c5": "Allow management of invitation links", diff --git a/client/shared/i18n/langs/zh-CN/translation.json b/client/shared/i18n/langs/zh-CN/translation.json index 056e7814..2be64f8d 100644 --- a/client/shared/i18n/langs/zh-CN/translation.json +++ b/client/shared/i18n/langs/zh-CN/translation.json @@ -4,6 +4,7 @@ "k10c018fe": "工作协同", "k1141d649": "更新版本", "k11cef91e": "页面出现了一些问题", + "k123852c": "群组隐私控制,防止通过群组恶意骚扰用户。", "k1252f904": "服务网关", "k131598d0": "检测到有新版本, 是否立即刷新以升级到最新内容", "k13ae6a93": "复制", @@ -294,6 +295,7 @@ "kb6f1c83f": "想要让大家如何称呼你", "kb76d94e0": "刷新", "kb7a57f24": "插件中心服务", + "kb8021af2": "禁止在群组发起私信", "kb8185132": "或", "kb8ec7062": "邮箱验证通过", "kb96b79c5": "允许管理邀请链接", diff --git a/client/shared/model/group.ts b/client/shared/model/group.ts index 6325c20f..ede5cd7b 100644 --- a/client/shared/model/group.ts +++ b/client/shared/model/group.ts @@ -108,6 +108,7 @@ export function getGroupConfigWithInfo( groupInfo: GroupInfo | null | undefined ): { hideGroupMemberDiscriminator: boolean; + disableCreateConverseFromGroup: boolean; [key: string]: unknown; } { const config = groupInfo?.config ?? {}; @@ -115,6 +116,8 @@ export function getGroupConfigWithInfo( return { ...config, hideGroupMemberDiscriminator: config.hideGroupMemberDiscriminator ?? false, + disableCreateConverseFromGroup: + config.disableCreateConverseFromGroup ?? false, }; } diff --git a/client/web/src/components/modals/GroupDetail/Config.tsx b/client/web/src/components/modals/GroupDetail/Config.tsx index fe657dad..fbc54549 100644 --- a/client/web/src/components/modals/GroupDetail/Config.tsx +++ b/client/web/src/components/modals/GroupDetail/Config.tsx @@ -54,6 +54,27 @@ export const GroupConfig: React.FC<{ } /> + {/* 如果开启了 hideGroupMemberDiscriminator 则视为禁止发起私信 */} + + handleModifyConfig('disableCreateConverseFromGroup', checked) + } + /> + } + /> + { const converse = await createDMConverse([userId]);