diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-09-18 21:54:31 +0700 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-10-04 21:59:17 +0000 |
| commit | 67d772dd73af7adb2dfb912298c194fa796a72f9 (patch) | |
| tree | 8d1373986dceb4af24cdb86bf9bc5f53dc16615b /lib/pleroma/user.ex | |
| parent | 1dd6d81ddf6a4d20830a7a9086e843b4aafda05f (diff) | |
| download | pleroma-67d772dd73af7adb2dfb912298c194fa796a72f9.tar.gz | |
Replace `Pleroma.FlakeId` with `flake_id` hex package
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 06cffbd60..2eba1f288 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -32,7 +32,7 @@ defmodule Pleroma.User do @type t :: %__MODULE__{} - @primary_key {:id, Pleroma.FlakeId, autogenerate: true} + @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true} # credo:disable-for-next-line Credo.Check.Readability.MaxLineLength @email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/ @@ -573,7 +573,7 @@ defmodule Pleroma.User do restrict_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) cond do - is_integer(nickname_or_id) or Pleroma.FlakeId.is_flake_id?(nickname_or_id) -> + is_integer(nickname_or_id) or FlakeId.flake_id?(nickname_or_id) -> get_cached_by_id(nickname_or_id) || get_cached_by_nickname(nickname_or_id) restrict_to_local == false or not String.contains?(nickname_or_id, "@") -> |