mirror of https://github.com/mastodon/mastodon
Add ability to manage which websites can credit you in link previews (#31819)
Eugen Rochko
7 months ago
committed by
GitHub
parent
3929e3c6d2
commit
e0c27a5047
@ -0,0 +1,25 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
module Account::AttributionDomains
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
validates :attribution_domains_as_text, domain: { multiline: true }, lines: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? }
|
||||
end
|
||||
|
||||
def attribution_domains_as_text
|
||||
self[:attribution_domains].join("\n")
|
||||
end
|
||||
|
||||
def attribution_domains_as_text=(str)
|
||||
self[:attribution_domains] = str.split.filter_map do |line|
|
||||
line.strip.delete_prefix('*.')
|
||||
end
|
||||
end
|
||||
|
||||
def can_be_attributed_from?(domain)
|
||||
segments = domain.split('.')
|
||||
variants = segments.map.with_index { |_, i| segments[i..].join('.') }.to_set
|
||||
self[:attribution_domains].to_set.intersect?(variants)
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,9 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class LinesValidator < ActiveModel::EachValidator
|
||||
def validate_each(record, attribute, value)
|
||||
return if value.blank?
|
||||
|
||||
record.errors.add(attribute, :too_many_lines, limit: options[:maximum]) if options[:maximum].present? && value.split.size > options[:maximum]
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class AddAttributionDomainsToAccounts < ActiveRecord::Migration[7.1]
|
||||
def change
|
||||
add_column :accounts, :attribution_domains, :string, array: true, default: []
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,125 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe DomainValidator do
|
||||
let(:record) { record_class.new }
|
||||
|
||||
context 'with no options' do
|
||||
let(:record_class) do
|
||||
Class.new do
|
||||
include ActiveModel::Validations
|
||||
|
||||
attr_accessor :domain
|
||||
|
||||
validates :domain, domain: true
|
||||
end
|
||||
end
|
||||
|
||||
describe '#validate_each' do
|
||||
context 'with a nil value' do
|
||||
it 'does not add errors' do
|
||||
record.domain = nil
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a valid domain' do
|
||||
it 'does not add errors' do
|
||||
record.domain = 'example.com'
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a domain that is too long' do
|
||||
it 'adds an error' do
|
||||
record.domain = "#{'a' * 300}.com"
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:domain)).to_not be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a domain with an empty segment' do
|
||||
it 'adds an error' do
|
||||
record.domain = '.example.com'
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:domain)).to_not be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a domain with an invalid character' do
|
||||
it 'adds an error' do
|
||||
record.domain = '*.example.com'
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:domain)).to_not be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a domain that would fail parsing' do
|
||||
it 'adds an error' do
|
||||
record.domain = '/'
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:domain)).to_not be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'with acct option' do
|
||||
let(:record_class) do
|
||||
Class.new do
|
||||
include ActiveModel::Validations
|
||||
|
||||
attr_accessor :acct
|
||||
|
||||
validates :acct, domain: { acct: true }
|
||||
end
|
||||
end
|
||||
|
||||
describe '#validate_each' do
|
||||
context 'with a nil value' do
|
||||
it 'does not add errors' do
|
||||
record.acct = nil
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with no domain' do
|
||||
it 'does not add errors' do
|
||||
record.acct = 'hoge_123'
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with a valid domain' do
|
||||
it 'does not add errors' do
|
||||
record.acct = 'hoge_123@example.com'
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with an invalid domain' do
|
||||
it 'adds an error' do
|
||||
record.acct = 'hoge_123@.example.com'
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:acct)).to_not be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,46 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe LinesValidator do
|
||||
let(:record_class) do
|
||||
Class.new do
|
||||
include ActiveModel::Validations
|
||||
|
||||
attr_accessor :text
|
||||
|
||||
validates :text, lines: { maximum: 5 }
|
||||
end
|
||||
end
|
||||
|
||||
let(:record) { record_class.new }
|
||||
|
||||
describe '#validate_each' do
|
||||
context 'with a nil value' do
|
||||
it 'does not add errors' do
|
||||
record.text = nil
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with lines below the limit' do
|
||||
it 'does not add errors' do
|
||||
record.text = "hoge\n" * 5
|
||||
|
||||
expect(record).to be_valid
|
||||
expect(record.errors).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
context 'with more lines than limit' do
|
||||
it 'adds an error' do
|
||||
record.text = "hoge\n" * 6
|
||||
|
||||
expect(record).to_not be_valid
|
||||
expect(record.errors.where(:text)).to_not be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue