summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2022-05-15 16:44:10 +0200
committermathieui <mathieui@mathieui.net>2022-05-15 16:44:10 +0200
commit566e7dc771d74e8c41698a86d6cf782066d46e44 (patch)
treec7328b8b4fda8e3e5e70cdfdc077314776b9b1c5
parente1a240ec6c39a10ca84a2aaaf3a7ba46f93d3d09 (diff)
parentaa492f905c7a6e24326a153bc1de0c61ff4f3c17 (diff)
downloadslixmpp-master.tar.gz
slixmpp-master.tar.bz2
slixmpp-master.tar.xz
slixmpp-master.zip
Merge branch 'nicoco-master-patch-38938' into 'master'HEADmaster
Fix typo in chat markers (fixes #3469) Closes #3469 See merge request poezio/slixmpp!199
-rw-r--r--slixmpp/plugins/xep_0333/markers.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/slixmpp/plugins/xep_0333/markers.py b/slixmpp/plugins/xep_0333/markers.py
index ca7a27da..86ddf612 100644
--- a/slixmpp/plugins/xep_0333/markers.py
+++ b/slixmpp/plugins/xep_0333/markers.py
@@ -1,4 +1,3 @@
-
# slixmpp: The Slick XMPP Library
# Copyright (C) 2016 Emmanuel Gil Peyrot
# This file is part of slixmpp.
@@ -68,11 +67,11 @@ class XEP_0333(BasePlugin):
: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)
+ displayed, received, 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'):
+ if marker not in ('displayed', 'received', 'acknowledged'):
raise ValueError('Invalid marker: %s' % marker)
msg = self.xmpp.make_message(mto=mto, mfrom=mfrom)
if thread: