Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings.
		
			
				
	
	
		
			55 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
	
		
			1.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
 | 
						|
  skip_before_action :authenticate_resource_owner!
 | 
						|
 | 
						|
  before_action :store_current_location
 | 
						|
  before_action :authenticate_resource_owner!
 | 
						|
  before_action :set_pack
 | 
						|
  before_action :require_not_suspended!, only: :destroy
 | 
						|
  before_action :set_body_classes
 | 
						|
  before_action :set_cache_headers
 | 
						|
 | 
						|
  before_action :set_last_used_at_by_app, only: :index, unless: -> { request.format == :json }
 | 
						|
 | 
						|
  skip_before_action :require_functional!
 | 
						|
 | 
						|
  include Localized
 | 
						|
 | 
						|
  def destroy
 | 
						|
    Web::PushSubscription.unsubscribe_for(params[:id], current_resource_owner)
 | 
						|
    super
 | 
						|
  end
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def set_body_classes
 | 
						|
    @body_classes = 'admin'
 | 
						|
  end
 | 
						|
 | 
						|
  def store_current_location
 | 
						|
    store_location_for(:user, request.url)
 | 
						|
  end
 | 
						|
 | 
						|
  def set_pack
 | 
						|
    use_pack 'settings'
 | 
						|
  end
 | 
						|
 | 
						|
  def require_not_suspended!
 | 
						|
    forbidden if current_account.unavailable?
 | 
						|
  end
 | 
						|
 | 
						|
  def set_cache_headers
 | 
						|
    response.cache_control.replace(private: true, no_store: true)
 | 
						|
  end
 | 
						|
 | 
						|
  def set_last_used_at_by_app
 | 
						|
    @last_used_at_by_app = Doorkeeper::AccessToken
 | 
						|
                           .select('DISTINCT ON (application_id) application_id, last_used_at')
 | 
						|
                           .where(resource_owner_id: current_resource_owner.id)
 | 
						|
                           .where.not(last_used_at: nil)
 | 
						|
                           .order(application_id: :desc, last_used_at: :desc)
 | 
						|
                           .pluck(:application_id, :last_used_at)
 | 
						|
                           .to_h
 | 
						|
  end
 | 
						|
end
 |