diff options
author | kaniini <nenolod@gmail.com> | 2018-10-30 20:30:01 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-10-30 20:30:01 +0000 |
commit | c5948996f695d32c4d57c60562cc198956461bce (patch) | |
tree | ad29dab9b2c755e813b0258dcbf56b9a8f79ec69 /lib/pleroma/user.ex | |
parent | a880e0a5278110031ad14bfd5c24e8054e878d9d (diff) | |
parent | b92e38d2d4c05da19b00162d7ca35f1905b44a80 (diff) | |
download | pleroma-c5948996f695d32c4d57c60562cc198956461bce.tar.gz |
Merge branch 'reactivate' into 'develop'
Add user reactivation task.
Closes #338
See merge request pleroma/pleroma!404
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 0c9fa559a..bb5b91c61 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -622,8 +622,8 @@ defmodule Pleroma.User do ) end - def deactivate(%User{} = user) do - new_info = Map.put(user.info, "deactivated", true) + def deactivate(%User{} = user, status \\ true) do + new_info = Map.put(user.info, "deactivated", status) cs = User.info_changeset(user, %{info: new_info}) update_and_set_cache(cs) end |