From 0964c207eb184696355a2d8efd9d671dcc23ce66 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 4 Jan 2019 23:23:47 +0000
Subject: [PATCH 1/2] rich media: use cachex to avoid flooding remote servers

---
 lib/pleroma/application.ex           | 11 +++++++++++
 lib/pleroma/web/rich_media/parser.ex |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index cb3e6b69b..ad2797209 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -63,6 +63,17 @@ defmodule Pleroma.Application do
           ],
           id: :cachex_object
         ),
+        worker(
+          Cachex,
+          [
+            :rich_media_cache,
+            [
+              default_ttl: :timer.minutes(120),
+              limit: 5000
+            ]
+          ],
+          id: :cachex_rich_media
+        ),
         worker(
           Cachex,
           [
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index 477a38196..b88ed5371 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -2,9 +2,13 @@ defmodule Pleroma.Web.RichMedia.Parser do
   @parsers [Pleroma.Web.RichMedia.Parsers.OGP]
 
   def parse(url) do
-    {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
+    Cachex.fetch!(:rich_media_cache, url, fn _ ->
+      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
 
-    html |> maybe_parse() |> get_parsed_data()
+      result = html |> maybe_parse() |> get_parsed_data()
+
+      {:commit, result}
+    end)
   end
 
   defp maybe_parse(html) do

From 487c00d36dee1b975ffc8fca8f0a5bb5510f71a3 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 4 Jan 2019 23:50:54 +0000
Subject: [PATCH 2/2] rich media: disable cachex in test mode

---
 lib/pleroma/web/rich_media/parser.ex | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index b88ed5371..3746feaf6 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -1,14 +1,17 @@
 defmodule Pleroma.Web.RichMedia.Parser do
   @parsers [Pleroma.Web.RichMedia.Parsers.OGP]
 
-  def parse(url) do
-    Cachex.fetch!(:rich_media_cache, url, fn _ ->
-      {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
+  if Mix.env() == :test do
+    def parse(url), do: parse_url(url)
+  else
+    def parse(url),
+      do: {:commit, Cachex.fetch!(:rich_media_cache, url, fn _ -> parse_url(url) end)}
+  end
 
-      result = html |> maybe_parse() |> get_parsed_data()
+  defp parse_url(url) do
+    {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
 
-      {:commit, result}
-    end)
+    html |> maybe_parse() |> get_parsed_data()
   end
 
   defp maybe_parse(html) do