Merge 32c7ae3c0c into 199376a080

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

.env.production.sample

@@ -88,3 +88,27 @@ S3_ALIAS_HOST=files.example.com
 # -----------------------
 IP_RETENTION_PERIOD=31556952
 SESSION_RETENTION_PERIOD=31556952
+
+# Fetch All Replies Behavior
+# --------------------------
+
+# Period to wait between fetching replies (in minutes)
+FETCH_REPLIES_COOLDOWN_MINUTES=15
+
+# Period to wait after a post is first created before fetching its replies (in minutes)
+FETCH_REPLIES_INITIAL_WAIT_MINUTES=5
+
+# Max number of replies to fetch - total, recursively through a whole reply tree
+FETCH_REPLIES_MAX_GLOBAL=1000
+
+# Max number of replies to fetch - for a single post
+FETCH_REPLIES_MAX_SINGLE=500
+
+# Max number of replies Collection pages to fetch - total
+FETCH_REPLIES_MAX_PAGES=500
+
+# Maximum allowed poll options
+MAX_POLL_OPTIONS=4
+
+# Maximum allowed poll option characters
+MAX_POLL_OPTION_CHARS=50

Gemfile.lock

@@ -324,7 +324,7 @@ GEM
       rainbow (>= 2.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.1.1)
+    i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi

app/javascript/mastodon/features/ui/components/modal_root.jsx

@@ -136,7 +136,7 @@ export default class ModalRoot extends PureComponent {
       <Base backgroundColor={backgroundColor} onClose={this.handleClose} ignoreFocus={ignoreFocus}>
         {visible && (
           <>
-            <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>
+            <BundleContainer key={type} fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>
               {(SpecificComponent) => {
                 return <SpecificComponent {...props} onChangeBackgroundColor={this.setBackgroundColor} onClose={this.handleClose} ref={this.setModalRef} />;
               }}

app/services/backup_service.rb

@@ -63,7 +63,7 @@ class BackupService < BaseService
       dump_actor!(zipfile)
     end
 
-    archive_filename = "#{['archive', Time.now.utc.strftime('%Y%m%d%H%M%S'), SecureRandom.hex(16)].join('-')}.zip"
+    archive_filename = "#{['archive', Time.current.to_fs(:number), SecureRandom.hex(16)].join('-')}.zip"
 
     @backup.dump      = ActionDispatch::Http::UploadedFile.new(tempfile: tmp_file, filename: archive_filename)
     @backup.processed = true

app/services/create_collection_service.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class CreateCollectionService
+  def call(params, account)
+    tag = params.delete(:tag)
+    account_ids = params.delete(:account_ids)
+    @collection = Collection.new(params.merge({ account:, local: true, tag: find_or_create_tag(tag) }))
+    build_items(account_ids)
+
+    @collection.save!
+    @collection
+  end
+
+  private
+
+  def find_or_create_tag(name)
+    return nil if name.blank?
+
+    Tag.find_or_create_by_names(name).first
+  end
+
+  def build_items(account_ids)
+    return if account_ids.blank?
+
+    account_ids.each do |account_id|
+      account = Account.find(account_id)
+      # TODO: validate preferences
+      @collection.collection_items.build(account:)
+    end
+  end
+end

app/validators/poll_options_validator.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class PollOptionsValidator < ActiveModel::Validator
-  MAX_OPTIONS      = 4
-  MAX_OPTION_CHARS = 50
+  MAX_OPTIONS      = (ENV['MAX_POLL_OPTIONS'] || 4).to_i
+  MAX_OPTION_CHARS = (ENV['MAX_POLL_OPTION_CHARS'] || 50).to_i
 
   def validate(poll)
     poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1

spec/services/create_collection_service_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CreateCollectionService do
+  subject { described_class.new }
+
+  let(:author) { Fabricate.create(:account) }
+
+  describe '#call' do
+    let(:base_params) do
+      {
+        name: 'People to follow',
+        description: 'All my favourites',
+        sensitive: false,
+        discoverable: true,
+      }
+    end
+
+    context 'when given valid parameters' do
+      it 'creates a new local collection' do
+        collection = nil
+
+        expect do
+          collection = subject.call(base_params, author)
+        end.to change(Collection, :count).by(1)
+
+        expect(collection).to be_a(Collection)
+        expect(collection).to be_local
+      end
+
+      context 'when given account ids' do
+        let(:account_ids) do
+          Fabricate.times(2, :account).map { |a| a.id.to_s }
+        end
+        let(:params) do
+          base_params.merge(account_ids:)
+        end
+
+        it 'also creates collection items' do
+          expect do
+            subject.call(params, author)
+          end.to change(CollectionItem, :count).by(2)
+        end
+      end
+
+      context 'when given a tag' do
+        let(:params) { base_params.merge(tag: '#people') }
+
+        context 'when the tag exists' do
+          let!(:tag) { Fabricate.create(:tag, name: 'people') }
+
+          it 'correctly assigns the existing tag' do
+            collection = subject.call(params, author)
+
+            expect(collection.tag).to eq tag
+          end
+        end
+
+        context 'when the tag does not exist' do
+          it 'creates a new tag' do
+            collection = nil
+
+            expect do
+              collection = subject.call(params, author)
+            end.to change(Tag, :count).by(1)
+
+            expect(collection.tag.name).to eq 'people'
+          end
+        end
+      end
+    end
+
+    context 'when given invalid parameters' do
+      it 'raises an exception' do
+        expect do
+          subject.call({}, author)
+        end.to raise_error(ActiveRecord::RecordInvalid)
+      end
+    end
+  end
+end