Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 49 deletions

diff --git a/lib/xml_builder.ex b/lib/xml_builder.ex
deleted file mode 100644
index 33b63a71f..000000000
--- a/lib/xml_builder.ex
+++ /dev/null
@@ -1,49 +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.XmlBuilder do
-  def to_xml({tag, attributes, content}) do
-    open_tag = make_open_tag(tag, attributes)
-
-    content_xml = to_xml(content)
-
-    "<#{open_tag}>#{content_xml}</#{tag}>"
-  end
-
-  def to_xml({tag, %{} = attributes}) do
-    open_tag = make_open_tag(tag, attributes)
-
-    "<#{open_tag} />"
-  end
-
-  def to_xml({tag, content}), do: to_xml({tag, %{}, content})
-
-  def to_xml(content) when is_binary(content) do
-    to_string(content)
-  end
-
-  def to_xml(content) when is_list(content) do
-    for element <- content do
-      to_xml(element)
-    end
-    |> Enum.join()
-  end
-
-  def to_xml(%NaiveDateTime{} = time) do
-    NaiveDateTime.to_iso8601(time)
-  end
-
-  def to_doc(content), do: ~s(<?xml version="1.0" encoding="UTF-8"?>) <> to_xml(content)
-
-  defp make_open_tag(tag, attributes) do
-    attributes_string =
-      for {attribute, value} <- attributes do
-        value = String.replace(value, "\"", "&quot;")
-        "#{attribute}=\"#{value}\""
-      end
-      |> Enum.join(" ")
-
-    [tag, attributes_string] |> Enum.join(" ") |> String.trim()
-  end
-end