@@ -88,13 +88,14 @@ class WsChatController < WsController

         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 -= [client.jid.strip.to_s]

+                attendants -= [me]

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

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

                 #Rails.logger.debug messages

             else

-                messages = [MessageBuilder::build_message(message[:message], client.jid.strip.to_s, message[:to])]

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

             end

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

@@ -125,7 +126,7 @@ class WsChatController < WsController

         if owner == me

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

             attendants.each do |attendant|

-                client.send(MessageBuilder::destroy_multichat(me, attendant, chat_id))

+                client.send(MessageBuilder::kick_from_multichat(me, attendant, chat_id))

             end

         else

             changes = {removed: [me]}

@@ -135,29 +136,6 @@ class WsChatController < WsController

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

     end

-    def kick_from_multichat

-        chat_id = message[:chatId]

-        client  = find_client(message[:me])

-        owner   = client.jid.strip.to_s

-        kick    = message[:kick]

-

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

-        contacts -= [kick]

-

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

-

-        client.send(MessageBuilder::destroy_multichat(owner, kick, chat_id))

-

-        if contacts.empty?

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

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

-        else

-            contacts.each do |contact|

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

-            end

-        end

-    end

-

     private

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

@@ -175,13 +153,6 @@ class WsChatController < WsController

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

     end

-    def destroy_multichat(to, chat_id)

-        client = find_client(to)

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

-

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

-    end

-

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

         client = find_client(to)

@@ -19,7 +19,7 @@ class WsController < WebsocketRails::BaseController

         client.jid.strip.to_s

     end

-    def multichats_owner

+    def where_i_am_multichat_owner

         chats_owner = {}

         connection_store[:clients].each do |client|

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

@@ -32,15 +32,14 @@ class WsController < WebsocketRails::BaseController

         chats_owner

     end

-    def kick_from_multichat2(kick)

-        chats = multichats_owner()

+    def kick_from_all_multichats(kick)

+        chats = where_i_am_multichat_owner()

         chats.each do |client, chat_id|

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

             contacts -= [kick]

             if contacts.empty?

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

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

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

             else

                 contacts.each do |contact|

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

@@ -59,6 +58,13 @@ class WsController < WebsocketRails::BaseController

                      chat_id: chat_id

     end

+    def destroy_multichat(to, chat_id)

+        client = find_client(to)

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

+

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

+    end

+

     def xml_contacts_to_array(xml_contacts)

         xml_contacts.get_elements('contact').map do |contact|

             contact.text

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

                 if new_presence.type == :unavailable

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

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

-                    #kick_from_multichat2(roster_item.jid.strip.to_s)

+                    kick_from_all_multichats(roster_item.jid.strip.to_s)

                 else

                     status = uniform_presence(new_presence.show)

                     result = { status: status, message: new_presence.status.to_s }

@@ -81,7 +81,7 @@ module MessageBuilder

         message

     end

-    def self.destroy_multichat(from, to, chat_id)

+    def self.kick_from_multichat(from, to, chat_id)

         message = Jabber::Message.new(to)

         message.from = from

         message.add_attributes('destroy_multichat' => 'true')