aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-08-08 23:20:07 +0100
committerMatthew Wild <mwild1@gmail.com>2018-08-08 23:20:07 +0100
commit7df3613768b9d0a85ccf0589caafc2e2a632c21e (patch)
tree77c141846138013e742b4afdc2d6631a64a1b420 /util
parent674da5cef01d41d923718d721d7a665008bf12e9 (diff)
downloadprosody-7df3613768b9d0a85ccf0589caafc2e2a632c21e.tar.gz
prosody-7df3613768b9d0a85ccf0589caafc2e2a632c21e.zip
mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060
Diffstat (limited to 'util')
-rw-r--r--util/pubsub.lua26
1 files changed, 24 insertions, 2 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua
index dc7c01e5..48f9af3e 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -10,7 +10,7 @@ local default_config = {
get_affiliation = function () end;
normalize_jid = function (jid) return jid; end;
capabilities = {
- restricted = {
+ outcast = {
be_subscribed = false;
be_unsubscribed = true;
};
@@ -24,6 +24,28 @@ local default_config = {
unsubscribe = true;
get_subscription = true;
get_subscriptions = true;
+ get_items = false;
+
+ subscribe_other = false;
+ unsubscribe_other = false;
+ get_subscription_other = false;
+ get_subscriptions_other = false;
+
+ be_subscribed = true;
+ be_unsubscribed = true;
+
+ set_affiliation = false;
+ };
+ member = {
+ create = false;
+ publish = false;
+ retract = false;
+ get_nodes = true;
+
+ subscribe = true;
+ unsubscribe = true;
+ get_subscription = true;
+ get_subscriptions = true;
get_items = true;
subscribe_other = false;
@@ -196,7 +218,7 @@ function service:get_default_affiliation(node, actor, action) -- luacheck: ignor
if access_model == "open" then
return "none";
elseif access_model == "whitelist" then
- return "restricted";
+ return "outcast";
end
if self.config.access_models then