pleroma

commit: 5f74aadaaf6f8cbd31ce251a03729c8d5276409a
parent 2656199dc73c3febe595f8d55e34e30c6a94e1f6
Author: lain <lain@soykaf.club>
Date:   Thu,  7 Dec 2023 08:08:27 +0000

Merge branch 'last_status_at' into 'develop'

MastoAPI AccountView: Change last_status_at to be a date

See merge request pleroma/pleroma!3978
Diffstat:
A
changelog.d/last_status_at.change
2
++
M
lib/pleroma/web/mastodon_api/views/account_view.ex
8
++++++--
M
test/pleroma/web/mastodon_api/views/account_view_test.exs
5
+++--

3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changelog.d/last_status_at.change b/changelog.d/last_status_at.change
@@ -0,0 +1 @@
+- Change AccountView `last_status_at` from a datetime to a date (as done in Mastodon 3.1.0)
+\ No newline at end of file
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2023 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.AccountView do
@@ -249,6 +249,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
         nil
       end
 
+    last_status_at =
+      user.last_status_at &&
+        user.last_status_at |> NaiveDateTime.to_date() |> Date.to_iso8601()
+
     %{
       id: to_string(user.id),
       username: username_from_nickname(user.nickname),
@@ -277,7 +281,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
           actor_type: user.actor_type
         }
       },
-      last_status_at: user.last_status_at,
+      last_status_at: last_status_at,
 
       # Pleroma extensions
       # Note: it's insecure to output :email but fully-qualified nickname may serve as safe stub
diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -35,7 +35,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         inserted_at: ~N[2017-08-15 15:47:06.597036],
         emoji: %{"karjalanpiirakka" => "/file.png"},
         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"],
+        last_status_at: NaiveDateTime.utc_now()
       })
 
     expected = %{
@@ -74,7 +75,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
         fields: []
       },
       fqn: "shp@shitposter.club",
-      last_status_at: nil,
+      last_status_at: user.last_status_at |> NaiveDateTime.to_date() |> Date.to_iso8601(),
       pleroma: %{
         ap_id: user.ap_id,
         also_known_as: ["https://shitposter.zone/users/shp"],