Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
f584a603
Commit
f584a603
authored
Nov 01, 2018
by
kaniini
Browse files
user: make User.delete() return data consistent with Object.delete()
parent
2c3bfd7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/mix/tasks/rm_user.ex
View file @
f584a603
...
...
@@ -7,7 +7,7 @@ def run([nickname]) 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
lib/pleroma/user.ex
View file @
f584a603
...
...
@@ -657,7 +657,7 @@ def delete(%User{} = user) do
end
end
)
:ok
{
:ok
,
user
}
end
def
html_filter_policy
(%
User
{
info:
%{
"no_rich_text"
=>
true
}})
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment