summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doap.xml7
-rw-r--r--itests/test_moderate.py2
-rw-r--r--slixmpp/plugins/xep_0424/retraction.py3
3 files changed, 9 insertions, 3 deletions
diff --git a/doap.xml b/doap.xml
index f3a3aa77..0ff4ae16 100644
--- a/doap.xml
+++ b/doap.xml
@@ -986,5 +986,12 @@
<file-release rdf:resource="https://files.pythonhosted.org/packages/ce/f1/b7cb0ba0b2f9950d3bd8e4d256502c39ac731136e1744c926f67e2c21131/slixmpp-1.5.2.tar.gz"/>
</Version>
</release>
+ <release>
+ <Version>
+ <revision>1.6.0</revision>
+ <created>2020-12-12</created>
+ <file-release rdf:resource="https://lab.louiz.org/poezio/slixmpp/-/archive/slix-1.6.0/slixmpp-slix-1.6.0.tar.gz"/>
+ </Version>
+ </release>
</Project>
</rdf:RDF>
diff --git a/itests/test_moderate.py b/itests/test_moderate.py
index 3e155ce4..e7e2b95e 100644
--- a/itests/test_moderate.py
+++ b/itests/test_moderate.py
@@ -56,7 +56,7 @@ class TestModerate(SlixIntegration):
iqres, new_msg = await asyncio.gather(
self.clients[0]['xep_0425'].moderate(
self.muc,
- id=msg_recv['id'],
+ id=msg_recv['stanza_id']['id'],
reason='Your message is bad.',
),
self.clients[1].wait_until('moderated_message')
diff --git a/slixmpp/plugins/xep_0424/retraction.py b/slixmpp/plugins/xep_0424/retraction.py
index 09e3adee..8446ac4a 100644
--- a/slixmpp/plugins/xep_0424/retraction.py
+++ b/slixmpp/plugins/xep_0424/retraction.py
@@ -45,8 +45,7 @@ class XEP_0424(BasePlugin):
self.xmpp.plugin['xep_0030'].del_feature(feature=stanza.NS)
def _handle_retract_message(self, message: Message):
- if message['type'] != 'groupchat':
- self.xmpp.event('message_retract', message)
+ self.xmpp.event('message_retract', message)
def send_retraction(self, mto: JID, id: str, mtype: str = 'chat',
include_fallback: bool = True,