@@ -2,6 +2,14 @@ this.App =

   debug: (msg) ->

     console.log msg

+  stripJid: (jid) ->

+    r = new RegExp('(^.*)\/.*$')

+    match = r.exec(jid)

+    if match and (match.length > 0)

+      return match[1]

+    else

+      return jid

+

   UI:

     setAutoHeight: ->

       height = $(window).height()

@@ -198,7 +206,8 @@ this.App =

           #TODO: prepisat tuto hrozu

-          contact = App.Collections.contacts.findByJid(result.from)

+          contact = App.Collections.contacts.findByJid(App.stripJid(result.from))

+          contact.setPreferredResource(result.from)

           if contact

             contactView = App.Collections.contacts.friendsList.hasContact(contact) ||

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

   defaults:

     jid: ''

+    preferredJid: null

     name: ''

     status: 'offline'

     message: ''

@@ -24,6 +25,12 @@ class Xmpp.Models.Contact extends Xmpp.Models.Model

   setUsingMyApp: ->

     @set('usingMyApp', true)

+  setPreferredResource: (jid) ->

+    @set('preferredJid', jid)

+

+  getPreferredResource: ->

+    @get('preferredJid') || @get('jid')

+

 class Xmpp.Collections.ContactsCollection extends Backbone.Collection

   model: Xmpp.Models.Contact

@@ -83,7 +90,12 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

       @_switchContactBelongingList(@get(contact), @activeList, @friendsList) && @friendsList.reOrder()

   updateStatus: (response) ->

-    @get(response.jid).set(message: response.status.message, status: response.status.status)

+    contact = @get(response.jid)

+    return unless contact

+

+    contact.set(message: response.status.message, status: response.status.status)

+    if response.status.status == 'offline'

+      contact.setPreferredResource(null)

   udpateVcard: (response) ->

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

@@ -52,7 +52,7 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     if (message.trim())

       chatId = @tab.getChatId()

-      attendant = if not chatId then @tab.getAttendant().get('jid') else null

+      attendant = if not chatId then @tab.getAttendant().getPreferredResource() else null

       App.Models.me.sendMessage(message, chatId, attendant

       , (message) =>

@@ -3,29 +3,27 @@ class WsChatController < WsController

     def start_polling_messages

         connection_store[:clients].each do |client|

             client.add_message_callback do |message|

-                from = message.from.strip.to_s

-                to   = message.to.strip.to_s

                 chat_id = message.attribute('chat_id').to_s

                 #noinspection RubyAssignmentExpressionInConditionalInspection

                 if message.body

-                    process_incoming_message(from, to, message.body, chat_id)

-                elsif request = message.first_element('sync_contacts_request')

-                    # toto mozem prijat len ako admin multichatu

-                    send_contacts(from, to, request.attribute('chat_id').to_s)

-                elsif answer = message.first_element('synced_contacts')

-                    # toto mozem prijat len ako ucastnik multichatu (nie admin)

-                    contacts = xml_contacts_to_array(answer)

-                    sync_contacts_frontend(from, to, answer.attribute('chat_id').to_s, contacts)

-                elsif answer = message.first_element('exported_chat')

-                    contacts = xml_contacts_to_array(message.first_element('exported_chat'))

-                    import_people_in_chat(from, to, answer.attribute('chat_id').to_s, contacts)

-                elsif message.attribute('destroy_multichat')

-                    destroy_multichat(to, chat_id)

-                elsif message.attribute('req_update_contacts')

-                    added   = xml_contacts_to_array(message.first_element('added'))

-                    removed = xml_contacts_to_array(message.first_element('removed'))

-                    update_attendants_in_multichat(from, to, chat_id, removed, added)

+                    process_incoming_message(message.from, message.to, message.body, chat_id)

+                #elsif request = message.first_element('sync_contacts_request')

+                #    # toto mozem prijat len ako admin multichatu

+                #    send_contacts(message.from, message.to, request.attribute('chat_id').to_s)

+                #elsif answer = message.first_element('synced_contacts')

+                #    # toto mozem prijat len ako ucastnik multichatu (nie admin)

+                #    contacts = xml_contacts_to_array(answer)

+                #    sync_contacts_frontend(message.from, message.to, answer.attribute('chat_id').to_s, contacts)

+                #elsif answer = message.first_element('exported_chat')

+                #    contacts = xml_contacts_to_array(message.first_element('exported_chat'))

+                #    import_people_in_chat(message.from, message.to, answer.attribute('chat_id').to_s, contacts)

+                #elsif message.attribute('destroy_multichat')

+                #    destroy_multichat(to, chat_id)

+                #elsif message.attribute('req_update_contacts')

+                #    added   = xml_contacts_to_array(message.first_element('added'))

+                #    removed = xml_contacts_to_array(message.first_element('removed'))

+                #    update_attendants_in_multichat(message.from, message.to, chat_id, removed, added)

                 end

                 #TODO: upozornit na pisanie spravy

                 #TODO: odoslat informaciu o tom, ze pisem spravu

@@ -139,10 +137,9 @@ class WsChatController < WsController

     private

     def process_incoming_message(from, to, body, chat_id = nil)

-        #Rails.logger.debug [message, message.to.strip.to_s]

         send_message 'app.chat.messageReceived',

-                     from: from,

-                     to: to,

+                     from: from.to_s,

+                     to: to.strip.to_s,

                      message: body,

                      chat_id: chat_id

     end