diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index c2de8fb2af..567542f91d 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -5,7 +5,7 @@ class ApplicationRecord < ActiveRecord::Base
include Remotable
- connects_to database: { writing: :primary, reading: ENV['DB_REPLICA_NAME'] || ENV['REPLICA_DATABASE_URL'] ? :replica : :primary }
+ connects_to database: { writing: :primary, reading: ENV['REPLICA_DB_NAME'] || ENV['REPLICA_DATABASE_URL'] ? :replica : :primary }
class << self
def update_index(_type_name, *_args, &_block)
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index b732fbcec3..a15b691211 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -8,6 +8,143 @@ class AccountSearchService < BaseService
# Min. number of characters to look for non-exact matches
MIN_QUERY_LENGTH = 5
+ class QueryBuilder
+ def initialize(query, account, options = {})
+ @query = query
+ @account = account
+ @options = options
+ end
+
+ def build
+ AccountsIndex.query(
+ bool: {
+ must: {
+ function_score: {
+ query: {
+ bool: {
+ must: must_clauses,
+ },
+ },
+
+ functions: [
+ reputation_score_function,
+ followers_score_function,
+ time_distance_function,
+ ],
+ },
+ },
+
+ should: should_clauses,
+ }
+ )
+ end
+
+ private
+
+ def must_clauses
+ if @account && @options[:following]
+ [core_query, only_following_query]
+ else
+ [core_query]
+ end
+ end
+
+ def should_clauses
+ if @account && !@options[:following]
+ [boost_following_query]
+ else
+ []
+ end
+ end
+
+ # This function limits results to only the accounts the user is following
+ def only_following_query
+ {
+ terms: {
+ id: following_ids,
+ },
+ }
+ end
+
+ # This function promotes accounts the user is following
+ def boost_following_query
+ {
+ terms: {
+ id: following_ids,
+ boost: 100,
+ },
+ }
+ end
+
+ # This function deranks accounts that follow more people than follow them
+ def reputation_score_function
+ {
+ script_score: {
+ script: {
+ source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
+ },
+ },
+ }
+ end
+
+ # This function promotes accounts that have more followers
+ def followers_score_function
+ {
+ script_score: {
+ script: {
+ source: "(Math.max(doc['followers_count'].value, 0) / (Math.max(doc['followers_count'].value, 0) + 1))",
+ },
+ },
+ }
+ end
+
+ # This function deranks accounts that haven't posted in a long time
+ def time_distance_function
+ {
+ gauss: {
+ last_status_at: {
+ scale: '30d',
+ offset: '30d',
+ decay: 0.3,
+ },
+ },
+ }
+ end
+
+ def following_ids
+ @following_ids ||= @account.active_relationships.pluck(:target_account_id) + [@account.id]
+ end
+ end
+
+ class AutocompleteQueryBuilder < QueryBuilder
+ private
+
+ def core_query
+ {
+ multi_match: {
+ query: @query,
+ type: 'bool_prefix',
+ fields: %w(username username.* display_name display_name.*),
+ },
+ }
+ end
+ end
+
+ class FullQueryBuilder < QueryBuilder
+ private
+
+ def core_query
+ {
+ multi_match: {
+ query: @query,
+ type: 'most_fields',
+ fields: %w(username^2 display_name^2 text text.*),
+ operator: 'and',
+ },
+ }
+ end
+ end
+
def call(query, account = nil, options = {})
@query = query&.strip&.gsub(/\A@/, '')
@limit = options[:limit].to_i
@@ -71,27 +208,15 @@ class AccountSearchService < BaseService
end
def from_elasticsearch
- must_clauses = must_clause
- should_clauses = should_clause
-
- if account
- return [] if options[:following] && following_ids.empty?
-
- if options[:following]
- must_clauses << { terms: { id: following_ids } }
- elsif following_ids.any?
- should_clauses << { terms: { id: following_ids, boost: 100 } }
+ query_builder = begin
+ if options[:use_searchable_text]
+ FullQueryBuilder.new(terms_for_query, account, options.slice(:following))
+ else
+ AutocompleteQueryBuilder.new(terms_for_query, account, options.slice(:following))
end
end
- query = { bool: { must: must_clauses, should: should_clauses } }
- functions = [reputation_score_function, followers_score_function, time_distance_function]
-
- records = AccountsIndex.query(function_score: { query: query, functions: functions })
- .limit(limit_for_non_exact_results)
- .offset(offset)
- .objects
- .compact
+ records = query_builder.build.limit(limit_for_non_exact_results).offset(offset).objects.compact
ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
@@ -100,76 +225,6 @@ class AccountSearchService < BaseService
nil
end
- def reputation_score_function
- {
- script_score: {
- script: {
- source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
- },
- },
- }
- end
-
- def followers_score_function
- {
- script_score: {
- script: {
- source: "Math.log10(Math.max(doc['followers_count'].value, 0) + 2)",
- },
- },
- }
- end
-
- def time_distance_function
- {
- gauss: {
- last_status_at: {
- scale: '30d',
- offset: '30d',
- decay: 0.3,
- },
- },
- }
- end
-
- def must_clause
- if options[:start_with_hashtag]
- fields = %w(text text.*)
- else
- fields = %w(username username.* display_name display_name.*)
- fields << 'text' << 'text.*' if options[:use_searchable_text]
- end
-
- [
- {
- multi_match: {
- query: terms_for_query,
- fields: fields,
- type: 'best_fields',
- operator: 'or',
- },
- },
- ]
- end
-
- def should_clause
- [
- {
- multi_match: {
- query: terms_for_query,
- fields: %w(username username.* display_name display_name.*),
- type: 'best_fields',
- operator: 'and',
- boost: 10,
- },
- },
- ]
- end
-
- def following_ids
- @following_ids ||= account.active_relationships.pluck(:target_account_id) + [account.id]
- end
-
def limit_for_non_exact_results
return 0 if @account.nil? && query.size < MIN_QUERY_LENGTH
diff --git a/app/services/bulk_import_service.rb b/app/services/bulk_import_service.rb
index 5c14adc499..591b112127 100644
--- a/app/services/bulk_import_service.rb
+++ b/app/services/bulk_import_service.rb
@@ -162,10 +162,9 @@ class BulkImportService < BaseService
def import_lists!
rows = @import.rows.to_a
+ included_lists = rows.map { |row| row.data['list_name'] }.uniq
if @import.overwrite?
- included_lists = rows.map { |row| row.data['list_name'] }.uniq
-
@account.owned_lists.where.not(title: included_lists).destroy_all
# As list membership changes do not retroactively change timeline
@@ -175,6 +174,10 @@ class BulkImportService < BaseService
end
end
+ included_lists.each do |title|
+ @account.owned_lists.find_or_create_by!(title: title)
+ end
+
Import::RowWorker.push_bulk(rows) do |row|
[row.id]
end
diff --git a/config/database.yml b/config/database.yml
index 0907193feb..b995f23178 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -55,10 +55,10 @@ production:
prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
replica:
<<: *default
- database: <%= ENV['DB_REPLICA_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %>
- username: <%= ENV['DB_REPLICA_USER'] ||ENV['DB_USER'] || 'mastodon' %>
- password: <%= (ENV['DB_REPLICA_PASS'] || ENV['DB_PASS'] || '').to_json %>
- host: <%= ENV['DB_REPLICA_HOST'] ||ENV['DB_HOST'] || 'localhost' %>
- port: <%= ENV['DB_REPLICA_PORT'] ||ENV['DB_PORT'] || 5432 %>
+ database: <%= ENV['REPLICA_DB_NAME'] ||ENV['DB_NAME'] || 'mastodon_production' %>
+ username: <%= ENV['REPLICA_DB_USER'] ||ENV['DB_USER'] || 'mastodon' %>
+ password: <%= (ENV['REPLICA_DB_PASS'] || ENV['DB_PASS'] || '').to_json %>
+ host: <%= ENV['REPLICA_DB_HOST'] ||ENV['DB_HOST'] || 'localhost' %>
+ port: <%= ENV['REPLICA_DB_PORT'] ||ENV['DB_PORT'] || 5432 %>
prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %>
replica: true
diff --git a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
index 936d7840eb..c35ad80028 100644
--- a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
+++ b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
@@ -18,7 +18,7 @@ class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
def deduplicate_and_reindex!
deduplicate_preview_cards!
- safety_assured { execute 'REINDEX INDEX preview_cards_statuses_pkey' }
+ safety_assured { execute 'REINDEX INDEX CONCURRENTLY preview_cards_statuses_pkey' }
rescue ActiveRecord::RecordNotUnique
retry
end
diff --git a/dist/mastodon-streaming.service b/dist/mastodon-streaming.service
index 533feb5341..66cc3474ef 100644
--- a/dist/mastodon-streaming.service
+++ b/dist/mastodon-streaming.service
@@ -1,51 +1,12 @@
[Unit]
Description=mastodon-streaming
After=network.target
+Wants=mastodon-streaming@4000.service
[Service]
-Type=simple
-User=mastodon
-WorkingDirectory=/home/mastodon/live
-Environment="NODE_ENV=production"
-Environment="PORT=4000"
-ExecStart=/usr/bin/node ./streaming
-TimeoutSec=15
-Restart=always
-LimitNOFILE=65536
-# Proc filesystem
-ProcSubset=pid
-ProtectProc=invisible
-# Capabilities
-CapabilityBoundingSet=
-# Security
-NoNewPrivileges=true
-# Sandboxing
-ProtectSystem=strict
-PrivateTmp=true
-PrivateDevices=true
-PrivateUsers=true
-ProtectHostname=true
-ProtectKernelLogs=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-RestrictAddressFamilies=AF_INET
-RestrictAddressFamilies=AF_INET6
-RestrictAddressFamilies=AF_NETLINK
-RestrictAddressFamilies=AF_UNIX
-RestrictNamespaces=true
-LockPersonality=true
-RestrictRealtime=true
-RestrictSUIDSGID=true
-RemoveIPC=true
-PrivateMounts=true
-ProtectClock=true
-# System Call Filtering
-SystemCallArchitectures=native
-SystemCallFilter=~@cpu-emulation @debug @keyring @ipc @memlock @mount @obsolete @privileged @resources @setuid
-SystemCallFilter=pipe
-SystemCallFilter=pipe2
-ReadWritePaths=/home/mastodon/live
+Type=oneshot
+ExecStart=/bin/echo "mastodon-streaming exists only to collectively start and stop mastodon-streaming@ instances, shimming over the migration to templated mastodon-streaming systemd unit"
+RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
diff --git a/dist/mastodon-streaming@.service b/dist/mastodon-streaming@.service
new file mode 100644
index 0000000000..f43c4ea4a6
--- /dev/null
+++ b/dist/mastodon-streaming@.service
@@ -0,0 +1,54 @@
+[Unit]
+Description=mastodon-streaming on port %I
+After=network.target
+# handles using `systemctl restart mastodon-streaming`
+PartOf=mastodon-streaming.service
+ReloadPropagatedFrom=mastodon-streaming.service
+
+[Service]
+Type=simple
+User=mastodon
+WorkingDirectory=/home/mastodon/live
+Environment="NODE_ENV=production"
+Environment="PORT=%i"
+ExecStart=/usr/bin/node ./streaming
+TimeoutSec=15
+Restart=always
+LimitNOFILE=65536
+# Proc filesystem
+ProcSubset=pid
+ProtectProc=invisible
+# Capabilities
+CapabilityBoundingSet=
+# Security
+NoNewPrivileges=true
+# Sandboxing
+ProtectSystem=strict
+PrivateTmp=true
+PrivateDevices=true
+PrivateUsers=true
+ProtectHostname=true
+ProtectKernelLogs=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+RestrictAddressFamilies=AF_INET
+RestrictAddressFamilies=AF_INET6
+RestrictAddressFamilies=AF_NETLINK
+RestrictAddressFamilies=AF_UNIX
+RestrictNamespaces=true
+LockPersonality=true
+RestrictRealtime=true
+RestrictSUIDSGID=true
+RemoveIPC=true
+PrivateMounts=true
+ProtectClock=true
+# System Call Filtering
+SystemCallArchitectures=native
+SystemCallFilter=~@cpu-emulation @debug @keyring @ipc @memlock @mount @obsolete @privileged @resources @setuid
+SystemCallFilter=pipe
+SystemCallFilter=pipe2
+ReadWritePaths=/home/mastodon/live
+
+[Install]
+WantedBy=multi-user.target mastodon-streaming.service
diff --git a/dist/nginx.conf b/dist/nginx.conf
index fc68e9a6d1..39fa58e50d 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -8,7 +8,15 @@ upstream backend {
}
upstream streaming {
+ # Instruct nginx to send connections to the server with the least number of connections
+ # to ensure load is distributed evenly.
+ least_conn;
+
server 127.0.0.1:4000 fail_timeout=0;
+ # Uncomment these lines for load-balancing multiple instances of streaming for scaling,
+ # this assumes your running the streaming server on ports 4000, 4001, and 4002:
+ # server 127.0.0.1:4001 fail_timeout=0;
+ # server 127.0.0.1:4002 fail_timeout=0;
}
proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 5a252b3512..4a43f67c27 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -195,7 +195,14 @@ module Mastodon
def supports_drop_index_concurrently?
version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
- version >= 90200
+ version >= 90_200
+ end
+
+ # Only available on Postgresql >= 11
+ def supports_add_column_with_default?
+ version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
+
+ version >= 11_000
end
# Adds a foreign key with only minimal locking on the tables involved.
@@ -414,6 +421,11 @@ module Mastodon
# This method can also take a block which is passed directly to the
# `update_column_in_batches` method.
def add_column_with_default(table, column, type, default:, limit: nil, allow_null: false, &block)
+ if supports_add_column_with_default?
+ add_column(table, column, type, default: default, limit: limit, null: allow_null)
+ return
+ end
+
if transaction_open?
raise 'add_column_with_default can not be run inside a transaction, ' \
'you can disable transactions by calling disable_ddl_transaction! ' \
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f95c105eee..236204de7b 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,15 +9,15 @@ module Mastodon
end
def minor
- 1
+ 2
end
def patch
- 6
+ 0
end
def flags
- ENV.fetch('MASTODON_VERSION_FLAGS', '')
+ ENV.fetch('MASTODON_VERSION_FLAGS', '-beta1')
end
def suffix
diff --git a/spec/fixtures/files/attachment.gif b/spec/fixtures/files/attachment.gif
index 2937f5abef..89dd73ad3e 100644
Binary files a/spec/fixtures/files/attachment.gif and b/spec/fixtures/files/attachment.gif differ
diff --git a/spec/fixtures/files/attachment.webm b/spec/fixtures/files/attachment.webm
index 3babe5cf59..edde443960 100644
Binary files a/spec/fixtures/files/attachment.webm and b/spec/fixtures/files/attachment.webm differ
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index d142875aa9..d57d43eda7 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
describe 'local?' do
subject { media_attachment.local? }
- let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url) }
+ let(:media_attachment) { described_class.new(remote_url: remote_url) }
context 'when remote_url is blank' do
let(:remote_url) { '' }
@@ -28,7 +28,7 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
describe 'needs_redownload?' do
subject { media_attachment.needs_redownload? }
- let(:media_attachment) { Fabricate(:media_attachment, remote_url: remote_url, file: file) }
+ let(:media_attachment) { described_class.new(remote_url: remote_url, file: file) }
context 'when file is blank' do
let(:file) { nil }
@@ -64,11 +64,11 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
end
describe '#to_param' do
- let(:media_attachment) { Fabricate(:media_attachment, shortcode: shortcode) }
- let(:shortcode) { nil }
+ let(:media_attachment) { Fabricate.build(:media_attachment, shortcode: shortcode, id: id) }
context 'when media attachment has a shortcode' do
let(:shortcode) { 'foo' }
+ let(:id) { 123 }
it 'returns shortcode' do
expect(media_attachment.to_param).to eq shortcode
@@ -77,9 +77,10 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
context 'when media attachment does not have a shortcode' do
let(:shortcode) { nil }
+ let(:id) { 123 }
it 'returns string representation of id' do
- expect(media_attachment.to_param).to eq media_attachment.id.to_s
+ expect(media_attachment.to_param).to eq id.to_s
end
end
end
@@ -89,38 +90,33 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
media.destroy
end
- it 'saves media attachment' do
+ it 'saves media attachment with correct file metadata' do
expect(media.persisted?).to be true
expect(media.file).to_not be_nil
- end
- it 'completes processing' do
+ # completes processing
expect(media.processing_complete?).to be true
- end
- it 'sets type' do
+ # sets type
expect(media.type).to eq 'image'
- end
- it 'sets content type' do
+ # sets content type
expect(media.file_content_type).to eq content_type
- end
- it 'sets file extension' do
+ # sets file extension
expect(media.file_file_name).to end_with extension
end
- it 'strips original file name' do
+ it 'saves media attachment with correct size metadata' do
+ # strips original file name
expect(media.file_file_name).to_not start_with '600x400'
- end
- it 'sets meta for original' do
+ # sets meta for original
expect(media.file.meta['original']['width']).to eq 600
expect(media.file.meta['original']['height']).to eq 400
expect(media.file.meta['original']['aspect']).to eq 1.5
- end
- it 'sets meta for thumbnail' do
+ # sets meta for thumbnail
expect(media.file.meta['small']['width']).to eq 588
expect(media.file.meta['small']['height']).to eq 392
expect(media.file.meta['small']['aspect']).to eq 1.5
@@ -128,54 +124,48 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
end
describe 'jpeg' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.jpeg')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.jpeg')) }
it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
end
describe 'png' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.png')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.png')) }
it_behaves_like 'static 600x400 image', 'image/png', '.png'
end
describe 'webp' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.webp')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.webp')) }
it_behaves_like 'static 600x400 image', 'image/webp', '.webp'
end
describe 'avif' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.avif')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.avif')) }
it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
end
describe 'heic' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('600x400.heic')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('600x400.heic')) }
it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
end
describe 'base64-encoded image' do
let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('600x400.jpeg').read)}" }
- let(:media) { described_class.create(account: Fabricate(:account), file: base64_attachment) }
+ let(:media) { Fabricate(:media_attachment, file: base64_attachment) }
it_behaves_like 'static 600x400 image', 'image/jpeg', '.jpeg'
end
describe 'animated gif' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('avatar.gif')) }
- it 'sets type to gifv' do
+ it 'sets correct file metadata' do
expect(media.type).to eq 'gifv'
- end
-
- it 'converts original file to mp4' do
expect(media.file_content_type).to eq 'video/mp4'
- end
-
- it 'sets meta' do
expect(media.file.meta['original']['width']).to eq 128
expect(media.file.meta['original']['height']).to eq 128
end
@@ -189,17 +179,11 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
fixtures.each do |fixture|
context fixture[:filename] do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture(fixture[:filename])) }
- it 'sets type to image' do
+ it 'sets correct file metadata' do
expect(media.type).to eq 'image'
- end
-
- it 'leaves original file as-is' do
expect(media.file_content_type).to eq 'image/gif'
- end
-
- it 'sets meta' do
expect(media.file.meta['original']['width']).to eq fixture[:width]
expect(media.file.meta['original']['height']).to eq fixture[:height]
expect(media.file.meta['original']['aspect']).to eq fixture[:aspect]
@@ -209,31 +193,19 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
end
describe 'ogg with cover art' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('boop.ogg')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.ogg')) }
- it 'detects it as an audio file' do
+ it 'sets correct file metadata' do
expect(media.type).to eq 'audio'
- end
-
- it 'sets meta for the duration' do
expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
- end
-
- it 'extracts thumbnail' do
expect(media.thumbnail.present?).to be true
- end
-
- it 'extracts colors from thumbnail' do
expect(media.file.meta['colors']['background']).to eq '#3088d4'
- end
-
- it 'gives the file a random name' do
expect(media.file_file_name).to_not eq 'boop.ogg'
end
end
describe 'mp3 with large cover art' do
- let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('boop.mp3')) }
+ let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.mp3')) }
it 'detects it as an audio file' do
expect(media.type).to eq 'audio'
@@ -253,34 +225,36 @@ RSpec.describe MediaAttachment, paperclip_processing: true do
end
it 'is invalid without file' do
- media = described_class.new(account: Fabricate(:account))
+ media = described_class.new
+
expect(media.valid?).to be false
+ expect(media).to model_have_error_on_field(:file)
end
describe 'size limit validation' do
it 'rejects video files that are too large' do
stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
- expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Fabricate(:media_attachment, file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
end
it 'accepts video files that are small enough' do
stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
- media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm'))
+ media = Fabricate(:media_attachment, file: attachment_fixture('attachment.webm'))
expect(media.valid?).to be true
end
it 'rejects image files that are too large' do
stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
- expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { Fabricate(:media_attachment, file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
end
it 'accepts image files that are small enough' do
stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
- media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg'))
+ media = Fabricate(:media_attachment, file: attachment_fixture('attachment.jpg'))
expect(media.valid?).to be true
end
end
diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index 5e09845b53..a77acc0732 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -161,6 +161,12 @@ RSpec.describe BulkImportRowService do
end
include_examples 'common behavior'
+
+ it 'does not create a new list' do
+ account.follow!(target_account)
+
+ expect { subject.call(import_row) }.to_not(change { List.where(title: 'my list').count })
+ end
end
end
end