alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-the-build' into 'develop' 

Group def perform() together to fix the build

See merge request pleroma/pleroma!1151
This commit is contained in:
lambda 2019-05-14 17:40:08 +00:00
parent fa4bd898f1 1caa6331ea
commit 8e721706c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/user.ex
View File

@ -1014,8 +1014,6 @@ def deactivate_async(user, status \\ true) 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 @@ def perform(:fetch_initial_posts, %User{} = 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