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/activity.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/activity.ex')
| -rw-r--r-- | lib/pleroma/activity.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex index ec558168a..2c04a26f9 100644 --- a/lib/pleroma/activity.ex +++ b/lib/pleroma/activity.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Activity do @type t :: %__MODULE__{} @type actor :: String.t() - @primary_key {:id, Pleroma.FlakeId, autogenerate: true} + @primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true} # https://github.com/tootsuite/mastodon/blob/master/app/models/notification.rb#L19 @mastodon_notification_types %{ |