diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-09 17:55:48 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-09 17:55:48 +0000 |
| commit | 37c34ccec3983b1d52b4c0c3a0a9d915b3dac3ec (patch) | |
| tree | 840f2773f54df7fc9f53feadcdddb4d7bbf992bc /lib | |
| parent | 632dab5d30c39f4831b77bea9249b91b1b7b3347 (diff) | |
| parent | f4b7f32d51f9d0bd721befdd33b49d2c52a6e231 (diff) | |
| download | pleroma-37c34ccec3983b1d52b4c0c3a0a9d915b3dac3ec.tar.gz pleroma-37c34ccec3983b1d52b4c0c3a0a9d915b3dac3ec.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/activity/search.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex index f847ac238..d30a5a6a5 100644 --- a/lib/pleroma/activity/search.ex +++ b/lib/pleroma/activity/search.ex @@ -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 |