tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant return in IntentsController (#29099)

Browse Source
This commit is contained in:
Matt Jankowski 2024-02-06 07:56:22 -05:00 committed by GitHub
parent e8cc98977d
commit 0877f6fda4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/intents_controller.rb
View File

@ -1,27 +1,26 @@
# frozen_string_literal: true # frozen_string_literal: true
class IntentsController < ApplicationController class IntentsController < ApplicationController
before_action :check_uri EXPECTED_SCHEME = 'web+mastodon'
before_action :handle_invalid_uri, unless: :valid_uri?
rescue_from Addressable::URI::InvalidURIError, with: :handle_invalid_uri rescue_from Addressable::URI::InvalidURIError, with: :handle_invalid_uri
def show def show
if uri.scheme == 'web+mastodon'
case uri.host case uri.host
when 'follow' when 'follow'
return redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:')) redirect_to authorize_interaction_path(uri: uri.query_values['uri'].delete_prefix('acct:'))
when 'share' when 'share'
return redirect_to share_path(text: uri.query_values['text']) redirect_to share_path(text: uri.query_values['text'])
else
handle_invalid_uri
end end
end end
not_found
end
private private
def check_uri def valid_uri?
not_found if uri.blank? uri.present? && uri.scheme == EXPECTED_SCHEME
end end
def handle_invalid_uri def handle_invalid_uri