From df0ecfc1428a097578305ca58b40b7668f6e9a19 Mon Sep 17 00:00:00 2001 From: jinyu <96060102+jinyu2022@users.noreply.github.com> Date: Sun, 8 Sep 2024 12:26:36 +0800 Subject: [PATCH] Update the type of BasePlugin.xmpp to BaseXMPP. Increase the timeout for join_muc_wait. --- slixmpp/plugins/base.py | 4 ++-- slixmpp/plugins/xep_0045/muc.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/slixmpp/plugins/base.py b/slixmpp/plugins/base.py index 6fe4f622..14c82c76 100644 --- a/slixmpp/plugins/base.py +++ b/slixmpp/plugins/base.py @@ -12,7 +12,7 @@ import copy import logging import threading -from slixmpp.clientxmpp import ClientXMPP +from slixmpp.basexmpp import BaseXMPP from typing import Any, Dict, Set, ClassVar @@ -274,7 +274,7 @@ class BasePlugin(object): #: `plugin.config['foo']`. default_config: ClassVar[Dict[str, Any]] = {} - def __init__(self, xmpp: ClientXMPP, config=None): + def __init__(self, xmpp: BaseXMPP, config=None): self.xmpp = xmpp if self.xmpp: self.api = self.xmpp.api.wrap(self.name) diff --git a/slixmpp/plugins/xep_0045/muc.py b/slixmpp/plugins/xep_0045/muc.py index c13e0eab..ea0e06a5 100644 --- a/slixmpp/plugins/xep_0045/muc.py +++ b/slixmpp/plugins/xep_0045/muc.py @@ -266,7 +266,7 @@ class XEP_0045(BasePlugin): seconds: Optional[int] = None, since: Optional[datetime] = None, presence_options: Optional[PresenceArgs] = None, - timeout: int = 30) -> JoinResult: + timeout: int = 300) -> JoinResult: """ Try to join a MUC and block until we are joined or get an error. @@ -312,7 +312,7 @@ class XEP_0045(BasePlugin): stanza.send() return await self._await_join(room, timeout) - async def _await_join(self, room: JID, timeout: int = 30) -> JoinResult: + async def _await_join(self, room: JID, timeout: int = 300) -> JoinResult: """Do the heavy lifting for awaiting a MUC join A muc join, once the join stanza is sent, is: