Commiting
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::Timelines::ExploreController < Api::BaseController
|
||||
class Api::V1::Timelines::ExploreController < EmptyController
|
||||
before_action :set_sort_type
|
||||
before_action :set_statuses
|
||||
|
||||
@@ -45,110 +45,7 @@ class Api::V1::Timelines::ExploreController < Api::BaseController
|
||||
end
|
||||
|
||||
def explore_statuses
|
||||
statuses = nil
|
||||
|
||||
date_limit = 30.days.ago
|
||||
top_order = 'status_stats.favourites_count DESC, status_stats.reblogs_count DESC, status_stats.replies_count DESC'
|
||||
|
||||
if @sort_type == 'hot'
|
||||
# : todo :
|
||||
# unique groups
|
||||
# unique users
|
||||
date_limit = 8.hours.ago
|
||||
elsif @sort_type == 'top_today'
|
||||
date_limit = 24.hours.ago
|
||||
elsif @sort_type == 'top_weekly'
|
||||
date_limit = 7.days.ago
|
||||
elsif @sort_type == 'top_monthly'
|
||||
date_limit = 30.days.ago
|
||||
elsif @sort_type == 'top_yearly'
|
||||
date_limit = 1.year.ago
|
||||
end
|
||||
|
||||
if current_account
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.with_public_visibility.where(
|
||||
reply: false
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.with_public_visibility.where(
|
||||
reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.with_public_visibility.where(
|
||||
reply: false
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif @sort_type == 'hot'
|
||||
statuses = Status.unscoped.with_public_visibility.where(
|
||||
reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
else
|
||||
statuses = Status.unscoped.with_public_visibility.where(
|
||||
reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
end
|
||||
end
|
||||
else
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.with_public_visibility.where(
|
||||
reply: false
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
)
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.with_public_visibility.where(
|
||||
reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
)
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.with_public_visibility.where(
|
||||
reply: false
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
)
|
||||
else
|
||||
statuses = Status.unscoped.with_public_visibility.where(
|
||||
reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
statuses
|
||||
SortingQueryBuilder.new.call(@sort_type, params[:max_id])
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::Timelines::GroupCollectionController < Api::BaseController
|
||||
class Api::V1::Timelines::GroupCollectionController < EmptyController
|
||||
before_action :set_collection_type
|
||||
before_action :set_sort_type
|
||||
before_action :set_statuses
|
||||
@@ -61,8 +61,6 @@ class Api::V1::Timelines::GroupCollectionController < Api::BaseController
|
||||
end
|
||||
|
||||
def group_collection_statuses
|
||||
statuses = nil
|
||||
|
||||
@groupIds = []
|
||||
if @collection_type == 'featured'
|
||||
@groupIds = FetchGroupsService.new.call("featured")
|
||||
@@ -72,98 +70,7 @@ class Api::V1::Timelines::GroupCollectionController < Api::BaseController
|
||||
return []
|
||||
end
|
||||
|
||||
date_limit = 30.days.ago
|
||||
top_order = 'status_stats.favourites_count DESC, status_stats.reblogs_count DESC, status_stats.replies_count DESC'
|
||||
|
||||
if @sort_type == 'hot'
|
||||
# : todo :
|
||||
# unique groups
|
||||
# unique users
|
||||
date_limit = 8.hours.ago
|
||||
elsif @sort_type == 'top_today'
|
||||
date_limit = 24.hours.ago
|
||||
elsif @sort_type == 'top_weekly'
|
||||
date_limit = 7.days.ago
|
||||
elsif @sort_type == 'top_monthly'
|
||||
date_limit = 30.days.ago
|
||||
elsif @sort_type == 'top_yearly'
|
||||
date_limit = 1.year.ago
|
||||
end
|
||||
|
||||
if current_account
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.where(
|
||||
group: @groupIds, reply: false
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.where(
|
||||
group: @groupIds, reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.where(
|
||||
group: @groupIds, reply: false
|
||||
).joins(:status_stat).order(top_order)
|
||||
.paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
else
|
||||
statuses = Status.unscoped.where(
|
||||
group: @groupIds, reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
end
|
||||
end
|
||||
else
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.where(
|
||||
group: @groupIds, reply: false
|
||||
).paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.where(
|
||||
group: @groupIds, reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.where(
|
||||
group: @groupIds, reply: false
|
||||
).joins(:status_stat).order(top_order)
|
||||
.paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
else
|
||||
statuses = Status.unscoped.where(
|
||||
group: @groupIds, reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
statuses
|
||||
SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
|
||||
@@ -13,6 +13,7 @@ class Api::V1::Timelines::GroupController < Api::BaseController
|
||||
if current_user
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
group_id: params[:id],
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id, group_id: @group.id)
|
||||
else
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer
|
||||
@@ -50,103 +51,7 @@ class Api::V1::Timelines::GroupController < Api::BaseController
|
||||
end
|
||||
|
||||
def group_statuses
|
||||
statuses = nil
|
||||
|
||||
date_limit = 30.days.ago
|
||||
top_order = 'status_stats.favourites_count DESC, status_stats.reblogs_count DESC, status_stats.replies_count DESC'
|
||||
|
||||
if @sort_type == 'hot'
|
||||
# : todo :
|
||||
# unique groups
|
||||
# unique users
|
||||
date_limit = 8.hours.ago
|
||||
elsif @sort_type == 'top_today'
|
||||
date_limit = 24.hours.ago
|
||||
elsif @sort_type == 'top_weekly'
|
||||
date_limit = 7.days.ago
|
||||
elsif @sort_type == 'top_monthly'
|
||||
date_limit = 30.days.ago
|
||||
elsif @sort_type == 'top_yearly'
|
||||
date_limit = 1.year.ago
|
||||
end
|
||||
|
||||
if current_account
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.where(
|
||||
group: @group, reply: false
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.where(
|
||||
group: @group, reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.where(
|
||||
group: @group, reply: false
|
||||
).joins(:status_stat).order(top_order)
|
||||
.paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
else
|
||||
statuses = Status.unscoped.where(
|
||||
group: @group, reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
|
||||
end
|
||||
end
|
||||
else
|
||||
if @sort_type == 'newest'
|
||||
statuses = Status.where(
|
||||
group: @group, reply: false
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
elsif @sort_type == 'recent'
|
||||
statuses = Status.where(
|
||||
group: @group, reply: false
|
||||
).joins(:status_stat).where(
|
||||
'status_stats.replies_count > 0 OR status_stats.reblogs_count > 0 OR status_stats.favourites_count > 0'
|
||||
).order('status_stats.updated_at DESC').paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
elsif ['top_today', 'top_weekly', 'top_monthly', 'top_yearly', 'top_all_time', 'hot'].include? @sort_type
|
||||
if @sort_type == 'top_all_time'
|
||||
statuses = Status.unscoped.where(
|
||||
group: @group, reply: false
|
||||
).joins(:status_stat).order(top_order)
|
||||
.paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
else
|
||||
statuses = Status.unscoped.where(
|
||||
group: @group, reply: false
|
||||
).where(
|
||||
'statuses.created_at > ?', date_limit
|
||||
).joins(:status_stat).order(top_order).paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
statuses
|
||||
SortingQueryBuilder.new.call(@sort_type, params[:max_id], @group)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
|
||||
@@ -5,8 +5,6 @@ class Api::V1::Timelines::HomeController < Api::BaseController
|
||||
before_action :require_user!, only: [:show]
|
||||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
|
||||
|
||||
respond_to :json
|
||||
|
||||
def show
|
||||
@statuses = load_statuses
|
||||
render json: @statuses,
|
||||
|
||||
@@ -10,6 +10,7 @@ class Api::V1::Timelines::PreviewCardController < Api::BaseController
|
||||
def show
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
preview_card_id: params[:id],
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
|
||||
end
|
||||
|
||||
|
||||
@@ -4,8 +4,6 @@ class Api::V1::Timelines::ProController < Api::BaseController
|
||||
before_action :require_user!, only: [:show]
|
||||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
|
||||
|
||||
respond_to :json
|
||||
|
||||
def show
|
||||
@statuses = load_statuses
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::Timelines::PublicController < Api::BaseController
|
||||
before_action :require_user!, only: [:show]
|
||||
before_action :require_admin!
|
||||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
|
||||
|
||||
respond_to :json
|
||||
|
||||
def show
|
||||
@statuses = load_statuses
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def load_statuses
|
||||
cached_public_statuses
|
||||
end
|
||||
|
||||
def cached_public_statuses
|
||||
cache_collection public_statuses, Status
|
||||
end
|
||||
|
||||
def public_statuses
|
||||
statuses = public_timeline_statuses.paginate_by_id(
|
||||
limit_param(DEFAULT_STATUSES_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
|
||||
if truthy_param?(:only_media)
|
||||
# `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids.
|
||||
status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id)
|
||||
statuses.where(id: status_ids)
|
||||
else
|
||||
statuses
|
||||
end
|
||||
end
|
||||
|
||||
def public_timeline_statuses
|
||||
Status.as_public_timeline(current_account)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
end
|
||||
|
||||
def pagination_params(core_params)
|
||||
params.slice(:limit, :only_media).permit(:limit, :only_media).merge(core_params)
|
||||
end
|
||||
|
||||
def next_path
|
||||
api_v1_timelines_public_url pagination_params(max_id: pagination_max_id)
|
||||
end
|
||||
|
||||
def prev_path
|
||||
api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
|
||||
end
|
||||
|
||||
def pagination_max_id
|
||||
@statuses.last.id
|
||||
end
|
||||
|
||||
def pagination_since_id
|
||||
@statuses.first.id
|
||||
end
|
||||
end
|
||||
@@ -5,11 +5,11 @@ class Api::V1::Timelines::TagController < Api::BaseController
|
||||
before_action :require_user!, only: [:show]
|
||||
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
|
||||
|
||||
respond_to :json
|
||||
|
||||
def show
|
||||
@statuses = tagged_statuses
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
Reference in New Issue
Block a user