diff options
| author | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-05-27 17:30:16 +0200 |
| commit | 3513190931f213b9f661dde88db87ddbfd531b35 (patch) | |
| tree | 04a1c3f3af54f4b092c83cce4df035594f3b6ac1 /plugins | |
| parent | 240b0bb53ec6286c5cdce7d8ca10af514a00bb0f (diff) | |
| parent | 607f7ee607b814000ac65e1e032ee4a20c91116e (diff) | |
| download | prosody-3513190931f213b9f661dde88db87ddbfd531b35.tar.gz prosody-3513190931f213b9f661dde88db87ddbfd531b35.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_disco.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_watchregistrations.lua | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua index b135d46d..10eb632d 100644 --- a/plugins/mod_disco.lua +++ b/plugins/mod_disco.lua @@ -175,6 +175,7 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(even end local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'}); if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account + reply:tag('identity', {category='account', type='registered'}):up(); module:fire_event("account-disco-info", { origin = origin, reply = reply }); origin.send(reply); return true; diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua index dc979b9a..82666b09 100644 --- a/plugins/mod_watchregistrations.lua +++ b/plugins/mod_watchregistrations.lua @@ -22,7 +22,8 @@ module:hook("user-registered", function (user) :tag("body") :text(registration_notification:gsub("%$(%w+)", function (v) return user[v] or user.session and user.session[v] or nil; - end)); + end)) + :up(); for jid in registration_watchers do module:log("debug", "Notifying %s", jid); message.attr.to = jid; |