Move YouTube oembed hack to oembed parseryoutube-fix

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 4d1c2dc9a..566fc8c8a 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -78,13 +78,6 @@ defmodule Pleroma.Web.RichMedia.Helpers do
 
   def fetch_data_for_activity(_), do: %{}
 
-  # YouTube's oEmbed implementation is broken, requiring this hack.
-  # https://github.com/oscarotero/Embed/issues/417#issuecomment-746673027
-  def rich_media_get("http://www.youtube.com/oembed?" <> params) do
-    # Use HTTPS explicitly, even though YouTube returns HTTP
-    rich_media_get("https://www.youtube.com/oembed?#{params}")
-  end
-
   def rich_media_get(url) do
     headers = [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
 
diff --git a/lib/pleroma/web/rich_media/parsers/o_embed.ex b/lib/pleroma/web/rich_media/parsers/o_embed.ex
index 09eabec56..24fca56bb 100644
--- a/lib/pleroma/web/rich_media/parsers/o_embed.ex
+++ b/lib/pleroma/web/rich_media/parsers/o_embed.ex
@@ -21,6 +21,13 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
     Enum.find_value(attributes, fn {k, v} -> if k == "href", do: v end)
   end
 
+  # YouTube's oEmbed implementation is broken, requiring this hack.
+  # https://github.com/oscarotero/Embed/issues/417#issuecomment-746673027
+  defp get_oembed_data("http://www.youtube.com/oembed?" <> params) do
+    # Use HTTPS explicitly, even though YouTube returns HTTP
+    get_oembed_data("https://www.youtube.com/oembed?#{params}")
+  end
+
   defp get_oembed_data(url) do
     with {:ok, %Tesla.Env{body: json}} <- Pleroma.Web.RichMedia.Helpers.rich_media_get(url) do
       Jason.decode(json)