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

         super

         @storages_arr = [:clients, :rosters]

-        @storages_hash = [:link_roster_client, :presences]

+        @storages_hash = [:link_roster_client, :my_presences, :presences]

     end

     def initialize_storage

@@ -112,14 +112,30 @@ class WsRosterController < WsController

             roster.add_presence_callback do |roster_item, old_presence, new_presence|

                 if new_presence.type == :unavailable

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

+                    result = {message: ''}

+

+                    unless connection_store[:presences][roster_item.jid.strip.to_s].nil?

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

+                    end

+

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

-                    kick_from_all_multichats(roster_item.jid.strip.to_s)

+                    #kick_from_all_multichats(roster_item.jid.to_s)

                 else

                     status = uniform_presence(new_presence.show)

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

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

+

+                    if connection_store[:presences][roster_item.jid.strip.to_s].nil?

+                        connection_store[:presences][roster_item.jid.strip.to_s] = Hash.new()

+                    end

+

+                    connection_store[:presences][roster_item.jid.strip.to_s][new_presence.from.to_s] = {

+                        status: status,

+                        multichat: false

+                    }

                 end

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

+

                 send_message 'app.roster.statusChanged',

                              jid: roster_item.jid.strip.to_s, status: result

             end

@@ -135,7 +151,7 @@ class WsRosterController < WsController

         connection_store[:clients].each do |client|

             presence = Jabber::Presence.new.set_type(:available)

             client.send(presence)

-            connection_store[:presences][client] = presence

+            connection_store[:my_presences][client] = presence

         end

     end

@@ -165,7 +181,7 @@ class WsRosterController < WsController

         connection_store[:clients].each do |client|

             vcard = get_vcard(client)

             jid = client.jid.strip.to_s

-            presence = uniform_presence(connection_store[:presences][client].show)

+            presence = uniform_presence(connection_store[:my_presences][client].show)

         end

         trigger_success jid: jid, vcard: vcard, status: presence

@@ -232,6 +248,18 @@ class WsRosterController < WsController

     private

+    def select_most_online_status(jid_stripped)

+        if connection_store[:presences][jid_stripped].nil? || connection_store[:presences][jid_stripped].empty?

+            return uniform_presence(:offline)

+        end

+

+        statuses = { offline: 0, dnd: 1, away: 2, online: 3 }

+

+        Hash[connection_store[:presences][jid_stripped].map do |jid, data|

+            [ statuses[data[:status]], data[:status] ]

+        end].max.second

+    end

+

     def get_vcard(me, contact_jid = nil)

         vcard = Jabber::Vcard::Helper.get(me, contact_jid)

@@ -246,6 +274,7 @@ class WsRosterController < WsController

     def uniform_presence(xmpp_presence)

         case xmpp_presence

+            when :offline   then :offline

             when :away, :xa then :away

             when :dnd       then :dnd

             else                 :online