From 16276cd163ae1761067ad5fef532fdf32da36bb5 Mon Sep 17 00:00:00 2001 From: mathieui Date: Tue, 6 May 2014 00:17:22 +0200 Subject: [PATCH] Provide our own (non-blocking) wrappers for room configuration functions --- src/multiuserchat.py | 20 ++++++++++++++++++++ src/tabs/muctab.py | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/multiuserchat.py b/src/multiuserchat.py index ccf33ed1..ae8acb77 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -175,3 +175,23 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason import traceback log.debug('Error setting the affiliation: %s', traceback.format_exc()) return False + +def cancel_config(xmpp, room): + query = ET.Element('{http://jabber.org/protocol/muc#owner}query') + x = ET.Element('{jabber:x:data}x', type='cancel') + query.append(x) + iq = xmpp.makeIqSet(query) + iq['to'] = room + iq.send(block=False) + +def configure_room(xmpp, room, form): + if form is None: + return + iq = xmpp.makeIqSet() + iq['to'] = room + query = ET.Element('{http://jabber.org/protocol/muc#owner}query') + form = form.getXML('submit') + query.append(form) + iq.append(query) + iq.send(block=False) + diff --git a/src/tabs/muctab.py b/src/tabs/muctab.py index 201010f5..70f6fb70 100644 --- a/src/tabs/muctab.py +++ b/src/tabs/muctab.py @@ -372,14 +372,14 @@ class MucTab(ChatTab): """ The user do not want to send his/her config, send an iq cancel """ - self.core.xmpp.plugin['xep_0045'].cancelConfig(self.name) + muc.cancel_config(self.core.xmpp, self.name) self.core.close_tab() def send_config(self, form): """ The user sends his/her config to the server """ - self.core.xmpp.plugin['xep_0045'].configureRoom(self.name, form) + muc.configure_room(self.core.xmpp, self.name, form) self.core.close_tab() def command_cycle(self, arg):