From 597f56b4c4db3c63ff66fc93717d3b20655e1543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 16 Jul 2022 16:09:47 +0200 Subject: Use :utc_datetime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- lib/pleroma/user.ex | 4 ++-- lib/pleroma/user_relationship.ex | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 88837b91a..44754879a 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1463,8 +1463,8 @@ defmodule Pleroma.User do expires_at = if expires_in > 0 do - NaiveDateTime.utc_now() - |> NaiveDateTime.add(expires_in) + DateTime.utc_now() + |> DateTime.add(expires_in) else nil end diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex index f35f3ac63..5b3e593d3 100644 --- a/lib/pleroma/user_relationship.ex +++ b/lib/pleroma/user_relationship.ex @@ -18,7 +18,7 @@ defmodule Pleroma.UserRelationship do belongs_to(:source, User, type: FlakeId.Ecto.CompatType) belongs_to(:target, User, type: FlakeId.Ecto.CompatType) field(:relationship_type, Pleroma.UserRelationship.Type) - field(:expires_at, :naive_datetime) + field(:expires_at, :utc_datetime) timestamps(updated_at: false) end -- cgit v1.2.3