From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 6 Apr 2022 19:10:23 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b368c7502931aa06121ecad8a97193b1f17cf90a;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Upstream removed this file, while glitch-soc had changes to deal with
  its theming system.
  Removed the file like upstream did.
---

b368c7502931aa06121ecad8a97193b1f17cf90a
diff --cc app/controllers/auth/sessions_controller.rb
index 8607077f7,c4c8151e3..056f8a9f1
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@@ -7,10 -7,7 +7,9 @@@ class Auth::SessionsController < Devise
    skip_before_action :require_functional!
    skip_before_action :update_user_sign_in
  
 +  prepend_before_action :set_pack
 +
    include TwoFactorAuthenticationConcern
-   include SignInTokenAuthenticationConcern
  
    before_action :set_instance_presenter, only: [:new]
    before_action :set_body_classes
diff --cc app/models/user.rb
index 76ad7d1b2,d19fe2c92..5dd93519c
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@@ -125,14 -126,14 +126,14 @@@ class User < ApplicationRecor
  
    has_many :session_activations, dependent: :destroy
  
 -  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
 -           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media,
 +  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal,
 +           :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_followers_count,
             :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
             :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
 -           :disable_swiping,
 +           :disable_swiping, :default_content_type, :system_emoji_font,
             to: :settings, prefix: :setting, allow_nil: false
  
-   attr_reader :invite_code, :sign_in_token_attempt
+   attr_reader :invite_code
    attr_writer :external, :bypass_invite_request_check
  
    def confirmed?
@@@ -200,12 -201,8 +201,8 @@@
      !account.memorial?
    end
  
-   def suspicious_sign_in?(ip)
-     !otp_required_for_login? && !skip_sign_in_token? && current_sign_in_at.present? && !ips.where(ip: ip).exists?
-   end
- 
    def functional?
 -    confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
 +    confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial?
    end
  
    def unconfirmed?