pleroma

commit: c589b8445f1479b25d31984176f3741def83bcaa
parent 454f892f37d7a940068f560583a5cf4f6fd28124
Author: tusooa <tusooa@kazv.moe>
Date:   Thu, 21 Jul 2022 21:27:16 +0000

Merge branch 'birthday_fix' into 'develop'

Allow to unset birthday

See merge request pleroma/pleroma!3702
Diffstat:
M
lib/pleroma/web/api_spec/operations/account_operation.ex
24
++++++++++++++++++++----
M
test/pleroma/web/mastodon_api/update_credentials_test.exs
14
++++++++++++++

2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -545,10 +545,18 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
           description: "Invite token required when the registrations aren't public"
         },
         birthday: %Schema{
-          type: :string,
           nullable: true,
           description: "User's birthday",
-          format: :date
+          anyOf: [
+            %Schema{
+              type: :string,
+              format: :date
+            },
+            %Schema{
+              type: :string,
+              maxLength: 0
+            }
+          ]
         },
         language: %Schema{
           type: :string,
@@ -733,10 +741,18 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
         },
         actor_type: ActorType,
         birthday: %Schema{
-          type: :string,
           nullable: true,
           description: "User's birthday",
-          format: :date
+          anyOf: [
+            %Schema{
+              type: :string,
+              format: :date
+            },
+            %Schema{
+              type: :string,
+              maxLength: 0
+            }
+          ]
         },
         show_birthday: %Schema{
           allOf: [BooleanLike],
diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs
@@ -390,6 +390,20 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
       assert user_data["source"]["pleroma"]["show_birthday"] == true
     end
 
+    test "unsets birth date", %{conn: conn} do
+      patch(conn, "/api/v1/accounts/update_credentials", %{
+        "birthday" => "2001-02-12"
+      })
+
+      res =
+        patch(conn, "/api/v1/accounts/update_credentials", %{
+          "birthday" => ""
+        })
+
+      assert user_data = json_response_and_validate_schema(res, 200)
+      assert user_data["pleroma"]["birthday"] == nil
+    end
+
     test "emojis in fields labels", %{conn: conn} do
       fields = [
         %{"name" => ":firefox:", "value" => "is best 2hu"},