Merge 9c992c3dc1 into e7c30cd072

Avoid render not_found in api/v1/tags
2025-09-05 17:31:12 +00:00 · 2025-09-04 14:05:17 +00:00 · 2025-08-15 08:53:56 -04:00
1 changed files with 5 additions and 2 deletions
--- a/app/controllers/api/v1/tags_controller.rb
+++ b/app/controllers/api/v1/tags_controller.rb
@ -4,6 +4,7 @@ class Api::V1::TagsController < Api::BaseController
  before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, only: [:follow, :unfollow]
  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:feature, :unfeature]
  before_action :require_user!, except: :show
+  before_action :verify_tag_format
  before_action :set_or_create_tag

  override_rate_limit_headers :follow, family: :follows
@ -36,9 +37,11 @@ class Api::V1::TagsController < Api::BaseController

  private

-  def set_or_create_tag
-    return not_found unless Tag::HASHTAG_NAME_RE.match?(params[:id])
+  def verify_tag_format
+    not_found unless Tag::HASHTAG_NAME_RE.match?(params[:id])
+  end

+  def set_or_create_tag
    @tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
  end
 end
Author	SHA1	Message	Date
Matt Jankowski	576b738f12	Merge `9c992c3dc1` into `e7c30cd072`	2025-09-04 14:05:17 +00:00
Matt Jankowski	9c992c3dc1	Avoid `render not_found` in api/v1/tags	2025-08-15 08:53:56 -04:00