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

Use desc id to sort instead of desc inserted_at

Browse Source 
Should mean the same and is indexed.
This commit is contained in:
Roger Braun 2017-09-17 11:16:08 +02:00
parent 003cb17b16
commit 678dd4c8ec
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def fetch_activities_for_context(context) do def fetch_activities_for_context(context) do
query = from activity in Activity, query = from activity in Activity,
where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context), where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
order_by: [desc: :inserted_at] order_by: [desc: :id]
Repo.all(query) Repo.all(query)
end end

2
lib/pleroma/web/activity_pub/utils.ex
View File

@ -152,7 +152,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
query = from activity in Activity, query = from activity in Activity,
where: fragment("? @> ?", activity.data, ^%{type: "Follow", actor: follower_id, where: fragment("? @> ?", activity.data, ^%{type: "Follow", actor: follower_id,
object: followed_id}), object: followed_id}),
order_by: [desc: :inserted_at], order_by: [desc: :id],
limit: 1 limit: 1
Repo.one(query) Repo.one(query)
end end

2
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -21,7 +21,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
query = from activity in Activity, query = from activity in Activity,
where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id), where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
limit: 20, limit: 20,
order_by: [desc: :inserted_at] order_by: [desc: :id]
activities = query activities = query
|> Repo.all |> Repo.all