From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 4 Jan 2019 23:23:47 +0000 (+0000)
Subject: rich media: use cachex to avoid flooding remote servers
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0964c207eb184696355a2d8efd9d671dcc23ce66;p=akkoma

rich media: use cachex to avoid flooding remote servers
---

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