Changeset 8709 for branches/gajim_0.11.1/src/common

Timestamp:

09/04/07 20:32:31 (15 months ago)

Author:

asterix

Message:

ask vcard to rela jid in muc if we knows it

Files:

• branches/gajim_0.11.1/src/common/connection_handlers.py (modified) (9 diffs)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -797 +797 @@
                 self.vcard_shas = {} # sha of contacts
                 self.room_jids = [] # list of gc jids so that vcard are saved in a folder
+                self.groupchat_jids = {} # {ID : groupchat_jid}
                 
         def add_sha(self, p, send_caps = True):
@@ -895 +896 @@
                 return vcard
 
-        def request_vcard(self, jid = None, is_fake_jid = False):
-                '''request the VCARD. If is_fake_jid is True, it means we request a vcard
-                to a fake jid, like in private messages in groupchat'''
+        def request_vcard(self, jid = None, groupchat_jid = None):
+                '''request the VCARD. If groupchat_jid is not nul, it means we request a vcard
+                to a fake jid, like in private messages in groupchat. jid can be the
+                real jid of the contact, but we want to consider it comes from a fake jid'''
                 if not self.connection:
                         return
@@ -910 +912 @@
                 if not j:
                         j = gajim.get_jid_from_account(self.name)
-                self.awaiting_answers[id] = (VCARD_ARRIVED, j)
-                if is_fake_jid:
-                        room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
+                self.awaiting_answers[id] = (VCARD_ARRIVED, j, groupchat_jid)
+                if groupchat_jid:
+                        room_jid, nick = gajim.get_room_and_nick_from_fjid(groupchat_jid)
                         if not room_jid in self.room_jids:
                                 self.room_jids.append(room_jid)
+                        self.groupchat_jids[id] = groupchat_jid
                 self.connection.send(iq)
-                        #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...})
 
         def send_vcard(self, vcard):
@@ -999 +1001 @@
                         # it knows it arrived
                         jid = self.awaiting_answers[id][1]
+                        groupchat_jid = self.awaiting_answers[id][2]
+                        frm = jid
+                        if groupchat_jid:
+                                # We do as if it comes from the fake_jid
+                                frm = groupchat_jid
                         our_jid = gajim.get_jid_from_account(self.name)
                         if iq_obj.getType() == 'error' and jid == our_jid:
@@ -1004 +1011 @@
                                 self.vcard_supported = False
                         if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error':
-                                if jid and jid != our_jid:
+                                if frm and frm != our_jid:
                                         # Write an empty file
-                                        self.save_vcard_to_hd(jid, '')
-                                        self.dispatch('VCARD', {'jid': jid})
-                                elif jid == our_jid:
-                                        self.dispatch('MYVCARD', {'jid': jid})
+                                        self.save_vcard_to_hd(frm, '')
+                                        self.dispatch('VCARD', {'jid': frm})
+                                elif frm == our_jid:
+                                        self.dispatch('MYVCARD', {'jid': frm})
                 elif self.awaiting_answers[id][0] == AGENT_REMOVED:
                         jid = self.awaiting_answers[id][1]
@@ -1052 +1059 @@
                 if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD:
                         return
+                id = vc.getID()
                 frm_iq = vc.getFrom()
                 our_jid = gajim.get_jid_from_account(self.name)
                 resource = ''
-                if frm_iq:
+                if id in self.groupchat_jids:
+                        who = self.groupchat_jids[id]
+                        frm, resource = gajim.get_room_and_nick_from_fjid(who)
+                        del self.groupchat_jids[id]
+                elif frm_iq:
                         who = helpers.get_full_jid_from_iq(vc)
                         frm, resource = gajim.get_room_and_nick_from_fjid(who)
@@ -1127 +1139 @@
                         self.connection.send(p)
                 else:
+                        #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...})
                         self.dispatch('VCARD', vcard)
 
@@ -1655 +1668 @@
                                 if gajim.config.get('log_contact_status_changes') and self.name\
                                 not in no_log_for and jid_stripped not in no_log_for:
-                                        gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped, resource)
+                                        gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped,
+                                                resource)
                                         st = status or ''
                                         if gc_c:
@@ -1673 +1687 @@
                                                 puny_nick = helpers.sanitize_filename(resource)
                                                 gajim.interface.remove_avatar_files(jid_stripped, puny_nick)
-                                        if self.vcard_shas.has_key(who): # Verify sha cached in mem
-                                                if avatar_sha != self.vcard_shas[who]:
-                                                        # avatar has been updated
-                                                        self.request_vcard(who, True)
-                                        else: # Verify sha cached in hdd
-                                                cached_vcard = self.get_cached_vcard(who, True)
-                                                if cached_vcard and cached_vcard.has_key('PHOTO') and \
-                                                cached_vcard['PHOTO'].has_key('SHA'):
-                                                        cached_sha = cached_vcard['PHOTO']['SHA']
-                                                else:
-                                                        cached_sha = ''
-                                                if cached_sha != avatar_sha:
-                                                        # avatar has been updated
-                                                        # sha in mem will be updated later
-                                                        self.request_vcard(who, True)
-                                                else:
-                                                        # save sha in mem NOW
-                                                        self.vcard_shas[who] = avatar_sha
+                                        # if it's a gc presence, don't ask vcard here. We may ask it to
+                                        # real jid in gui part.
                                 self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource,
                                         prs.getRole(), prs.getAffiliation(), prs.getJid(),
                                         prs.getReason(), prs.getActor(), prs.getStatusCode(),
-                                        prs.getNewNick()))
+                                        prs.getNewNick(), avatar_sha))
                         return