gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Merge 9c992c3dc1 into 14cb5ff881

Browse Source
This commit is contained in:
Matt Jankowski 2025-09-03 20:05:42 +00:00 committed by GitHub
commit 0384ef3d31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/api/v1/tags_controller.rb
View File

@ -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! :follow, :write, :'write:follows' }, only: [:follow, :unfollow]
before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:feature, :unfeature] before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:feature, :unfeature]
before_action :require_user!, except: :show before_action :require_user!, except: :show
before_action :verify_tag_format
before_action :set_or_create_tag before_action :set_or_create_tag
override_rate_limit_headers :follow, family: :follows override_rate_limit_headers :follow, family: :follows
@ -36,9 +37,11 @@ class Api::V1::TagsController < Api::BaseController
private private
def set_or_create_tag def verify_tag_format
return not_found unless Tag::HASHTAG_NAME_RE.match?(params[:id]) 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]) @tag = Tag.find_normalized(params[:id]) || Tag.new(name: Tag.normalize(params[:id]), display_name: params[:id])
end end
end end