diff options
| author | lain <lain@soykaf.club> | 2020-01-21 13:07:07 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-21 13:07:07 +0000 |
| commit | fa47a719901050b27534492b0ff7189bc78895eb (patch) | |
| tree | 3be7f6c6336da24416edd22e3d8c6cf141b5288f /lib/pleroma/web | |
| parent | ab36459464311389c2929ff1c48537889066a9f8 (diff) | |
| parent | 6e88a7e5917f558fe3e9d639297086a9e8b98939 (diff) | |
| download | pleroma-fa47a719901050b27534492b0ff7189bc78895eb.tar.gz | |
Merge branch 'issue/1484' into 'develop'
[#1484] excludes posts of blocked users from search results
Closes #1484
See merge request pleroma/pleroma!2122
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/search_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex index 0a929f55b..5a5db8e00 100644 --- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex @@ -43,7 +43,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do result = default_values |> Enum.map(fn {resource, default_value} -> - if params["type"] == nil or params["type"] == resource do + if params["type"] in [nil, resource] do {resource, fn -> resource_search(version, resource, query, options) end} else {resource, fn -> default_value end} |