summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Cedilnik <nicolas.cedilnik@inheart.fr>2022-06-09 16:45:36 +0200
committerNicolas Cedilnik <nicolas.cedilnik@inheart.fr>2022-06-09 16:45:36 +0200
commita1a5f3984dbb44163d3b107d502e010793b56cff (patch)
tree246d7694c0e8b0a1094940bbc732cec4636609bb
parent5ceb48bbcd842962f8b8d206fddbce1dcfe7c069 (diff)
downloadslixmpp-a1a5f3984dbb44163d3b107d502e010793b56cff.tar.gz
slixmpp-a1a5f3984dbb44163d3b107d502e010793b56cff.tar.bz2
slixmpp-a1a5f3984dbb44163d3b107d502e010793b56cff.tar.xz
slixmpp-a1a5f3984dbb44163d3b107d502e010793b56cff.zip
XEP-0356: namespace version bump
-rw-r--r--slixmpp/plugins/xep_0356/stanza.py11
-rw-r--r--tests/test_stanza_xep_0356.py2
-rw-r--r--tests/test_stream_xep_0356.py4
3 files changed, 10 insertions, 7 deletions
diff --git a/slixmpp/plugins/xep_0356/stanza.py b/slixmpp/plugins/xep_0356/stanza.py
index ef01ee3e..46f1523a 100644
--- a/slixmpp/plugins/xep_0356/stanza.py
+++ b/slixmpp/plugins/xep_0356/stanza.py
@@ -7,7 +7,7 @@ from slixmpp.plugins.xep_0297 import Forwarded
class Privilege(ElementBase):
- namespace = "urn:xmpp:privilege:1"
+ namespace = "urn:xmpp:privilege:2"
name = "privilege"
plugin_attrib = "privilege"
@@ -24,7 +24,10 @@ class Privilege(ElementBase):
def presence(self):
return self.permission("presence")
-
+
+ def iq(self):
+ return self.permission("iq")
+
def add_perm(self, access, type):
# This should only be needed for servers, so maybe out of scope for slixmpp
perm = Perm()
@@ -34,7 +37,7 @@ class Privilege(ElementBase):
class Perm(ElementBase):
- namespace = "urn:xmpp:privilege:1"
+ namespace = "urn:xmpp:privilege:2"
name = "perm"
plugin_attrib = "perm"
plugin_multi_attrib = "perms"
@@ -44,4 +47,4 @@ class Perm(ElementBase):
def register():
register_stanza_plugin(Message, Privilege)
register_stanza_plugin(Privilege, Forwarded)
- register_stanza_plugin(Privilege, Perm, iterable=True) \ No newline at end of file
+ register_stanza_plugin(Privilege, Perm, iterable=True)
diff --git a/tests/test_stanza_xep_0356.py b/tests/test_stanza_xep_0356.py
index ef116db2..cf14ccba 100644
--- a/tests/test_stanza_xep_0356.py
+++ b/tests/test_stanza_xep_0356.py
@@ -13,7 +13,7 @@ class TestPermissions(SlixTest):
def testAdvertisePermission(self):
xmlstring = """
<message from='capulet.net' to='pubub.capulet.lit'>
- <privilege xmlns='urn:xmpp:privilege:1'>
+ <privilege xmlns='urn:xmpp:privilege:2'>
<perm access='roster' type='both'/>
<perm access='message' type='outgoing'/>
<perm access='presence' type='managed_entity'/>
diff --git a/tests/test_stream_xep_0356.py b/tests/test_stream_xep_0356.py
index 2949daad..e2ce9569 100644
--- a/tests/test_stream_xep_0356.py
+++ b/tests/test_stream_xep_0356.py
@@ -31,7 +31,7 @@ class TestPermissions(SlixTest):
self.recv(
"""
<message from='capulet.net' to='pubub.capulet.lit' id='54321'>
- <privilege xmlns='urn:xmpp:privilege:1'>
+ <privilege xmlns='urn:xmpp:privilege:2'>
<perm access='roster' type='both'/>
<perm access='message' type='outgoing'/>
</privilege>
@@ -95,7 +95,7 @@ class TestPermissions(SlixTest):
def testMakeOutgoingMessage(self):
xmlstring = """
<message xmlns="jabber:component:accept" from='pubsub.capulet.lit' to='capulet.net'>
- <privilege xmlns='urn:xmpp:privilege:1'>
+ <privilege xmlns='urn:xmpp:privilege:2'>
<forwarded xmlns='urn:xmpp:forward:0'>
<message from="juliet@capulet.lit" to="romeo@montague.lit" xmlns="jabber:client">
<body>I do not hate you</body>