Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 45 deletions

diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
deleted file mode 100644
index c69a86a1e..000000000
--- a/lib/pleroma/web/xml/xml.ex
+++ /dev/null
@@ -1,45 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.XML do
-  require Logger
-
-  def string_from_xpath(_, :error), do: nil
-
-  def string_from_xpath(xpath, doc) do
-    try do
-      {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
-
-      res =
-        res
-        |> to_string
-        |> String.trim()
-
-      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
-    try do
-      {doc, _rest} =
-        text
-        |> :binary.bin_to_list()
-        |> :xmerl_scan.string(quiet: true)
-
-      doc
-    rescue
-      _e ->
-        Logger.debug("Couldn't parse XML: #{inspect(text)}")
-        :error
-    catch
-      :exit, _error ->
-        Logger.debug("Couldn't parse XML: #{inspect(text)}")
-        :error
-    end
-  end
-end