about summary refs log tree commit diff
path: root/app/controllers/api/v1/timelines
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-10-11 14:55:34 -0700
committerReverite <github@reverite.sh>2019-10-11 14:55:34 -0700
commitb63bcefbdf19eece58ae430bce14031d147ab796 (patch)
tree9ce7c29898ddf3f4c4af20890492409793d2fb0f /app/controllers/api/v1/timelines
parent38afc782051fe6faf06c2c9ca20304dd946cfb5c (diff)
parentfbe1de114fca16d63ff651425f69eb534ba013e9 (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/api/v1/timelines')
-rw-r--r--app/controllers/api/v1/timelines/home_controller.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index fcd0757f1..ff5ede138 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -13,7 +13,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
     render json: @statuses,
            each_serializer: REST::StatusSerializer,
            relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id),
-           status: regeneration_in_progress? ? 206 : 200
+           status: account_home_feed.regenerating? ? 206 : 200
   end
 
   private
@@ -62,8 +62,4 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   def pagination_since_id
     @statuses.first.id
   end
-
-  def regeneration_in_progress?
-    Redis.current.exists("account:#{current_account.id}:regeneration")
-  end
 end