lib/ayadn/action.rb in ayadn-1.2.5 vs lib/ayadn/action.rb in ayadn-1.2.6

@@ -43,21 +43,19 @@
     end
 
     def global(settings)
       begin
         options = settings.dup
-        options[:filter] = true if Settings.options[:nicerank][:filter] == true
+        if Settings.options[:nicerank]
+          options[:filter] = true if Settings.options[:nicerank][:filter] == true
+        end
         doing(options)
         stream = @api.get_global(options)
-
-        ###DEBUG
-        #niceranks = @api.get_niceranks stream
-        niceranks, _ = @api.get_niceranks stream, 0
-
+        niceranks = NiceRank.new.get_ranks stream
         (no_new_posts unless Databases.has_new?(stream, 'global')) if options[:new]
         Databases.save_max_id(stream)
         render_view(stream, options, niceranks)
-        Scroll.new(@api, @view).global(options, niceranks) if options[:scroll]
+        Scroll.new(@api, @view).global(options) if options[:scroll]
       rescue => e
         Errors.global_error("action/global", options, e)
       ensure
         Databases.close_all
       end