From 97d488aea3ce75e52d4e6ba9a3b5e4447b535879 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 24 Jul 2024 15:45:35 -0400
Subject: [PATCH] Fix RichMedia negative cache entries

The negative cache entry was a nil value, but that is an expected response when the cache is missing an entry so it didn't work as intended.
---
 lib/pleroma/web/rich_media/backfill.ex        |  2 +-
 test/pleroma/web/rich_media/backfill_test.exs | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 test/pleroma/web/rich_media/backfill_test.exs

diff --git a/lib/pleroma/web/rich_media/backfill.ex b/lib/pleroma/web/rich_media/backfill.ex
index cf638fa29..1cd90629f 100644
--- a/lib/pleroma/web/rich_media/backfill.ex
+++ b/lib/pleroma/web/rich_media/backfill.ex
@@ -64,5 +64,5 @@ defp stream_update(%{"activity_id" => activity_id}) do
   defp warm_cache(key, val), do: @cachex.put(:rich_media_cache, key, val)
 
   defp negative_cache(key, ttl \\ :timer.minutes(15)),
-    do: @cachex.put(:rich_media_cache, key, nil, ttl: ttl)
+    do: @cachex.put(:rich_media_cache, key, :error, ttl: ttl)
 end
diff --git a/test/pleroma/web/rich_media/backfill_test.exs b/test/pleroma/web/rich_media/backfill_test.exs
new file mode 100644
index 000000000..6d221fcf5
--- /dev/null
+++ b/test/pleroma/web/rich_media/backfill_test.exs
@@ -0,0 +1,26 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.RichMedia.BackfillTest do
+  use Pleroma.DataCase
+
+  alias Pleroma.Web.RichMedia.Backfill
+  alias Pleroma.Web.RichMedia.Card
+
+  import Mox
+
+  setup_all do: clear_config([:rich_media, :enabled], true)
+
+  test "sets a negative cache entry for an error" do
+    url = "https://bad.example.com/"
+    url_hash = Card.url_to_hash(url)
+
+    Tesla.Mock.mock(fn %{url: ^url} -> :error end)
+
+    Pleroma.CachexMock
+    |> expect(:put, fn :rich_media_cache, ^url_hash, :error, ttl: _ -> {:ok, true} end)
+
+    Backfill.run(%{"url" => url})
+  end
+end