pleroma

commit: 6fc38aac8814fa63d6c43d004cb5280131106cb2
parent 6f9b03384fe50ce063e8fee3103a69dff298107b
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 19 Nov 2020 16:20:59 +0000

Merge branch 'fix-rum-search' into 'develop'

Fix rum search speed

See merge request pleroma/pleroma!3161
Diffstat:
M
CHANGELOG.md
10
+++++-----
M
lib/pleroma/activity/search.ex
5
++++-

2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,11 +34,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 
-<details>
+- <details>
   <summary>API Changes</summary>
-- Mastodon API: Current user is now included in conversation if it's the only participant.
-- Mastodon API: Fixed last_status.account being not filled with account data.
-
+  - Mastodon API: Current user is now included in conversation if it's the only participant.
+  - Mastodon API: Fixed last_status.account being not filled with account data.
 </details>
 
 ## Unreleased (Patch)
@@ -50,8 +49,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 
 - Config generation: rename `Pleroma.Upload.Filter.ExifTool` to `Pleroma.Upload.Filter.Exiftool`.
+- Search: RUM index search speed has been fixed.
 - S3 Uploads with Elixir 1.11.
-- Fixed Emoji Reaction activity filtering from blocked and muted accounts
+- Emoji Reaction activity filtering from blocked and muted accounts.
 - Mix task pleroma.user delete_activities for source installations.
 
 ## [2.2.0] - 2020-11-12
diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex
@@ -27,7 +27,10 @@ defmodule Pleroma.Activity.Search do
     |> maybe_restrict_local(user)
     |> maybe_restrict_author(author)
     |> maybe_restrict_blocked(user)
-    |> Pagination.fetch_paginated(%{"offset" => offset, "limit" => limit}, :offset)
+    |> Pagination.fetch_paginated(
+      %{"offset" => offset, "limit" => limit, "skip_order" => index_type == :rum},
+      :offset
+    )
     |> maybe_fetch(user, search_query)
   end