jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'join-wait-timeout-none' into 'master'

Browse Source 
XEP-0045: make the join_muc_wait timeout parameter optional

See merge request poezio/slixmpp!112
This commit is contained in:
mathieui 2021-01-31 19:41:40 +01:00
commit 3c19f69c25
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slixmpp/plugins/xep_0045/muc.py
View File

@ -264,7 +264,7 @@ class XEP_0045(BasePlugin):
seconds: Optional[int] = None, seconds: Optional[int] = None,
since: Optional[datetime] = None, since: Optional[datetime] = None,
presence_options: Optional[Dict[str, str]] = None, presence_options: Optional[Dict[str, str]] = None,
timeout: int = 30) -> Presence: timeout: Optional[int] = None) -> Presence:
""" """
Try to join a MUC and block until we are joined or get an error. Try to join a MUC and block until we are joined or get an error.
@ -276,6 +276,8 @@ class XEP_0045(BasePlugin):
:param maxstanzas: Max number of stanzas to return from history. :param maxstanzas: Max number of stanzas to return from history.
:param seconds: Fetch history until that many seconds in the past. :param seconds: Fetch history until that many seconds in the past.
:param since: Fetch history since that timestamp. :param since: Fetch history since that timestamp.
:param timeout: Timeout after which a TimeoutError is raised.
None means no timeout.
:raises: A slixmpp.exceptions.PresenceError if the MUC returns a :raises: A slixmpp.exceptions.PresenceError if the MUC returns a
presence error. presence error.
:raises: An asyncio.TimeoutError if there is neither success nor :raises: An asyncio.TimeoutError if there is neither success nor