From d3e8993e22c46bccea37ab06b8fbc7abf97d959a Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Sun, 8 Apr 2012 16:01:21 -0400
Subject: [PATCH] Fix looking up local and cached vcards.

---
 sleekxmpp/plugins/xep_0054/vcard_temp.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/sleekxmpp/plugins/xep_0054/vcard_temp.py b/sleekxmpp/plugins/xep_0054/vcard_temp.py
index 9be4c098..b9096759 100644
--- a/sleekxmpp/plugins/xep_0054/vcard_temp.py
+++ b/sleekxmpp/plugins/xep_0054/vcard_temp.py
@@ -55,17 +55,28 @@ class XEP_0054(BasePlugin):
 
     def get_vcard(self, jid=None, ifrom=None, local=False, cached=False, 
                   block=True, callback=None, timeout=None):
-        if self.xmpp.is_component and jid.bare == self.xmpp.boundjid.bare:
+        if self.xmpp.is_component and jid.domain == self.xmpp.boundjid.domain:
             local = True
 
-        if local or cached:
+        if local:
             vcard = self.api['get_vcard'](jid, None, ifrom)
             if not isinstance(vcard, Iq):
                 iq = self.xmpp.Iq()
+                if vcard is None:
+                    vcard = VCardTemp()
                 iq.append(vcard)
                 return iq
             return vcard
 
+        if cached:
+            vcard = self.api['get_vcard'](jid, None, ifrom)
+            if vcard is not None:
+                if not isinstance(vcard, Iq):
+                    iq = self.xmpp.Iq()
+                    iq.append(vcard)
+                    return iq
+                return vcard
+
         iq = self.xmpp.Iq()
         iq['to'] = jid
         iq['from'] = ifrom
@@ -73,9 +84,10 @@ class XEP_0054(BasePlugin):
         iq.enable('vcard_temp')
 
         vcard = iq.send(block=block, callback=callback, timeout=timeout)
-
-        self.api['set_vcard'](vcard['from'], args=vcard['vcard_temp'])
-        return vcard
+        
+        if block:
+            self.api['set_vcard'](vcard['from'], args=vcard['vcard_temp'])
+            return vcard
 
     def publish_vcard(self, vcard=None, jid=None, block=True, ifrom=None, 
                       callback=None, timeout=None):
@@ -111,7 +123,7 @@ class XEP_0054(BasePlugin):
         self._vcard_cache[jid.bare] = vcard
 
     def _get_vcard(self, jid, node, ifrom, vcard):
-        return self._vcard_cache.get(jid.bare, VCardTemp())
+        return self._vcard_cache.get(jid.bare, None)
 
     def _del_vcard(self, jid, node, ifrom, vcard):
         if jid.bare in self._vcard_cache: