pleroma

commit: 44613db853226015207977ee958ebbf4d26f7c00
parent 95b39223281a61f3ee7d52776df2713952de3be0
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Sat, 11 Jun 2022 19:52:07 -0400

Show original status at the first of history

Diffstat:
M
lib/pleroma/web/mastodon_api/views/status_view.ex
11
+++++------
M
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
2
+-

2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -418,13 +418,12 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       |> Enum.map(&Map.put(&1, "id", object.data["id"]))
       |> Enum.map(&%Object{data: &1, id: object.id})
 
-    history = [object | past_history]
-
-    history_len = length(history)
-
     history =
-      Enum.zip(history_len..0, history)
-      |> Enum.map(fn {chrono_order, object} ->
+      [object | past_history]
+      # Mastodon expects the original to be at the first
+      |> Enum.reverse()
+      |> Enum.with_index()
+      |> Enum.map(fn {object, chrono_order} ->
         %{
           # The history is prepended every time there is a new edit.
           # In chrono_order, the oldest item is always at 0, and so on.
diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@ -2032,7 +2032,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
 
       conn = get(conn, "/api/v1/statuses/#{activity.id}/history")
 
-      assert [_, %{"spoiler_text" => "title 2"}, %{"spoiler_text" => "title 1"}] =
+      assert [%{"spoiler_text" => "title 1"}, %{"spoiler_text" => "title 2"}, _] =
                json_response_and_validate_schema(conn, 200)
     end
   end