Revert "Upstream 20240517"

app/controllers/intents_controller.rb

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