projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->0.10
[prosody.git]
/
plugins
/
mod_pep.lua
diff --git
a/plugins/mod_pep.lua
b/plugins/mod_pep.lua
index 5a6196f2ffb84dde532be69cc9179fe29026743e..a6916d1f8963b5345bace705d454be985df0590e 100644
(file)
--- a/
plugins/mod_pep.lua
+++ b/
plugins/mod_pep.lua
@@
-1,7
+1,7
@@
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
@@
-10,13
+10,12
@@
local jid_bare = require "util.jid".bare;
local jid_split = require "util.jid".split;
local st = require "util.stanza";
local jid_bare = require "util.jid".bare;
local jid_split = require "util.jid".split;
local st = require "util.stanza";
-local hosts = hosts;
-local user_exists = require "core.usermanager".user_exists;
local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
-local pairs
, ipairs = pairs, i
pairs;
+local pairs
=
pairs;
local next = next;
local type = type;
local calculate_hash = require "util.caps".calculate_hash;
local next = next;
local type = type;
local calculate_hash = require "util.caps".calculate_hash;
+local core_post_stanza = prosody.core_post_stanza;
local NULL = {};
local data = {};
local NULL = {};
local data = {};
@@
-32,7
+31,7
@@
module.restore = function(state)
hash_map = state.hash_map or {};
end
hash_map = state.hash_map or {};
end
-module:add_identity("pubsub", "pep",
"pep",
module:get_option_string("name", "Prosody"));
+module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));
module:add_feature("http://jabber.org/protocol/pubsub#publish");
local function subscription_presence(user_bare, recipient)
module:add_feature("http://jabber.org/protocol/pubsub#publish");
local function subscription_presence(user_bare, recipient)
@@
-42,7
+41,8
@@
local function subscription_presence(user_bare, recipient)
return is_contact_subscribed(username, host, recipient_bare);
end
return is_contact_subscribed(username, host, recipient_bare);
end
-local function publish(session, node, id, item)
+module:hook("pep-publish-item", function (event)
+ local session, node, id, item = event.session, event.node, event.id, event.item;
item.attr.xmlns = nil;
local disable = #item.tags ~= 1 or #item.tags[1] == 0;
if #item.tags == 0 then item.name = "retract"; end
item.attr.xmlns = nil;
local disable = #item.tags ~= 1 or #item.tags[1] == 0;
if #item.tags == 0 then item.name = "retract"; end
@@
-63,7
+63,7
@@
local function publish(session, node, id, item)
end
else
if not user_data then user_data = {}; data[bare] = user_data; end
end
else
if not user_data then user_data = {}; data[bare] = user_data; end
- user_data[node] = {id
or "1"
, item};
+ user_data[node] = {id, item};
end
-- broadcast
end
-- broadcast
@@
-73,7
+73,8
@@
local function publish(session, node, id, item)
core_post_stanza(session, stanza);
end
end
core_post_stanza(session, stanza);
end
end
-end
+end);
+
local function publish_all(user, recipient, session)
local d = data[user];
local notify = recipients[user] and recipients[user][recipient];
local function publish_all(user, recipient, session)
local d = data[user];
local notify = recipients[user] and recipients[user][recipient];
@@
-136,7
+137,7
@@
module:hook("presence/bare", function(event)
recipients[user][recipient] = hash;
local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
recipients[user][recipient] = hash;
local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
- -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute
+ -- COMPAT from ~= stanza.attr.to because OneTeam
and Asterisk 1.8
can't deal with missing from attribute
origin.send(
st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"})
:query("http://jabber.org/protocol/disco#info")
origin.send(
st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"})
:query("http://jabber.org/protocol/disco#info")
@@
-170,9
+171,12
@@
module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event)
local node = payload.attr.node;
payload = payload.tags[1];
if payload and payload.name == "item" then -- <item>
local node = payload.attr.node;
payload = payload.tags[1];
if payload and payload.name == "item" then -- <item>
- local id = payload.attr.id;
+ local id = payload.attr.id or "1";
+ payload.attr.id = id;
session.send(st.reply(stanza));
session.send(st.reply(stanza));
- publish(session, node, id, st.clone(payload));
+ module:fire_event("pep-publish-item", {
+ node = node, actor = session.jid, id = id, session = session, item = st.clone(payload);
+ });
return true;
end
end
return true;
end
end
@@
-263,19
+267,19
@@
module:hook("iq-result/bare/disco", function(event)
end);
module:hook("account-disco-info", function(event)
end);
module:hook("account-disco-info", function(event)
- local
stanza = event.stanza
;
-
stanza
:tag('identity', {category='pubsub', type='pep'}):up();
-
stanza
:tag('feature', {var='http://jabber.org/protocol/pubsub#publish'}):up();
+ local
reply = event.reply
;
+
reply
:tag('identity', {category='pubsub', type='pep'}):up();
+
reply
:tag('feature', {var='http://jabber.org/protocol/pubsub#publish'}):up();
end);
module:hook("account-disco-items", function(event)
end);
module:hook("account-disco-items", function(event)
- local
stanza = event.stanza
;
- local bare =
stanza
.attr.to;
+ local
reply = event.reply
;
+ local bare =
reply
.attr.to;
local user_data = data[bare];
if user_data then
for node, _ in pairs(user_data) do
local user_data = data[bare];
if user_data then
for node, _ in pairs(user_data) do
-
stanza
:tag('item', {jid=bare, node=node}):up(); -- TODO we need to handle queries to these nodes
+
reply
:tag('item', {jid=bare, node=node}):up(); -- TODO we need to handle queries to these nodes
end
end
end);
end
end
end);