logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: c0a50b7c3e340cd621827922200daa0f29dc6e15
parent 18deea59b441a89c1e6870d29dd0a6c0f3070f55
Author: Mark Felder <feld@feld.me>
Date:   Sun, 10 Dec 2023 13:24:04 -0500

User.get_or_fetch_public_key_for_ap_id/1 is no longer required.

Diffstat:

Mlib/pleroma/user.ex9---------
Mtest/pleroma/user_test.exs5-----
2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex @@ -2135,15 +2135,6 @@ defmodule Pleroma.User do def public_key(_), do: {:error, "key not found"} - def get_or_fetch_public_key_for_ap_id(ap_id) do - with {:ok, %User{} = user} <- get_or_fetch_by_ap_id(ap_id), - {:ok, public_key} <- public_key(user) do - {:ok, public_key} - else - _ -> :error - end - end - def get_public_key_for_ap_id(ap_id) do with %User{} = user <- get_cached_by_ap_id(ap_id), {:ok, public_key} <- public_key(user) do diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs @@ -1951,11 +1951,6 @@ defmodule Pleroma.UserTest do end end - test "get_or_fetch_public_key_for_ap_id fetches a user that's not in the db" do - assert {:ok, _key} = - User.get_or_fetch_public_key_for_ap_id("http://mastodon.example.org/users/admin") - end - test "get_public_key_for_ap_id returns correctly for user that's not in the db" do assert :error = User.get_public_key_for_ap_id("http://mastodon.example.org/users/admin") end