diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-13 13:02:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 13:02:13 +0100 |
| commit | 06663fcf87fe0d6bc71336e6f212b82f098066d7 (patch) | |
| tree | 267ca2c141cc77c68c85d1229ace0646cce6ad29 /app/controllers | |
| parent | d4ef90eae39f8c00be3dd2c6785fe9ece1f055ff (diff) | |
Fix `tagged` param not being normalized before querying tags (#10249)
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/api/v1/timelines/tag_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tags_controller.rb | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index cad2ecf3f..dfbe5bffc 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -80,7 +80,13 @@ class AccountsController < ApplicationController end def hashtag_scope - Status.tagged_with(Tag.find_by(name: params[:tag].downcase)&.id) + tag = Tag.find_normalized(params[:tag]) + + if tag + Status.tagged_with(tag.id) + else + Status.none + end end def set_account diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index ed10f3f6a..8cd8f8e79 100644 --- a/app/controllers/api/v1/accounts/statuses_controller.rb +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -69,7 +69,13 @@ class Api::V1::Accounts::StatusesController < Api::BaseController end def hashtag_scope - Status.tagged_with(Tag.find_by(name: params[:tagged])&.id) + tag = Tag.find_normalized(params[:tagged]) + + if tag + Status.tagged_with(tag.id) + else + Status.none + end end def pagination_params(core_params) diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb index 92c32c178..9adc4ad29 100644 --- a/app/controllers/api/v1/timelines/tag_controller.rb +++ b/app/controllers/api/v1/timelines/tag_controller.rb @@ -14,7 +14,7 @@ class Api::V1::Timelines::TagController < Api::BaseController private def load_tag - @tag = Tag.find_by(name: params[:id].downcase) + @tag = Tag.find_normalized(params[:id]) end def load_statuses diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 729553e1e..66b184901 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -9,7 +9,7 @@ class TagsController < ApplicationController before_action :set_instance_presenter def show - @tag = Tag.find_by!(name: params[:id].downcase) + @tag = Tag.find_normalized!(params[:id]) respond_to do |format| format.html do |