diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-27 14:17:12 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-27 14:17:12 +0000 |
| commit | d35be02e7064da8ffce51fb10a937af30b145c7b (patch) | |
| tree | 190b66745954121399abbb225784b470984006ce /lib/pleroma/user.ex | |
| parent | 91f73a7592049ffe2b1a99e86c6f4ee51218c768 (diff) | |
| parent | 6bd7070b00a8d0ac64292f4c7152b71bee5f6b69 (diff) | |
| download | pleroma-d35be02e7064da8ffce51fb10a937af30b145c7b.tar.gz | |
Merge branch 'refactor-add-mention-step-one' into 'develop'
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 842b28c06..42c4c4e3e 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1208,8 +1208,9 @@ defmodule Pleroma.User do def increment_unread_conversation_count(_, user), do: {:ok, user} - @spec get_users_from_set([String.t()], boolean()) :: [User.t()] - def get_users_from_set(ap_ids, local_only \\ true) do + @spec get_users_from_set([String.t()], keyword()) :: [User.t()] + def get_users_from_set(ap_ids, opts \\ []) do + local_only = Keyword.get(opts, :local_only, true) criteria = %{ap_id: ap_ids, deactivated: false} criteria = if local_only, do: Map.put(criteria, :local, true), else: criteria |