[Web.ActivityPub.ActivityPub]: Fix restrict_tag()

Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching

1 files changed, 28 insertions, 5 deletions

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e0d020fab..d414ecc46 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -426,18 +426,41 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_since(query, _), do: query
 
-  defp restrict_tag(query, %{"tag" => tag, "tag_reject" => tag_reject}) when tag_reject != [] do
+  defp restrict_tag(query, %{"tag" => tag, "tag_reject" => tag_reject})
+       when is_list(tag) and tag_reject != [] do
     from(
       activity in query,
-      where: fragment("? <@ (? #> '{\"object\",\"tag\"}')", ^tag, activity.data),
-      where: fragment("? @> (? #> '{\"object\",\"tag\"}')", ^tag_reject, activity.data)
+      where:
+        fragment(
+          "? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}')))",
+          ^tag,
+          activity.data
+        ),
+      where:
+        fragment(
+          "(not ? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}'))))",
+          ^tag_reject,
+          activity.data
+        )
+    )
+  end
+
+  defp restrict_tag(query, %{"tag" => tag}) when is_list(tag) do
+    from(
+      activity in query,
+      where:
+        fragment(
+          "? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}')))",
+          ^tag,
+          activity.data
+        )
     )
   end
 
-  defp restrict_tag(query, %{"tag" => tag}) do
+  defp restrict_tag(query, %{"tag" => tag}) when is_binary(tag) do
     from(
       activity in query,
-      where: fragment("? && jsonb_array_elements_text((? #> '{\"object\",\"tag\"}'))", ^tag, activity.data)
+      where: fragment("? <@ (? #> '{\"object\",\"tag\"}')", ^tag, activity.data)
     )
   end