projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index 96ddcc480866835e6a186ddde84fa2e7345f63b9..bed96861f893043f8651401fb6cc268aa91c2d5a 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-4,33
+4,53
@@
defmodule Pleroma.Activity do
import Ecto.Query
schema "activities" do
import Ecto.Query
schema "activities" do
- field
:data, :map
- field
:local, :boolean, default: true
- field
:actor, :string
- field
:recipients, {:array, :string}
- has_many
:notifications, Notification, on_delete: :delete_all
+ field
(:data, :map)
+ field
(:local, :boolean, default: true)
+ field
(:actor, :string)
+ field
(:recipients, {:array, :string})
+ has_many
(:notifications, Notification, on_delete: :delete_all)
timestamps()
end
def get_by_ap_id(ap_id) do
timestamps()
end
def get_by_ap_id(ap_id) do
- Repo.one(from activity in Activity,
- where: fragment("(?)->>'id' = ?", activity.data, ^to_string(ap_id)))
+ Repo.one(
+ from(
+ activity in Activity,
+ where: fragment("(?)->>'id' = ?", activity.data, ^to_string(ap_id))
+ )
+ )
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
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
- from activity in Activity,
- where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id)),
+ from(
+ activity in Activity,
+ where:
+ fragment(
+ "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+ activity.data,
+ activity.data,
+ ^to_string(ap_id)
+ ),
where: fragment("(?)->>'type' = 'Create'", activity.data)
where: fragment("(?)->>'type' = 'Create'", activity.data)
+ )
end
# Wrong name, returns all.
def all_non_create_by_object_ap_id_q(ap_id) do
end
# Wrong name, returns all.
def all_non_create_by_object_ap_id_q(ap_id) do
- from activity in Activity,
- where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ?", activity.data, activity.data, ^to_string(ap_id))
+ from(
+ activity in Activity,
+ where:
+ fragment(
+ "coalesce((?)->'object'->>'id', (?)->>'object') = ?",
+ activity.data,
+ activity.data,
+ ^to_string(ap_id)
+ )
+ )
end
# Wrong name plz fix thx
end
# Wrong name plz fix thx
@@
-39,13
+59,27
@@
defmodule Pleroma.Activity do
end
def create_activity_by_object_id_query(ap_ids) do
end
def create_activity_by_object_id_query(ap_ids) do
- from activity in Activity,
- where: fragment("coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)", activity.data, activity.data, ^ap_ids),
+ from(
+ activity in Activity,
+ where:
+ fragment(
+ "coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
+ activity.data,
+ activity.data,
+ ^ap_ids
+ ),
where: fragment("(?)->>'type' = 'Create'", activity.data)
where: fragment("(?)->>'type' = 'Create'", activity.data)
+ )
end
end
- def get_create_activity_by_object_ap_id(ap_id) do
+ def get_create_activity_by_object_ap_id(ap_id)
when is_binary(ap_id)
do
create_activity_by_object_id_query([ap_id])
create_activity_by_object_id_query([ap_id])
- |> Repo.one
+ |> Repo.one
()
end
end
+
+ def get_create_activity_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
end
end