X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Factivity.ex;h=f0aa3ce978f437c854b66b49cbedc9b248760a05;hb=df2f7b39dd4e4879976fb40b67fa3087e828a6ce;hp=a14d1e8c6ddadb2638160bafa41f9890e611d4ba;hpb=dec23500d8988c22a99f049ef1d1e49328ba075a;p=akkoma
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index a14d1e8c6..f0aa3ce97 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Activity do
@@ -8,6 +8,7 @@ defmodule Pleroma.Activity do
import Ecto.Query
@type t :: %__MODULE__{}
+ @primary_key {:id, Pleroma.FlakeId, autogenerate: true}
# https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19
@mastodon_notification_types %{
@@ -36,10 +37,11 @@ defmodule Pleroma.Activity do
)
end
- # TODO:
- # Go through these and fix them everywhere.
- # Wrong name, only returns create activities
- def all_by_object_ap_id_q(ap_id) do
+ def get_by_id(id) do
+ Repo.get(Activity, id)
+ end
+
+ def by_object_ap_id(ap_id) do
from(
activity in Activity,
where:
@@ -48,57 +50,55 @@ defmodule Pleroma.Activity do
activity.data,
activity.data,
^to_string(ap_id)
- ),
- where: fragment("(?)->>'type' = 'Create'", activity.data)
+ )
)
end
- # Wrong name, returns all.
- def all_non_create_by_object_ap_id_q(ap_id) do
+ def create_by_object_ap_id(ap_ids) when is_list(ap_ids) do
from(
activity in Activity,
where:
fragment(
- "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+ "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
activity.data,
activity.data,
- ^to_string(ap_id)
- )
+ ^ap_ids
+ ),
+ where: fragment("(?)->>'type' = 'Create'", activity.data)
)
end
- # Wrong name plz fix thx
- def all_by_object_ap_id(ap_id) do
- Repo.all(all_by_object_ap_id_q(ap_id))
- end
-
- def create_activity_by_object_id_query(ap_ids) do
+ def create_by_object_ap_id(ap_id) do
from(
activity in Activity,
where:
fragment(
- "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
+ "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
activity.data,
activity.data,
- ^ap_ids
+ ^to_string(ap_id)
),
where: fragment("(?)->>'type' = 'Create'", activity.data)
)
end
- def get_create_activity_by_object_ap_id(ap_id) when is_binary(ap_id) do
- create_activity_by_object_id_query([ap_id])
+ def get_all_create_by_object_ap_id(ap_id) do
+ Repo.all(create_by_object_ap_id(ap_id))
+ end
+
+ def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
+ create_by_object_ap_id(ap_id)
|> Repo.one()
end
- def get_create_activity_by_object_ap_id(_), do: nil
+ def get_create_by_object_ap_id(_), do: nil
def normalize(obj) when is_map(obj), do: Activity.get_by_ap_id(obj["id"])
def normalize(ap_id) when is_binary(ap_id), do: Activity.get_by_ap_id(ap_id)
def normalize(_), do: nil
def get_in_reply_to_activity(%Activity{data: %{"object" => %{"inReplyTo" => ap_id}}}) do
- get_create_activity_by_object_ap_id(ap_id)
+ get_create_by_object_ap_id(ap_id)
end
def get_in_reply_to_activity(_), do: nil