diff options
| author | feld <feld@feld.me> | 2020-06-12 12:31:27 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-06-12 12:31:27 +0000 |
| commit | 11aa02bb108d957c778275fbcfa4c7cf2165d249 (patch) | |
| tree | 32fbc5acca33ed994f8d2077e2755496a01c16fb /lib | |
| parent | 5474b5c988d3ab8869217b72d3702fb9396adadf (diff) | |
| parent | 21880970660906d8072dc501e6a8b25fb4a4b0c7 (diff) | |
| download | pleroma-11aa02bb108d957c778275fbcfa4c7cf2165d249.tar.gz | |
Merge branch '1794-hashtags-construction-from-uri-fix' into 'develop'
[#1794] Fixes URI query handling for hashtags extraction in search
Closes #1794
See merge request pleroma/pleroma!2645
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/search_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex index 46bcf4228..3be0ca095 100644 --- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex @@ -152,6 +152,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do defp preprocess_uri_query(query) do if query =~ ~r/https?:\/\// do query + |> String.trim_trailing("/") |> URI.parse() |> Map.get(:path) |> String.split("/") |