aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 00:28:16 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-23 00:28:16 +0000
commita6973a668e40645f9c0940a4fb5aeee45003b66f (patch)
tree9949d9dbddf3d7f8a2c21df43ad7e34dada0af93 /lib
parent59518cbcd8bcc0fe98f2d05ef88d3e2ff68a256f (diff)
downloadpleroma-a6973a668e40645f9c0940a4fb5aeee45003b66f.tar.gz
formatting
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/activity.ex11
-rw-r--r--lib/pleroma/web/common_api/common_api.ex3
-rw-r--r--lib/pleroma/web/common_api/utils.ex3
3 files changed, 10 insertions, 7 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index f041d0e53..a762d66ef 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -59,11 +59,12 @@ defmodule Pleroma.Activity do
:inner,
[activity],
o in Object,
- on: fragment(
- "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)",
- o.data,
- activity.data
- )
+ on:
+ fragment(
+ "(?->>'id') = COALESCE((? -> 'object'::text) ->> 'id'::text)",
+ o.data,
+ activity.data
+ )
)
|> preload([activity, object], object: object)
end
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 8625f6621..25b990677 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -63,7 +63,8 @@ defmodule Pleroma.Web.CommonAPI do
end
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),
true <- User.superuser?(user) || user.ap_id == object.data["actor"],
{:ok, _} <- unpin(activity_id, user),
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 6a94c2d26..f596f703b 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -17,7 +17,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere.
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 &&
if activity.data["type"] == "Create" do