Revert "Upstream 20240517"

app/validators/email_address_validator.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-# NOTE: I initially wrote this as `EmailValidator` but it ended up clashing
-# with an indirect dependency of ours, `validate_email`, which, turns out,
-# has the same approach as we do, but with an extra check disallowing
-# single-label domains. Decided to not switch to `validate_email` because
-# we do want to allow at least `localhost`.
-
-class EmailAddressValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    value = value.strip
-
-    address = Mail::Address.new(value)
-    record.errors.add(attribute, :invalid) if address.address != value
-  rescue Mail::Field::FieldError
-    record.errors.add(attribute, :invalid)
-  end
-end

app/validators/emoji_reaction_validator.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-class EmojiReactionValidator < ActiveModel::Validator
-  SUPPORTED_EMOJIS = Oj.load_file(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json').to_s).keys.freeze
-
-  def validate(emoji_reaction)
-    return if emoji_reaction.name.blank?
-
-    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.blank? && !unicode_emoji?(emoji_reaction.name)
-    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.present? && disabled_custom_emoji?(emoji_reaction.custom_emoji)
-    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if deny_emoji_reactions?(emoji_reaction)
-    emoji_reaction.errors.add(:name, I18n.t('reactions.errors.banned')) if blocking?(emoji_reaction) || domain_blocking?(emoji_reaction)
-  end
-
-  private
-
-  def unicode_emoji?(name)
-    SUPPORTED_EMOJIS.include?(name)
-  end
-
-  def disabled_custom_emoji?(custom_emoji)
-    custom_emoji.nil? ? false : custom_emoji.disabled
-  end
-
-  def deny_emoji_reactions?(emoji_reaction)
-    !emoji_reaction.status.account.allow_emoji_reaction?(emoji_reaction.account)
-  end
-
-  def blocking?(emoji_reaction)
-    return false if !emoji_reaction.status.local? || emoji_reaction.status.account == emoji_reaction.account
-
-    emoji_reaction.status.account.blocking?(emoji_reaction.account)
-  end
-
-  def domain_blocking?(emoji_reaction)
-    return false unless !emoji_reaction.account.local? && emoji_reaction.status.local?
-
-    emoji_reaction.status.account.domain_blocking?(emoji_reaction.account.domain)
-  end
-end

app/validators/poll_validator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PollValidator < ActiveModel::Validator
-  MAX_OPTIONS      = 8
+  MAX_OPTIONS      = 4
   MAX_OPTION_CHARS = 50
   MAX_EXPIRATION   = 1.month.freeze
   MIN_EXPIRATION   = 5.minutes.freeze

app/validators/reaction_validator.rb

@@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
   end
 
   def new_reaction?(reaction)
-    !reaction.announcement.announcement_reactions.exists?(name: reaction.name)
+    !reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
   end
 
   def limit_reached?(reaction)

app/validators/vote_validator.rb

@@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
     if vote.persisted?
       account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
     else
-      account_votes_on_same_poll(vote).exists?(choice: vote.choice)
+      account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
     end
   end