Commit 3ce7eac1 authored by Christian Schudt's avatar Christian Schudt

Rename 'default_access_model' to 'access' as per XEP-0060 § 10. Feature Summary.

default_access_model is nowhere specified in XEP-0060.
parent 4ff26df1
......@@ -553,6 +553,9 @@ public class PubSubModule extends BasicModule implements ServerItemsProvider, Di
if (name == null && node == null) {
// Answer the features of the PubSub service
features.add("http://jabber.org/protocol/pubsub");
// Default access model for nodes created on the service
String modelName = getDefaultNodeConfiguration(true).getAccessModel().getName();
features.add("http://jabber.org/protocol/pubsub#access-" + modelName);
if (isCollectionNodesSupported()) {
// Collection nodes are supported
features.add("http://jabber.org/protocol/pubsub#collections");
......@@ -609,10 +612,6 @@ public class PubSubModule extends BasicModule implements ServerItemsProvider, Di
features.add("http://jabber.org/protocol/pubsub#subscribe");
// Configuration of subscription options is supported
features.add("http://jabber.org/protocol/pubsub#subscription-options");
// Default access model for nodes created on the service
String modelName = getDefaultNodeConfiguration(true).getAccessModel().getName();
features.add("http://jabber.org/protocol/pubsub#default_access_model_" + modelName);
}
else if (name == null) {
// Answer the features of a given node
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment