diff options
| author | lain <lain@soykaf.club> | 2020-01-15 12:41:25 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-15 12:41:25 +0100 |
| commit | 9ae24fc68ece9fad4dc3ee95ebeb2fabcb25c619 (patch) | |
| tree | f66616ff50ac725795789422e8e1dc77853d1afb | |
| parent | 167e9c45eccf5ddb89077c979b1d587318f78cc0 (diff) | |
TimelineController: Do not order hashtag timelines for now.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 397348304..5adc577f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Store status data inside Flag activity - Deprecated (reorganized as `UserRelationship` entity) User fields with user AP IDs (`blocks`, `mutes`, `muted_reblogs`, `muted_notifications`, `subscribers`). - Logger: default log level changed from `warn` to `info`. +- Hashtag timelines: This is now unsorted, which fixes most timeouts. <details> <summary>API Changes</summary> diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index 29964a1d4..5fe0ea1cb 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -105,6 +105,8 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do |> Map.put("tag", tags) |> Map.put("tag_all", tag_all) |> Map.put("tag_reject", tag_reject) + # Temporary fix until we get a proper solution in + |> Map.put("skip_order", true) |> ActivityPub.fetch_public_activities() end |