From 59269cf07a42e0f6ac406c99f47414fa98f3e71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Tue, 21 Jul 2026 01:22:33 +0200
Subject: [PATCH] Fix hashtag timeline query
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 lib/pleroma/web/activity_pub/activity_pub.ex  | 24 ++++++++++++-------
 .../controllers/timeline_controller_test.exs  |  3 ++-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 1e8bfe3dd..a564a634d 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -893,14 +893,22 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       |> Repo.all()
 
     # Note: NO extra ordering should be done on "activities.id desc nulls last" for optimal plan
-    from(
-      [_activity, object] in query,
-      join: hto in "hashtags_objects",
-      on: hto.object_id == object.id,
-      where: hto.hashtag_id in ^hashtag_ids,
-      distinct: [desc: object.id],
-      order_by: [desc: object.id]
-    )
+    query =
+      from(
+        [_activity, object] in query,
+        join: hto in "hashtags_objects",
+        on: hto.object_id == object.id,
+        where: hto.hashtag_id in ^hashtag_ids
+      )
+
+    if query.distinct == [] do
+      from([activity, object] in query,
+        distinct: [desc: activity.id],
+        order_by: [desc: activity.id]
+      )
+    else
+      query
+    end
   end
 
   defp restrict_hashtag_any(query, %{tag: tag}) when is_binary(tag) do
diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
index b8d6129bb..19f75fe0e 100644
--- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
@@ -912,7 +912,8 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
 
         any_test = get(conn, "/api/v1/timelines/tag/test?any[]=test1")
 
-        [status_none, status_test1, status_test] = json_response_and_validate_schema(any_test, :ok)
+        [status_none, status_test1, status_test] =
+          json_response_and_validate_schema(any_test, :ok)
 
         assert to_string(activity_test.id) == status_test["id"]
         assert to_string(activity_test1.id) == status_test1["id"]