Ticket #378: add_to_roster.diff

src/dialogs.py

@@ -2034 +2034 @@
                         # it's expanded!!
                         self.input_textview.grab_focus()
 
+class RosterItemExchangeWindow:
+        ''' Windows used when someone send you a exchange contact suggestion '''
+        def __init__(self, account, action, exchange_list, jid_from, message_body):
+                self.account = account
+                self.action = action
+                self.exchange_list = exchange_list
+                self.message_body = message_body
+                self.jid_from = jid_from
+
+                # Connect to glade
+                self.xml = gtkgui_helpers.get_glade('roster_item_exchange_window.glade')
+                self.window = self.xml.get_widget('roster_item_exchange_window')
+
+                # Add Widgets.
+                for widget_to_add in ['cancel_button', 'accept_button', 'type_label',
+                'body_scrolledwidow', 'body_textview', 'items_list_treeview']:
+                        self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
+
+                # Set labels
+                #self.action can be 'add', 'modify' or 'remove'
+                self.type_label.set_label(\
+                _('<b>%s</b> would like you to <b>%s</b> some contacts in your roster.') \
+                        % (jid_from, _(self.action)))
+                if message_body:
+                        buffer = self.body_textview.get_buffer()
+                        buffer.set_text(self.message_body)
+                else:
+                        self.body_scrolledwindow.hide()
+                # Treeview
+                model = gtk.ListStore(bool, str, str, str, str)
+                self.items_list_treeview.set_model(model)
+                # columns
+                renderer1 = gtk.CellRendererToggle()
+                renderer1.set_property('activatable', True)
+                renderer1.connect('toggled', self.toggled_callback)
+                self.items_list_treeview.insert_column_with_attributes(-1,
+                                        _(self.action), renderer1, active = 0)
+                renderer2 = gtk.CellRendererText()
+                self.items_list_treeview.insert_column_with_attributes(-1,
+                                        _('Jabber ID'), renderer2, text = 1)
+                renderer3 = gtk.CellRendererText()
+                self.items_list_treeview.insert_column_with_attributes(-1,
+                                        _('Name'), renderer3, text = 2)
+                renderer4 = gtk.CellRendererText()
+                self.items_list_treeview.insert_column_with_attributes(-1,
+                                        _('Groups'), renderer4, text = 3)
+
+                # Init contacts
+                model = self.items_list_treeview.get_model()
+                model.clear()
+
+                for jid in self.exchange_list:
+                        groups = ''
+                        is_in_roster = True
+                        contact = gajim.contacts.get_contact_with_highest_priority(\
+                                self.account, jid)
+                        if not contact:
+                                is_in_roster = False
+                        name = self.exchange_list[jid][0]
+                        num_list = len(self.exchange_list[jid][1])
+                        current = 0
+                        for group in self.exchange_list[jid][1]:
+                                current += 1
+                                if contact and not group in contact.groups:
+                                        is_in_roster = False
+                                if current == num_list:
+                                        groups = groups + group
+                                else:
+                                        groups = groups + group + ', '
+                        if not is_in_roster:
+                                iter = model.append()
+                                model.set(iter, 0, True, 1, jid, 2, name, 3, groups)
+
+                self.window.show_all()
+
+                self.xml.signal_autoconnect(self)
+
+        def toggled_callback(self, cell, path):
+                model = self.items_list_treeview.get_model()
+                iter = model.get_iter(path)
+                model[iter][0] = not cell.get_active()
+
+        def on_accept_button_clicked(self, widget):
+                model = self.items_list_treeview.get_model()
+                iter = model.get_iter_root()
+                if self.action == 'add':
+                        a = 0
+                        while iter:
+                                if model[iter][0]:
+                                        a+=1
+                                        # it is selected
+                                        #remote_jid = model[iter][1].decode('utf-8')
+                                        message = _('%s suggested me to add you in my roster.' % self.jid_from)
+                                        # keep same groups and same nickname
+                                        groups = model[iter][3].split(', ')
+                                        if groups == ['']:
+                                                groups = []
+                                        gajim.interface.roster.req_sub(self, model[iter][1], message,
+                                                self.account, groups = groups,
+                                                nickname = model[iter][2], auto_auth = True)
+                                iter = model.iter_next(iter)
+                        InformationDialog('Added  %s contacts' % str(a))
+                self.window.destroy()
+
 class PrivacyListWindow:
         '''Window that is used for creating NEW or EDITING already there privacy
         lists'''

src/gajim.py

@@ -1814 +1814 @@
                         _('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource,
                         is_modal = False, ok_handler = on_ok)
 
+        def handle_event_roster_item_exchange(self, account, data):
+                # data = (action in [add, delete, modify], exchange_list, jid_from, body)
+                dialogs.RosterItemExchangeWindow(account, data[0], data[1], data[2], data[3])
+
         def read_sleepy(self):
                 '''Check idle status and change that status if needed'''
                 if not self.sleeper.poll():
@@ -2141 +2145 @@
                         'SEARCH_FORM': self.handle_event_search_form,
                         'SEARCH_RESULT': self.handle_event_search_result,
                         'RESOURCE_CONFLICT': self.handle_event_resource_conflict,
+                        'ROSTERX': self.handle_event_roster_item_exchange,
                 }
                 gajim.handlers = self.handlers
 

src/common/connection_handlers.py

@@ -1408 +1408 @@
                                 self.dispatch('GMAIL_NOTIFY', (jid, newmsgs, gmail_messages_list))
                         raise common.xmpp.NodeProcessed
 
+        def _rosterItemExchangeCB(self, con, msg):
+                ''' XEP-0144 Roster Item Echange '''
+                exchange_items_list = {}
+                jid_from = msg.getAttr('from')
+                items_list = msg.getTag('x').getChildren()
+                action = items_list[0].getAttr('action')
+                if action == None:
+                        action = 'add'
+                for item in msg.getTag('x').getChildren():
+                        jid = item.getAttr('jid')
+                        name = item.getAttr('name')
+                        groups=[]
+                        for group in item.getChildren():
+                                groups.append(group.getData())
+                        exchange_items_list[jid] = []
+                        exchange_items_list[jid].append(name)
+                        exchange_items_list[jid].append(groups)
+                self.dispatch('ROSTERX', (action, exchange_items_list, jid_from, msg.getBody()))
+
         def _messageCB(self, con, msg):
                 '''Called when we receive a message'''
                 # check if the message is pubsub#event
                 if msg.getTag('event') is not None:
                         self._pubsubEventCB(con, msg)
                         return
+                # check if the message is a roster item exchange (XEP-0144)
+                if msg.getTag('x') and msg.getTag('x').namespace == \
+                common.xmpp.NS_ROSTERX:
+                        self._rosterItemExchangeCB(con, msg)
+                        return
                 # check if the message is a xep70-confirmation-request
                 if msg.getTag('confirm') and msg.getTag('confirm').namespace == \
                 common.xmpp.NS_HTTP_AUTH: