mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-09-21 16:50:29 +02:00
commit 43151af529
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/mod_vcard_legacy.lua
View file

@ -321,13 +321,19 @@ local function inject_xep153(event)
if stanza.attr.type then return end if stanza.attr.type then return end
local pep_service = mod_pep.get_pep_service(username); local pep_service = mod_pep.get_pep_service(username);
stanza:remove_children("x", "vcard-temp:x:update"); local x_update = stanza:get_child("x", "vcard-temp:x:update");
local x_update = st.stanza("x", { xmlns = "vcard-temp:x:update" }); if not x_update then
x_update = st.stanza("x", { xmlns = "vcard-temp:x:update" }):tag("photo");
stanza:add_direct_child(x_update);
elseif x_update:get_child("photo") then
return; -- XEP implies that these should be left alone
else
x_update:tag("photo");
end
local ok, avatar_hash = pep_service:get_last_item("urn:xmpp:avatar:metadata", true); local ok, avatar_hash = pep_service:get_last_item("urn:xmpp:avatar:metadata", true);
if ok and avatar_hash then if ok and avatar_hash then
x_update:text_tag("photo", avatar_hash); x_update:text(avatar_hash);
end end
stanza:add_direct_child(x_update);
end end
module:hook("pre-presence/full", inject_xep153, 1); module:hook("pre-presence/full", inject_xep153, 1);

26
prosodyctl
View file

@ -1142,17 +1142,21 @@ function commands.check(arg)
if modules:contains("proxy65") then if modules:contains("proxy65") then
local proxy65_target = configmanager.get(host, "proxy65_address") or host; local proxy65_target = configmanager.get(host, "proxy65_address") or host;
local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA"); if type(proxy65_target) == "string" then
local prob = {}; local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA");
if not A then local prob = {};
table.insert(prob, "A"); if not A then
end table.insert(prob, "A");
if v6_supported and not AAAA then end
table.insert(prob, "AAAA"); if v6_supported and not AAAA then
end table.insert(prob, "AAAA");
if #prob > 0 then end
print(" File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/") if #prob > 0 then
.." record. Create one or set 'proxy65_address' to the correct host/IP."); print(" File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/")
.." record. Create one or set 'proxy65_address' to the correct host/IP.");
end
else
print(" proxy65_address for "..host.." should be set to a string, unable to perform DNS check");
end end
end end