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

         App.debug ['message received', result]

         if (result.chat_id)

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

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

-          )

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

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

@@ -200,7 +197,7 @@ this.App =

           )

           tab.showChat()

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

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

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

         else

           #TODO: prepisat tuto hrozu

@@ -15,9 +15,9 @@ class WsChatController < WsController

                 #    # 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 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')

@@ -38,15 +38,15 @@ class WsChatController < WsController

         end

     end

-    def import_people_in_chat(from, to, chat_id, contacts)

+    def import_people_in_chat(owner, me, chat_id, contacts)

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

-        client = find_client(to)

-        create_opened_chat(client, chat_id, from, contacts)

+        client = find_client(me.strip.to_s)

+        create_opened_chat(client, chat_id, owner.to_s, contacts)

         send_message 'app.chat.importChat',

-                     owner:    from,

+                     owner:    owner.strip.to_s,

                      chat_id:  chat_id,

-                     contacts: contacts

+                     contacts: strip_all(contacts)

     end

     # Owner vytvori najprv u seba novy multichat

@@ -56,7 +56,7 @@ class WsChatController < WsController

         chat_id = hash + Time.now.to_f.to_s

         client = find_client(me)

-        create_opened_chat(client, chat_id, me)

+        create_opened_chat(client, chat_id, client.jid.to_s)

         trigger_success id: chat_id

     end

@@ -67,33 +67,39 @@ class WsChatController < WsController

         chat_id  = message[:chatId]

         add      = message[:jid]

+        add_resource = find_multichat_supported(add)

-        connection_store[:opened_chats][client][chat_id][:attendants] << add

+        if add_resource

+            connection_store[:opened_chats][client][chat_id][:attendants] << add_resource

+            #Rails.logger.debug ['adding to multichat', add_resource]

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

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

-        contacts.each do |contact|

-            client.send(MessageBuilder::export_multichat(client.jid.strip.to_s, contact, chat_id, contacts))

-        end

+            contacts.each do |contact|

+                client.send(MessageBuilder::export_multichat(client.jid.to_s, contact, chat_id, contacts))

+            end

-        trigger_success

+            trigger_success

+        else

+            #Rails.logger.debug ['adding to multichat failure', connection_store[:presences][add]]

+            trigger_failure

+        end

     end

     def send_chat_message

         me = message[:from]

         client = find_client(me)

+        my_jid = client.jid.to_s

         if client

             chat_id = message[:chatId]

             if chat_id

-                me = client.jid.strip.to_s

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

-                attendants -= [me]

+                attendants -= [my_jid]

-                messages = MessageBuilder::build_multi_messages(message[:message], me, attendants, chat_id)

-                #Rails.logger.debug messages

+                messages = MessageBuilder::build_multi_messages(message[:message], my_jid, attendants, chat_id)

             else

-                messages = [MessageBuilder::build_message(message[:message], me, message[:to])]

+                messages = [MessageBuilder::build_message(message[:message], my_jid, message[:to])]

             end

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

@@ -14,11 +14,6 @@ class WsController < WebsocketRails::BaseController

         end

     end

-    def find_client_jid(client_jid)

-        client = find_client(client_jid)

-        client.jid.strip.to_s

-    end

-

     def where_i_am_multichat_owner

         chats_owner = {}

@@ -73,4 +68,21 @@ class WsController < WebsocketRails::BaseController

             contact.text

         end

     end

+

+    def find_multichat_supported(jid_stripped)

+        contact = connection_store[:presences][jid_stripped.to_sym].find do |resource, info|

+            info[:multichat]

+        end

+        contact.first

+    end

+

+    def strip_all(contacts)

+        if contacts.is_a? Array

+            contacts.map do |jid|

+                Jabber::JID.new(jid).strip!.to_s

+            end

+        else

+            contacts

+        end

+    end

 end

\ No newline at end of file

@@ -235,7 +235,7 @@ class WsRosterController < WsController

         connection_store[:clients].each do |client|

             client.add_message_callback do |message|

                 if message.attribute('i_am_using_same_app')

-                    connection_store[:presences][message.from.strip.to_s][message.from.to_s.to_sym][multichat: true]

+                    connection_store[:presences][message.from.strip.to_s][message.from.to_s.to_sym][:multichat] = true

                     send_message 'app.roster.using_this_app',

                                  jid: message.from.strip.to_s

@@ -271,7 +271,7 @@ class WsRosterController < WsController

                     priority: new_presence.priority

                 }

-                ask_if_using_this_app(connection_store[:link_roster_client][roster], new_presence.from.strip.to_s)

+                ask_if_using_this_app(connection_store[:link_roster_client][roster], new_presence.from.to_s)

             end

             result[:status] = select_most_online_status(roster_item.jid.strip.to_s)

@@ -297,10 +297,6 @@ class WsRosterController < WsController

     end

     def ask_if_using_this_app(client, contact)

-        return unless connection_store[:presences][contact]

-

-        connection_store[:presences][contact].each do |jid_resource, state|

-            client.send(MessageBuilder::control_question(client.jid.to_s, jid_resource.to_s))

-        end

+        client.send(MessageBuilder::control_question(client.jid.to_s, contact))

     end

 end