diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 04:59:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 04:59:06 +0000 |
| commit | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (patch) | |
| tree | 33da1ceebc81b01a0afabc324c37fefd1352711d /lib/pleroma/user.ex | |
| parent | 9bf1a4234da5125d27c21fb2d4212377348ec123 (diff) | |
| parent | a3ba72d97849ba12a5ea4008bd0b97e80bdd588b (diff) | |
| download | pleroma-4df71cd88b2725f1838c2899b3078a74dbb0c33f.tar.gz | |
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 18137106e..b006f9f19 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -17,6 +17,8 @@ defmodule Pleroma.User do @type t :: %__MODULE__{} + @primary_key {:id, Pleroma.FlakeId, autogenerate: true} + @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])?)*$/ @strict_local_nickname_regex ~r/^[a-zA-Z\d]+$/ |