Merge branch '2201-i-hate-this' into 'develop'

User search: Once again, change uri handling.

Closes #2201

See merge request pleroma/pleroma!3048

lib/pleroma/user/search.ex

@@ -54,8 +54,9 @@ defp maybe_add_ap_id_match(list, query) do
 
   defp maybe_add_uri_match(list, query) do
     with {:ok, query} <- UriType.cast(query),
-         %User{} = user <- Pleroma.Repo.get_by(User, uri: query) do
+         q = from(u in User, where: u.uri == ^query, select: u.id),
-      [user.id | list]
+         users = Pleroma.Repo.all(q) do
+      users ++ list
     else
       _ -> list
     end

priv/repo/migrations/20200928145912_revert_citext_change.exs

@@ -6,6 +6,6 @@ def change do
       modify(:uri, :text)
     end
 
-    create_if_not_exists(unique_index(:users, :uri))
+    # create_if_not_exists(unique_index(:users, :uri))
   end
 end

priv/repo/migrations/20200930082320_user_ur_is_index_part_three.exs

@@ -0,0 +1,8 @@
+defmodule Pleroma.Repo.Migrations.UserURIsIndexPartThree do
+  use Ecto.Migration
+
+  def change do
+    drop_if_exists(unique_index(:users, :uri))
+    create_if_not_exists(index(:users, :uri))
+  end
+end

test/user_search_test.exs

@@ -36,6 +36,12 @@ test "returns a user with matching ap_id as the first result" do
       assert first_user.id == user.id
     end
 
+    test "doesn't die if two users have the same uri" do
+      insert(:user, %{uri: "https://gensokyo.2hu/@raymoo"})
+      insert(:user, %{uri: "https://gensokyo.2hu/@raymoo"})
+      assert [_first_user, _second_user] = User.search("https://gensokyo.2hu/@raymoo")
+    end
+
     test "returns a user with matching uri as the first result" do
       user =
         insert(:user, %{