From 13624c417a367b378fb2f8414ad47a9a939127fa Mon Sep 17 00:00:00 2001 From: souliane Date: Sun, 17 Nov 2013 16:23:29 +0100 Subject: [PATCH] plugin XEP-0249: silently discard MUC invitation if user is already in --- src/plugins/plugin_xep_0249.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/plugin_xep_0249.py b/src/plugins/plugin_xep_0249.py index b12f4c40..0aecd4f8 100755 --- a/src/plugins/plugin_xep_0249.py +++ b/src/plugins/plugin_xep_0249.py @@ -137,8 +137,11 @@ class XEP_0249(object): except: error(_('Error while parsing invitation')) return - autojoin = self.host.memory.getParamA(AUTOJOIN_NAME, AUTOJOIN_KEY, profile_key=profile) from_ = message["from"] + if room in self.host.plugins["XEP-0045"].clients[profile].joined_rooms: + info(_("Invitation silently discarded because user is already in the room.")) + return + autojoin = self.host.memory.getParamA(AUTOJOIN_NAME, AUTOJOIN_KEY, profile_key=profile) def accept_cb(conf_id, accepted, data, profile): if conf_id == room and accepted: