aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/activity.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-03-21 16:24:57 +0000
committerrinpatch <rinpatch@sdf.org>2019-03-21 16:24:57 +0000
commitb92a16aa006dd7ec26397b6fcd111c8f8f843a9c (patch)
tree843acb85e9df0bfd03c4596cef7d33993cd4d96e /lib/pleroma/activity.ex
parentb68fb3dc172a2cb13c07d7e42351947ecade1e3b (diff)
parente59cfa7cacd48d699e42b63eb9ec9503d72083a2 (diff)
downloadpleroma-b92a16aa006dd7ec26397b6fcd111c8f8f843a9c.tar.gz
Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957
Diffstat (limited to 'lib/pleroma/activity.ex')
-rw-r--r--lib/pleroma/activity.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index de0e66681..04c3bb673 100644
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -113,7 +113,8 @@ defmodule Pleroma.Activity do
def delete_by_ap_id(id) when is_binary(id) do
by_object_ap_id(id)
- |> Repo.delete_all(returning: true)
+ |> select([u], u)
+ |> Repo.delete_all()
|> elem(1)
|> Enum.find(fn
%{data: %{"type" => "Create", "object" => %{"id" => ap_id}}} -> ap_id == id