diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-22 10:05:28 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-22 10:05:28 +0300 |
| commit | 218c51960606454577a12fb6e417d66ab46f3965 (patch) | |
| tree | 831e8bef7e82021bf22ec057cb46716be70091b4 /lib | |
| parent | ca7f24064304945587fc232325dce4b834ff6c94 (diff) | |
| parent | 42e495df2b8d72365e22f8be708051130bc81973 (diff) | |
| download | pleroma-218c51960606454577a12fb6e417d66ab46f3965.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 341e0368d..bbe0b11ec 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -493,7 +493,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do def build_tags(object_tags) when is_list(object_tags) do object_tags |> Enum.filter(&is_binary/1) - |> Enum.map(&%{name: &1, url: "/tag/#{URI.encode(&1)}"}) + |> Enum.map(&%{name: &1, url: "#{Pleroma.Web.base_url()}/tag/#{URI.encode(&1)}"}) end def build_tags(_), do: [] |