pleroma

commit: bc75bb35fac172c021f6caa3ee8624cbc5325c9c
parent 774e0cb17218c764791df522d6b6f7d9d2facfd5
Author: lain <lain@soykaf.club>
Date:   Sat, 14 Jun 2025 08:30:13 +0000

Merge branch 'relaxed-also-known-as' into 'develop'

Relax alsoKnownAs requirements to just being a URI

See merge request pleroma/pleroma!4367
Diffstat:
A
changelog.d/relax-also-known-as.change
2
++
M
lib/pleroma/user.ex
2
+-
M
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
2
+-
M
test/pleroma/user_test.exs
9
+++++++++

4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changelog.d/relax-also-known-as.change b/changelog.d/relax-also-known-as.change
@@ -0,0 +1 @@
+Relax alsoKnownAs requirements to just URI, not necessarily HTTP(S)
+\ No newline at end of file
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -150,7 +150,7 @@ defmodule Pleroma.User do
     field(:allow_following_move, :boolean, default: true)
     field(:skip_thread_containment, :boolean, default: false)
     field(:actor_type, :string, default: "Person")
-    field(:also_known_as, {:array, ObjectValidators.ObjectID}, default: [])
+    field(:also_known_as, {:array, ObjectValidators.BareUri}, default: [])
     field(:inbox, :string)
     field(:shared_inbox, :string)
     field(:accepts_chat_messages, :boolean, default: nil)
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
@@ -190,7 +190,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do
       f.()
     rescue
       error ->
-        Logger.error("#{__MODULE__} search error: #{inspect(error)}")
+        Logger.error(Exception.format(:error, error, __STACKTRACE__))
         fallback
     end
   end
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs
@@ -2792,6 +2792,15 @@ defmodule Pleroma.UserTest do
       assert user_updated.also_known_as |> length() == 1
       assert user2.ap_id in user_updated.also_known_as
     end
+
+    test "should tolerate non-http(s) aliases" do
+      user =
+        insert(:user, %{
+          also_known_as: ["at://did:plc:xgvzy7ni6ig6ievcbls5jaxe"]
+        })
+
+      assert "at://did:plc:xgvzy7ni6ig6ievcbls5jaxe" in user.also_known_as
+    end
   end
 
   describe "alias_users/1" do