Merge branch 'merge-upstream' into 'develop'

Birthdays: Fix outgoing federation of birth dates See merge request soapbox-pub/soapbox!89
2022-02-01 15:47:43 +00:00 · 2022-02-01 15:47:43 +00:00 · d683d6d4f3
commit d683d6d4f3
parent 87ae63a12c a87b7b3046
1 changed files with 2 additions and 2 deletions
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@ -93,8 +93,8 @@ def render("user.json", %{user: user}) do
      end

    birthday =
-      if user.show_birthday,
-        do: user.birthday,
+      if user.show_birthday && user.birthday,
+        do: Date.to_iso8601(user.birthday),
        else: nil

    %{