Changeset c82a88d

Timestamp:

2015-06-08T20:22:08Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

d832164

Parents:

d628339

Message:

Show presence as awayness instead of "onlineness".

File:

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

python/wa.py

@@ -146 +146 @@
                         return
                 
-                status = 8 # MOBILE
-                if pres.getType() != "unavailable":
-                        status |= 1 # ONLINE
+                # Online/offline is not really how WA works. Let's show everyone
+                # as online but unavailable folks as away. This also solves the
+                # problem of offline->IRC /quit causing the persons to leave chat
+                # channels as well (and not reappearing there when they return).
+                status = 8 | 1  # MOBILE | ONLINE
+                if pres.getType() == "unavailable":
+                        status |= 4  # AWAY
                 self.cb.buddy_status(pres.getFrom(), status, None, None)
                 
@@ -213 +217 @@
                 if entity.invalidNumbers:
                         self.cb.error("Invalid numbers: %s" %
-                                      ", ".join(entity.invalidNumbers.keys()))
+                                      ", ".join(entity.invalidNumbers))
 
                 # Disabled since yowsup won't give us the result...
@@ -376 +380 @@
                 self.bee.chat_add_buddy(id, self.account["user"])
                 for msg in group.setdefault("queue", []):
+                        ## TODO: getBody fails for media msgs.
                         self.bee.chat_msg(group["id"], msg.getParticipant(), msg.getBody(), 0, msg.getTimestamp())
                 del group["queue"]