Merge remote-tracking branch 'origin/main'

# Conflicts:
#	nanobot/channels/qq.py
#	nanobot/channels/telegram.py
#	nanobot/channels/whatsapp.py
#	tests/test_qq_channel.py

tests/test_qq_channel.py

@@ -80,6 +80,7 @@ async def test_on_group_message_routes_to_group_chat_id() -> None:
         content="hello",
         group_openid="group123",
         author=SimpleNamespace(member_openid="user1"),
+        attachments=[],
     )
 
     await channel._on_message(data, is_group=True)
@@ -142,6 +143,35 @@ async def test_send_c2c_message_uses_plain_text_c2c_api_with_msg_seq() -> None:
     assert not channel._client.api.group_calls
 
 
+@pytest.mark.asyncio
+async def test_send_group_message_uses_markdown_when_configured() -> None:
+    channel = QQChannel(
+        QQConfig(app_id="app", secret="secret", allow_from=["*"], msg_format="markdown"),
+        MessageBus(),
+    )
+    channel._client = _FakeClient()
+    channel._chat_type_cache["group123"] = "group"
+
+    await channel.send(
+        OutboundMessage(
+            channel="qq",
+            chat_id="group123",
+            content="**hello**",
+            metadata={"message_id": "msg1"},
+        )
+    )
+
+    assert len(channel._client.api.group_calls) == 1
+    call = channel._client.api.group_calls[0]
+    assert call == {
+        "group_openid": "group123",
+        "msg_type": 2,
+        "markdown": {"content": "**hello**"},
+        "msg_id": "msg1",
+        "msg_seq": 2,
+    }
+
+
 @pytest.mark.asyncio
 async def test_send_group_remote_media_url_uses_file_api_then_media_message(monkeypatch) -> None:
     channel = QQChannel(QQConfig(app_id="app", secret="secret", allow_from=["*"]), MessageBus())

tests/test_whatsapp_channel.py

@@ -106,3 +106,52 @@ async def test_send_when_disconnected_is_noop():
     await ch.send(msg)
 
     ch._ws.send.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_group_policy_mention_skips_unmentioned_group_message():
+    ch = WhatsAppChannel({"enabled": True, "groupPolicy": "mention"}, MagicMock())
+    ch._handle_message = AsyncMock()
+
+    await ch._handle_bridge_message(
+        json.dumps(
+            {
+                "type": "message",
+                "id": "m1",
+                "sender": "12345@g.us",
+                "pn": "user@s.whatsapp.net",
+                "content": "hello group",
+                "timestamp": 1,
+                "isGroup": True,
+                "wasMentioned": False,
+            }
+        )
+    )
+
+    ch._handle_message.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_group_policy_mention_accepts_mentioned_group_message():
+    ch = WhatsAppChannel({"enabled": True, "groupPolicy": "mention"}, MagicMock())
+    ch._handle_message = AsyncMock()
+
+    await ch._handle_bridge_message(
+        json.dumps(
+            {
+                "type": "message",
+                "id": "m1",
+                "sender": "12345@g.us",
+                "pn": "user@s.whatsapp.net",
+                "content": "hello @bot",
+                "timestamp": 1,
+                "isGroup": True,
+                "wasMentioned": True,
+            }
+        )
+    )
+
+    ch._handle_message.assert_awaited_once()
+    kwargs = ch._handle_message.await_args.kwargs
+    assert kwargs["chat_id"] == "12345@g.us"
+    assert kwargs["sender_id"] == "user"