diff --git a/VKAPI/Handlers/Users.php b/VKAPI/Handlers/Users.php index 6eccab1b5..c80f0a0ee 100644 --- a/VKAPI/Handlers/Users.php +++ b/VKAPI/Handlers/Users.php @@ -60,7 +60,7 @@ function get(string $user_ids = "0", string $fields = "", int $offset = 0, int $ $response[$i]->verified = intval($usr->isVerified()); break; case "sex": - $response[$i]->sex = $usr->isFemale() ? 1 : 2; + $response[$i]->sex = $usr->isFemale() ? 1 : ($usr->isNeutral() ? 0 : 2); break; case "has_photo": $response[$i]->has_photo = is_null($usr->getAvatarPhoto()) ? 0 : 1; diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index 693ca3cb3..7c293c2b3 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -170,7 +170,7 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3 "last_name" => $user->getLastName(), "can_access_closed" => false, "is_closed" => false, - "sex" => $user->isFemale() ? 1 : 2, + "sex" => $user->isFemale() ? 1 : ($user->isNeutral() ? 0 : 2), "screen_name" => $user->getShortCode(), "photo_50" => $user->getAvatarUrl(), "photo_100" => $user->getAvatarUrl(), @@ -349,7 +349,7 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us "last_name" => $user->getLastName(), "can_access_closed" => false, "is_closed" => false, - "sex" => $user->isFemale() ? 1 : 2, + "sex" => $user->isFemale() ? 1 : ($user->isNeutral() ? 0 : 2), "screen_name" => $user->getShortCode(), "photo_50" => $user->getAvatarUrl(), "photo_100" => $user->getAvatarUrl(), diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index d2ef6e2c5..6adf20f20 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -783,7 +783,7 @@ function getNsfwTolerance(): int function isFemale(): bool { - return (bool) $this->getRecord()->sex == 1; + return $this->getRecord()->sex == 1; } function isNeutral(): bool diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index d0534a0e9..41da61bf1 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -170,15 +170,16 @@ function renderEdit(): void if ($this->postParam("politViews") <= 9 && $this->postParam("politViews") >= 0) $user->setPolit_Views($this->postParam("politViews")); + bdump($this->postParam("pronouns")); if ($this->postParam("pronouns") <= 2 && $this->postParam("pronouns") >= 0) switch ($this->postParam("pronouns")) { - case 'male': + case '0': $user->setSex(0); break; - case 'female': + case '1': $user->setSex(1); break; - case 'neutral': + case '2': $user->setSex(2); break; } diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index acc1eab71..7f140e602 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -94,8 +94,8 @@ {/if} {if $x->getPrivacySetting("page.info.read") > 1}
{_gender}: | -{$user->isFemale() ? tr("female") : tr("male")} | +{_pronouns}: | +{$user->isFemale() ? tr("female") : ($user->isNeutral() ? tr("neutral") : tr("male"))} |
{_relationship}: | diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index 8dba32f4b..c2dfdfcc9 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -26,8 +26,8 @@