gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-07 18:31:07 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add action_logs association to account

Browse Source
This commit is contained in:
Matt Jankowski 2025-09-04 09:22:42 -04:00
parent e7c30cd072
commit 9b359d8daf
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/concerns/accountable_concern.rb
View File

@ -4,10 +4,8 @@ module AccountableConcern
extend ActiveSupport::Concern extend ActiveSupport::Concern
def log_action(action, target) def log_action(action, target)
Admin::ActionLog.create( current_account
account: current_account, .action_logs
action: action, .create(action:, target:)
target: target
)
end end
end end

2
app/models/account.rb
View File

@ -143,7 +143,7 @@ class Account < ApplicationRecord
scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") } scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) } scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) } scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) } scope :auditable, -> { where.associated(:action_logs).distinct }
scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) } scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) } scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) } scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.by_recent_status).references(:account_stat) }

1
app/models/concerns/account/associations.rb
View File

@ -11,6 +11,7 @@ module Account::Associations
has_many :account_moderation_notes has_many :account_moderation_notes
has_many :account_pins has_many :account_pins
has_many :account_warnings has_many :account_warnings
has_many :action_logs, class_name: 'Admin::ActionLog'
has_many :aliases, class_name: 'AccountAlias' has_many :aliases, class_name: 'AccountAlias'
has_many :bookmarks has_many :bookmarks
has_many :conversations, class_name: 'AccountConversation' has_many :conversations, class_name: 'AccountConversation'

4
spec/models/account_spec.rb
View File

@ -6,6 +6,10 @@ RSpec.describe Account do
it_behaves_like 'Account::Search' it_behaves_like 'Account::Search'
it_behaves_like 'Reviewable' it_behaves_like 'Reviewable'
describe 'Associations' do
it { is_expected.to have_many(:action_logs).class_name('Admin::ActionLog') }
end
context 'with an account record' do context 'with an account record' do
subject { Fabricate(:account) } subject { Fabricate(:account) }