diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
| commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
| tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /app/controllers/api | |
| parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
| parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) | |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/followed_tags_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/api/v1/tags_controller.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/api/v1/followed_tags_controller.rb b/app/controllers/api/v1/followed_tags_controller.rb index f0dfd044c..eae2bdc01 100644 --- a/app/controllers/api/v1/followed_tags_controller.rb +++ b/app/controllers/api/v1/followed_tags_controller.rb @@ -3,11 +3,11 @@ class Api::V1::FollowedTagsController < Api::BaseController TAGS_LIMIT = 100 - before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' }, except: :show + before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' } before_action :require_user! before_action :set_results - after_action :insert_pagination_headers, only: :show + after_action :insert_pagination_headers def index render json: @results.map(&:tag), each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@results.map(&:tag), current_user&.account_id) @@ -43,7 +43,7 @@ class Api::V1::FollowedTagsController < Api::BaseController end def records_continue? - @results.size == limit_param(TAG_LIMIT) + @results.size == limit_param(TAGS_LIMIT) end def pagination_params(core_params) diff --git a/app/controllers/api/v1/tags_controller.rb b/app/controllers/api/v1/tags_controller.rb index 32f71bdce..0966ee469 100644 --- a/app/controllers/api/v1/tags_controller.rb +++ b/app/controllers/api/v1/tags_controller.rb @@ -12,7 +12,7 @@ class Api::V1::TagsController < Api::BaseController end def follow - TagFollow.create!(tag: @tag, account: current_account, rate_limit: true) + TagFollow.first_or_create!(tag: @tag, account: current_account, rate_limit: true) render json: @tag, serializer: REST::TagSerializer end |