diff options
author | lain <lain@soykaf.club> | 2020-08-28 12:17:19 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-28 12:17:19 +0000 |
commit | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (patch) | |
tree | efcb0b8e68f86d067de98a23f40a24c7dab79d2f /lib/pleroma/signature.ex | |
parent | f891e2b2f1d1daa122b9856e4b660be394d31e34 (diff) | |
parent | b141e35d641e733dffe7bd6a45a5bbcafe586c56 (diff) |
Merge branch 'release/2.1.0' into 'stable'v2.1.0
Release/2.1.0
See merge request pleroma/pleroma!2927
Diffstat (limited to 'lib/pleroma/signature.ex')
-rw-r--r-- | lib/pleroma/signature.ex | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/pleroma/signature.ex b/lib/pleroma/signature.ex index 7006eb2c0..3aa6909d2 100644 --- a/lib/pleroma/signature.ex +++ b/lib/pleroma/signature.ex @@ -5,6 +5,7 @@ defmodule Pleroma.Signature do @behaviour HTTPSignatures.Adapter + alias Pleroma.EctoType.ActivityPub.ObjectValidators alias Pleroma.Keys alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub @@ -21,14 +22,16 @@ defmodule Pleroma.Signature do uri end - case uri do - %URI{scheme: scheme} when scheme in ["https", "http"] -> - {:ok, URI.to_string(uri)} + maybe_ap_id = URI.to_string(uri) + + case ObjectValidators.ObjectID.cast(maybe_ap_id) do + {:ok, ap_id} -> + {:ok, ap_id} _ -> - case Pleroma.Web.WebFinger.finger(URI.to_string(uri)) do + case Pleroma.Web.WebFinger.finger(maybe_ap_id) do %{"ap_id" => ap_id} -> {:ok, ap_id} - _ -> {:error, URI.to_string(uri)} + _ -> {:error, maybe_ap_id} end end end |