Merge branch 'develop' into oembed_provider

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/formatter.ex
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 751624e80cc381adee8e85b8f0380521be369263,dd1985d6ee1b91a16e0c88517f0edc9fa1e49f27..49b007422a9390c4444ca2c0ee360ed8d5ab4ce9
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -467,21 -459,7 +470,21 @@@ defmodule Fallback.RedirectController d
    def redirector(conn, _params) do
      conn
      |> put_resp_content_type("text/html")
 -    |> send_file(200, Pleroma.Plugs.InstanceStatic.file_path("index.html"))
 +    |> send_file(200, index_file_path())
 +  end
 +
 +  def redirector_with_meta(conn, params) do
 +    {:ok, index_content} = File.read(index_file_path())
 +    tags = Metadata.build_tags(params)
 +    response = String.replace(index_content, "<!--server-generated-meta-->", tags)
 +
 +    conn
 +    |> put_resp_content_type("text/html")
 +    |> send_resp(200, response)
 +  end
 +
 +  def index_file_path do
-     Application.app_dir(:pleroma, "priv/static/index.html")
++    Pleroma.Plugs.InstanceStatic.file_path("index.html"))
    end
  
    def registration_page(conn, params) do

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge