diff --git a/libervia/backend/core/main.py b/libervia/backend/core/main.py index 0bb3d048..459f4c1e 100644 --- a/libervia/backend/core/main.py +++ b/libervia/backend/core/main.py @@ -1168,7 +1168,7 @@ class LiberviaBackend(service.Service): # discovery methods are shortcuts to self.memory.disco # the main difference with client.disco is that self.memory.disco manage cache - def hasFeature(self, *args, **kwargs): + def has_feature(self, *args, **kwargs): return defer.ensureDeferred(self.memory.disco.has_feature(*args, **kwargs)) def check_feature(self, *args, **kwargs): diff --git a/libervia/backend/plugins/plugin_misc_ip.py b/libervia/backend/plugins/plugin_misc_ip.py index e9ddd5af..c1d51c6b 100644 --- a/libervia/backend/plugins/plugin_misc_ip.py +++ b/libervia/backend/plugins/plugin_misc_ip.py @@ -268,7 +268,7 @@ class IPPlugin(object): return self._external_ip_cache # we first try with XEP-0279 - ip_check = await self.host.hasFeature(client, NS_IP_CHECK) + ip_check = await self.host.has_feature(client, NS_IP_CHECK) if ip_check: log.debug("Server IP Check available, we use it to retrieve our IP") iq_elt = client.IQ("get") diff --git a/libervia/backend/plugins/plugin_xep_0045.py b/libervia/backend/plugins/plugin_xep_0045.py index 3b7ba651..9eb5ca9b 100644 --- a/libervia/backend/plugins/plugin_xep_0045.py +++ b/libervia/backend/plugins/plugin_xep_0045.py @@ -1333,7 +1333,7 @@ class LiberviaMUCClient(muc.MUCClient): async def join(self, room_jid, nick, password=None): room_service = jid.JID(room_jid.host) - has_mam = await self.host.hasFeature(self.client, mam.NS_MAM, room_service) + has_mam = await self.host.has_feature(self.client, mam.NS_MAM, room_service) if not self._mam or not has_mam: return await self._join_legacy(self.client, room_jid, nick, password) else: diff --git a/libervia/backend/plugins/plugin_xep_0096.py b/libervia/backend/plugins/plugin_xep_0096.py index d7e4fe12..2175b328 100644 --- a/libervia/backend/plugins/plugin_xep_0096.py +++ b/libervia/backend/plugins/plugin_xep_0096.py @@ -75,7 +75,7 @@ class XEP_0096(object): ) async def can_handle_file_send(self, client, peer_jid, filepath): - return await self.host.hasFeature(client, NS_SI_FT, peer_jid) + return await self.host.has_feature(client, NS_SI_FT, peer_jid) def unload(self): self._si.unregister_si_profile(SI_PROFILE_NAME) diff --git a/libervia/backend/plugins/plugin_xep_0115.py b/libervia/backend/plugins/plugin_xep_0115.py index 7c9c57fe..bb5e3b5d 100644 --- a/libervia/backend/plugins/plugin_xep_0115.py +++ b/libervia/backend/plugins/plugin_xep_0115.py @@ -68,7 +68,7 @@ class XEP_0115(object): # because disco infos/identities may change between clients # optimize check - client._caps_optimize = yield self.host.hasFeature(client, NS_CAPS_OPTIMIZE) + client._caps_optimize = yield self.host.has_feature(client, NS_CAPS_OPTIMIZE) if client._caps_optimize: log.info(_("Caps optimisation enabled")) client._caps_sent = False diff --git a/libervia/backend/plugins/plugin_xep_0234.py b/libervia/backend/plugins/plugin_xep_0234.py index 9ac3ead0..60cea030 100644 --- a/libervia/backend/plugins/plugin_xep_0234.py +++ b/libervia/backend/plugins/plugin_xep_0234.py @@ -124,7 +124,7 @@ class XEP_0234(BaseApplicationHandler): async def can_handle_file_send(self, client, peer_jid, filepath): if peer_jid.resource: - return await self.host.hasFeature(client, NS_JINGLE_FT, peer_jid) + return await self.host.has_feature(client, NS_JINGLE_FT, peer_jid) else: # if we have a bare jid, Jingle Message Initiation will be tried return True diff --git a/libervia/backend/plugins/plugin_xep_0260.py b/libervia/backend/plugins/plugin_xep_0260.py index 2fc46e67..d3004d1c 100644 --- a/libervia/backend/plugins/plugin_xep_0260.py +++ b/libervia/backend/plugins/plugin_xep_0260.py @@ -538,7 +538,7 @@ class XEP_0260(BaseTransportHandler): ) self._j.terminate(client, self._j.REASON_CONNECTIVITY_ERROR, session) else: - d = self.host.hasFeature( + d = self.host.has_feature( client, self._jingle_ibb.NAMESPACE, session["peer_jid"] ) d.addCallback(self._do_fallback, session, content_name, client) diff --git a/libervia/backend/plugins/plugin_xep_0300.py b/libervia/backend/plugins/plugin_xep_0300.py index 074f7985..9de5b6c1 100644 --- a/libervia/backend/plugins/plugin_xep_0300.py +++ b/libervia/backend/plugins/plugin_xep_0300.py @@ -185,7 +185,7 @@ class XEP_0300: """ client = self.host.get_client(profile) for algo in reversed(XEP_0300.ALGOS): - has_feature = await self.host.hasFeature( + has_feature = await self.host.has_feature( client, NS_HASHES_FUNCTIONS.format(algo), to_jid ) if has_feature: