diff options
| author | mathieui <mathieui@mathieui.net> | 2013-01-17 17:37:06 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2013-01-17 17:37:06 +0100 |
| commit | c5cc462963363b2307a2a341da170829385a9589 (patch) | |
| tree | 7a93dec042fef00865dab70320ed4cb8f560a9e9 /src/multiuserchat.py | |
| parent | b06240ee7b4940af52a0c01915214860d8a06bb2 (diff) | |
| download | poezio-c5cc462963363b2307a2a341da170829385a9589.tar.gz poezio-c5cc462963363b2307a2a341da170829385a9589.tar.bz2 poezio-c5cc462963363b2307a2a341da170829385a9589.tar.xz poezio-c5cc462963363b2307a2a341da170829385a9589.zip | |
Move to the upstream SleekXMPP
- remove the decline command that is not in the trunk (and mediated
declines are supported nowhere anyway)
- change a bit xhtml-im support
- change the bookmarks management a bit
- Add a verification to avoid crashing when poezio will be launched the
next time
- Fix the (unrelated) bug when setting a jid affiliation
Diffstat (limited to 'src/multiuserchat.py')
| -rw-r--r-- | src/multiuserchat.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multiuserchat.py b/src/multiuserchat.py index d3eb70ca..58d2771a 100644 --- a/src/multiuserchat.py +++ b/src/multiuserchat.py @@ -79,7 +79,7 @@ def join_groupchat(xmpp, jid, nick, passwd='', maxhistory=None, status=None, sho stanza.append(x) stanza.send() xmpp.plugin['xep_0045'].rooms[jid] = {} - xmpp.plugin['xep_0045'].our_nicks[jid] = nick + xmpp.plugin['xep_0045'].ourNicks[jid] = nick def leave_groupchat(xmpp, jid, own_nick, msg): """ @@ -119,6 +119,8 @@ def set_user_affiliation(xmpp, muc_jid, affiliation, nick=None, jid=None, reason jid = safeJID(jid) muc_jid = safeJID(muc_jid) try: - return xmpp.plugin['xep_0045'].set_affiliation(muc_jid, jid, nick, affiliation) + return xmpp.plugin['xep_0045'].setAffiliation(str(muc_jid), str(jid) if jid else None, nick, affiliation) except: + import traceback + log.debug('Error setting the affiliation: %s', traceback.format_exc()) return False |