Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

diff --cc CHANGELOG.md
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/pleroma/web/rich_media/parser.ex
Simple merge

diff --cc lib/pleroma/web/rich_media/parsers/meta_tags_parser.ex
Simple merge

diff --cc lib/pleroma/web/rich_media/parsers/oembed_parser.ex
index 5d87a90e95dbde92a46e5fe93207dd21319e31a3,db8ccf15d146fac213e1e2c6a74f2fa440866b2a..6bdeac89c21158165231569bea381967167cef9f
--- 1/lib/pleroma/web/rich_media/parsers/oembed_parser.ex
--- 2/lib/pleroma/web/rich_media/parsers/oembed_parser.ex
+++ b/lib/pleroma/web/rich_media/parsers/oembed_parser.ex
@@@ -5,11 -5,11 +5,11 @@@
  defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
    def parse(html, _data) do
      with elements = [_ | _] <- get_discovery_data(html),
-          {:ok, oembed_url} <- get_oembed_url(elements),
+          oembed_url when is_binary(oembed_url) <- get_oembed_url(elements),
           {:ok, oembed_data} <- get_oembed_data(oembed_url) do
 -      {:ok, oembed_data}
 +      oembed_data
      else
 -      _e -> {:error, "No OEmbed data found"}
 +      _e -> %{}
      end
    end