Philipp Hörist pushed to branch master at gajim / gajim
Commits:
9a591533 by Philipp Hörist at 2022-09-07T22:52:40+02:00
fix: MUC: Don’t ignore MUC invites when ignore_unknown_contacts is set
Fixes #11107
- - - - -
2 changed files:
- gajim/common/helpers.py
- gajim/common/modules/muc.py
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -809,18 +809,6 @@ def load_json(path: Path,
return json_dict.get(key, default)
-def ignore_contact(account: str, jid: JID) -> bool:
- client = app.get_client(account)
- contact = client.get_module('Contacts').get_contact(jid)
-
- ignore_unknown = app.settings.get_account_setting(
- account, 'ignore_unknown_contacts')
- if ignore_unknown and not contact.is_in_roster:
- log.info('Ignore unknown contact %s', str(jid))
- return True
- return False
-
-
class AdditionalDataDict(collections.UserDict):
data: dict[str, Any]
=====================================
gajim/common/modules/muc.py
=====================================
@@ -1025,10 +1025,10 @@ def _on_invite_or_decline(self,
_stanza: Message,
properties: MessageProperties
) -> None:
+
if properties.muc_decline is not None:
data = properties.muc_decline
- if helpers.ignore_contact(self._account, data.from_):
- raise nbxmpp.NodeProcessed
+ contact = self._get_contact(data.muc, groupchat=True)
self._log.info('Invite declined from: %s, reason: %s',
data.from_, data.reason)
@@ -1040,12 +1040,10 @@ def _on_invite_or_decline(self,
if properties.muc_invite is not None:
data = properties.muc_invite
- if helpers.ignore_contact(self._account, data.from_):
- raise nbxmpp.NodeProcessed
+ contact = self._get_contact(data.muc, groupchat=True)
self._log.info('Invite from: %s, to: %s', data.from_, data.muc)
- contact = self._get_contact(data.muc, groupchat=True)
if contact.is_joined:
# We are already in groupchat. Ignore invitation
self._log.info('We are already in this room')
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/9a591533c6b7f7405c0433d7c5668a8c6e76765c
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/9a591533c6b7f7405c0433d7c5668a8c6e76765c
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
