@@ -28,9 +28,9 @@ this.App =

             newContact = new Xmpp.Models.Contact(

               id: contact.jid

               jid: contact.jid

-              belongsTo: contact.belongsTo

+              belongsTo: [contact.belongsTo]

             )

-            App.Collections.contacts.add newContact

+            App.Collections.contacts.add(newContact, merge: true)

           )

       )

@@ -53,6 +53,9 @@ this.App =

         )

       )

+    removeContactRemote: (contact, client) ->

+      App.Com.trigger(event: 'app.roster.removeContact', data: {jid: contact, client: client})

+

     _setupBackboneComponents: ->

       App.Collections.contacts = new Xmpp.Collections.ContactsCollection()

       App.Collections.chats = new Xmpp.Collections.ChatsCollection()

@@ -70,6 +73,11 @@ this.App =

         App.Collections.contacts.udpateVcard(result)

       )

+      App._dispatcher.bind('app.roster.subscriptionChanged', (subscription) ->

+        App.debug 'subscription changed'

+        App.Collections.contacts.subscriptionChanged(subscription)

+      )

+

   Models:

     me: null

@@ -7,7 +7,7 @@ class Xmpp.Models.Contact extends Xmpp.Models.Model

     status: 'offline'

     message: ''

     avatar: ''

-    belongsTo: ''

+    belongsTo: []

   initialize: ->

     _.bindAll(this)

@@ -31,6 +31,7 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

     @activeList.setAsActiveChatGroup()

     @on('add', @appendContact)

+    @on('change:belongsTo', @mergeContacts)

     Backbone.Events.on('openChat', (chat) =>

       @moveToInactiveList('all')

@@ -42,8 +43,21 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

     )

   appendContact: (contact) ->

+    App.debug ['apppend', contact]

     @friendsList.appendContact(contact)

+  mergeContacts: (contact) ->

+    App.debug ['merging contacts', contact]

+    #TODO: ak ten isty clovek je vo viacerych rosteroch, treba nastavit spravne belongsTo

+

+    existingContact = @get(contact.get('id'))

+    if existingContact?

+      alreadyBelongsTo = existingContact.get('belongsTo')

+      willBelongTo = contact.get('belongsTo')

+      existingContact.set(belongsTo: _.union(alreadyBelongsTo, willBelongTo))

+    else

+      @add(contact)

+

   moveToActiveList: (contact) ->

     @_switchContactBelongingList(@get(contact), @friendsList, @activeList)

@@ -61,6 +75,30 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

   udpateVcard: (response) ->

     @get(response.jid).set(name: response.vcard.name, avatar: response.vcard.avatar)

+  subscriptionChanged: (newSubscription) ->

+    if (newSubscription.action == 'subscribed')

+      App.debug ['subscribed', newSubscription]

+

+      newContact = new Xmpp.Models.Contact(

+        id: newSubscription.jid

+        jid: newSubscription.jid

+        belongsTo: [newSubscription.belongsTo]

+      )

+      @mergeContacts(newContact)

+    else if (newSubscription.action == 'unsubscribed')

+      # TODO: show info and ask if user want to remove him from roster

+      App.debug ['unsubscribed', newSubscription]

+

+      contact = @get(newSubscription.jid)

+      App.Com.removeContactRemote(contact.get('jid'), newSubscription.belongsTo)

+

+      nowBelongsTo = _.without(contact.get('belongsTo'), newSubscription.belongsTo)

+      if (nowBelongsTo.length == 0)

+        Backbone.Events.trigger('removeContact', contact)

+        @remove(contact)

+

+    # ignore 'unsubscribe' type of action

+

   _switchContactBelongingList: (contact, fromList, toList) ->

     if !contact?

       false

@@ -13,6 +13,8 @@ class Xmpp.Views.Contacts.ListView extends Backbone.View

     @activeGroup = false

     @contactViews = []

+    Backbone.Events.on('removeContact', @detachContact)

+

   createListContainer: ->

     $(@el).html(@template(title: @title, isActiveGroup: @activeGroup))

@@ -81,6 +81,19 @@ class WsRosterController < WebsocketRails::BaseController

     # Zacni pocuvat zmeny stavov v rosteri

     def start_polling_contacts_state

         connection_store[:rosters].each do |roster|

+            roster.add_subscription_callback do |roster_item, stanza|

+                # stan unsubscribe = niekto uz ma nesubscribuje

+                # stan unsubscribed = niekto ma uz nesubscribuje a aj si ma vymazal

+                # stan subscribed = niekto moze vidiet moj stav

+

+                client = connection_store[:link_roster_client][roster]

+

+                send_message 'app.roster.subscriptionChanged',

+                             action: stanza.type,

+                             jid: roster_item.jid.strip.to_s,

+                             belongsTo: client.jid.strip.to_s

+            end

+

             roster.add_presence_callback do |roster_item, old_presence, new_presence|

                 if new_presence.type == :unavailable

                     result = {status: :offline, message: ''}

@@ -108,6 +121,22 @@ class WsRosterController < WebsocketRails::BaseController

         end

     end

+    def remove_contact

+        jid = message[:jid]

+        client_jid = message[:client]

+

+        found_roster_item = nil

+        connection_store[:rosters].each do |roster|

+            roster_item = roster.find(jid)

+            if roster_item.first[1] && connection_store[:link_roster_client][roster].jid.strip.to_s == client_jid

+                found_roster_item = roster_item.first[1]

+                break

+            end

+        end

+

+        found_roster_item && found_roster_item.remove()

+    end

+

     ##

     # Ziskaj informacie o mne (meno, stav, status...)

     def myself

@@ -54,6 +54,7 @@ WebsocketRails::EventMap.describe do

             subscribe :startPolling,        to: WsRosterController, with_method: :start_polling_contacts_state

             subscribe :setPresence,         to: WsRosterController, with_method: :set_presence

             subscribe :myself,              to: WsRosterController, with_method: :myself

+            subscribe :removeContact,       to: WsRosterController, with_method: :remove_contact

         end

     end