Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

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

@@ -182,13 +182,13 @@ def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
   def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
     Task.start(fn ->
       String.split(list)
-      |> Enum.map(fn nick ->
+      |> Enum.map(fn account ->
         with %User{} = follower <- User.get_cached_by_ap_id(user.ap_id),
-             %User{} = followed <- User.get_or_fetch_by_nickname(nick),
+             %User{} = followed <- User.get_or_fetch(account),
              {:ok, follower} <- User.follow(follower, followed) do
           ActivityPub.follow(follower, followed)
         else
-          _e -> Logger.debug("follow_import: following #{nick} failed")
+          _e -> Logger.debug("follow_import: following #{account} failed")
         end
       end)
     end)

lib/pleroma/web/xml/xml.ex

@@ -4,14 +4,20 @@ defmodule Pleroma.Web.XML do
   def string_from_xpath(_, :error), do: nil
 
   def string_from_xpath(xpath, doc) do
-    {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
+    try do
+      {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
 
-    res =
-      res
-      |> to_string
-      |> String.trim()
+      res =
+        res
+        |> to_string
+        |> String.trim()
 
-    if res == "", do: nil, else: res
+      if res == "", do: nil, else: res
+    catch
+      e ->
+        Logger.debug("Couldn't find xpath #{xpath} in XML doc")
+        nil
+    end
   end
 
   def parse_document(text) do