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/web/oauth | |
| 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/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 cc4b74bc5..f8c65602d 100644 --- a/lib/pleroma/web/oauth/authorization.ex +++ b/lib/pleroma/web/oauth/authorization.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.OAuth.Authorization do field(:token, :string) field(:valid_until, :naive_datetime) field(:used, :boolean, default: false) - belongs_to(:user, Pleroma.User) + belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId) belongs_to(:app, App) timestamps() diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex index f0ebc63f6..4e01b123b 100644 --- a/lib/pleroma/web/oauth/token.ex +++ b/lib/pleroma/web/oauth/token.ex @@ -14,7 +14,7 @@ defmodule Pleroma.Web.OAuth.Token do field(:token, :string) field(:refresh_token, :string) field(:valid_until, :naive_datetime) - belongs_to(:user, Pleroma.User) + belongs_to(:user, Pleroma.User, type: Pleroma.FlakeId) belongs_to(:app, App) timestamps() |