Changeset 2446e4c

Timestamp:

2015-05-24T18:31:13Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

93e0901

Parents:

cb1b973

Message:

Minor WA bugfixes.

File:

• python/wa.py (modified) (3 diffs)

python/wa.py

@@ -109 +109 @@
                         # sane enough?
                         self.cb.buddy_times(pres.getFrom(), 0, int(pres.getLast()))
-                except ValueError:
-                        # Could be "error" or, more likely, "deny"
+                except (ValueError, TypeError):
+                        # Could be "error" or, more likely, "deny", or None.
                         pass
         
@@ -120 +120 @@
                 if msg.getParticipant():
                         group = self.b.groups.get(msg.getFrom(), None)
-                        if not group:
+                        if not group or "id" not in group:
                                 self.cb.log("Warning: Activity in room %s" % msg.getFrom())
                                 self.b.groups.setdefault(msg.getFrom(), {}).setdefault("queue", []).append(msg)
@@ -314 +314 @@
                 self.bee.chat_add_buddy(id, self.account["user"])
                 for msg in group.setdefault("queue", []):
-                        self.cb.chat_msg(group["id"], msg.getParticipant(), msg.getBody(), 0, msg.getTimestamp())
+                        self.bee.chat_msg(group["id"], msg.getParticipant(), msg.getBody(), 0, msg.getTimestamp())
                 del group["queue"]