diff options
| author | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-03 12:55:29 +0200 |
| commit | 6fb96f64c13597bcf8d10f30442ac61610cec58e (patch) | |
| tree | 29db6b5d77a562dd496618ebcd54c15574f093a8 /lib/pleroma/web/pleroma_api | |
| parent | 4dfc617cdf1c2579f4f941dcd0fa5c728178df06 (diff) | |
| parent | 095635453ac58b9e01a32ad226c0b61466c16da0 (diff) | |
| download | pleroma-6fb96f64c13597bcf8d10f30442ac61610cec58e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete-validator
Diffstat (limited to 'lib/pleroma/web/pleroma_api')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex index 2c1874051..1bdb3aa4d 100644 --- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex @@ -61,7 +61,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do else users = Enum.map(user_ap_ids, &User.get_cached_by_ap_id/1) - |> Enum.filter(& &1) + |> Enum.filter(fn + %{deactivated: false} -> true + _ -> false + end) %{ name: emoji, |