AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 94
Code Issues 180 Pull requests 27 Projects 2 Releases 14 Packages Wiki Activity

signing_key: refactor nested case into with statement
Some checks are pending
ci/woodpecker/push/build-amd64 Pipeline is pending approval
Details
ci/woodpecker/push/build-arm64 Pipeline is pending approval
Details
ci/woodpecker/push/docs Pipeline is pending approval
Details
ci/woodpecker/push/lint Pipeline is pending approval
Details
ci/woodpecker/push/test Pipeline is pending approval
Details

Browse source 
The error branches were already effectively identical before.
This change is purely cosmetic.
This commit is contained in:
Oneric 2024-10-30 23:05:57 +01:00 committed by Floatingghost
parent 7583eceb38
commit 294de939cb
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/pleroma/user/signing_key.ex
View file

@ -194,31 +194,24 @@ def get_or_fetch_by_key_id(key_id) do
""" """
def fetch_remote_key(key_id) do def fetch_remote_key(key_id) do
Logger.debug("Fetching remote key: #{key_id}") Logger.debug("Fetching remote key: #{key_id}")
resp = Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(key_id)
case resp do with {:ok, _body} = resp <-
{:ok, _body} -> Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(key_id),
case handle_signature_response(resp) do {:ok, ap_id, public_key_pem} <- handle_signature_response(resp) do
{:ok, ap_id, public_key_pem} -> Logger.debug("Fetched remote key: #{ap_id}")
Logger.debug("Fetched remote key: #{ap_id}") # fetch the user
# fetch the user {:ok, user} = User.get_or_fetch_by_ap_id(ap_id)
{:ok, user} = User.get_or_fetch_by_ap_id(ap_id) # store the key
# store the key key = %__MODULE__{
key = %__MODULE__{ user_id: user.id,
user_id: user.id, public_key: public_key_pem,
public_key: public_key_pem, key_id: key_id
key_id: key_id }
}
Repo.insert(key, on_conflict: :replace_all, conflict_target: :key_id) Repo.insert(key, on_conflict: :replace_all, conflict_target: :key_id)
else
e -> e ->
Logger.debug("Failed to fetch remote key: #{inspect(e)}") Logger.debug("Failed to fetch remote key: #{inspect(e)}")
{:error, "Could not fetch key"}
end
_ ->
Logger.debug("Failed to fetch remote key: #{inspect(resp)}")
{:error, "Could not fetch key"} {:error, "Could not fetch key"}
end end
end end