From 0ec14efa37d2fc399dd6ef7c64d0c8b4be4c3eab Mon Sep 17 00:00:00 2001
From: atsu1125 <atsuchan@atsuchan.page>
Date: Sat, 17 Dec 2022 12:57:23 +0900
Subject: [PATCH] Fix: Groundpolis Gender

---
 .../flavours/glitch/features/account/components/header.js     | 2 +-
 app/javascript/mastodon/features/account/components/header.js | 2 +-
 app/serializers/activitypub/actor_serializer.rb               | 2 +-
 app/services/activitypub/process_account_service.rb           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
index 200c5b075b46af..40fa7a13572bf2 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.js
+++ b/app/javascript/flavours/glitch/features/account/components/header.js
@@ -356,7 +356,7 @@ class Header extends ImmutablePureComponent {
                         <td><FormattedDate value={birthday} hour12={false} year='numeric' month='short' day='2-digit' />(<FormattedMessage id='account.age' defaultMessage='{age} years old}' values={{age: age(birthday)}} />)</td>
                       </tr>}
                       {sex && <tr>
-                        <th><Icon id='sexIcon' fixedWidth aria-hidden='true' /> <FormattedMessage id='account.sex' defaultMessage='Sex' /></th>
+                        <th><Icon id='venus' fixedWidth aria-hidden='true' /> <FormattedMessage id='account.sex' defaultMessage='Sex' /></th>
                         <td>{sex}</td>
                       </tr>}
                       <tr>
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 0fb23797b9ccc0..538d985cb9ab2f 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -356,7 +356,7 @@ class Header extends ImmutablePureComponent {
                       <td><FormattedDate value={birthday} hour12={false} year='numeric' month='short' day='2-digit' />(<FormattedMessage id='account.age' defaultMessage='{age} years old}' values={{age: age(birthday)}} />)</td>
                     </tr>}
                     {sex && <tr>
-                      <th><Icon id='sexIcon' fixedWidth aria-hidden='true' /> <FormattedMessage id='account.sex' defaultMessage='Sex' /></th>
+                      <th><Icon id='venus' fixedWidth aria-hidden='true' /> <FormattedMessage id='account.sex' defaultMessage='Sex' /></th>
                       <td>{sex}</td>
                     </tr>}
                     <tr>
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index f378b97820fd2a..ed8851c0bc20ab 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -27,7 +27,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   attribute :suspended, if: :suspended?
   attribute :bday, key: :'vcard:bday'
   attribute :address, key: :'vcard:Address'
-  attribute :gender, key: :'vcard:Gender'
+  attribute :gender, key: :'vcard:gender'
 
   has_many :virtual_other_settings, key: :other_setting
 
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index a60fc102584df0..ea8f3c09dd9906 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -224,8 +224,8 @@ def address
   end
 
   def gender
-    return {} if @json['vcard:Gender'].blank?
-    { 'sex' => @json['vcard:Gender'] }
+    return {} if @json['vcard:gender'].blank?
+    { 'sex' => @json['vcard:gender'] }
   end
 
   DEFER_SETTINGS_KEYS = %w(