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

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-10 14:14:00 +09:00
commit 139030f230
16 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/api/v1/statuses/emoji_reactioned_by_accounts_controller.rb
View file

@ -16,14 +16,15 @@ class Api::V1::Statuses::EmojiReactionedByAccountsController < Api::BaseControll
def load_accounts
scope = default_accounts
# scope = scope.where.not(account_id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
scope = scope.where.not(account_id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
scope.merge(paginated_emoji_reactions).to_a
end
def default_accounts
EmojiReaction
.where(status_id: @status.id)
#.where(account: { suspended_at: nil })
.includes(:account)
.where(account: { suspended_at: nil })
end
def paginated_emoji_reactions