a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Order conversation fetches like GS does.

This commit is contained in:
Roger Braun 2017-06-30 16:30:19 +02:00
parent 6a44427915
commit d4de38e8ff
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -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

2
test/web/activity_pub/activity_pub_test.exs
View File

@ -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

4
test/web/twitter_api/twitter_api_test.exs
View File

@ -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