diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-19 16:20:59 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-19 16:20:59 +0000 |
| commit | 6fc38aac8814fa63d6c43d004cb5280131106cb2 (patch) | |
| tree | 7cfd321622447d9d64fa9f4b6332c104d0e2d719 | |
| parent | 6f9b03384fe50ce063e8fee3103a69dff298107b (diff) | |
| parent | 1eda5ab267524aa953d093a6764d6194d4d6894e (diff) | |
| download | pleroma-6fc38aac8814fa63d6c43d004cb5280131106cb2.tar.gz | |
Merge branch 'fix-rum-search' into 'develop'
Fix rum search speed
See merge request pleroma/pleroma!3161
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | lib/pleroma/activity/search.ex | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8658d5440..6e0bec996 100644 --- 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 index ceb365bb3..382c81118 100644 --- 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 |