Author: jim++ Date: 2008-03-20 00:14:58 +0100 (Thu, 20 Mar 2008) New Revision: 9397
Modified: trunk/src/common/logger.py Log: Make jid_is_from_pm works with not-full jid
Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2008-03-19 22:01:21 UTC (rev 9396) +++ trunk/src/common/logger.py 2008-03-19 23:14:58 UTC (rev 9397) @@ -157,10 +157,14 @@ pm (so higly unlikely) and if we fail we do not go chaos (user will see the first pm as if it was message in room's public chat) and after that all okay''' + + if jid.find('/') > -1: + possible_room_jid, possible_nick = jid.split('/', 1) + return self.jid_is_room_jid(possible_room_jid) + else: + # it's not a full jid, so it's not a pm one + return False
- possible_room_jid, possible_nick = jid.split('/', 1) - return self.jid_is_room_jid(possible_room_jid) - def jid_is_room_jid(self, jid): self.cur.execute('SELECT jid_id FROM jids WHERE jid=? AND type=?', (jid, constants.JID_ROOM_TYPE))