YokaiRick/akkoma
1
0
Fork 1
forked from AkkomaGang/akkoma
Code Pull requests Activity

Merge pull request 'Return last_status_at as date, not datetime' (#681) from katafrakt/akkoma:fix-last-status-at into develop

Browse source 
Reviewed-on: AkkomaGang/akkoma#681
This commit is contained in:
floatingghost 2024-02-17 11:37:19 +00:00
commit 289f93f5a2
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -261,6 +261,9 @@ defp do_render("show.json", %{user: user} = opts) do
|> MediaProxy.url() |> MediaProxy.url()
end end
last_status_at =
if is_nil(user.last_status_at), do: nil, else: NaiveDateTime.to_date(user.last_status_at)
%{ %{
id: to_string(user.id), id: to_string(user.id),
username: username_from_nickname(user.nickname), username: username_from_nickname(user.nickname),
@ -289,7 +292,7 @@ defp do_render("show.json", %{user: user} = opts) do
actor_type: user.actor_type actor_type: user.actor_type
} }
}, },
last_status_at: user.last_status_at, last_status_at: last_status_at,
akkoma: %{ akkoma: %{
instance: render("instance.json", %{instance: instance}), instance: render("instance.json", %{instance: instance}),
status_ttl_days: user.status_ttl_days, status_ttl_days: user.status_ttl_days,

5
test/pleroma/web/mastodon_api/views/account_view_test.exs
View file

@ -40,7 +40,8 @@ test "Represent a user account" do
emoji: %{"karjalanpiirakka" => "/file.png"}, emoji: %{"karjalanpiirakka" => "/file.png"},
raw_bio: "valid html. a\nb\nc\nd\nf '&<>\"", raw_bio: "valid html. a\nb\nc\nd\nf '&<>\"",
also_known_as: ["https://shitposter.zone/users/shp"], also_known_as: ["https://shitposter.zone/users/shp"],
status_ttl_days: 5 status_ttl_days: 5,
last_status_at: ~N[2023-12-31T15:06:17]
}) })
insert(:instance, %{host: "example.com", nodeinfo: %{version: "2.1"}}) insert(:instance, %{host: "example.com", nodeinfo: %{version: "2.1"}})
@ -92,7 +93,7 @@ test "Represent a user account" do
fields: [] fields: []
}, },
fqn: "shp@shitposter.club", fqn: "shp@shitposter.club",
last_status_at: nil, last_status_at: ~D[2023-12-31],
pleroma: %{ pleroma: %{
ap_id: user.ap_id, ap_id: user.ap_id,
also_known_as: ["https://shitposter.zone/users/shp"], also_known_as: ["https://shitposter.zone/users/shp"],