a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use :utc_datetime 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-07-16 16:09:47 +02:00
parent 0b16ce79f9
commit 597f56b4c4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/user.ex
View File

@ -1463,8 +1463,8 @@ defmodule Pleroma.User do
expires_at = expires_at =
if expires_in > 0 do if expires_in > 0 do
NaiveDateTime.utc_now() DateTime.utc_now()
|> NaiveDateTime.add(expires_in) |> DateTime.add(expires_in)
else else
nil nil
end end

2
lib/pleroma/user_relationship.ex
View File

@ -18,7 +18,7 @@ defmodule Pleroma.UserRelationship do
belongs_to(:source, User, type: FlakeId.Ecto.CompatType) belongs_to(:source, User, type: FlakeId.Ecto.CompatType)
belongs_to(:target, User, type: FlakeId.Ecto.CompatType) belongs_to(:target, User, type: FlakeId.Ecto.CompatType)
field(:relationship_type, Pleroma.UserRelationship.Type) field(:relationship_type, Pleroma.UserRelationship.Type)
field(:expires_at, :naive_datetime) field(:expires_at, :utc_datetime)
timestamps(updated_at: false) timestamps(updated_at: false)
end end

2
priv/repo/migrations/20220616163503_add_expires_at_to_user_relationships.exs
View File

@ -7,7 +7,7 @@ defmodule Pleroma.Repo.Migrations.AddExpiresAtToUserRelationships do
def change do def change do
alter table(:user_relationships) do alter table(:user_relationships) do
add_if_not_exists(:expires_at, :naive_datetime) add_if_not_exists(:expires_at, :utc_datetime)
end end
end end
end end

4
test/pleroma/web/mastodon_api/views/account_view_test.exs
View File

@ -646,9 +646,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
mute_expires_at: mute_expires_at mute_expires_at: mute_expires_at
} = AccountView.render("show.json", %{user: other_user, for: user, mutes: true}) } = AccountView.render("show.json", %{user: other_user, for: user, mutes: true})
assert NaiveDateTime.diff( assert DateTime.diff(
mute_expires_at, mute_expires_at,
NaiveDateTime.utc_now() |> NaiveDateTime.add(24 * 60 * 60) DateTime.utc_now() |> DateTime.add(24 * 60 * 60)
) in -3..3 ) in -3..3
end end
end end