aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-11-01 07:56:21 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-11-01 07:56:21 +0000
commitf584a603f95f95c7c8d2c1897b24b5c7399f4f74 (patch)
tree4004c4a4f3fd42d5512011709a7600d2783d7a31 /lib
parent2c3bfd7f76c2154ada70f1167023752e06ee595f (diff)
downloadpleroma-f584a603f95f95c7c8d2c1897b24b5c7399f4f74.tar.gz
user: make User.delete() return data consistent with Object.delete()
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/rm_user.ex2
-rw-r--r--lib/pleroma/user.ex2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex
index 27521b745..b7c922d6c 100644
--- a/lib/mix/tasks/rm_user.ex
+++ b/lib/mix/tasks/rm_user.ex
@@ -7,7 +7,7 @@ defmodule Mix.Tasks.RmUser do
Mix.Task.run("app.start")
with %User{local: true} = user <- User.get_by_nickname(nickname) do
- User.delete(user)
+ {:ok, _} = User.delete(user)
end
end
end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index f724f8a5b..b2f59ab6b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -657,7 +657,7 @@ defmodule Pleroma.User do
end
end)
- :ok
+ {:ok, user}
end
def html_filter_policy(%User{info: %{"no_rich_text" => true}}) do