AP and WebFinger need love here

[akkoma] / lib / pleroma / web / web_finger / web_finger.ex

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 54cbf4ceab3a4cd5921c1c4621c60a5fc215ba2d..9c39cc5a155021e9a3d6575d1e583fc1ee5f7b22 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -60,7 +60,8 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      Repo.update(Ecto.Changeset.change(user, info: info))
+      Ecto.Changeset.change(user, info: info)
+      |> User.update_and_set_cache()
     end
   end
 
@@ -105,6 +106,7 @@ defmodule Pleroma.Web.WebFinger do
   end
 
   def finger(account) do
+    account = String.trim_leading(account, "@")
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->
@@ -120,7 +122,7 @@ defmodule Pleroma.Web.WebFinger do
       {:ok, data}
     else
       e ->
-        Logger.debug(fn -> "Couldn't finger #{account}." end)
+        Logger.debug(fn -> "Couldn't finger #{account}" end)
         Logger.debug(fn -> inspect(e) end)
         {:error, e}
     end