post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix output 0 as count when user set hide counts

Browse source
This commit is contained in:
KMY 2023-05-19 19:05:35 +09:00
parent a5fcacaded
commit b50d851385
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/activitypub/outboxes_controller.rb
View file

@ -37,7 +37,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
ActivityPub::CollectionPresenter.new( ActivityPub::CollectionPresenter.new(
id: outbox_url, id: outbox_url,
type: :ordered, type: :ordered,
size: @account.statuses_count, size: @account.user&.setting_hide_statuses_count ? 0 : @account.statuses_count,
first: outbox_url(page: true), first: outbox_url(page: true),
last: outbox_url(page: true, min_id: 0) last: outbox_url(page: true, min_id: 0)
) )

4
app/controllers/follower_accounts_controller.rb
View file

@ -63,7 +63,7 @@ class FollowerAccountsController < ApplicationController
ActivityPub::CollectionPresenter.new( ActivityPub::CollectionPresenter.new(
id: account_followers_url(@account, page: params.fetch(:page, 1)), id: account_followers_url(@account, page: params.fetch(:page, 1)),
type: :ordered, type: :ordered,
size: @account.followers_count, size: @account.user&.setting_hide_followers_count ? 0 : @account.followers_count,
items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) }, items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
part_of: account_followers_url(@account), part_of: account_followers_url(@account),
next: next_page_url, next: next_page_url,
@ -73,7 +73,7 @@ class FollowerAccountsController < ApplicationController
ActivityPub::CollectionPresenter.new( ActivityPub::CollectionPresenter.new(
id: account_followers_url(@account), id: account_followers_url(@account),
type: :ordered, type: :ordered,
size: @account.followers_count, size: @account.user&.setting_hide_followers_count ? 0 : @account.followers_count,
first: page_url(1) first: page_url(1)
) )
end end

4
app/controllers/following_accounts_controller.rb
View file

@ -66,7 +66,7 @@ class FollowingAccountsController < ApplicationController
ActivityPub::CollectionPresenter.new( ActivityPub::CollectionPresenter.new(
id: account_following_index_url(@account, page: params.fetch(:page, 1)), id: account_following_index_url(@account, page: params.fetch(:page, 1)),
type: :ordered, type: :ordered,
size: @account.following_count, size: @account.user&.setting_hide_following_count ? 0 : @account.following_count,
items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) }, items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
part_of: account_following_index_url(@account), part_of: account_following_index_url(@account),
next: next_page_url, next: next_page_url,
@ -76,7 +76,7 @@ class FollowingAccountsController < ApplicationController
ActivityPub::CollectionPresenter.new( ActivityPub::CollectionPresenter.new(
id: account_following_index_url(@account), id: account_following_index_url(@account),
type: :ordered, type: :ordered,
size: @account.following_count, size: @account.user&.setting_hide_following_count ? 0 : @account.following_count,
first: page_url(1) first: page_url(1)
) )
end end