Merge branch 'fix/prefer-url-over-search' into 'develop'

status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050
This commit is contained in:
rinpatch 2019-12-09 17:55:48 +00:00
commit 37c34ccec3
2 changed files with 8 additions and 3 deletions

View file

@ -86,7 +86,7 @@ defmodule Pleroma.Activity.Search do
{:ok, object} <- Fetcher.fetch_object_from_id(search_query),
%Activity{} = activity <- Activity.get_create_by_object_ap_id(object.data["id"]),
true <- Visibility.visible_for_user?(activity, user) do
activities ++ [activity]
[activity | activities]
else
_ -> activities
end