@@ -3,11 +3,9 @@ class WsChatController < WsController

     def start_polling_messages

         connection_store[:clients].each do |client|

             client.add_message_callback do |message|

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

-

                 #noinspection RubyAssignmentExpressionInConditionalInspection

                 if message.body

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

+                    process_incoming_message(message.from, message.to, message.body, message.attribute('chat_id').to_s)

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

@@ -18,12 +16,12 @@ class WsChatController < WsController

                 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)

+                elsif message.attribute('destroy_multichat')

+                    destroy_multichat(message.to, message.attribute('chat_id').to_s)

+                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, message.attribute('chat_id').to_s, removed, added)

                 end

                 #TODO: upozornit na pisanie spravy

                 #TODO: odoslat informaciu o tom, ze pisem spravu

@@ -124,7 +122,7 @@ class WsChatController < WsController

     def i_closed_multichat

         chat_id = message[:chatId]

         client  = find_client(message[:me])

-        me      = client.jid.strip.to_s

+        me      = client.jid.to_s

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

         if owner == me

@@ -156,8 +154,8 @@ class WsChatController < WsController

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

     end

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

-        client = find_client(to)

+    def update_attendants_in_multichat(owner, me, chat_id, removed, added)

+        client = find_client(me.strip.to_s)

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

         contacts -= removed

@@ -166,13 +164,13 @@ class WsChatController < WsController

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

         if contacts.empty?

-            destroy_multichat(to, chat_id)

+            destroy_multichat(me, chat_id)

         else

             contacts.each do |contact|

-                client.send(MessageBuilder::send_multichat_contacts(to, contact, chat_id, contacts))

+                client.send(MessageBuilder::send_multichat_contacts(me.to_s, contact, chat_id, contacts))

             end

-            sync_contacts_frontend(from, to, chat_id, contacts)

+            sync_contacts_frontend(owner, me, chat_id, contacts)

         end

     end

 end

\ No newline at end of file

@@ -20,9 +20,9 @@ class WsController < WebsocketRails::BaseController

         if connection_store[:opened_chats]

             connection_store[:clients].each do |client|

                 connection_store[:opened_chats][client].each do |chat_id, contacts|

-                #    if contacts[:owner] == client.jid.strip.to_s

-                #        chats_owner[client] = chat_id

-                #    end

+                    if contacts[:owner] == client.jid.to_s

+                        chats_owner[client] = chat_id

+                    end

                 end

             end

         end

@@ -34,30 +34,30 @@ class WsController < WebsocketRails::BaseController

         chats = where_i_am_multichat_owner()

         chats.each do |client, chat_id|

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

-            contacts -= [kick]

+            contacts -= [kick.to_s]

             if contacts.empty?

-                destroy_multichat(client.jid.strip.to_s, chat_id)

+                destroy_multichat(client.jid, chat_id)

             else

                 contacts.each do |contact|

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

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

                 end

-                sync_contacts_frontend('', client.jid.strip.to_s, chat_id, contacts)

+                sync_contacts_frontend(client.jid, client.jid, chat_id, contacts)

             end

         end

     end

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

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

         send_message 'app.chat.updateSyncedContacts',

-                     me: to,

-                     contacts: contacts,

-                     owner: from,

+                     me: me.strip.to_s,

+                     contacts: strip_all(contacts),

+                     owner: owner.strip.to_s,

                      chat_id: chat_id

     end

-    def destroy_multichat(to, chat_id)

-        client = find_client(to)

+    def destroy_multichat(me, chat_id)

+        client = find_client(me.strip.to_s)

         connection_store[:opened_chats][client].delete(chat_id)

         send_message 'app.chat.destroyMultichat', chat_id: chat_id

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

                 end

                 # mozno treba vyhodit cloveka z multichatu, ak som jeho owner

-                #kick_from_all_multichats(roster_item.jid.to_s)

+                kick_from_all_multichats(new_presence.from)

             else

                 status = uniform_presence(new_presence.show)

                 result = {message: new_presence.status.to_s}