@@ -96,57 +96,11 @@ class WsRosterController < WsController

     ##

     # Zacni pocuvat zmeny stavov v rosteri

     def start_polling_contacts_state

-        connection_store[:rosters].each do |roster|

-            start_polling_control_answer()

-            #start_polling_subscription(roster)

-            #start_polling_presence(roster)

-

-            #subscription

-            roster.add_subscription_callback do |roster_item, stanza|

-                # stan unsubscribe = niekto uz ma nesubscribuje

-                # stan unsubscribed = niekto ma uz nesubscribuje a aj si ma vymazal

-                # stan subscribed = niekto moze vidiet moj stav

-

-                client = connection_store[:link_roster_client][roster]

-

-                send_message 'app.roster.subscriptionChanged',

-                             action: stanza.type,

-                             jid: roster_item.jid.strip.to_s,

-                             belongsTo: client.jid.strip.to_s

-            end

-

-            #presence

-            roster.add_presence_callback do |roster_item, old_presence, new_presence|

-                if new_presence.type == :unavailable

-                    result = {message: ''}

-

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

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

-                    end

-

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

-                    #kick_from_all_multichats(roster_item.jid.to_s)

-                else

-                    status = uniform_presence(new_presence.show)

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

-

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

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

-                    end

-

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

-                        status: status,

-                        multichat: false

-                    }

-

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

-                end

-

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

+        start_polling_control_answer()

-                send_message 'app.roster.statusChanged',

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

-            end

+        connection_store[:rosters].each do |roster|

+            start_polling_subscription(roster)

+            start_polling_presence(roster)

         end

     end

@@ -292,6 +246,55 @@ class WsRosterController < WsController

         end

     end

+    def start_polling_presence(roster)

+        roster.add_presence_callback do |roster_item, old_presence, new_presence|

+            if new_presence.type == :unavailable

+                result = {message: ''}

+

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

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

+                end

+

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

+                #kick_from_all_multichats(roster_item.jid.to_s)

+            else

+                status = uniform_presence(new_presence.show)

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

+

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

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

+                end

+

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

+                    status: status,

+                    multichat: false

+                }

+

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

+            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

+    end

+

+    def start_polling_subscription(roster)

+        roster.add_subscription_callback do |roster_item, stanza|

+            # stan unsubscribe = niekto uz ma nesubscribuje

+            # stan unsubscribed = niekto ma uz nesubscribuje a aj si ma vymazal

+            # stan subscribed = niekto moze vidiet moj stav

+

+            client = connection_store[:link_roster_client][roster]

+

+            send_message 'app.roster.subscriptionChanged',

+                         action: stanza.type,

+                         jid: roster_item.jid.strip.to_s,

+                         belongsTo: client.jid.strip.to_s

+        end

+    end

+

     def ask_if_using_this_app(client, contact)

         return unless connection_store[:presences][contact]