Skip to content

fix(weixin): reject nonzero send ret #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
louiseboo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(weixin): reject nonzero send ret #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions raven/channels/adapters/weixin/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,9 @@ def _bot_msg(self, to_user: str, ctx_token: str, item_list: list[dict] | None =
async def _send_text(self, to_user: str, text: str, ctx_token: str) -> None:
item_list = [{"type": p.ITEM_TEXT, "text_item": {"text": text}}] if text else []
data = await self._post("ilink/bot/sendmessage", {"msg": self._bot_msg(to_user, ctx_token, item_list)})
if errcode := data.get("errcode", 0):
raise RuntimeError(f"WeChat send text error (code {errcode}): {data.get('errmsg', '')}")
ret, errcode = data.get("ret", 0), data.get("errcode", 0)
if (ret and ret != 0) or (errcode and errcode != 0):
raise RuntimeError(f"WeChat send text error: ret={ret} errcode={errcode} errmsg={data.get('errmsg', '')}")

async def _send_media_file(self, to_user: str, media_path: str, ctx_token: str) -> None:
"""Upload to the iLink CDN (AES-encrypted) and send it as a media message."""
Expand Down
8 changes: 8 additions & 0 deletions tests/test_channels_weixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,14 @@ def test_send_raises_when_context_token_missing():
asyncio.run(ch.send("u1", "hi"))


def test_send_text_rejects_nonzero_ret_even_when_errcode_is_zero():
ch = _channel()
ch._post = AsyncMock(return_value={"ret": -2, "errcode": 0, "errmsg": "prepare failed"})

with pytest.raises(RuntimeError, match=r"ret=-2.*errcode=0.*prepare failed"):
asyncio.run(ch._send_text("u1", "hi", "ctok"))


# ── _process_message gating + dedup (text path, no network) ───────────


Expand Down