mirror of
https://github.com/evennia/evennia.git
synced 2026-04-02 22:17:17 +02:00
Merge 344c97b341 into 3761a7cb21
This commit is contained in:
commit
a0d765237f
1 changed files with 10 additions and 3 deletions
|
|
@ -534,10 +534,17 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
|
|||
if "guild_id" in data:
|
||||
# message received to a Discord channel
|
||||
keywords["type"] = "channel"
|
||||
author = data["member"]["nick"] or data["author"]["username"]
|
||||
author_id = data["author"]["id"]
|
||||
member = data.get("member", {}) or {}
|
||||
author_info = data.get("author", {}) or {}
|
||||
# Prefer guild nickname; fall back to global_name, then username
|
||||
author = (
|
||||
member.get("nick")
|
||||
or author_info.get("global_name")
|
||||
or author_info.get("username")
|
||||
)
|
||||
author_id = author_info.get("id") or data["author"]["id"]
|
||||
keywords["sender"] = (author_id, author)
|
||||
keywords["guild_id"] = data["guild_id"]
|
||||
keywords["guild_id"] = data.get("guild_id")
|
||||
|
||||
else:
|
||||
# message sent directly to the bot account via DM
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue