Merge branch 'import' into 'develop'

Fix follow errors

See merge request pleroma/pleroma!198

.gitignore

@@ -26,3 +26,6 @@ erl_crash.dump
 
 .DS_Store
 .env
+
+# Editor config
+/.vscode

lib/pleroma/web/twitter_api/controllers/util_controller.ex

@@ -189,7 +189,7 @@ def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
              {:ok, follower} <- User.follow(follower, followed) do
           ActivityPub.follow(follower, followed)
         else
-          _e -> Logger.debug("follow_import: following #{account} failed")
+          err -> Logger.debug("follow_import: following #{account} failed with #{inspect(err)}")
         end
       end)
     end)

lib/pleroma/web/web_finger/web_finger.ex

@@ -144,31 +144,33 @@ def ensure_keys_present(user) do
     end
   end
 
-  defp webfinger_from_xml(doc) do
+  defp get_magic_key(magic_key) do
-    magic_key = XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc)
     "data:application/magic-public-key," <> magic_key = magic_key
+    {:ok, magic_key}
+  rescue
+    MatchError -> {:error, "Missing magic key data."}
+  end
 
-    topic =
+  defp webfinger_from_xml(doc) do
+    with magic_key <- XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc),
+         {:ok, magic_key} <- get_magic_key(magic_key),
+         topic <-
            XML.string_from_xpath(
              ~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href},
              doc
-      )
+           ),
-
+         subject <- XML.string_from_xpath("//Subject", doc),
-    subject = XML.string_from_xpath("//Subject", doc)
+         salmon <- XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc),
-    salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)
+         subscribe_address <-
-
-    subscribe_address =
            XML.string_from_xpath(
              ~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template},
              doc
-      )
+           ),
-
+         ap_id <-
-    ap_id =
            XML.string_from_xpath(
              ~s{//Link[@rel="self" and @type="application/activity+json"]/@href},
              doc
-      )
+           ) do
-
       data = %{
         "magic_key" => magic_key,
         "topic" => topic,
@@ -179,6 +181,13 @@ defp webfinger_from_xml(doc) do
       }
 
       {:ok, data}
+    else
+      {:error, e} ->
+        {:error, e}
+
+      e ->
+        {:error, e}
+    end
   end
 
   defp webfinger_from_json(doc) do
@@ -268,8 +277,11 @@ def finger(account) do
       if doc != :error do
         webfinger_from_xml(doc)
       else
-        {:ok, doc} = Jason.decode(body)
+        with {:ok, doc} <- Jason.decode(body) do
           webfinger_from_json(doc)
+        else
+          {:error, e} -> e
+        end
       end
     else
       e ->