hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-10 17:23:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Notify WhatsApp requesters on access decisions and ship EN ops help.

Browse source 
After admin YES/NO, DM the requester a field guide; WA help/bind no longer returns the Chinese productivity todo menu.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-10 23:37:50 +08:00
parent f31ebeb30e
commit 94a1b5b26c
5 changed files with 179 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
runtime/application/gateway/inbound_service.py
View file

@ -100,7 +100,11 @@ def _build_admin_gateway_executor(
)
def _menu_text() -> str:
def _menu_text(*, channel: str = "") -> str:
if str(channel or "").strip().lower() == "whatsapp":
from runtime.extensions.whatsapp.access_control import whatsapp_ops_help_text
return whatsapp_ops_help_text(lang="en")
return (
"已绑定成功，常用命令：\n"
"1) 帮助 / 菜单\n"
@ -121,13 +125,14 @@ def _handle_productivity_commands(
session_id: str = "",
creator_external_user_id: str = "",
creator_push_name: str = "",
channel: str = "",
) -> str | None:
t = (text or "").strip()
t_low = t.lower()
if not t:
return None
if t in ("帮助", "菜单", "help", "/help"):
return _menu_text()
return _menu_text(channel=channel)
from svc.config.paths import db_path
from svc.persistence.sqlite_store import SqliteStore
@ -1045,7 +1050,16 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
else None
),
)
reply = ("绑定成功。\n\n" + _menu_text()) if info else "绑定失败：无效或已使用的绑定码。"
channel_is_wa_bind = str(inbound.channel or "").strip().lower() == "whatsapp"
if info:
guide = _menu_text(channel=str(inbound.channel or ""))
reply = ("Bound successfully.\n\n" + guide) if channel_is_wa_bind else ("绑定成功。\n\n" + guide)
else:
reply = (
"Bind failed: invalid or already used code."
if channel_is_wa_bind
else "绑定失败：无效或已使用的绑定码。"
)
else:
if inbound.is_group and not should_process_group_inbound(
is_group=inbound.is_group,
@ -1238,6 +1252,7 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
)
or ""
),
channel=str(inbound.channel or ""),
)
if cmd_reply is not None:
reply = cmd_reply
@ -1742,7 +1757,7 @@ def process_inbound_payload(payload: dict[str, Any]) -> dict[str, Any]:
if reply:
reply = f"{preface}\n\n{reply}"
else:
reply = f"{preface}\n\n{_menu_text()}"
reply = f"{preface}\n\n{_menu_text(channel=str(inbound.channel or ''))}"
ch_lower = str(inbound.channel or "").strip().lower()
if ch_lower in {"wechat", "weixin"}: