Maintain local handle to buddy cache

1 files changed, 3 insertions, 1 deletions

diff --git a/activity.py b/activity.py
index 2ce05e5..107102d 100644
--- a/activity.py
+++ b/activity.py
@@ -195,6 +195,7 @@ class HelloTube(ExportedGObject):
         self.entered = False  # Have we set up the tube?
         self.helloworld = False  # Trivial "game state"
         self._get_buddy = get_buddy  # Converts handle to Buddy object
+        self._handle_to_buddy = {}  # Cache buddy handles
         self.tube.watch_participants(self.participant_change_cb)
 
     def participant_change_cb(self, added, removed):
@@ -204,8 +205,9 @@ class HelloTube(ExportedGObject):
             buddy = self._get_buddy(handle)
             if buddy is not None:
                 self._logger.debug('Buddy %s was added' % buddy.props.nick)
+                self._handle_to_buddy[handle] = buddy
         for handle in removed:
-            buddy = self._get_buddy(handle)
+            buddy = self._handle_to_buddy.pop(handle, None)
             if buddy is not None:
                 self._logger.debug('Buddy %s was removed' % buddy.props.nick)
         if not self.entered: