X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=b2f59ab6b61abc7a55df3fdd533a52c317635d85;hb=9f03b5c4f773d0ee969a100c30bd6c1a885bebc5;hp=0c9fa559a21944c3bf29aa98d6aa7fce2296a8c5;hpb=1b480e351405a4f987e0ba21bfe845cef7ff36de;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 0c9fa559a..b2f59ab6b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -295,6 +295,7 @@ defmodule Pleroma.User do
   def invalidate_cache(user) do
     Cachex.del(:user_cache, "ap_id:#{user.ap_id}")
     Cachex.del(:user_cache, "nickname:#{user.nickname}")
+    Cachex.del(:user_cache, "user_info:#{user.id}")
   end
 
   def get_cached_by_ap_id(ap_id) do
@@ -622,8 +623,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
@@ -656,7 +657,7 @@ defmodule Pleroma.User do
       end
     end)
 
-    :ok
+    {:ok, user}
   end
 
   def html_filter_policy(%User{info: %{"no_rich_text" => true}}) do