From 58c3579f74e2827c0be973cac9b0a0ae9a606a1e Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 19:36:20 +0100 Subject: XEP-0422: Message Fastening --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0422/__init__.py | 13 +++++++++++ slixmpp/plugins/xep_0422/fastening.py | 28 +++++++++++++++++++++++ slixmpp/plugins/xep_0422/stanza.py | 42 +++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 slixmpp/plugins/xep_0422/__init__.py create mode 100644 slixmpp/plugins/xep_0422/fastening.py create mode 100644 slixmpp/plugins/xep_0422/stanza.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index f948ead6..dce69083 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -93,5 +93,6 @@ __all__ = [ 'xep_0404', # MIX-Anon 'xep_0405', # MIX-PAM 'xep_0421', # Anonymous unique occupant identifiers for MUCs + 'xep_0422', # Message Fastening 'xep_0444', # Message Reactions ] diff --git a/slixmpp/plugins/xep_0422/__init__.py b/slixmpp/plugins/xep_0422/__init__.py new file mode 100644 index 00000000..9a1575c1 --- /dev/null +++ b/slixmpp/plugins/xep_0422/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0422.stanza import * +from slixmpp.plugins.xep_0422.fastening import XEP_0422 + +register_plugin(XEP_0422) diff --git a/slixmpp/plugins/xep_0422/fastening.py b/slixmpp/plugins/xep_0422/fastening.py new file mode 100644 index 00000000..68560e16 --- /dev/null +++ b/slixmpp/plugins/xep_0422/fastening.py @@ -0,0 +1,28 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0422 import stanza + + +class XEP_0422(BasePlugin): + '''XEP-0422: Message Fastening''' + + name = 'xep_0422' + description = 'Message Fastening' + dependencies = {'xep_0030'} + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() + + def session_bind(self, jid): + self.xmpp.plugin['xep_0030'].add_feature(feature=stanza.NS) + + def plugin_end(self): + self.xmpp.plugin['xep_0030'].del_feature(feature=stanza.NS) diff --git a/slixmpp/plugins/xep_0422/stanza.py b/slixmpp/plugins/xep_0422/stanza.py new file mode 100644 index 00000000..a739809e --- /dev/null +++ b/slixmpp/plugins/xep_0422/stanza.py @@ -0,0 +1,42 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) + + +NS = 'urn:xmpp:fasten:0' + + +class ApplyTo(ElementBase): + namespace = NS + name = 'apply-to' + plugin_attrib = 'apply_to' + interfaces = {'id', 'shell'} + + def set_shell(self, value: bool): + if value: + self.xml.attrib['shell'] = str(value).lower() + else: + if 'shell' in self.xml.attrib: + del self.xml.attrib['shell'] + + +class External(ElementBase): + namespace = NS + name = 'external' + plugin_attrib = 'external' + interfaces = {'name'} + + +def register_plugins(): + register_stanza_plugin(Message, ApplyTo) + register_stanza_plugin(ApplyTo, External) -- cgit v1.2.3 From c63e9a32b9481ccd52f5ccf3dcdd3a61f0109f21 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 19:47:46 +0100 Subject: XEP-0359: Unique and Stable Stanza IDs (was partially supported in places before) --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0359/__init__.py | 13 +++++++++++++ slixmpp/plugins/xep_0359/stanza.py | 35 +++++++++++++++++++++++++++++++++++ slixmpp/plugins/xep_0359/stanzaid.py | 22 ++++++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 slixmpp/plugins/xep_0359/__init__.py create mode 100644 slixmpp/plugins/xep_0359/stanza.py create mode 100644 slixmpp/plugins/xep_0359/stanzaid.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index dce69083..758cccd1 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -86,6 +86,7 @@ __all__ = [ 'xep_0325', # IoT Systems Control 'xep_0332', # HTTP Over XMPP Transport 'xep_0353', # Jingle Message Initiation + 'xep_0359', # Unique and Stable Stanza IDs 'xep_0363', # HTTP File Upload 'xep_0369', # MIX-CORE 'xep_0377', # Spam reporting diff --git a/slixmpp/plugins/xep_0359/__init__.py b/slixmpp/plugins/xep_0359/__init__.py new file mode 100644 index 00000000..dd01ea1e --- /dev/null +++ b/slixmpp/plugins/xep_0359/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0359.stanza import * +from slixmpp.plugins.xep_0359.stanzaid import XEP_0359 + +register_plugin(XEP_0359) diff --git a/slixmpp/plugins/xep_0359/stanza.py b/slixmpp/plugins/xep_0359/stanza.py new file mode 100644 index 00000000..db8e9fff --- /dev/null +++ b/slixmpp/plugins/xep_0359/stanza.py @@ -0,0 +1,35 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) + + +NS = 'urn:xmpp:sid:0' + + +class StanzaID(ElementBase): + namespace = NS + name = 'stanza-id' + plugin_attrib = 'stanza_id' + interfaces = {'id', 'by'} + + +class OriginID(ElementBase): + namespace = NS + name = 'origin-id' + plugin_attrib = 'origin_id' + interfaces = {'id'} + + +def register_plugins(): + register_stanza_plugin(Message, StanzaID) + register_stanza_plugin(Message, OriginID) diff --git a/slixmpp/plugins/xep_0359/stanzaid.py b/slixmpp/plugins/xep_0359/stanzaid.py new file mode 100644 index 00000000..2235e74b --- /dev/null +++ b/slixmpp/plugins/xep_0359/stanzaid.py @@ -0,0 +1,22 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0359 import stanza + + +class XEP_0359(BasePlugin): + '''XEP-0359: Unique and Stable Stanza IDs''' + + name = 'xep_0359' + description = 'Unique and Stable Stanza IDs' + dependencies = set() + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() -- cgit v1.2.3 From 54d556280ae5003eb56eeb419dfcb0b906506938 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 19:54:14 +0100 Subject: XEP-0428: Fallback Indication --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0428/__init__.py | 13 +++++++++++++ slixmpp/plugins/xep_0428/fallback.py | 22 ++++++++++++++++++++++ slixmpp/plugins/xep_0428/stanza.py | 26 ++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 slixmpp/plugins/xep_0428/__init__.py create mode 100644 slixmpp/plugins/xep_0428/fallback.py create mode 100644 slixmpp/plugins/xep_0428/stanza.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index 758cccd1..0bc62676 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -95,5 +95,6 @@ __all__ = [ 'xep_0405', # MIX-PAM 'xep_0421', # Anonymous unique occupant identifiers for MUCs 'xep_0422', # Message Fastening + 'xep_0428', # Message Fallback 'xep_0444', # Message Reactions ] diff --git a/slixmpp/plugins/xep_0428/__init__.py b/slixmpp/plugins/xep_0428/__init__.py new file mode 100644 index 00000000..864f4ed3 --- /dev/null +++ b/slixmpp/plugins/xep_0428/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0428.stanza import * +from slixmpp.plugins.xep_0428.fallback import XEP_0428 + +register_plugin(XEP_0428) diff --git a/slixmpp/plugins/xep_0428/fallback.py b/slixmpp/plugins/xep_0428/fallback.py new file mode 100644 index 00000000..61e913e3 --- /dev/null +++ b/slixmpp/plugins/xep_0428/fallback.py @@ -0,0 +1,22 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0428 import stanza + + +class XEP_0428(BasePlugin): + '''XEP-0428: Fallback Indication''' + + name = 'xep_0428' + description = 'Fallback Indication' + dependencies = set() + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() diff --git a/slixmpp/plugins/xep_0428/stanza.py b/slixmpp/plugins/xep_0428/stanza.py new file mode 100644 index 00000000..41df80d0 --- /dev/null +++ b/slixmpp/plugins/xep_0428/stanza.py @@ -0,0 +1,26 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) + + +NS = 'urn:xmpp:fallback:0' + + +class Fallback(ElementBase): + namespace = NS + name = 'fallback' + plugin_attrib = 'fallback' + + +def register_plugins(): + register_stanza_plugin(Message, Fallback) -- cgit v1.2.3 From c4ca15a040d45ba27c4f546293e83ff6143b4dfc Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 20:10:25 +0100 Subject: XEP-0424: Message Retraction --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0424/__init__.py | 13 +++++++ slixmpp/plugins/xep_0424/retraction.py | 62 ++++++++++++++++++++++++++++++++++ slixmpp/plugins/xep_0424/stanza.py | 38 +++++++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 slixmpp/plugins/xep_0424/__init__.py create mode 100644 slixmpp/plugins/xep_0424/retraction.py create mode 100644 slixmpp/plugins/xep_0424/stanza.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index 0bc62676..61e7a995 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -95,6 +95,7 @@ __all__ = [ 'xep_0405', # MIX-PAM 'xep_0421', # Anonymous unique occupant identifiers for MUCs 'xep_0422', # Message Fastening + 'xep_0424', # Message Retraction 'xep_0428', # Message Fallback 'xep_0444', # Message Reactions ] diff --git a/slixmpp/plugins/xep_0424/__init__.py b/slixmpp/plugins/xep_0424/__init__.py new file mode 100644 index 00000000..0e5dfce1 --- /dev/null +++ b/slixmpp/plugins/xep_0424/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0424.stanza import * +from slixmpp.plugins.xep_0424.retraction import XEP_0424 + +register_plugin(XEP_0424) diff --git a/slixmpp/plugins/xep_0424/retraction.py b/slixmpp/plugins/xep_0424/retraction.py new file mode 100644 index 00000000..5425a61f --- /dev/null +++ b/slixmpp/plugins/xep_0424/retraction.py @@ -0,0 +1,62 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from typing import Optional + +from slixmpp import JID, Message +from slixmpp.exceptions import IqError, IqTimeout +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0424 import stanza + + +DEFAULT_FALLBACK = ( + 'This person attempted to retract a previous message, but your client ' + 'does not support it.' +) + + +class XEP_0424(BasePlugin): + '''XEP-0424: Message Retraction''' + + name = 'xep_0424' + description = 'Message Retraction' + dependencies = {'xep_0422', 'xep_0030', 'xep_0359', 'xep_0428', 'xep_0334'} + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() + + def session_bind(self, jid): + self.xmpp.plugin['xep_0030'].add_feature(feature=stanza.NS) + + def plugin_end(self): + self.xmpp.plugin['xep_0030'].del_feature(feature=stanza.NS) + + def send_retraction(self, mto: JID, id: str, mtype: str = 'chat', + include_fallback: bool = True, + fallback_text: Optional[str] = None, *, + mfrom: Optional[JID] = None): + """ + Send a message retraction + :param JID mto: The JID to retract the message from + :param str id: Message ID to retract + :param str mtype: Message type + :param bool include_fallback: Whether to include a fallback body + :param Optional[str] fallback_text: The contet of the fallback + body. None will set the default value. + """ + if fallback_text is None: + fallback_text = DEFAULT_FALLBACK + msg = self.xmpp.make_message(mto=mto, mtype=mtype, mfrom=mfrom) + if include_fallback: + msg['body'] = fallback_text + msg.enable('fallback') + msg['apply_to']['id'] = id + msg['apply_to'].enable('retract') + msg.enable('store') + msg.send() diff --git a/slixmpp/plugins/xep_0424/stanza.py b/slixmpp/plugins/xep_0424/stanza.py new file mode 100644 index 00000000..c55af08c --- /dev/null +++ b/slixmpp/plugins/xep_0424/stanza.py @@ -0,0 +1,38 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) +from slixmpp.plugins.xep_0422.stanza import ApplyTo +from slixmpp.plugins.xep_0359 import OriginID + + +NS = 'urn:xmpp:message-retract:0' + + +class Retract(ElementBase): + namespace = NS + name = 'retract' + plugin_attrib = 'retract' + + +class Retracted(ElementBase): + namespace = NS + name = 'retracted' + plugin_attrib = 'retracted' + interfaces = {'stamp'} + + +def register_plugins(): + register_stanza_plugin(ApplyTo, Retract) + register_stanza_plugin(Message, Retracted) + + register_stanza_plugin(Retracted, OriginID) -- cgit v1.2.3 From 41dea80d94e319b0df14d5a271ddb2cc06b56876 Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 20:25:50 +0100 Subject: XEP-0425: Message Moderation --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0425/__init__.py | 13 ++++++++++ slixmpp/plugins/xep_0425/moderation.py | 39 ++++++++++++++++++++++++++++ slixmpp/plugins/xep_0425/stanza.py | 46 ++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 slixmpp/plugins/xep_0425/__init__.py create mode 100644 slixmpp/plugins/xep_0425/moderation.py create mode 100644 slixmpp/plugins/xep_0425/stanza.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index 61e7a995..2b02c9e3 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -96,6 +96,7 @@ __all__ = [ 'xep_0421', # Anonymous unique occupant identifiers for MUCs 'xep_0422', # Message Fastening 'xep_0424', # Message Retraction + 'xep_0425', # Message Moderation 'xep_0428', # Message Fallback 'xep_0444', # Message Reactions ] diff --git a/slixmpp/plugins/xep_0425/__init__.py b/slixmpp/plugins/xep_0425/__init__.py new file mode 100644 index 00000000..2effe361 --- /dev/null +++ b/slixmpp/plugins/xep_0425/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0425.stanza import * +from slixmpp.plugins.xep_0425.moderation import XEP_0425 + +register_plugin(XEP_0425) diff --git a/slixmpp/plugins/xep_0425/moderation.py b/slixmpp/plugins/xep_0425/moderation.py new file mode 100644 index 00000000..e840d80d --- /dev/null +++ b/slixmpp/plugins/xep_0425/moderation.py @@ -0,0 +1,39 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from typing import Optional + +from slixmpp import JID, Message +from slixmpp.exceptions import IqError, IqTimeout +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0425 import stanza + + +class XEP_0425(BasePlugin): + '''XEP-0425: Message Moderation''' + + name = 'xep_0425' + description = 'Message Moderation' + dependencies = {'xep_0424', 'xep_0421'} + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() + + def session_bind(self, jid): + self.xmpp.plugin['xep_0030'].add_feature(feature=stanza.NS) + + def plugin_end(self): + self.xmpp.plugin['xep_0030'].del_feature(feature=stanza.NS) + + async def moderate(self, room: JID, id: str, reason: str = '', *, + ifrom: Optional[JID] = None, **iqkwargs): + iq = self.xmpp.make_iq_set(ito=room.bare, ifrom=ifrom) + iq['apply_to']['id'] = id + iq['apply_to']['moderate']['reason'] = reason + await iq.send(**iqkwargs) diff --git a/slixmpp/plugins/xep_0425/stanza.py b/slixmpp/plugins/xep_0425/stanza.py new file mode 100644 index 00000000..9b756953 --- /dev/null +++ b/slixmpp/plugins/xep_0425/stanza.py @@ -0,0 +1,46 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message, Iq +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) +from slixmpp.plugins.xep_0422.stanza import ApplyTo +from slixmpp.plugins.xep_0421.stanza import OccupantId +from slixmpp.plugins.xep_0424.stanza import Retract, Retracted + + +NS = 'urn:xmpp:message-moderate:0' + + +class Moderate(ElementBase): + namespace = NS + name = 'moderate' + plugin_attrib = 'moderate' + interfaces = {'reason'} + sub_interfaces = {'reason'} + + +class Moderated(ElementBase): + namespace = NS + name = 'moderated' + plugin_attrib = 'moderated' + interfaces = {'reason', 'by'} + sub_interfaces = {'reason'} + + +def register_plugins(): + register_stanza_plugin(Iq, ApplyTo) + register_stanza_plugin(ApplyTo, Moderate) + register_stanza_plugin(Moderate, Retract) + + register_stanza_plugin(Message, Moderated) + register_stanza_plugin(ApplyTo, Moderated) + register_stanza_plugin(Moderated, Retracted) + register_stanza_plugin(Moderated, OccupantId) -- cgit v1.2.3 From 2c523d1a3b6a97b78b5ee4d688f33fccd71eb83c Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 20:56:41 +0100 Subject: XEP-0439: Quick Response --- slixmpp/plugins/__init__.py | 1 + slixmpp/plugins/xep_0439/__init__.py | 13 +++++ slixmpp/plugins/xep_0439/quickresponse.py | 91 +++++++++++++++++++++++++++++++ slixmpp/plugins/xep_0439/stanza.py | 43 +++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 slixmpp/plugins/xep_0439/__init__.py create mode 100644 slixmpp/plugins/xep_0439/quickresponse.py create mode 100644 slixmpp/plugins/xep_0439/stanza.py diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py index 2b02c9e3..02ac3712 100644 --- a/slixmpp/plugins/__init__.py +++ b/slixmpp/plugins/__init__.py @@ -98,5 +98,6 @@ __all__ = [ 'xep_0424', # Message Retraction 'xep_0425', # Message Moderation 'xep_0428', # Message Fallback + 'xep_0439', # Quick Response 'xep_0444', # Message Reactions ] diff --git a/slixmpp/plugins/xep_0439/__init__.py b/slixmpp/plugins/xep_0439/__init__.py new file mode 100644 index 00000000..6fa46cb4 --- /dev/null +++ b/slixmpp/plugins/xep_0439/__init__.py @@ -0,0 +1,13 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" + +from slixmpp.plugins.base import register_plugin +from slixmpp.plugins.xep_0439.stanza import * +from slixmpp.plugins.xep_0439.quickresponse import XEP_0439 + +register_plugin(XEP_0439) diff --git a/slixmpp/plugins/xep_0439/quickresponse.py b/slixmpp/plugins/xep_0439/quickresponse.py new file mode 100644 index 00000000..74e299d6 --- /dev/null +++ b/slixmpp/plugins/xep_0439/quickresponse.py @@ -0,0 +1,91 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permission. +""" +from typing import ( + Iterable, + Optional, + Tuple, +) + +from slixmpp import JID +from slixmpp.plugins import BasePlugin +from slixmpp.plugins.xep_0439 import stanza + + +class XEP_0439(BasePlugin): + '''XEP-0439: Quick Response''' + + name = 'xep_0439' + description = 'Quick Response' + dependencies = set() + stanza = stanza + namespace = stanza.NS + + def plugin_init(self) -> None: + stanza.register_plugins() + + def ask_for_responses(self, mto: JID, body: str, + responses: Iterable[Tuple[str, str]], + mtype: str = 'chat', lang: Optional[str] = None, *, + mfrom: Optional[JID] = None): + """ + Send a message with a set of responses. + + :param JID mto: The JID of the entity which will receive the message + :param str body: The message body of the question + :param Iterable[Tuple[str, str]] responses: A set of tuples containing + (value, label) for each response + :param str mtype: The message type + :param str lang: The lang of the message (if not use, the default + for this session will be used. + """ + if lang is None: + lang = self.xmpp.default_lang + msg = self.xmpp.make_message(mto=mto, mfrom=mfrom, mtype=mtype) + msg['body|%s' % lang] = body + values = set() + for value, label in responses: + if value in values: + raise ValueError("Duplicate values") + values.add(value) + elem = stanza.Response() + elem['lang'] = lang + elem['value'] = value + elem['label'] = label + msg.append(elem) + msg.send() + + def ask_for_actions(self, mto: JID, body: str, + actions: Iterable[Tuple[str, str]], + mtype: str = 'chat', lang: Optional[str] = None, *, + mfrom: Optional[JID] = None): + """ + Send a message with a set of actions. + + :param JID mto: The JID of the entity which will receive the message + :param str body: The message body of the question + :param Iterable[Tuple[str, str]] actions: A set of tuples containing + (action, label) for each action + :param str mtype: The message type + :param str lang: The lang of the message (if not use, the default + for this session will be used. + """ + if lang is None: + lang = self.xmpp.default_lang + msg = self.xmpp.make_message(mto=mto, mfrom=mfrom, mtype=mtype) + msg['body|%s' % lang] = body + ids = set() + for id, label in actions: + if id in ids: + raise ValueError("Duplicate ids") + ids.add(id) + elem = stanza.Action() + elem['lang'] = lang + elem['id'] = id + elem['label'] = label + msg.append(elem) + msg.send() diff --git a/slixmpp/plugins/xep_0439/stanza.py b/slixmpp/plugins/xep_0439/stanza.py new file mode 100644 index 00000000..e00e1f27 --- /dev/null +++ b/slixmpp/plugins/xep_0439/stanza.py @@ -0,0 +1,43 @@ +""" + Slixmpp: The Slick XMPP Library + Copyright (C) 2020 Mathieu Pasquet + This file is part of Slixmpp. + + See the file LICENSE for copying permissio +""" + +from slixmpp.stanza import Message +from slixmpp.xmlstream import ( + ElementBase, + register_stanza_plugin, +) + + +NS = 'urn:xmpp:tmp:quick-response' + + +class Response(ElementBase): + namespace = NS + name = 'response' + plugin_attrib = 'response' + interfaces = {'value', 'label'} + + +class Action(ElementBase): + namespace = NS + name = 'action' + plugin_attrib = 'action' + interfaces = {'id', 'label'} + + +class ActionSelected(ElementBase): + namespace = NS + name = 'action-selected' + plugin_attrib = 'action_selected' + interfaces = {'id'} + + +def register_plugins(): + register_stanza_plugin(Message, Action, iterable=True) + register_stanza_plugin(Message, ActionSelected) + register_stanza_plugin(Message, Response, iterable=True) -- cgit v1.2.3 From fdb0749cd14ea9480687d5e243ec8fc81731e4dd Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 4 Dec 2020 18:45:06 +0100 Subject: XEP-0422,0424,0425,0439: Add basic stanza tests --- tests/test_stanza_xep_0422.py | 33 +++++++++++++++++++++++++ tests/test_stanza_xep_0424.py | 39 +++++++++++++++++++++++++++++ tests/test_stanza_xep_0425.py | 47 +++++++++++++++++++++++++++++++++++ tests/test_stanza_xep_0439.py | 57 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 tests/test_stanza_xep_0422.py create mode 100644 tests/test_stanza_xep_0424.py create mode 100644 tests/test_stanza_xep_0425.py create mode 100644 tests/test_stanza_xep_0439.py diff --git a/tests/test_stanza_xep_0422.py b/tests/test_stanza_xep_0422.py new file mode 100644 index 00000000..9d2cc396 --- /dev/null +++ b/tests/test_stanza_xep_0422.py @@ -0,0 +1,33 @@ +import unittest +from slixmpp import Message +from slixmpp.test import SlixTest +from slixmpp.xmlstream import ET +from slixmpp.plugins.xep_0422 import stanza + + +class TestFastening(SlixTest): + + def setUp(self): + stanza.register_plugins() + + def testFastenExternal(self): + message = Message() + message['apply_to']['id'] = 'some-id' + message['apply_to'].xml.append( + ET.fromstring('Test') + ) + message['apply_to']['external']['name'] = 'body' + message['body'] = 'Toto' + + self.check(message, """ + + + Test + + + Toto + + """, use_values=False) + + +suite = unittest.TestLoader().loadTestsFromTestCase(TestFastening) diff --git a/tests/test_stanza_xep_0424.py b/tests/test_stanza_xep_0424.py new file mode 100644 index 00000000..c94ed79b --- /dev/null +++ b/tests/test_stanza_xep_0424.py @@ -0,0 +1,39 @@ +import unittest +from slixmpp import Message +from slixmpp.test import SlixTest +from slixmpp.plugins.xep_0424 import stanza + + +class TestRetraction(SlixTest): + + def setUp(self): + stanza.register_plugins() + + def testRetract(self): + message = Message() + message['apply_to']['id'] = 'some-id' + message['apply_to']['retract'] + + self.check(message, """ + + + + + + """, use_values=False) + + def testRetracted(self): + message = Message() + message['retracted']['stamp'] = '2019-09-20T23:09:32Z' + message['retracted']['origin_id']['id'] = 'originid' + + self.check(message, """ + + + + + + """) + + +suite = unittest.TestLoader().loadTestsFromTestCase(TestRetraction) diff --git a/tests/test_stanza_xep_0425.py b/tests/test_stanza_xep_0425.py new file mode 100644 index 00000000..96d979e8 --- /dev/null +++ b/tests/test_stanza_xep_0425.py @@ -0,0 +1,47 @@ +import unittest +from slixmpp import Message, Iq, JID +from slixmpp.test import SlixTest +from slixmpp.plugins.xep_0425 import stanza + + +class TestModeration(SlixTest): + + def setUp(self): + stanza.register_plugins() + + def testModerate(self): + iq = Iq() + iq['type'] = 'set' + iq['id'] = 'a' + iq['apply_to']['id'] = 'some-id' + iq['apply_to']['moderate'].enable('retract') + iq['apply_to']['moderate']['reason'] = 'R' + + self.check(iq, """ + + + + + R + + + + """, use_values=False) + + def testModerated(self): + message = Message() + message['moderated']['by'] = JID('toto@titi') + message['moderated']['retracted']['stamp'] = '2019-09-20T23:09:32Z' + message['moderated']['reason'] = 'R' + + self.check(message, """ + + + + R + + + """) + + +suite = unittest.TestLoader().loadTestsFromTestCase(TestModeration) diff --git a/tests/test_stanza_xep_0439.py b/tests/test_stanza_xep_0439.py new file mode 100644 index 00000000..fbd3aa47 --- /dev/null +++ b/tests/test_stanza_xep_0439.py @@ -0,0 +1,57 @@ +import unittest +from slixmpp import Message +from slixmpp.test import SlixTest +from slixmpp.plugins.xep_0439 import stanza + + +class TestQuickResponse(SlixTest): + + def setUp(self): + stanza.register_plugins() + + def testResponse(self): + message = Message() + message['body'] = 'Reply 1 or 2?' + for (value, label) in [('1', 'Rep 1'), ('2', 'Rep 2')]: + rep = stanza.Response() + rep['value'] = value + rep['label'] = label + message.append(rep) + + self.check(message, """ + + Reply 1 or 2? + + + + """, use_values=False) + + def testAction(self): + message = Message() + message['body'] = 'action 1 or 2?' + for (id_, label) in [('1', 'action 1'), ('2', 'action 2')]: + act = stanza.Action() + act['id'] = id_ + act['label'] = label + message.append(act) + + self.check(message, """ + + action 1 or 2? + + + + """, use_values=False) + + def testActionSelected(self): + message = Message() + message['action_selected']['id'] = 'act1' + + self.check(message, """ + + + + """, use_values=False) + + +suite = unittest.TestLoader().loadTestsFromTestCase(TestQuickResponse) -- cgit v1.2.3 From c2b09c5c8317d919d7df94b85ac92910de05904a Mon Sep 17 00:00:00 2001 From: mathieui Date: Wed, 2 Dec 2020 21:09:55 +0100 Subject: Update doap.xml --- doap.xml | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/doap.xml b/doap.xml index e8db8830..e8c3b07a 100644 --- a/doap.xml +++ b/doap.xml @@ -506,6 +506,13 @@ unknown + + + + complete + NEXT + + @@ -521,7 +528,14 @@ - + + + complete + NEXT + + + + complete 1.0.0 @@ -531,7 +545,8 @@ - unknown + partial + NEXT @@ -543,19 +558,22 @@ - unknown + partial + NEXT - unknown + partial + NEXT - unknown + partial + NEXT @@ -564,10 +582,47 @@ unknown + + + + complete + NEXT + + + + + + complete + NEXT + + + + + + complete + NEXT + + + + + + complete + NEXT + + + + + + complete + NEXT + 0.1.0 + + - unknown + complete + 0.1.0 -- cgit v1.2.3