From b97092a97e2669f75d117103ab69e30255092b59 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Fri, 24 Jul 2026 18:36:25 +0400 Subject: [PATCH] fix: preserve optimized hashtag ordering --- lib/pleroma/web/activity_pub/activity_pub.ex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index a564a634d..4efd18d39 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -901,10 +901,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do 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] + if is_nil(query.distinct) do + from([_activity, object] in query, + distinct: [desc: object.id], + order_by: [desc: object.id] ) else query