Changeset 8478 for branches/pep/src/common/contacts.py

Timestamp:

08/09/07 17:39:18 (17 months ago)

Author:

asterix

Message:

merge diff from trunk to pep branch

Files:

• branches/pep/src/common/contacts.py (modified) (8 diffs)

branches/pep/src/common/contacts.py

@@ -3 +3 @@
 ## Copyright (C) 2006 Yann Le Boulanger <asterix@lagaule.org>
 ## Copyright (C) 2006 Nikos Kouremenos <kourem@gmail.com>
+## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
+## Copyright (C) 2007 Julien Pivotto <roidelapluie@gmail.com>
 ##
 ##
@@ -21 +23 @@
         def __init__(self, jid='', name='', groups=[], show='', status='', sub='',
         ask='', resource='', priority=0, keyID='', our_chatstate=None,
-        chatstate=None, last_status_time=None, msg_id = None, composing_jep = None):
+        chatstate=None, last_status_time=None, msg_id = None, composing_xep = None):
                 self.jid = jid
                 self.name = name
@@ -38 +40 @@
                 self.keyID = keyID
 
+                # Capabilities; filled by caps.py/ConnectionCaps object
+                # every time it gets these from presence stanzas
+                self.caps_node=None
+                self.caps_ver=None
+                self.caps_exts=None
+
                 # please read jep-85 http://www.jabber.org/jeps/jep-0085.html
                 # we keep track of jep85 support with the peer by three extra states:
@@ -48 +56 @@
                 self.msg_id = msg_id
                 # tell which JEP we're using for composing state
-                # None = have to ask, JEP-0022 = use this jep,
-                # JEP-0085 = use this jep, False = no composing support
-                self.composing_jep = composing_jep
+                # None = have to ask, XEP-0022 = use this jep,
+                # XEP-0085 = use this jep, False = no composing support
+                self.composing_xep = composing_xep
                 # this is contact's chatstate
                 self.chatstate = chatstate
@@ -154 +162 @@
         def create_contact(self, jid='', name='', groups=[], show='', status='',
                 sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None,
-                chatstate=None, last_status_time=None, composing_jep=None):
+                chatstate=None, last_status_time=None, composing_xep=None):
                 return Contact(jid, name, groups, show, status, sub, ask, resource,
                         priority, keyID, our_chatstate, chatstate, last_status_time,
-                        composing_jep)
+                        composing_xep)
         
         def copy_contact(self, contact):
@@ -209 +217 @@
                 self.remove_metacontact(account, jid)
 
+        def get_contacts(self, account, jid):
+                '''Returns the list of contact instances for this jid.'''
+                if jid in self._contacts[account]:
+                        return self._contacts[account][jid]
+                else:
+                        return []
+        
         def get_contact(self, account, jid, resource = None):
-                '''Returns the list of contact instances for this jid (one per resource)
-                or [] if no resource is given
-                returns the contact instance for the given resource if it's given
-                or None if there is not'''
+                '''Returns the contact instance for the given resource if it's given else
+                the first contact is no resource is given or None if there is not'''
                 if jid in self._contacts[account]:
-                        contacts = self._contacts[account][jid]
                         if not resource:
-                                return contacts
-                        for c in contacts:
+                                return self._contacts[account][jid][0]
+                        for c in self._contacts[account][jid]:
                                 if c.resource == resource:
                                         return c
-                if resource:
-                        return None
-                return []
-
-        def get_contacts_from_jid(self, account, jid):
-                '''we may have two or more resources on that jid'''
-                if jid in self._contacts[account]:
-                        contacts_instances = self._contacts[account][jid]
-                        return contacts_instances
-                return []
+                return None
+
+        def get_contact_from_full_jid(self, account, fjid):
+                ''' Get Contact object for specific resource of given jid'''
+                barejid, resource = common.gajim.get_room_and_nick_from_fjid(fjid)
+                return self.get_contact(account, barejid, resource)
 
         def get_highest_prio_contact_from_contacts(self, contacts):
@@ -242 +250 @@
 
         def get_contact_with_highest_priority(self, account, jid):
-                contacts = self.get_contacts_from_jid(account, jid)
+                contacts = self.get_contacts(account, jid)
                 if not contacts and '/' in jid:
                         # jid may be a fake jid, try it
@@ -259 +267 @@
                 group_contacts = []
                 for jid in self._contacts[account]:
-                        contacts = self.get_contacts_from_jid(account, jid)
+                        contacts = self.get_contacts(account, jid)
                         if group in contacts[0].groups:
                                 group_contacts += contacts