@@ -122,39 +122,56 @@ this.App =

           isMultiChat: true

         );

+        App.debug newChat.get('chatId')

+

         App.Collections.chats.add(newChat);

         newChat.syncContacts(chatData.contacts, chatData.owner);

         Backbone.Events.trigger('openChat', newChat)

       )

       App._dispatcher.bind('app.chat.messageReceived', (result) ->

-        App.debug 'message received'

+        App.debug ['message received', result]

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

+        if (result.chat_id)

+          _.each(App.Collections.chats.models, (chat) ->

+            App.debug chat.get('chatId')

+          )

+          chat = App.Collections.chats.findById(result.chat_id)

-        if contact

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

-            App.Collections.contacts.activeList.hasContact(contact)

-        else

-          contact = new Xmpp.Models.Contact(

-            id: result.from

-            jid: result.from

-            belongsTo: [result.to]

+          Backbone.Events.trigger('openChat', chat)

+

+          tab = _.find(App.Views.tabbar.tabs, (tab) ->

+            tab.getChatId() == result.chat_id

           )

-          App.Collections.contacts.add(contact, merge: true)

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

-        contactView.startChat()

+          tab.showChat()

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

+          tab.chatWindow.appendMessage(contact, new Date(), result.message)

+        else

+          #TODO: prepisat tuto hrozu

+

-        tab = _.find(App.Views.tabbar.tabs, (tab) ->

-          tab.hasParticipants(App.Models.me, contact)

-        )

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

+

+          if contact

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

+              App.Collections.contacts.activeList.hasContact(contact)

+          else

+            contact = new Xmpp.Models.Contact(

+              id: result.from

+              jid: result.from

+              belongsTo: [result.to]

+            )

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

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

+

+          contactView.startChat()

-        tab.chatWindow.appendMessage(contact, new Date(), result.message)

+          tab = _.find(App.Views.tabbar.tabs, (tab) ->

+            tab.hasParticipants(App.Models.me, contact)

+          )

-#        if (result.chat_id)

-#          #todo otvorit chat podla chat_id. Spytat sa servera, kto vsetko je ucastnikom

-#          #chat = App.Collections.chats.findById(result.chat_id)

+          tab.chatWindow.appendMessage(contact, new Date(), result.message)

       )

   Models:

@@ -13,8 +13,6 @@ class Xmpp.Models.Chat extends Xmpp.Models.Model

     if (@get('isMultiChat'))

       @set('withWhom', [])

-    #App.Com.openNewMultiChatId(@get('who').get('jid'), @get('withWhom').get('jid'), this)

-

   appendWithWhom: (newPerson) ->

     allWithWhom = @get('withWhom');

@@ -57,7 +55,7 @@ class Xmpp.Models.Chat extends Xmpp.Models.Model

       @set('who', ownerContact)

-    App.debug ['importing contacts to chat', this]

+    App.debug ['importing contacts to chat', this, this.get('chatId')]

 class Xmpp.Collections.ChatsCollection extends Backbone.Collection

@@ -76,7 +74,9 @@ class Xmpp.Collections.ChatsCollection extends Backbone.Collection

     )

   findById: (id) ->

-    @findWhere(chatId: id)

+    _.find(@models, (chat) ->

+      chat.get('chatId') == id

+    )

   removeChat: (chat) ->

     @models = _.without(@openedChats, chat)

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

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

       @moveToInactiveList('all')

+#      App.debug chat

       @moveToActiveList(chat.get('withWhom'))

     )

@@ -20,7 +20,7 @@ class Xmpp.Models.Me extends Xmpp.Models.Contact

   sendMessage: (message, chatId, to, callbackOk, callbackFail) ->

     App.debug ['sending from:', @get('jid'), message]

-    if (! chatId)

+    if (to)

       App.Com.sendMessage(message, to, @get('jid'), callbackOk, callbackFail)

     else

       App.Com.sendMultiMessage(message, chatId, @get('jid'), callbackOk, callbackFail)

\ No newline at end of file

@@ -47,15 +47,17 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     e.preventDefault()

     $this = $(e.currentTarget)

     input = $this.find(@inputSelector)

-    message = input.val().trim()

+    message = input.val()

     input.val('').focus()

-    if (message)

-      attendant = @tab.getAttendant().get('jid')

-      @tab.getOwner().sendMessage(message, @tab.getChatId(), attendant

+    if (message.trim())

+      chatId = @tab.getChatId()

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

+

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

       , (message) =>

         @sendSuccess(@tab.getOwner(), message)

-      , (message) ->

+      , (message) =>

         @sendFail(message))

   sendSuccess: (me, msg) ->

@@ -65,10 +65,11 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

     App.debug 'new multichat'

     withWhom = @model

-    newChat = new Xmpp.Models.Chat(isMultiChat: true);

-    newChat.set('who', App.Models.me);

-    newChat.appendWithWhom(withWhom);

+    newChat = new Xmpp.Models.Chat(isMultiChat: true)

+    newChat.set('who', App.Models.me)

+    newChat.appendWithWhom(withWhom)

+    App.Collections.chats.add(newChat)

     App.Com.openNewMultiChat(App.Models.me, withWhom, newChat)

   openChatById: (chatId) ->

@@ -30,20 +30,20 @@ class WsChatController < WsController

     end

     def import_people_in_chat(message, chat_id)

-        Rails.logger.debug ['imported chat arrived', message.to_s, chat_id]

+        #Rails.logger.debug ['imported chat arrived', message.to_s, chat_id]

-        client = find_client(message.to)

+        client = find_client(message.to.strip.to_s)

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

         connection_store[:opened_chats] = {} if ! connection_store[:opened_chats]

         connection_store[:opened_chats][client] = {} if ! connection_store[:opened_chats][client]

         connection_store[:opened_chats][client][chat_id] = {attendants: contacts, owner: message.from.node + '@' + message.from.domain}

-        Rails.logger.debug [

-            owner: message.from.node + '@' + message.from.domain,

-            chat_id:  chat_id,

-            contacts: contacts

-        ]

+        #Rails.logger.debug [

+        #    owner: message.from.node + '@' + message.from.domain,

+        #    chat_id:  chat_id,

+        #    contacts: contacts

+        #]

         send_message 'app.chat.importChat',

                      owner:    message.from.node + '@' + message.from.domain,

@@ -87,8 +87,8 @@ class WsChatController < WsController

         if client

             chat_id = message[:chatId]

             if chat_id

-                attendants = connection_store[:opened_chats][client][chat_id][:attendants]

-                           + connection_store[:opened_chats][client][chat_id][:owner]

+                attendants = connection_store[:opened_chats][client][chat_id][:attendants] + [connection_store[:opened_chats][client][chat_id][:owner]]

+                attendants -= [client.jid.strip.to_s]

                 messages = MessageBuilder::build_multi_messages(message[:message], client.jid.strip.to_s, attendants, chat_id)

             else

@@ -97,6 +97,7 @@ class WsChatController < WsController

             # Xmpp4r doesn't support XEP-0033 (multicast messages)

             messages.each do |message|

+                #Rails.logger.debug message.to_s

                 client.send(message)

             end

@@ -117,16 +118,17 @@ class WsChatController < WsController

     private

     def process_incoming_message(message)

+        #Rails.logger.debug message

         send_message 'app.chat.messageReceived',

                      from: message.from.strip.to_s,

                      to: message.to.strip.to_s,

                      message: message.body,

-                     chat_id: if message.attribute(:is_simulating) then message.attribute(:chat_id) end

+                     chat_id: message.attribute('chat_id').to_s

     end

     def send_contacts(message, chat_id)

-        from = message.from

-        client = find_client(message.to)

+        from = message.from.strip.to_s

+        client = find_client(message.to.strip.to_s)

         contacts = connection_store[:opened_chats][client][chat_id][:attendants]

         client.send(MessageBuilder::send_multichat_contacts(client.jid.strip.to_s, from, chat_id, contacts))

     end