pleroma

commit: 37c34ccec3983b1d52b4c0c3a0a9d915b3dac3ec
parent: 632dab5d30c39f4831b77bea9249b91b1b7b3347
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon,  9 Dec 2019 17:55:48 +0000

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:
M
lib/pleroma/activity/search.ex
2
+-
M
test/web/mastodon_api/controllers/search_controller_test.exs
9
+++++++--

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git 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
diff --git a/test/web/mastodon_api/controllers/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs
@@ -165,15 +165,20 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
       assert status["id"] == to_string(activity.id)
     end
 
-    test "search fetches remote statuses", %{conn: conn} do
+    test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
       capture_log(fn ->
+        {:ok, %{id: activity_id}} =
+          CommonAPI.post(insert(:user), %{
+            "status" => "check out https://shitposter.club/notice/2827873"
+          })
+
         conn =
           conn
           |> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
 
         assert results = json_response(conn, 200)
 
-        [status] = results["statuses"]
+        [status, %{"id" => ^activity_id}] = results["statuses"]
 
         assert status["uri"] ==
                  "tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"