Skip to content
Snippets Groups Projects
Commit a6973a66 authored by kaniini's avatar kaniini
Browse files

formatting

parent 59518cbc
No related branches found
No related tags found
No related merge requests found
...@@ -59,11 +59,12 @@ defmodule Pleroma.Activity do ...@@ -59,11 +59,12 @@ defmodule Pleroma.Activity do
:inner, :inner,
[activity], [activity],
o in Object, o in Object,
on: fragment( on:
"(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)", fragment(
o.data, "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)",
activity.data o.data,
) activity.data
)
) )
|> preload([activity, object], object: object) |> preload([activity, object], object: object)
end end
......
...@@ -63,7 +63,8 @@ defmodule Pleroma.Web.CommonAPI do ...@@ -63,7 +63,8 @@ defmodule Pleroma.Web.CommonAPI do
end end
def delete(activity_id, user) do def delete(activity_id, user) do
with %Activity{data: %{"object" => _}} = activity <- Activity.get_by_id_with_object(activity_id), with %Activity{data: %{"object" => _}} = activity <-
Activity.get_by_id_with_object(activity_id),
%Object{} = object <- Object.normalize(activity), %Object{} = object <- Object.normalize(activity),
true <- User.superuser?(user) || user.ap_id == object.data["actor"], true <- User.superuser?(user) || user.ap_id == object.data["actor"],
{:ok, _} <- unpin(activity_id, user), {:ok, _} <- unpin(activity_id, user),
......
...@@ -17,7 +17,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do ...@@ -17,7 +17,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere. # This is a hack for twidere.
def get_by_id_or_ap_id(id) do def get_by_id_or_ap_id(id) do
activity = Activity.get_by_id_with_object(id) || Activity.get_create_by_object_ap_id_with_object(id) activity =
Activity.get_by_id_with_object(id) || Activity.get_create_by_object_ap_id_with_object(id)
activity && activity &&
if activity.data["type"] == "Create" do if activity.data["type"] == "Create" do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment