aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-05-14 17:40:08 +0000
committerlambda <lain@soykaf.club>2019-05-14 17:40:08 +0000
commit8e721706c2fd06f890c055cf4d13056c653a0aa6 (patch)
tree0b35f9a8ee26be86193ca14b1776de0a98b56210
parentfa4bd898f13ccf43b7a6400de04d2d0fcb0c00dc (diff)
parent1caa6331eaba71db5a04b2097ef06fd6e4a54739 (diff)
downloadpleroma-8e721706c2fd06f890c055cf4d13056c653a0aa6.tar.gz
Merge branch 'fix-the-build' into 'develop'
Group def perform() together to fix the build See merge request pleroma/pleroma!1151
-rw-r--r--lib/pleroma/user.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 19f91d63c..c6a562a61 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1014,8 +1014,6 @@ defmodule Pleroma.User do
PleromaJobQueue.enqueue(:background, __MODULE__, [:deactivate_async, user, status])
end
- def perform(:deactivate_async, user, status), do: deactivate(user, status)
-
def deactivate(%User{} = user, status \\ true) do
info_cng = User.Info.set_activation_status(user.info, status)
@@ -1074,6 +1072,8 @@ defmodule Pleroma.User do
{:ok, user}
end
+ def perform(:deactivate_async, user, status), do: deactivate(user, status)
+
@spec perform(atom(), User.t(), list()) :: list() | {:error, any()}
def perform(:blocks_import, %User{} = blocker, blocked_identifiers)
when is_list(blocked_identifiers) do