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

         end

     end

-    def where_i_am_multichat_owner

-        chats_owner = {}

-

-        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.to_s

-                        chats_owner[client] = chat_id

-                    end

+    def where_i_am_multichat_owner(client)

+        chats_owner = []

+

+        if connection_store[:opened_chats] and connection_store[:opened_chats][client]

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

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

+                    chats_owner << chat_id

                 end

             end

         end

@@ -30,11 +28,11 @@ class WsController < WebsocketRails::BaseController

         chats_owner

     end

-    def kick_from_all_multichats(kick)

-        chats = where_i_am_multichat_owner()

-        chats.each do |client, chat_id|

+    def kick_from_all_multichats(client, somebody_to_kick)

+        chats = where_i_am_multichat_owner(client)

+        chats.each do |chat_id|

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

-            contacts -= [kick.to_s]

+            contacts -= [somebody_to_kick.to_s]

             if contacts.empty?

                 destroy_multichat(client.jid, chat_id)

@@ -48,6 +46,16 @@ class WsController < WebsocketRails::BaseController

         end

     end

+    def kick_myself_from_multichat(client, owner)

+        if connection_store[:opened_chats] and connection_store[:opened_chats][client]

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

+                if chat[:owner] == owner.to_s and chat[:attendants].include? client.jid.to_s

+                    destroy_multichat(client.jid, chat_id)

+                end

+            end

+        end

+    end

+

     def sync_contacts_frontend(owner, me, chat_id, contacts)

         send_message 'app.chat.updateSyncedContacts',

                      me: me.strip.to_s,

@@ -255,8 +255,12 @@ class WsRosterController < WsController

                     connection_store[:presences][roster_item.jid.strip.to_s.to_sym].delete(new_presence.from.to_s)

                 end

+                client = connection_store[:link_roster_client][roster]

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

-                kick_from_all_multichats(new_presence.from)

+                kick_from_all_multichats(client, new_presence.from)

+

+                # mozno treba sa odpojit z multichatu, ak sa odpojil jeho owner

+                kick_myself_from_multichat(client, new_presence.from)

             else

                 status = uniform_presence(new_presence.show)

                 result = {message: new_presence.status.to_s}