Merge branch 'main' into glitch-soc/merge-upstream

2022-07-22 09:58:35 +02:00
parent 0a61b000e3 76ff452306
commit d799fe2082
50 changed files with 983 additions and 662 deletions
--- a/app/controllers/api/v1/tags_controller.rb
+++ b/app/controllers/api/v1/tags_controller.rb
@ -24,6 +24,7 @@ class Api::V1::TagsController < Api::BaseController
  private

  def set_or_create_tag
+    return not_found unless /\A(#{Tag::HASHTAG_NAME_RE})\z/.match?(params[:id])
    @tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
  end
 end