Changeset 1356

Timestamp:

12/21/10 20:30:09 (17 months ago)

Author:

zeank

Message:

send raw xml to make role changes work

closes #268

Files:

• HelpIM3/branches/chatgroups/HelpIM/bot/bot.py (modified) (4 diffs)

HelpIM3/branches/chatgroups/HelpIM/bot/bot.py

@@ -677 +677 @@
             log.info("User '%s' joined room '%s' for chat_id '%s'." % (user.nick, room.jid, room.chat_id))
         else:
-            log.warning("User joined room '%s' while not expected (roomstatus == %s)." % (roomname, roomstatus))
-            log.info("User was: Nick = '%s'." % user.nick)
+            log.warning("User '%s' joined room '%s' while not expected (roomstatus == %s)." % (user.nick, room.jid, status))
             return False
 
@@ -685 +684 @@
             if not self.room_state.configured:
                 log.warning("Should make participant moderator, but room is not configured. (Room: '%s')" % room.jid)
-            elif not self.room_state.me.role=="moderator":
-                log.warning("Should make participant moderator, but bot is not moderator. (Bot role: '%s', Room: '%s')" % (self.room_state.me.role, room.jid))
+            if not self.room_state.me.affiliation=="admin" and not  self.room_state.me.affiliation=="owner":
+                log.warning("Should make participant moderator, but bot is not admin. (Bot affiliation: '%s', Room: '%s')" % (self.room_state.me.affiliation, room.jid))
             log.info("Making user moderator: Nick = '%s'" % user.nick)
             self.makeModerator(self.room_state.room_jid.bare(), user.nick)
@@ -728 +727 @@
                     log.info("User '%s' left group room '%s' (un-clean exit, chat_id == '%s')." % (user.nick, room.jid, room.chat_id))
         else:
-            log.warning("User left room '%s' while room was expected to be empty (roomstatus == %s)." % (roomname, roomstatus))
+            log.warning("User '%s' left  room '%s' while room was expected to be empty (roomstatus == %s)." % (user.nick, room.jid, status))
             log.info("User was: Nick = '%s'." % user.nick)
         #DBG log.debug("MUC-Room callback: user_joined(). User = '%s'" % (user))
@@ -1211 +1210 @@
             roomjid = str2roomjid(roomjid)
         log.info("Making user with nick '%s' moderator." % nick)
-        afflIq = MucIq(from_jid=self.jid, to_jid=roomjid, stanza_type="set")
-        afflIq.clear_muc_child()
-        afflIq.muc_child=MucAdminQuery(parent=afflIq.xmlnode)
-        item=MucItem("owner", role="moderator", nick=nick)
-        afflIq.muc_child.add_item(item)
-        log.debug(afflIq.serialize())
-        self.stream.send(afflIq)
-
+
+        xml = "<iq to='%s' type='set' id='mod'><query xmlns='http://jabber.org/protocol/muc#admin'><item role='moderator' nick='%s'/></query></iq>" % (roomjid, nick)
+        log.debug(xml)
+        self.stream.write_raw(xml)
+        
     def closeRooms(self, roomstatus=None, site=None):
         if site is None: