Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.local
Claire
1 year ago
commit
9a3d91f629
22 changed files with 443 additions and 59 deletions
@ -0,0 +1,153 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
class BackfillAdminActionLogsAgain < ActiveRecord::Migration[6.1] |
||||||
|
disable_ddl_transaction! |
||||||
|
|
||||||
|
class Account < ApplicationRecord |
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
has_one :user, inverse_of: :account |
||||||
|
|
||||||
|
def local? |
||||||
|
domain.nil? |
||||||
|
end |
||||||
|
|
||||||
|
def acct |
||||||
|
local? ? username : "#{username}@#{domain}" |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
class User < ApplicationRecord |
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
belongs_to :account |
||||||
|
end |
||||||
|
|
||||||
|
class Status < ApplicationRecord |
||||||
|
include RoutingHelper |
||||||
|
|
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
belongs_to :account |
||||||
|
|
||||||
|
def local? |
||||||
|
attributes['local'] || attributes['uri'].nil? |
||||||
|
end |
||||||
|
|
||||||
|
def uri |
||||||
|
local? ? activity_account_status_url(account, self) : attributes['uri'] |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
class DomainBlock < ApplicationRecord; end |
||||||
|
class DomainAllow < ApplicationRecord; end |
||||||
|
class EmailDomainBlock < ApplicationRecord; end |
||||||
|
class UnavailableDomain < ApplicationRecord; end |
||||||
|
|
||||||
|
class AccountWarning < ApplicationRecord |
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
belongs_to :account |
||||||
|
end |
||||||
|
|
||||||
|
class Announcement < ApplicationRecord; end |
||||||
|
class IpBlock < ApplicationRecord; end |
||||||
|
class CustomEmoji < ApplicationRecord; end |
||||||
|
class CanonicalEmailBlock < ApplicationRecord; end |
||||||
|
|
||||||
|
class Appeal < ApplicationRecord |
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
belongs_to :account |
||||||
|
end |
||||||
|
|
||||||
|
class AdminActionLog < ApplicationRecord |
||||||
|
# Dummy class, to make migration possible across version changes |
||||||
|
|
||||||
|
# Cannot use usual polymorphic support because of namespacing issues |
||||||
|
belongs_to :status, foreign_key: :target_id |
||||||
|
belongs_to :account, foreign_key: :target_id |
||||||
|
belongs_to :user, foreign_key: :user_id |
||||||
|
belongs_to :domain_block, foreign_key: :target_id |
||||||
|
belongs_to :domain_allow, foreign_key: :target_id |
||||||
|
belongs_to :email_domain_block, foreign_key: :target_id |
||||||
|
belongs_to :unavailable_domain, foreign_key: :target_id |
||||||
|
belongs_to :account_warning, foreign_key: :target_id |
||||||
|
belongs_to :announcement, foreign_key: :target_id |
||||||
|
belongs_to :ip_block, foreign_key: :target_id |
||||||
|
belongs_to :custom_emoji, foreign_key: :target_id |
||||||
|
belongs_to :canonical_email_block, foreign_key: :target_id |
||||||
|
belongs_to :appeal, foreign_key: :target_id |
||||||
|
end |
||||||
|
|
||||||
|
def up |
||||||
|
safety_assured do |
||||||
|
AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log| |
||||||
|
next if log.account.nil? |
||||||
|
log.update_attribute('human_identifier', log.account.acct) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log| |
||||||
|
next if log.user.nil? |
||||||
|
log.update_attribute('human_identifier', log.user.account.acct) |
||||||
|
log.update_attribute('route_param', log.user.account_id) |
||||||
|
end |
||||||
|
|
||||||
|
Admin::ActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text') |
||||||
|
|
||||||
|
AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log| |
||||||
|
next if log.domain_block.nil? |
||||||
|
log.update_attribute('human_identifier', log.domain_block.domain) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log| |
||||||
|
next if log.domain_allow.nil? |
||||||
|
log.update_attribute('human_identifier', log.domain_allow.domain) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log| |
||||||
|
next if log.email_domain_block.nil? |
||||||
|
log.update_attribute('human_identifier', log.email_domain_block.domain) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log| |
||||||
|
next if log.unavailable_domain.nil? |
||||||
|
log.update_attribute('human_identifier', log.unavailable_domain.domain) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log| |
||||||
|
next if log.status.nil? |
||||||
|
log.update_attribute('human_identifier', log.status.account.acct) |
||||||
|
log.update_attribute('permalink', log.status.uri) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log| |
||||||
|
next if log.account_warning.nil? |
||||||
|
log.update_attribute('human_identifier', log.account_warning.account.acct) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log| |
||||||
|
next if log.announcement.nil? |
||||||
|
log.update_attribute('human_identifier', log.announcement.text) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log| |
||||||
|
next if log.ip_block.nil? |
||||||
|
log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}") |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log| |
||||||
|
next if log.custom_emoji.nil? |
||||||
|
log.update_attribute('human_identifier', log.custom_emoji.shortcode) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log| |
||||||
|
next if log.canonical_email_block.nil? |
||||||
|
log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash) |
||||||
|
end |
||||||
|
|
||||||
|
AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log| |
||||||
|
next if log.appeal.nil? |
||||||
|
log.update_attribute('human_identifier', log.appeal.account.acct) |
||||||
|
log.update_attribute('route_param', log.appeal.account_warning_id) |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def down; end |
||||||
|
end |
||||||
@ -1,5 +1,48 @@ |
|||||||
require 'rails_helper' |
require 'rails_helper' |
||||||
|
|
||||||
RSpec.describe AccountMigration, type: :model do |
RSpec.describe AccountMigration, type: :model do |
||||||
|
describe 'validations' do |
||||||
|
let(:source_account) { Fabricate(:account) } |
||||||
|
let(:target_acct) { target_account.acct } |
||||||
|
|
||||||
|
let(:subject) { AccountMigration.new(account: source_account, acct: target_acct) } |
||||||
|
|
||||||
|
context 'with valid properties' do |
||||||
|
let(:target_account) { Fabricate(:account, username: 'target', domain: 'remote.org') } |
||||||
|
|
||||||
|
before do |
||||||
|
target_account.aliases.create!(acct: source_account.acct) |
||||||
|
|
||||||
|
service_double = double |
||||||
|
allow(ResolveAccountService).to receive(:new).and_return(service_double) |
||||||
|
allow(service_double).to receive(:call).with(target_acct, anything).and_return(target_account) |
||||||
|
end |
||||||
|
|
||||||
|
it 'passes validations' do |
||||||
|
expect(subject).to be_valid |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
context 'with unresolveable account' do |
||||||
|
let(:target_acct) { 'target@remote' } |
||||||
|
|
||||||
|
before do |
||||||
|
service_double = double |
||||||
|
allow(ResolveAccountService).to receive(:new).and_return(service_double) |
||||||
|
allow(service_double).to receive(:call).with(target_acct, anything).and_return(nil) |
||||||
|
end |
||||||
|
|
||||||
|
it 'has errors on acct field' do |
||||||
|
expect(subject).to model_have_error_on_field(:acct) |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
context 'with a space in the domain part' do |
||||||
|
let(:target_acct) { 'target@remote. org' } |
||||||
|
|
||||||
|
it 'has errors on acct field' do |
||||||
|
expect(subject).to model_have_error_on_field(:acct) |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
end |
end |
||||||
|
|||||||
Loading…
Reference in new issue