From 11ac5867fff9b53b432793a834bf24a8bd3ff1e2 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sun, 6 Dec 2020 21:28:40 +0100
Subject: XEP-0333: Rename plugin file from "hints" to "markers"

---
 slixmpp/plugins/xep_0333/markers.py | 55 +++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 slixmpp/plugins/xep_0333/markers.py

(limited to 'slixmpp/plugins/xep_0333/markers.py')

diff --git a/slixmpp/plugins/xep_0333/markers.py b/slixmpp/plugins/xep_0333/markers.py
new file mode 100644
index 00000000..5a3d3f9a
--- /dev/null
+++ b/slixmpp/plugins/xep_0333/markers.py
@@ -0,0 +1,55 @@
+"""
+    slixmpp: The Slick XMPP Library
+    Copyright (C) 2016 Emmanuel Gil Peyrot
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+import logging
+
+from slixmpp import Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0333 import stanza, Markable, Received, Displayed, Acknowledged
+
+log = logging.getLogger(__name__)
+
+class XEP_0333(BasePlugin):
+
+    name = 'xep_0333'
+    description = 'XEP-0333: Chat Markers'
+    stanza = stanza
+
+    def plugin_init(self):
+        register_stanza_plugin(Message, Markable)
+        register_stanza_plugin(Message, Received)
+        register_stanza_plugin(Message, Displayed)
+        register_stanza_plugin(Message, Acknowledged)
+
+        self.xmpp.register_handler(
+            Callback('Received Chat Marker',
+                StanzaPath('message/received'),
+                self._handle_received))
+        self.xmpp.register_handler(
+            Callback('Displayed Chat Marker',
+                StanzaPath('message/displayed'),
+                self._handle_displayed))
+        self.xmpp.register_handler(
+            Callback('Acknowledged Chat Marker',
+                StanzaPath('message/acknowledged'),
+                self._handle_acknowledged))
+
+    def _handle_received(self, message):
+        self.xmpp.event('marker_received', message)
+        self.xmpp.event('marker', message)
+
+    def _handle_displayed(self, message):
+        self.xmpp.event('marker_displayed', message)
+        self.xmpp.event('marker', message)
+
+    def _handle_acknowledged(self, message):
+        self.xmpp.event('marker_acknowledged', message)
+        self.xmpp.event('marker', message)
-- 
cgit v1.2.3


From b3e2a8eb91f5521b7dc43020e388de8918aaa33e Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sun, 6 Dec 2020 21:45:22 +0100
Subject: XEP-0333: Add missing feature, and a send_marker method

---
 slixmpp/plugins/xep_0333/markers.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'slixmpp/plugins/xep_0333/markers.py')

diff --git a/slixmpp/plugins/xep_0333/markers.py b/slixmpp/plugins/xep_0333/markers.py
index 5a3d3f9a..b8a003df 100644
--- a/slixmpp/plugins/xep_0333/markers.py
+++ b/slixmpp/plugins/xep_0333/markers.py
@@ -7,8 +7,9 @@
 """
 
 import logging
+from typing import Optional
 
-from slixmpp import Message
+from slixmpp import Message, JID
 from slixmpp.plugins import BasePlugin
 from slixmpp.xmlstream import register_stanza_plugin
 from slixmpp.xmlstream.handler import Callback
@@ -22,6 +23,7 @@ class XEP_0333(BasePlugin):
     name = 'xep_0333'
     description = 'XEP-0333: Chat Markers'
     stanza = stanza
+    dependencies = {'xep_0030'}
 
     def plugin_init(self):
         register_stanza_plugin(Message, Markable)
@@ -42,6 +44,12 @@ class XEP_0333(BasePlugin):
                 StanzaPath('message/acknowledged'),
                 self._handle_acknowledged))
 
+    def session_bind(self, jid):
+        self.xmpp.plugin['xep_0030'].add_feature(stanza.NS)
+
+    def plugin_end(self):
+        self.xmpp.plugin['xep_0030'].del_feature(feature=stanza.NS)
+
     def _handle_received(self, message):
         self.xmpp.event('marker_received', message)
         self.xmpp.event('marker', message)
@@ -53,3 +61,24 @@ class XEP_0333(BasePlugin):
     def _handle_acknowledged(self, message):
         self.xmpp.event('marker_acknowledged', message)
         self.xmpp.event('marker', message)
+
+    def send_marker(self, mto: JID, id: str, marker: str,
+                    thread: Optional[str] = None, *,
+                    mfrom: Optional[JID] = None):
+        """
+        Send a chat marker.
+
+        :param JID mto: recipient of the marker
+        :param str id: Identifier of the marked message
+        :param str marker: Marker to send (one of
+            displayed, retrieved, or acknowledged)
+        :param str thread: Message thread
+        :param str mfrom: Use a specific JID to send the message
+        """
+        if marker not in ('displayed', 'retrieved', 'acknowledged'):
+            raise ValueError('Invalid marker: %s' % marker)
+        msg = self.xmpp.make_message(mto=mto, mfrom=mfrom)
+        if thread:
+            msg['thread'] = thread
+        msg[marker]['id'] = id
+        msg.send()
-- 
cgit v1.2.3