Skip to content

Commit bce7a76

Browse files
committed
fix: discord bot sending now will fallback to user_id when username is not found, not sending message content directly
1 parent 886c5f6 commit bce7a76

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/discord.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,19 @@ async def send(
356356
if force_bot and self._send_method == "webhook" and webhook_url is not None:
357357
fmt = kwargs.get("bot_msg_format") or kwargs.get("msg_format")
358358
if isinstance(fmt, str) and fmt:
359+
username_value = kwargs.get("username", "")
360+
if isinstance(username_value, str):
361+
username_value = username_value.strip()
362+
else:
363+
username_value = str(username_value or "")
364+
if not username_value:
365+
username_value = str(kwargs.get("user_id") or "")
359366
ctx = {
360367
"platform": kwargs.get("platform"),
361368
"instance_id": kwargs.get("instance_id"),
362369
"from": kwargs.get("from"),
363370
"user": kwargs.get("user"),
371+
"username": username_value,
364372
"user_id": kwargs.get("user_id"),
365373
"user_avatar": kwargs.get("user_avatar"),
366374
"msg": kwargs.get("msg"),

0 commit comments

Comments
 (0)