Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
		
			
				
	
	
		
			71 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class AuthorizeInteractionsController < ApplicationController
 | |
|   include Authorization
 | |
| 
 | |
|   layout 'modal'
 | |
| 
 | |
|   before_action :authenticate_user!
 | |
|   before_action :set_body_classes
 | |
|   before_action :set_resource
 | |
|   before_action :set_pack
 | |
| 
 | |
|   def show
 | |
|     if @resource.is_a?(Account)
 | |
|       render :show
 | |
|     elsif @resource.is_a?(Status)
 | |
|       redirect_to web_url("statuses/#{@resource.id}")
 | |
|     else
 | |
|       render :error
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def create
 | |
|     if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource, with_rate_limit: true)
 | |
|       render :success
 | |
|     else
 | |
|       render :error
 | |
|     end
 | |
|   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
 | |
|     render :error
 | |
|   end
 | |
| 
 | |
|   private
 | |
| 
 | |
|   def set_resource
 | |
|     @resource = located_resource || render(:error)
 | |
|     authorize(@resource, :show?) if @resource.is_a?(Status)
 | |
|   end
 | |
| 
 | |
|   def located_resource
 | |
|     if uri_param_is_url?
 | |
|       ResolveURLService.new.call(uri_param)
 | |
|     else
 | |
|       account_from_remote_follow
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   def account_from_remote_follow
 | |
|     ResolveAccountService.new.call(uri_param)
 | |
|   end
 | |
| 
 | |
|   def uri_param_is_url?
 | |
|     parsed_uri.path && %w(http https).include?(parsed_uri.scheme)
 | |
|   end
 | |
| 
 | |
|   def parsed_uri
 | |
|     Addressable::URI.parse(uri_param).normalize
 | |
|   end
 | |
| 
 | |
|   def uri_param
 | |
|     params[:uri] || params.fetch(:acct, '').gsub(/\Aacct:/, '')
 | |
|   end
 | |
| 
 | |
|   def set_body_classes
 | |
|     @body_classes = 'modal-layout'
 | |
|   end
 | |
| 
 | |
|   def set_pack
 | |
|     use_pack 'modal'
 | |
|   end
 | |
| end
 |