From e2dcdf11df5944525b9b4a6af87d2f0cbed1329a Mon Sep 17 00:00:00 2001 From: sneakers-the-rat Date: Sun, 29 Sep 2024 23:37:47 -0700 Subject: [PATCH] rm spurious imports and reformatting --- app/controllers/api/v1/statuses_controller.rb | 11 +++++------ app/workers/fetch_reply_worker.rb | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index fcafc5d1365e05..834862761665d0 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -2,7 +2,6 @@ class Api::V1::StatusesController < Api::BaseController include Authorization - include JsonLdHelper before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :update, :destroy] before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:create, :update, :destroy] @@ -45,15 +44,15 @@ def context descendants_depth_limit = nil if current_account.nil? - ancestors_limit = ANCESTORS_LIMIT - descendants_limit = DESCENDANTS_LIMIT + ancestors_limit = ANCESTORS_LIMIT + descendants_limit = DESCENDANTS_LIMIT descendants_depth_limit = DESCENDANTS_DEPTH_LIMIT end - ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(ancestors_limit, current_account) + ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(ancestors_limit, current_account) descendants_results = @status.descendants(descendants_limit, current_account, descendants_depth_limit) - loaded_ancestors = preload_collection(ancestors_results, Status) - loaded_descendants = preload_collection(descendants_results, Status) + loaded_ancestors = preload_collection(ancestors_results, Status) + loaded_descendants = preload_collection(descendants_results, Status) @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants) statuses = [@status] + @context.ancestors + @context.descendants diff --git a/app/workers/fetch_reply_worker.rb b/app/workers/fetch_reply_worker.rb index 08739babf07e10..68a7414bebeaa0 100644 --- a/app/workers/fetch_reply_worker.rb +++ b/app/workers/fetch_reply_worker.rb @@ -3,7 +3,6 @@ class FetchReplyWorker include Sidekiq::Worker include ExponentialBackoff - include JsonLdHelper sidekiq_options queue: 'pull', retry: 3