diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-11-20 09:02:23 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-11-20 09:02:23 +0000 |
| commit | 82dd57de00dd40bd2eace8089752e657fb577f23 (patch) | |
| tree | 217d4945ee7c4a160ca684c43b495dbb4f73e3ad | |
| parent | 726d063ff7eac971074b7e6a7ac397a605721175 (diff) | |
| parent | e5282813cb1a618d76c4763d69d7dd354d8c12fc (diff) | |
| download | prosody-82dd57de00dd40bd2eace8089752e657fb577f23.tar.gz prosody-82dd57de00dd40bd2eace8089752e657fb577f23.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 6 | ||||
| -rw-r--r-- | util/pubsub.lua | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 8c777f54..de027b58 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -11,6 +11,7 @@ local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false); local pubsub_disco_name = module:get_option("name"); if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end +local expose_publisher = module:get_option_boolean("expose_publisher", false) local service; @@ -36,10 +37,13 @@ function handle_pubsub_iq(event) end end -function simple_broadcast(kind, node, jids, item) +function simple_broadcast(kind, node, jids, item, actor) if item then item = st.clone(item); item.attr.xmlns = nil; -- Clear the pubsub namespace + if expose_publisher and actor then + item.attr.publisher = actor + end end local message = st.message({ from = module.host, type = "headline" }) :tag("event", { xmlns = xmlns_pubsub_event }) diff --git a/util/pubsub.lua b/util/pubsub.lua index 2f8525b6..c15a41d7 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -294,7 +294,7 @@ function service:publish(node, actor, id, item) node_data[id] = item; trim_items(node_data, node_obj.config["pubsub#max_items"]); self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item }); - self.config.broadcaster("items", node, node_obj.subscribers, item); + self.config.broadcaster("items", node, node_obj.subscribers, item, actor); return true; end |