aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-09-17 11:16:08 +0200
committerRoger Braun <roger@rogerbraun.net>2017-09-17 11:16:08 +0200
commit678dd4c8ec85c34e1fded7d48ee0ab26e9555aad (patch)
tree92a3fbf9aaa1ff0a67500abf5065c135e9fb10ef
parent003cb17b165bc5c577276644fda36dbf036165b2 (diff)
downloadpleroma-678dd4c8ec85c34e1fded7d48ee0ab26e9555aad.tar.gz
Use desc id to sort instead of desc inserted_at
Should mean the same and is indexed.
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
-rw-r--r--lib/pleroma/web/activity_pub/utils.ex2
-rw-r--r--lib/pleroma/web/ostatus/ostatus_controller.ex2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 2a8034457..c4f7f432c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -97,7 +97,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def fetch_activities_for_context(context) do
query = from activity in Activity,
where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
- order_by: [desc: :inserted_at]
+ order_by: [desc: :id]
Repo.all(query)
end
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index ef58b88d2..4b8e6b690 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -152,7 +152,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
query = from activity in Activity,
where: fragment("? @> ?", activity.data, ^%{type: "Follow", actor: follower_id,
object: followed_id}),
- order_by: [desc: :inserted_at],
+ order_by: [desc: :id],
limit: 1
Repo.one(query)
end
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 05acfd04b..4e3fbb4f6 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -21,7 +21,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
query = from activity in Activity,
where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
limit: 20,
- order_by: [desc: :inserted_at]
+ order_by: [desc: :id]
activities = query
|> Repo.all