diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-26 16:13:07 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-26 16:16:30 +0300 |
| commit | 3d722dc2008ab7e5dde4b474bb038a1857a28d85 (patch) | |
| tree | 53c05aaea7626ec1f4782dd33eee779bb38d8730 /lib/pleroma/web/oauth | |
| parent | d75d0ae134e0a8de9504507f4c78567b9eedcc72 (diff) | |
| parent | 6abe12dceda8d0d32878208987a9631d5d546a3d (diff) | |
| download | pleroma-3d722dc2008ab7e5dde4b474bb038a1857a28d85.tar.gz | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'lib/pleroma/web/oauth')
| -rw-r--r-- | lib/pleroma/web/oauth/authorization.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/oauth/token.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/authorization.ex b/lib/pleroma/web/oauth/authorization.ex index d53e20d12..ed42a34f3 100644 --- a/lib/pleroma/web/oauth/authorization.ex +++ b/lib/pleroma/web/oauth/authorization.ex @@ -20,7 +20,7 @@ defmodule Pleroma.Web.OAuth.Authorization do field(:scopes, {:array, :string}, default: []) field(:valid_until, :naive_datetime_usec) field(:used, :boolean, default: false) - belongs_to(:user, User, type: Pleroma.FlakeId) + belongs_to(:user, User, type: FlakeId.Ecto.CompatType) belongs_to(:app, App) timestamps() diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex index 40f131b57..8ea373805 100644 --- a/lib/pleroma/web/oauth/token.ex +++ b/lib/pleroma/web/oauth/token.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Web.OAuth.Token do field(:refresh_token, :string) field(:scopes, {:array, :string}, default: []) field(:valid_until, :naive_datetime_usec) - belongs_to(:user, User, type: Pleroma.FlakeId) + belongs_to(:user, User, type: FlakeId.Ecto.CompatType) belongs_to(:app, App) timestamps() |