summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-21 01:28:28 +0900
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-21 01:29:30 +0900
commit77d0a7a46daffc50e3040fe2aa7db4a1ca2ad493 (patch)
treea8e3a80271f8e5f2eee8313a50960b7532710fa8
parent9d983abddfaf562f1a444f1b6ddc2cd989eabece (diff)
downloadpoezio-77d0a7a46daffc50e3040fe2aa7db4a1ca2ad493.tar.gz
poezio-77d0a7a46daffc50e3040fe2aa7db4a1ca2ad493.tar.bz2
poezio-77d0a7a46daffc50e3040fe2aa7db4a1ca2ad493.tar.xz
poezio-77d0a7a46daffc50e3040fe2aa7db4a1ca2ad493.zip
multiuserchat: Use newer MUC plugin from slixmpp.
-rw-r--r--poezio/multiuserchat.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/poezio/multiuserchat.py b/poezio/multiuserchat.py
index 90d03572..ed254d37 100644
--- a/poezio/multiuserchat.py
+++ b/poezio/multiuserchat.py
@@ -111,7 +111,7 @@ def join_groupchat(core, jid, nick, passwd='', status=None, show=None, seconds=N
to = stanza["to"]
stanza.send()
xmpp.plugin['xep_0045'].rooms[jid] = {}
- xmpp.plugin['xep_0045'].ourNicks[jid] = to.resource
+ xmpp.plugin['xep_0045'].our_nicks[jid] = to.resource
def leave_groupchat(xmpp, jid, own_nick, msg):
"""
@@ -119,7 +119,7 @@ def leave_groupchat(xmpp, jid, own_nick, msg):
"""
jid = safeJID(jid)
try:
- xmpp.plugin['xep_0045'].leaveMUC(jid, own_nick, msg)
+ xmpp.plugin['xep_0045'].leave_muc(jid, own_nick, msg)
except KeyError:
log.debug("muc.leave_groupchat: could not leave the room %s",
jid, exc_info=True)
@@ -169,7 +169,7 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason
if callback:
return iq.send(callback=callback)
try:
- return xmpp.plugin['xep_0045'].setAffiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation)
+ return xmpp.plugin['xep_0045'].set_affiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation)
except:
import traceback
log.debug('Error setting the affiliation: %s', traceback.format_exc())