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_expiration.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_expiration.ex')
| -rw-r--r-- | lib/pleroma/activity_expiration.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/activity_expiration.ex b/lib/pleroma/activity_expiration.ex index bf57abca4..7ea5c48ca 100644 --- a/lib/pleroma/activity_expiration.ex +++ b/lib/pleroma/activity_expiration.ex @@ -7,7 +7,6 @@ defmodule Pleroma.ActivityExpiration do alias Pleroma.Activity alias Pleroma.ActivityExpiration - alias Pleroma.FlakeId alias Pleroma.Repo import Ecto.Changeset @@ -17,7 +16,7 @@ defmodule Pleroma.ActivityExpiration do @min_activity_lifetime :timer.hours(1) schema "activity_expirations" do - belongs_to(:activity, Activity, type: FlakeId) + belongs_to(:activity, Activity, type: FlakeId.Ecto.CompatType) field(:scheduled_at, :naive_datetime) end |