# HG changeset patch # User Philipp Hancke # Date 1416474105 0 # Node ID c9a72c64c3e29ab6c9de0d5d71322af1f3c375b9 # Parent 8273236a995fd79607a073ca5b6db4c4e73ee263 mod_pubsub: Add support for including the publisher in item broadcasts diff -r 8273236a995f -r c9a72c64c3e2 plugins/mod_pubsub/mod_pubsub.lua --- a/plugins/mod_pubsub/mod_pubsub.lua Sun Nov 09 20:30:04 2014 +0100 +++ b/plugins/mod_pubsub/mod_pubsub.lua Thu Nov 20 09:01:45 2014 +0000 @@ -11,6 +11,7 @@ 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 @@ 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 -r 8273236a995f -r c9a72c64c3e2 util/pubsub.lua --- a/util/pubsub.lua Sun Nov 09 20:30:04 2014 +0100 +++ b/util/pubsub.lua Thu Nov 20 09:01:45 2014 +0000 @@ -294,7 +294,7 @@ 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