Software / code / prosody
Comparison
plugins/mod_pubsub/mod_pubsub.lua @ 6442:0f4025abbe8f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 01:56:22 +0200 |
| parent | 5973:905b4fd863b4 |
| parent | 6441:bcb1ea9047d3 |
| child | 6450:25d86b0f2147 |
comparison
equal
deleted
inserted
replaced
| 6432:388786af0dd2 | 6442:0f4025abbe8f |
|---|---|
| 62 publish = { "publish", autocreate_on_publish and "auto-create" }; | 62 publish = { "publish", autocreate_on_publish and "auto-create" }; |
| 63 delete = { "delete-nodes" }; | 63 delete = { "delete-nodes" }; |
| 64 get_items = { "retrieve-items" }; | 64 get_items = { "retrieve-items" }; |
| 65 add_subscription = { "subscribe" }; | 65 add_subscription = { "subscribe" }; |
| 66 get_subscriptions = { "retrieve-subscriptions" }; | 66 get_subscriptions = { "retrieve-subscriptions" }; |
| 67 set_configure = { "config-node" }; | |
| 68 get_default = { "retrieve-default" }; | |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 local function add_disco_features_from_service(service) | 71 local function add_disco_features_from_service(service) |
| 70 for method, features in pairs(feature_map) do | 72 for method, features in pairs(feature_map) do |
| 71 if service[method] then | 73 if service[method] then |
| 193 create = true; | 195 create = true; |
| 194 publish = true; | 196 publish = true; |
| 195 retract = true; | 197 retract = true; |
| 196 delete = true; | 198 delete = true; |
| 197 get_nodes = true; | 199 get_nodes = true; |
| 200 configure = true; | |
| 198 | 201 |
| 199 subscribe = true; | 202 subscribe = true; |
| 200 unsubscribe = true; | 203 unsubscribe = true; |
| 201 get_subscription = true; | 204 get_subscription = true; |
| 202 get_subscriptions = true; | 205 get_subscriptions = true; |
| 213 | 216 |
| 214 set_affiliation = true; | 217 set_affiliation = true; |
| 215 }; | 218 }; |
| 216 }; | 219 }; |
| 217 | 220 |
| 221 node_config_form = require"util.dataforms".new { | |
| 222 { | |
| 223 type = "hidden"; | |
| 224 name = "FORM_TYPE"; | |
| 225 value = "http://jabber.org/protocol/pubsub#node_config"; | |
| 226 }; | |
| 227 { | |
| 228 type = "text-single"; | |
| 229 name = "pubsub#max_items"; | |
| 230 label = "Max # of items to persist"; | |
| 231 }; | |
| 232 }; | |
| 233 | |
| 218 autocreate_on_publish = autocreate_on_publish; | 234 autocreate_on_publish = autocreate_on_publish; |
| 219 autocreate_on_subscribe = autocreate_on_subscribe; | 235 autocreate_on_subscribe = autocreate_on_subscribe; |
| 220 | 236 |
| 221 broadcaster = simple_broadcast; | 237 broadcaster = simple_broadcast; |
| 222 get_affiliation = get_affiliation; | 238 get_affiliation = get_affiliation; |