Merge branch 'patch-README' into 'develop'

[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 7576ea28abc6c3add4320139affb97fdbd0f71d4..019210124584c0901359f91d46eaca6cf05e574b 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -60,9 +60,8 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      res = Repo.update(Ecto.Changeset.change(user, info: info))
-      User.invalidate_cache(user)
-      res
+      Ecto.Changeset.change(user, info: info)
+      |> User.update_and_set_cache()
     end
   end
 
@@ -101,7 +100,7 @@ defmodule Pleroma.Web.WebFinger do
         with {:ok, %{body: body}} <- @httpoison.get("https://#{domain}/.well-known/host-meta", []) do
           get_template_from_xml(body)
         else
-          e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+          e -> {:error, "Can't find LRDD template: #{inspect(e)}"}
         end
     end
   end
@@ -123,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