diff options
author | kaniini <ariadne@dereferenced.org> | 2019-10-04 22:11:34 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 22:11:34 +0000 |
commit | 43be47c16136363506fda9e013df5ea19a5cb0e5 (patch) | |
tree | d0c0c076c0def555be8f2fbeb94f292c2070560e /lib/pleroma/registration.ex | |
parent | 15513f02d09bf6fe4df293db7ac8425df2c6ecd2 (diff) | |
parent | c19e539d37dbc4289c6cf459db4512be9f9394a2 (diff) | |
download | pleroma-43be47c16136363506fda9e013df5ea19a5cb0e5.tar.gz |
Merge branch 'backport/hex-flake-id' into 'maint/1.1'
backport: hex `flake_id` support
See merge request pleroma/pleroma!1793
Diffstat (limited to 'lib/pleroma/registration.ex')
-rw-r--r-- | lib/pleroma/registration.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/registration.ex b/lib/pleroma/registration.ex index 21fd1fc3f..8544461db 100644 --- a/lib/pleroma/registration.ex +++ b/lib/pleroma/registration.ex @@ -11,10 +11,10 @@ defmodule Pleroma.Registration do alias Pleroma.Repo alias Pleroma.User - @primary_key {:id, Pleroma.FlakeId, autogenerate: true} + @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true} schema "registrations" do - belongs_to(:user, User, type: Pleroma.FlakeId) + belongs_to(:user, User, type: FlakeId.Ecto.CompatType) field(:provider, :string) field(:uid, :string) field(:info, :map, default: %{}) |