diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-01-10 16:44:28 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-01-26 04:46:02 +0100 |
| commit | 5a84def6a6cd6ac782e16b2aace220a99c31ace7 (patch) | |
| tree | c397e00c7cc03a01a5db44a68f695339fb355ee5 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | 4ad0ad14ed2d8a10bbf642fd989b3f7f55f9017d (diff) | |
| download | pleroma-5a84def6a6cd6ac782e16b2aace220a99c31ace7.tar.gz | |
Fix the logic in multi-hashtag TLs
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 6811f827e..4c5f1e7a9 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -541,11 +541,16 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do local_only = params["local"] in [true, "True", "true", "1"] tags = - ([params["tag"]] ++ (params["all"] || []) ++ (params["any"] || [])) + ([params["tag"]] ++ (params["any"] || [])) |> Enum.uniq() |> Enum.filter(& &1) |> Enum.map(&String.downcase(&1)) + tag_all = + params["all"] || + [] + |> Enum.map(&String.downcase(&1)) + tag_reject = params["none"] || [] @@ -557,6 +562,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do |> Map.put("local_only", local_only) |> Map.put("blocking_user", user) |> Map.put("tag", tags) + |> Map.put("tag_all", tag_all) |> Map.put("tag_reject", tag_reject) activities = |