Revert "fix(whatsapp): handle group mentions and caller allowlists"

This reverts commit 9664e85599.

plugin-src/client/channels/whatsapp/api.js

@@ -97,11 +97,6 @@ function normalizeBot(value) {
             typeof entry === 'string' && /^[1-9]\d{4,14}$/.test(entry)
           )))]
         : [],
-      groupAllowedNumbers: Array.isArray(value.accessPolicy?.groupAllowedNumbers)
-        ? [...new Set(value.accessPolicy.groupAllowedNumbers.filter((entry) => (
-            typeof entry === 'string' && /^[1-9]\d{4,14}$/.test(entry)
-          )))]
-        : [],
     },
     bot: {
       name: text(value.bot?.name, 'WhatsApp机器人', 100),

plugin-src/client/channels/whatsapp/index.js

@@ -37,8 +37,6 @@ function accessPolicyFor(account) {
     accessMode,
     allowedNumbers: Array.isArray(account?.accessPolicy?.allowedNumbers)
       ? account.accessPolicy.allowedNumbers : [],
-    groupAllowedNumbers: Array.isArray(account?.accessPolicy?.groupAllowedNumbers)
-      ? account.accessPolicy.groupAllowedNumbers : [],
   };
 }
 
@@ -54,39 +52,30 @@ function allowedNumbersFromText(value) {
 export function WhatsappAccessSettings({ account, busy = false, onSave }) {
   const policy = accessPolicyFor(account);
   const sourceNumbers = policy.allowedNumbers.join('\n');
-  const sourceGroupNumbers = policy.groupAllowedNumbers.join('\n');
   const helpId = React.useId();
   const [accessMode, setAccessMode] = React.useState(policy.accessMode);
   const [allowedNumbers, setAllowedNumbers] = React.useState(sourceNumbers);
-  const [groupAllowedNumbers, setGroupAllowedNumbers] = React.useState(sourceGroupNumbers);
   const [error, setError] = React.useState(null);
 
   React.useEffect(() => {
     setAccessMode(policy.accessMode);
     setAllowedNumbers(sourceNumbers);
-    setGroupAllowedNumbers(sourceGroupNumbers);
     setError(null);
-  }, [policy.accessMode, sourceNumbers, sourceGroupNumbers]);
+  }, [policy.accessMode, sourceNumbers]);
 
   const save = async (event) => {
     event.preventDefault();
     setError(null);
     try {
       const normalized = allowedNumbersFromText(allowedNumbers);
-      const normalizedGroup = allowedNumbersFromText(groupAllowedNumbers);
       if (typeof onSave !== 'function') throw new Error('WhatsApp 访问设置暂不可用。');
-      await onSave({
-        accessMode,
-        allowedNumbers: normalized,
-        groupAllowedNumbers: normalizedGroup,
-      });
+      await onSave({ accessMode, allowedNumbers: normalized });
     } catch (caught) {
       setError(caught?.message ?? 'WhatsApp 访问设置保存失败。');
     }
   };
 
   const allowlistEnabled = accessMode === 'private-allowlist';
-  const groupAllowlistEnabled = accessMode === 'open';
   const labels = {
     'self-only': '仅自己模式',
     'private-allowlist': '指定联系人模式',
@@ -114,7 +103,7 @@ export function WhatsappAccessSettings({ account, busy = false, onSave }) {
               h('span', null, '响应自聊和白名单联系人的私聊，忽略群聊。')),
             h('span', { className: 'dwa-accessTooltipItem' },
               h('strong', null, '开放响应模式'),
-              h('span', null, '响应所有私聊、已绑定账号自己发出的群聊消息，以及允许成员的提及或回复；群聊号码列表留空时允许所有群成员。')))))),
+              h('span', null, '响应所有私聊、已绑定账号自己发出的群聊消息，以及其他群成员的提及或回复。')))))),
     h('label', { className: 'dwa-accessField' },
       h('span', null, '模式'),
       h('select', {
@@ -126,28 +115,18 @@ export function WhatsappAccessSettings({ account, busy = false, onSave }) {
       h('option', { value: 'self-only' }, '仅自己模式（默认）'),
       h('option', { value: 'private-allowlist' }, '指定联系人模式'),
       h('option', { value: 'open' }, '开放响应模式'))),
-    (allowlistEnabled || groupAllowlistEnabled)
+    allowlistEnabled
       ? h('label', { className: 'dwa-accessField' },
-          h('span', null, allowlistEnabled
-            ? '允许私聊的 WhatsApp 电话号码'
-            : '允许在群聊中呼叫机器人的 WhatsApp 电话号码'),
+          h('span', null, '允许私聊的 WhatsApp 电话号码'),
           h('textarea', {
-            value: allowlistEnabled ? allowedNumbers : groupAllowedNumbers,
+            value: allowedNumbers,
             disabled: busy,
             rows: 3,
             placeholder: '每行一个含国家或地区代码的号码',
-            'aria-label': allowlistEnabled
-              ? '允许私聊的 WhatsApp 电话号码'
-              : '允许在群聊中呼叫机器人的 WhatsApp 电话号码',
-            onChange: (event) => {
-              if (allowlistEnabled) setAllowedNumbers(event.target.value);
-              else setGroupAllowedNumbers(event.target.value);
-              setError(null);
-            },
+            'aria-label': '允许私聊的 WhatsApp 电话号码',
+            onChange: (event) => { setAllowedNumbers(event.target.value); setError(null); },
           }),
-          h('small', null, allowlistEnabled
-            ? '可以包含开头的 +，保存时会自动移除。'
-            : '留空表示所有群成员都可以通过提及或回复呼叫机器人。'))
+          h('small', null, '可以包含开头的 +，保存时会自动移除。'))
       : null,
     allowlistEnabled && allowedNumbers.trim() === ''
       ? h('p', { className: 'dwa-accessWarning', role: 'status' },

plugin-src/client/i18n.js

@@ -380,12 +380,9 @@ const EN = Object.freeze({
   '只响应已绑定 WhatsApp 账号的自聊消息。': 'Only respond to self-chat messages from the linked WhatsApp account.',
   '响应自聊和白名单联系人的私聊，忽略群聊。': 'Respond to self-chat and allowlisted direct messages; ignore group messages.',
   '响应所有私聊、已绑定账号自己发出的群聊消息，以及其他群成员的提及或回复。': 'Respond to all direct messages, group messages sent by the linked account, and mentions or replies from other group members.',
-  '响应所有私聊、已绑定账号自己发出的群聊消息，以及允许成员的提及或回复；群聊号码列表留空时允许所有群成员。': 'Respond to all direct messages, group messages sent by the linked account, and mentions or replies from allowed members; leaving the group number list empty allows every group member.',
   '允许私聊的 WhatsApp 电话号码': 'WhatsApp phone numbers allowed to send direct messages',
-  '允许在群聊中呼叫机器人的 WhatsApp 电话号码': 'WhatsApp phone numbers allowed to call the bot in group chats',
   '每行一个含国家或地区代码的号码': 'One number with country or region code per line',
   '可以包含开头的 +，保存时会自动移除。': 'A leading + is allowed and removed when saved.',
-  '留空表示所有群成员都可以通过提及或回复呼叫机器人。': 'Leave empty to let every group member call the bot by mentioning it or replying to it.',
   '仅指定联系人模式使用白名单，切换模式时会保留。': 'Only Selected contacts uses the allowlist; it is retained when modes change.',
   '白名单为空；保存后将只接受自聊消息。': 'The allowlist is empty; only self-chat messages will be accepted after saving.',
   '电话号码必须包含国家或地区代码，每行一个。': 'Each phone number must include a country or region code on its own line.',