Mercurial > prosody-hg
comparison util/pubsub.lua @ 6516:ecd8d6437053
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 20 Nov 2014 09:02:23 +0000 |
| parents | 0f4025abbe8f c9a72c64c3e2 |
| children | e813e8cf6046 |
comparison
equal
deleted
inserted
replaced
| 6514:d425fc41e59f | 6516:ecd8d6437053 |
|---|---|
| 292 remove_item_by_id(node_data, id); | 292 remove_item_by_id(node_data, id); |
| 293 node_data[#node_data + 1] = id; | 293 node_data[#node_data + 1] = id; |
| 294 node_data[id] = item; | 294 node_data[id] = item; |
| 295 trim_items(node_data, node_obj.config["pubsub#max_items"]); | 295 trim_items(node_data, node_obj.config["pubsub#max_items"]); |
| 296 self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item }); | 296 self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item }); |
| 297 self.config.broadcaster("items", node, node_obj.subscribers, item); | 297 self.config.broadcaster("items", node, node_obj.subscribers, item, actor); |
| 298 return true; | 298 return true; |
| 299 end | 299 end |
| 300 | 300 |
| 301 function service:retract(node, actor, id, retract) | 301 function service:retract(node, actor, id, retract) |
| 302 -- Access checking | 302 -- Access checking |
