Merge branch 'master' into close_profiles

VKAPI/Handlers/Account.php

@@ -14,6 +14,7 @@ final class Account extends VKAPIRequestHandler
             "last_name"        => $this->getUser()->getLastName(),
             "home_town"        => $this->getUser()->getHometown(),
             "status"           => $this->getUser()->getStatus(),
+            "audio_status"     => is_null($this->getUser()->getCurrentAudioStatus()) ? NULL : $this->getUser()->getCurrentAudioStatus()->toVkApiStruct($this->getUser()),
             "bdate"            => is_null($this->getUser()->getBirthday()) ? '01.01.1970' : $this->getUser()->getBirthday()->format('%e.%m.%Y'),
             "bdate_visibility" => $this->getUser()->getBirthdayPrivacy(),
             "phone"            => "+420 ** *** 228",                       # TODO

VKAPI/Handlers/Users.php

@@ -2,6 +2,7 @@
 namespace openvk\VKAPI\Handlers;
 use openvk\Web\Models\Entities\{User, Report};
 use openvk\Web\Models\Repositories\Users as UsersRepo;
+use openvk\Web\Models\Repositories\{Photos, Clubs, Albums, Videos, Notes, Audios};
 use openvk\Web\Models\Repositories\Reports;
 
 final class Users extends VKAPIRequestHandler
@@ -61,7 +62,7 @@ final class Users extends VKAPIRequestHandler
 								$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;
@@ -236,6 +237,15 @@ final class Users extends VKAPIRequestHandler
 
 								$response[$i]->rating = $usr->getRating();
 								break;
+							case "counters":
+								$response[$i]->counters = (object) [
+									"friends_count" => $usr->getFriendsCount(),
+									"photos_count" => (new Albums)->getUserPhotosCount($usr),
+									"videos_count" => (new Videos)->getUserVideosCount($usr),
+									"audios_count" => (new Audios)->getUserCollectionSize($usr),
+									"notes_count" => (new Notes)->getUserNotesCount($usr)
+								];
+								break;
 						}
 					}
 

VKAPI/Handlers/Wall.php

@@ -239,7 +239,7 @@ final class Wall extends VKAPIRequestHandler
                     "last_name"         => $user->getLastName(),
                     "can_access_closed" => (bool)$user->canBeViewedBy($this->getUser()),
                     "is_closed"         => $user->isClosed(),
-                    "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(),
@@ -442,19 +442,28 @@ final class Wall extends VKAPIRequestHandler
 
             foreach($profiles as $prof) {
                 $user                = (new UsersRepo)->get($prof);
-                $profilesFormatted[] = (object)[
-                    "first_name"        => $user->getFirstName(),
-                    "id"                => $user->getId(),
-                    "last_name"         => $user->getLastName(),
-                    "can_access_closed" => (bool)$user->canBeViewedBy($this->getUser()),
-                    "is_closed"         => $user->isClosed(),
-                    "sex"               => $user->isFemale() ? 1 : 2,
-                    "screen_name"       => $user->getShortCode(),
-                    "photo_50"          => $user->getAvatarUrl(),
-                    "photo_100"         => $user->getAvatarUrl(),
-                    "online"            => $user->isOnline(),
-                    "verified"          => $user->isVerified()
-                ];
+                if($user) {
+                    $profilesFormatted[] = (object)[
+                        "first_name"        => $user->getFirstName(),
+                        "id"                => $user->getId(),
+                        "last_name"         => $user->getLastName(),
+                        "can_access_closed" => (bool)$user->canBeViewedBy($this->getUser()),
+                        "is_closed"         => $user->isClosed(),
+                        "sex"               => $user->isFemale() ? 1 : 2,
+                        "screen_name"       => $user->getShortCode(),
+                        "photo_50"          => $user->getAvatarUrl(),
+                        "photo_100"         => $user->getAvatarUrl(),
+                        "online"            => $user->isOnline(),
+                        "verified"          => $user->isVerified()
+                    ];
+                } else {
+                    $profilesFormatted[] = (object)[
+                        "id" 		  => (int) $prof,
+                        "first_name"  => "DELETED",
+                        "last_name"   => "",
+                        "deactivated" => "deleted"
+                    ];
+                }
             }
 
             foreach($groups as $g) {

Web/Models/Entities/User.php

@@ -798,7 +798,29 @@ class User extends RowModel
 
     function isFemale(): bool
     {
-        return (bool) $this->getRecord()->sex;
+        return $this->getRecord()->sex == 1;
+    }
+
+    function isNeutral(): bool
+    {
+        return (bool) $this->getRecord()->sex == 2;
+    }
+
+    function getLocalizedPronouns(): string
+    {
+        switch ($this->getRecord()->sex) {
+            case 0:
+                return tr('male');
+            case 1:
+                return tr('female');
+            case 2:
+                return tr('neutral');
+        }
+    }
+
+    function getPronouns(): int
+    {
+        return $this->getRecord()->sex;
     }
 
     function isVerified(): bool

Web/Presenters/AuthPresenter.php

@@ -95,7 +95,17 @@ final class AuthPresenter extends OpenVKPresenter
                 $user = new User;
                 $user->setFirst_Name($this->postParam("first_name"));
                 $user->setLast_Name($this->postParam("last_name"));
-                $user->setSex((int)($this->postParam("sex") === "female"));
+                switch ($this->postParam("pronouns")) {
+                    case 'male':
+                        $user->setSex(0);
+                        break;
+                    case 'female':
+                        $user->setSex(1);
+                        break;
+                    case 'neutral':
+                        $user->setSex(2);
+                        break;
+                }
                 $user->setEmail($this->postParam("email"));
                 $user->setSince(date("Y-m-d H:i:s"));
                 $user->setRegistering_Ip(CONNECTING_IP);

Web/Presenters/UserPresenter.php

@@ -187,8 +187,18 @@ final class UserPresenter extends OpenVKPresenter
                 if ($this->postParam("politViews") <= 9 && $this->postParam("politViews") >= 0)
                 $user->setPolit_Views($this->postParam("politViews"));
                 
-                if ($this->postParam("gender") <= 1 && $this->postParam("gender") >= 0)
-                $user->setSex($this->postParam("gender"));
+                if ($this->postParam("pronouns") <= 2 && $this->postParam("pronouns") >= 0)
+                switch ($this->postParam("pronouns")) {
+                    case '0':
+                        $user->setSex(0);
+                        break;
+                    case '1':
+                        $user->setSex(1);
+                        break;
+                    case '2':
+                        $user->setSex(2);
+                        break;
+                }
                 $user->setAudio_broadcast_enabled($this->checkbox("broadcast_music"));
                 
                 if(!empty($this->postParam("phone")) && $this->postParam("phone") !== $user->getPhone()) {

Web/Presenters/templates/Auth/Register.xml

@@ -91,13 +91,13 @@
                     </tr>
                     <tr>
                         <td class="regform-left">
-                            <span class="nobold">{_gender}: </span>
+                            <span class="nobold">{_pronouns}: </span>
                         </td>
                         <td class="regform-right">
-                            {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]}
-                            <select name="sex" required>
-                                <option n:attr="selected => !$femalePreferred" value="male">{_male}</option>
-                                <option n:attr="selected => $femalePreferred" value="female">{_female}</option>
+                            <select name="pronouns" required>
+                                <option value="male">{_male}</option>
+                                <option value="female">{_female}</option>
+                                <option value="neutral">{_neutral}</option>
                             </select>
                         </td>
                     </tr>

Web/Presenters/templates/Notification/Feed.xml

@@ -21,6 +21,7 @@
 </div>
 {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
 {if sizeof($data) > 0}
+<div>
     <table class="post post-divider" border="0" style="font-size: 11px;" n:foreach="$data as $dat">
         <tbody>
             <tr>
@@ -44,6 +45,7 @@
             </tr>
         </tbody>
     </table>
+</div>
         {include "../components/paginator.xml", conf => (object) [
             "page"     => $page,
             "count"    => $count,

Web/Presenters/templates/Search/Index.xml

@@ -94,8 +94,8 @@
                 {/if}    
                 {if $x->getPrivacySetting("page.info.read") > 1}        
                 <tr>
-                    <td><span class="nobold">{_gender}: </span></td>
-                    <td>{$x->isFemale() ? tr("female") : tr("male")}</td>
+                    <td><span class="nobold">{_pronouns}: </span></td>
+                    <td>{$x->isFemale() ? tr("female") : ($x->isNeutral() ? tr("neutral") : tr("male"))}</td>
                 </tr>
                 <tr>
                     <td><span class="nobold">{_relationship}:</span></td>
@@ -308,14 +308,14 @@
             </div>
         </div>
 
-        <div class="searchOption">
+        <!-- <div class="searchOption">
             <div class="searchOptionName" id="n_gender" onclick="hideParams('gender')"><img src="/assets/packages/static/openvk/img/hide.png" class="searchHide">{_gender}</div>
             <div class="searchOptionBlock" id="s_gender">
                 <p><input type="radio" form="searcher" id="gend" {if $_GET['gender'] == 0}checked{/if} name="gender" value="0">{_male}</p>
                 <p><input type="radio" form="searcher" id="gend1"{if $_GET['gender'] == 1}checked{/if} name="gender" value="1">{_female}</p>
                 <p><input type="radio" form="searcher" id="gend2"{if $_GET['gender'] == 2 || is_null($_GET['gender'])}checked{/if} name="gender" value="2">{_s_any}</p>
             </div>
-        </div>
+        </div> -->
 
         <div class="searchOption">
             <div class="searchOptionName" id="n_relationship" onclick="hideParams('relationship')"><img src="/assets/packages/static/openvk/img/hide.png" class="searchHide">{ovk_proc_strtr(tr("relationship"), 14)}</div>

Web/Presenters/templates/User/Edit.xml

@@ -139,12 +139,13 @@
                     </tr>
                     <tr>
                         <td width="120" valign="top">
-                            <span class="nobold">{_gender}: </span>
+                            <span class="nobold">{_pronouns}: </span>
                         </td>
                         <td>
-                            <select name="gender">
-                                <option value="1" {if $user->isFemale() == true}selected{/if}>{_female}</option>
-                                <option value="0" {if $user->isFemale() == false}selected{/if}>{_male}</option>
+                            <select name="pronouns">
+                                <option value="0" {if $user->getPronouns() == 0}selected{/if}>{_male}</option>
+                                <option value="1" {if $user->getPronouns() == 1}selected{/if}>{_female}</option>
+                                <option value="2" {if $user->getPronouns() == 2}selected{/if}>{_neutral}</option>
                             </select>
                         </td>
                     </tr>

Web/Presenters/templates/User/View.xml

@@ -451,8 +451,8 @@
                 <table id="basicInfo" class="ugc-table" border="0" cellspacing="0" cellpadding="0" border="0" cellspacing="0" cellpadding="0" n:if=" $user->getPrivacyPermission('page.info.read', $thisUser ?? NULL)">
                     <tbody>
                         <tr>
-                            <td class="label"><span class="nobold">{_gender}: </span></td>
-                            <td class="data">{$user->isFemale() ? tr("female") : tr("male")}</td>
+                            <td class="label"><span class="nobold">{_pronouns}: </span></td>
+                            <td class="data">{$user->isFemale() ? tr("female") : ($user->isNeutral() ? tr("neutral") : tr("male"))}</td>
                         </tr>
                         <tr>
                             <td class="label"><span class="nobold">{_relationship}:</span></td>

Web/Presenters/templates/components/post/microblogpost.xml

@@ -26,8 +26,8 @@
                 <div class="post-author">
                     <a href="{$author->getURL()}"><b class="post-author-name">{$author->getCanonicalName()}</b></a>
                     <img n:if="$author->isVerified()" class="name-checkmark" src="/assets/packages/static/openvk/img/checkmark.png">
-                    {$post->isDeactivationMessage() ? ($author->isFemale() ? tr($deac . "_f") : tr($deac . "_m"))}
-                    {$post->isUpdateAvatarMessage() && !$post->isPostedOnBehalfOfGroup() ? ($author->isFemale() ? tr("upd_f") : tr("upd_m"))}
+                    {$post->isDeactivationMessage() ? ($author->isFemale() ? tr($deac . "_f") : ($author->isNeutral() ? tr($deac . "_g") : tr($deac . "_m")))}
+                    {$post->isUpdateAvatarMessage() && !$post->isPostedOnBehalfOfGroup() ? ($author->isFemale() ? tr("upd_f") : ($author->isNeutral() ? tr("upd_n") : tr("upd_m")))}
                     {$post->isUpdateAvatarMessage() && $post->isPostedOnBehalfOfGroup() ? tr("upd_g") : ""}
                     {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()}
                         {var $wallOwner = $post->getWallOwner()}

Web/Presenters/templates/components/post/oldpost.xml

@@ -33,6 +33,8 @@
                     {else}
                         {if $author->isFemale()}
                             {_post_writes_f}
+                        {elseif $author->isNeutral()}
+                            {_post_writes_g}
                         {else}
                             {_post_writes_m}
                         {/if}

Web/static/js/al_despacito_wall.js

@@ -1,6 +1,10 @@
 const contentPage = document.querySelector(".page_content");
 const rootElement = document.documentElement;
 
+// охуенное название файла, КТО ЭТО ПРИДУМАЛ КРАСАВА Я ИЗ КОМНАТЫ С ЭТОГО УЛЕТЕЛ НАХУЙ
+
+let scrolledAndHidden = false;
+
 let smallBlockObserver = new IntersectionObserver(entries => {
     entries.forEach(x => {
         window.requestAnimationFrame(() => {
@@ -10,10 +14,14 @@ let smallBlockObserver = new IntersectionObserver(entries => {
             else
                 contentPage.classList.add("overscrolled");
 
-            let currentHeight = contentPage.getBoundingClientRect().height;
-            let ratio         = currentHeight / pastHeight;
+            // let currentHeight = contentPage.getBoundingClientRect().height;
+            // let ratio         = currentHeight / pastHeight;
 
-            rootElement.scrollTop *= ratio;
+            // rootElement.scrollTop *= ratio;
+
+            // То что я задокументировал - работает мегакриво.
+            // Пусть юзер и проскролливает какую-то часть контента, зато не получит
+            // эпилепсии при использовании :)
         }, contentPage);
     });
 }, {

bootstrap.php

@@ -22,6 +22,7 @@ function _ovk_check_environment(): void
         "fileinfo",
         "PDO",
         "pdo_mysql",
+        "pdo_sqlite",
         "pcre",
         "hash",
         "curl",

locales/en.strings

@@ -72,9 +72,10 @@
 "change_status" = "change status";
 "name" = "Name";
 "surname" = "Surname";
-"gender" = "Sex";
-"male" = "male";
-"female" = "female";
+"pronouns" = "Pronouns";
+"male" = "he/him";
+"female" = "she/her";
+"neutral" = "they/them";
 "description" = "Description";
 "save" = "Save";
 "main_information" = "Main information";
@@ -183,8 +184,10 @@
 "post_writes_g" = "published";
 "post_deact_m" = "deleted his profile saying:";
 "post_deact_f" = "deleted her profile saying:";
+"post_deact_g" = "deleted they profile saying:";
 "post_deact_silent_m" = "silently deleted his profile.";
 "post_deact_silent_f" = "silently deleted her profile.";
+"post_deact_silent_f" = "silently deleted they profile.";
 "post_on_your_wall" = "on your wall";
 "post_on_group_wall" = "in $1";
 "post_on_user_wall" = "on $1's wall";

locales/ru.strings

@@ -62,9 +62,10 @@
 "change_status" = "изменить статус";
 "name" = "Имя";
 "surname" = "Фамилия";
-"gender" = "Пол";
-"male" = "мужской";
-"female" = "женский";
+"pronouns" = "Местоимения";
+"male" = "он/его";
+"female" = "она/её";
+"neutral" = "они/их";
 "description" = "Описание";
 "save" = "Сохранить";
 "main_information" = "Основная информация";
@@ -168,8 +169,10 @@
 "post_writes_g" = "опубликовали";
 "post_deact_m" = "удалил страницу со словами:";
 "post_deact_f" = "удалила страницу со словами:";
+"post_deact_g" = "удалили страницу со словами:";
 "post_deact_silent_m" = "молча удалил свою страницу.";
 "post_deact_silent_f" = "молча удалила свою страницу.";
+"post_deact_silent_g" = "молча удалили свою страницу.";
 "post_on_your_wall" = "на вашей стене";
 "post_on_group_wall" = "в $1";
 "post_on_user_wall" = "на стене $1";
@@ -462,6 +465,7 @@
 
 "upd_m" = "обновил фотографию на своей странице";
 "upd_f" = "обновила фотографию на своей странице";
+"upd_n" = "обновили фотографию на своей странице";
 "upd_g" = "обновило фотографию группы";
 
 "add_photos" = "Добавить фотографии";

locales/uk.strings

@@ -64,9 +64,10 @@
 "change_status" = "змінити статус";
 "name" = "Ім’я";
 "surname" = "Прізвище";
-"gender" = "Стать";
-"male" = "Чоловіча";
-"female" = "Жіноча";
+"pronouns" = "Займенники";
+"male" = "він/його";
+"female" = "вона/її";
+"neutral" = "вони/їх";
 "description" = "Опис";
 "save" = "Зберегти";
 "main_information" = "Основна інформація";
@@ -147,8 +148,10 @@
 "post_writes_g" = "опублікували";
 "post_deact_m" = "видалив сторінку зі словами:";
 "post_deact_f" = "видалила сторінку зі словами:";
+"post_deact_g" = "видалили сторінку зі словами:";
 "post_deact_silent_m" = "мовчки видалив свою сторінку.";
 "post_deact_silent_f" = "мовчки видалила свою сторінку.";
+"post_deact_silent_g" = "мовчки видалили свою сторінку.";
 "post_on_your_wall" = "на вашій стіні";
 "post_on_group_wall" = "в $1";
 "post_on_user_wall" = "на стіні $1";

themepacks/openvk_modern/stylesheet.css

@@ -13,14 +13,14 @@ body {
     background: #3C3C3C url("/themepack/openvk_modern/0.0.1.0/resource/2.png") no-repeat;
     background-size: 80%;
     background-position-y: 0px;
-    background-position-x: 2px;
+    background-position-x: 1px;
 }
 
 .home_button_custom {
     background: #3C3C3C url("/themepack/openvk_modern/0.0.1.0/resource/4.png") no-repeat;
     background-size: 80%;
     background-position-y: 0px;
-    background-position-x: 2px;
+    background-position-x: 1px;
     text-shadow: none;
 }
 
@@ -160,8 +160,9 @@ body {
 
 input[type="text"], input[type="password"], input[type~="text"],
 input[type~="password"], input[type="email"], input[type="phone"],
-input[type~="email"], input[type~="phone"], input[type="search"],
-input[type~="search"], textarea, select {
+input[type~="email"], input[type~="phone"], input[type="date"],
+input[type~="date"], input[type="search"], input[type~="search"],
+textarea, select {
     border: 1px solid #E5E5E5;
 }
 
@@ -169,6 +170,11 @@ input[type=checkbox] {
 	background-image: url("/themepack/openvk_modern/0.0.1.0/resource/6.png")
 }
 
+ul {
+	list-style: none;
+	list-style-type: disc;
+}
+
 .mb_tab#active div {
     border: 2px solid #898989;
 }
@@ -335,11 +341,11 @@ input[type=checkbox] {
 }
 
 .musicIcon {
-    filter: contrast(202%) !important;
+    filter: contrast(200%) !important;
 }
 
 .audioEntry .playerButton .playIcon {
-    filter: contrast(7) !important;
+    filter: contrast(2) !important;
 }
 
 .audioEmbed .track > .selectableTrack, .bigPlayer .selectableTrack {