pleroma

commit: d4de38e8fff3154259e08292de60900488c210d6
parent: 6a44427915098e45a6e27cccabe149d4cfcb3b7a
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 30 Jun 2017 16:30:19 +0200

Order conversation fetches like GS does.

Diffstat:
M
lib/pleroma/web/activity_pub/activity_pub.ex
3
++-
M
test/web/activity_pub/activity_pub_test.exs
2
+-
M
test/web/twitter_api/twitter_api_test.exs
4
++--

3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -77,7 +77,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
-      where: fragment("? @> ?", activity.data, ^%{ context: context })
+      where: fragment("? @> ?", activity.data, ^%{ context: context }),
+      order_by: [desc: :inserted_at]
     Repo.all(query)
   end
 
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
@@ -75,7 +75,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
 
       activities = ActivityPub.fetch_activities_for_context("2hu")
 
-      assert activities == [activity, activity_two]
+      assert activities == [activity_two, activity]
     end
   end
 
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
@@ -227,8 +227,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     statuses = TwitterAPI.fetch_conversation(user, object.id)
 
     assert length(statuses) == 2
-    assert Enum.at(statuses, 0)["id"] == activity.id
-    assert Enum.at(statuses, 1)["id"] == activity_two.id
+    assert Enum.at(statuses, 1)["id"] == activity.id
+    assert Enum.at(statuses, 0)["id"] == activity_two.id
   end
 
   test "upload a file" do