fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-25 15:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract constants for controller LIMIT queries (#32921)

Browse source
This commit is contained in:
Matt Jankowski 2024-11-18 04:23:38 -05:00 committed by GitHub
parent 16addf47c7
commit c511cbcd6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/instances_controller.rb
View file

@ -5,6 +5,8 @@ module Admin
before_action :set_instances, only: :index before_action :set_instances, only: :index
before_action :set_instance, except: :index before_action :set_instance, except: :index
LOGS_LIMIT = 5
def index def index
authorize :instance, :index? authorize :instance, :index?
preload_delivery_failures! preload_delivery_failures!
@ -13,7 +15,7 @@ module Admin
def show def show
authorize :instance, :show? authorize :instance, :show?
@time_period = (6.days.ago.to_date...Time.now.utc.to_date) @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
@action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5) @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(LOGS_LIMIT)
end end
def destroy def destroy

4
app/controllers/api/v1/featured_tags/suggestions_controller.rb
View file

@ -5,6 +5,8 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
before_action :require_user! before_action :require_user!
before_action :set_recently_used_tags, only: :index before_action :set_recently_used_tags, only: :index
RECENT_TAGS_LIMIT = 10
def index def index
render json: @recently_used_tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@recently_used_tags, current_user&.account_id) render json: @recently_used_tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@recently_used_tags, current_user&.account_id)
end end
@ -12,6 +14,6 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
private private
def set_recently_used_tags def set_recently_used_tags
@recently_used_tags = Tag.suggestions_for_account(current_account).limit(10) @recently_used_tags = Tag.suggestions_for_account(current_account).limit(RECENT_TAGS_LIMIT)
end end
end end

4
app/controllers/settings/featured_tags_controller.rb
View file

@ -5,6 +5,8 @@ class Settings::FeaturedTagsController < Settings::BaseController
before_action :set_featured_tag, except: [:index, :create] before_action :set_featured_tag, except: [:index, :create]
before_action :set_recently_used_tags, only: :index before_action :set_recently_used_tags, only: :index
RECENT_TAGS_LIMIT = 10
def index def index
@featured_tag = FeaturedTag.new @featured_tag = FeaturedTag.new
end end
@ -38,7 +40,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
end end
def set_recently_used_tags def set_recently_used_tags
@recently_used_tags = Tag.suggestions_for_account(current_account).limit(10) @recently_used_tags = Tag.suggestions_for_account(current_account).limit(RECENT_TAGS_LIMIT)
end end
def featured_tag_params def featured_tag_params

4
app/controllers/settings/imports_controller.rb
View file

@ -24,6 +24,8 @@ class Settings::ImportsController < Settings::BaseController
lists: false, lists: false,
}.freeze }.freeze
RECENT_IMPORTS_LIMIT = 10
def index def index
@import = Form::Import.new(current_account: current_account) @import = Form::Import.new(current_account: current_account)
end end
@ -96,6 +98,6 @@ class Settings::ImportsController < Settings::BaseController
end end
def set_recent_imports def set_recent_imports
@recent_imports = current_account.bulk_imports.reorder(id: :desc).limit(10) @recent_imports = current_account.bulk_imports.reorder(id: :desc).limit(RECENT_IMPORTS_LIMIT)
end end
end end