Merge branch 'fix/mix-task-caching' into 'develop'

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

diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
index b85712d6519f9dfea3138cddc81c608de01db715..da3f68ecba51f22ba966665944f37feb908c2cdf 100644 (file)
--- a/lib/pleroma/web/xml/xml.ex
+++ b/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
@@ -26,6 +32,10 @@ defmodule Pleroma.Web.XML do
       :exit, _error ->
         Logger.debug("Couldn't parse XML: #{inspect(text)}")
         :error
+    rescue
+      e ->
+        Logger.debug("Couldn't parse XML: #{inspect(text)}")
+        :error
     end
   end
 end