Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b27d748fe4 into 3761a7cb21

Browse source
This commit is contained in:
SKitterx 2026-03-01 13:15:55 -06:00 • committed by GitHub
commit 7d71bc3119
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/server/portal/discord.py
View file

@ -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

28
evennia/web/static/webclient/js/plugins/multimedia.js
View file

@ -27,7 +27,13 @@ let multimedia_plugin = (function () {
var mwins = window.plugins["goldenlayout"].routeMessage(args, kwargs);
mwins.forEach( function (mwin) {
mwin.append("<img src='"+ args[0] +"'/>");
var html = "<img src='"+ args[0] +"'/>";
var method = mwin.attr("updateMethod");
if (method === "replace") {
mwin.html(html);
} else {
mwin.append(html);
}
mwin.scrollTop(mwin[0].scrollHeight);
});
}
@ -40,9 +46,15 @@ let multimedia_plugin = (function () {
// create an HTML5 audio control (only .mp3 is fully compatible with all major browsers)
var mwins = window.plugins["goldenlayout"].routeMessage(args, kwargs);
mwins.forEach( function (mwin) {
mwin.append("<audio controls='' autoplay='' style='height:17px;width:175px'>" +
var html = "<audio controls='' autoplay='' style='height:17px;width:175px'>" +
"<source src='"+ args[0] +"'/>" +
"</audio>");
"</audio>";
var method = mwin.attr("updateMethod");
if (method === "replace") {
mwin.html(html);
} else {
mwin.append(html);
}
mwin.scrollTop(mwin[0].scrollHeight);
});
}
@ -55,9 +67,15 @@ let multimedia_plugin = (function () {
// create an HTML5 video element (only h264 .mp4 is compatible with all major browsers)
var mwins = window.plugins["goldenlayout"].routeMessage(args, kwargs);
mwins.forEach( function (mwin) {
mwin.append("<video controls='' autoplay=''>" +
var html = "<video controls='' autoplay=''>" +
"<source src='"+ args[0] +"'/>" +
"</video>");
"</video>";
var method = mwin.attr("updateMethod");
if (method === "replace") {
mwin.html(html);
} else {
mwin.append(html);
}
mwin.scrollTop(mwin[0].scrollHeight);
});
}