update Tweet.page scope

4 files changed, 4 insertions, 4 deletions

diff --git a/app/api/api_deprecated.rb b/app/api/api_deprecated.rb
index 746fe0d..5f325f4 100644
--- a/app/api/api_deprecated.rb
+++ b/app/api/api_deprecated.rb
@@ -40,7 +40,7 @@ class ApiDeprecated < Grape::API
 
       def paginate(tweets)
         count = [(params[:count] || Settings.tweets.count.default).to_i, Settings.tweets.count.max].min
-        tweets.limit(count).page((params[:page] || 1).to_i)
+        tweets.page((params[:page] || 1).to_i, count)
       end
 
       def paginate_with_ids(tweets)
diff --git a/app/api/api_tweets.rb b/app/api/api_tweets.rb
index c774fd6..72a9c92 100644
--- a/app/api/api_tweets.rb
+++ b/app/api/api_tweets.rb
@@ -52,7 +52,7 @@ class ApiTweets < Grape::API
 
       def paginate(tweets)
         count = [(params[:count] || Settings.tweets.count.default).to_i, Settings.tweets.count.max].min
-        tweets.limit(count).page((params[:page] || 1).to_i)
+        tweets.page((params[:page] || 1).to_i, count)
       end
 
       def paginate_with_ids(tweets)
diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index fd28c01..3e56c28 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -96,7 +96,7 @@ class TweetsController < ApplicationController
 
   def paginate_with_page_number(tweets)
     @page = (params[:page] || 1).to_i
-    tweets.limit(params_count).page(@page)
+    tweets.page(@page, params_count)
   end
 
   def params_count
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 7e927ec..b7121a9 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -17,7 +17,7 @@ class Tweet < ActiveRecord::Base
 
   scope :max_id, -> id { where("tweets.id <= ?", id.to_i) if id }
   scope :since_id, -> id { where("tweets.id > ?", id.to_i) if id }
-  scope :page, ->(page) { offset((page - 1) * all.limit_value) }
+  scope :page, ->(page, page_per) { limit(page_per).offset((page - 1) * page_per) }
 
   scope :order_by_id, -> { order(id: :desc) }
   scope :order_by_reactions, -> { order(reactions_count: :desc) }