From 15b9000ee1e30765fc5b2dbf829f2a41ac1afefe Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 21:28:01 +0300
Subject: [PATCH 01/60] fix(video api): fix items bug

---
 VKAPI/Handlers/Video.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/VKAPI/Handlers/Video.php b/VKAPI/Handlers/Video.php
index f8cecf05..43d7a468 100755
--- a/VKAPI/Handlers/Video.php
+++ b/VKAPI/Handlers/Video.php
@@ -20,12 +20,18 @@ final class Video extends VKAPIRequestHandler
         $this->requireUser();
 
         if (!empty($videos)) {
-            $vids = explode(',', $videos);
+            $vids = array_unique(explode(',', $videos));
+
+            if (sizeof($vids) > 100) {
+                $this->fail(15, "Too many ids given");
+            }
+
             $profiles = [];
             $groups = [];
+            $items = [];
+
             foreach ($vids as $vid) {
                 $id    = explode("_", $vid);
-                $items = [];
 
                 $video = (new VideosRepo())->getByOwnerAndVID(intval($id[0]), intval($id[1]));
                 if ($video && !$video->isDeleted()) {

From 7c4743633ee49edf28e378c7061d7ab7f19a3d0c Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 21:31:42 +0300
Subject: [PATCH 02/60] feat(wall): remove hidePanel()

---
 Web/Presenters/templates/components/wall.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml
index d6b68b53..080996bd 100644
--- a/Web/Presenters/templates/components/wall.xml
+++ b/Web/Presenters/templates/components/wall.xml
@@ -1,5 +1,5 @@
 <div class="content_divider">
-    <div class="content_title_expanded" onclick="hidePanel(this);">
+    <div class="content_title_expanded">
         {_wall} 
         <nobold>
             {tr("wall", $count)}

From da86a91b760bda74530e6f6fe3f61541c8176d40 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 21:36:51 +0300
Subject: [PATCH 03/60] feat(ajax): show loading cursor

---
 Web/static/css/main.css | 4 ++++
 Web/static/js/router.js | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 0332d278..cc63a36f 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -14,6 +14,10 @@ body {
     line-height: 1.19;
 }
 
+body.ajax_request_made {
+    cursor: progress;
+}
+
 body, .ovk-fullscreen-dimmer, .ovk-photo-view-dimmer {
     scrollbar-gutter: stable both-edges;
 }
diff --git a/Web/static/js/router.js b/Web/static/js/router.js
index 2a3a6c6a..4882926a 100644
--- a/Web/static/js/router.js
+++ b/Web/static/js/router.js
@@ -202,7 +202,7 @@ window.router = new class {
         if(this.prev_page_html && this.prev_page_html.pathname != location.pathname) {
             this.prev_page_html = null
         }
-        
+
         const push_url = params.push_state ?? true
         const next_page_url = new URL(url)
         if(push_url) {
@@ -210,6 +210,8 @@ window.router = new class {
         } else {
             history.replaceState({'from_router': 1}, '', url)
         }
+        
+        u('body').addClass('ajax_request_made')
 
         const parser = new DOMParser
         const next_page_request = await fetch(next_page_url, {
@@ -227,6 +229,8 @@ window.router = new class {
         
         this.__closeMsgs()
         this.__unlinkObservers()
+        
+        u('body').removeClass('ajax_request_made')
 
         try {
             this.__appendPage(parsed_content)

From c07ebc2f4d197145d7ba047f6193e11e4b9acfd9 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 21:43:10 +0300
Subject: [PATCH 04/60] feat(tips): add delay

---
 Web/static/js/al_mentions.js | 1 +
 Web/static/js/al_wall.js     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Web/static/js/al_mentions.js b/Web/static/js/al_mentions.js
index d324cca6..595b04b9 100644
--- a/Web/static/js/al_mentions.js
+++ b/Web/static/js/al_mentions.js
@@ -23,6 +23,7 @@ tippy.delegate("body", {
     target: '.mention',
     theme: "light vk",
     content: "⌛",
+    delay: 300,
     allowHTML: true,
     interactive: true,
     interactiveDebounce: 500,
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 6568ba51..1f6c0902 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -825,6 +825,7 @@ tippy.delegate("body", {
     target: '.client_app',
     theme: "light vk",
     content: "⌛",
+    delay: 400,
     allowHTML: true,
     interactive: true,
     interactiveDebounce: 500,
@@ -864,6 +865,7 @@ tippy.delegate('body', {
     target: `.post-like-button[data-type]:not([data-likes="0"])`,
     theme: "special vk",
     content: "⌛",
+    delay: 400,
     allowHTML: true,
     interactive: true,
     interactiveDebounce: 500,

From 039988c7fc40fa64ab3ea314621b4cece0917fa3 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 21:46:12 +0300
Subject: [PATCH 05/60] fix(docs): set correct margins

---
 Web/static/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index cc63a36f..730df906 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -4174,11 +4174,12 @@ hr {
     justify-content: center;
     border-radius: 2px;
     height: 17px;
-    padding: 2px 0px;
+    padding: 3px 0px;
 }
 
 .docListViewItem .doc_icon.no_image span {
     color: #6b6b6b;
+    font-weight: bold;
 }
 
 .doc_icon.no_image span::before {

From 9c01cd00fc9919b9635c6c8ff5704ceb4a239f10 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 22:42:55 +0300
Subject: [PATCH 06/60] feat(docs): ux changes

---
 Web/Presenters/DocumentsPresenter.php       |  6 ++--
 Web/Presenters/templates/Documents/List.xml | 33 ++++++++++-----------
 Web/static/css/main.css                     |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/Web/Presenters/DocumentsPresenter.php b/Web/Presenters/DocumentsPresenter.php
index b003b932..78f17bfc 100644
--- a/Web/Presenters/DocumentsPresenter.php
+++ b/Web/Presenters/DocumentsPresenter.php
@@ -73,10 +73,10 @@ final class DocumentsPresenter extends OpenVKPresenter
         $this->template->count = $docs->size();
         $this->template->docs  = iterator_to_array($docs->page($page, OPENVK_DEFAULT_PER_PAGE));
         $this->template->locale_string = "you_have_x_documents";
-        if ($owner_id < 0) {
-            $this->template->locale_string = "group_has_x_documents";
-        } elseif ($current_tab != 0) {
+        if ($current_tab != 0) {
             $this->template->locale_string = "x_documents_in_tab";
+        } else if ($owner_id < 0) {
+            $this->template->locale_string = "group_has_x_documents";
         }
 
         $this->template->canUpload = $owner_id == $this->user->id || $this->template->group->canBeModifiedBy($this->user->identity);
diff --git a/Web/Presenters/templates/Documents/List.xml b/Web/Presenters/templates/Documents/List.xml
index ad9a9948..5007de25 100644
--- a/Web/Presenters/templates/Documents/List.xml
+++ b/Web/Presenters/templates/Documents/List.xml
@@ -20,28 +20,25 @@
 {block content}
     {var $is_gallery = $current_tab == 3 || $current_tab == 4}
     <div id="docs_page_wrapper">
-        <div class="docs_page_search">
-            <form action="/search" method="get">
-                <input type="hidden" name="section" value="docs">
-                <input type="search" name="q" class="input_with_search_icon" placeholder="{_search_by_documents}">
-            </form>
-            <input n:if="$canUpload" id="upload_entry_point" class="button" type="button" value="{_upload_button}" {if isset($group)}data-gid="{$group->getId()}"{/if}>
-        </div>
-        <div n:if="sizeof($tabs) > 1" class="docs_page_tabs">
-            <div class="mb_tabs">
-                <div class="mb_tab" n:attr="id => $current_tab == 0 ? active">
-                    <a href="?tab=0">{_document_type_0}</a>
-                </div>
-                <div n:foreach="$tabs as $tab" class="mb_tab" n:attr="id => $tab['type'] == $current_tab ? active">
-                    <a href="?tab={$tab['type']}">
-                        {$tab["name"]}
-                        <span n:if="$tab['count'] > 1" class="special_counter">{$tab["count"]}</span>
-                    </a>
+        <div class="docs_page_tabs">
+            <div class="mb_tabs display_flex_row display_flex_space_between">
+                <div>
+                    <div class="mb_tab" n:attr="id => $current_tab == 0 ? active">
+                        <a href="?tab=0">{_document_type_0}</a>
+                    </div>
+                    <div n:foreach="$tabs as $tab" class="mb_tab" n:attr="id => $tab['type'] == $current_tab ? active">
+                        <a href="?tab={$tab['type']}">
+                            {$tab["name"]}
+                            <span n:if="$tab['count'] > 1" class="special_counter">{$tab["count"]}</span>
+                        </a>
+                    </div>
                 </div>
+
+                <input n:if="$canUpload" id="upload_entry_point" class="button" type="button" value="{_upload_button}" {if isset($group)}data-gid="{$group->getId()}"{/if}>
             </div>
         </div>
         <div n:class="docs_page_content, $is_gallery ? docs_page_gallery">
-            <div class="summaryBar display_flex_row display_flex_space_between">
+            <div n:if="$count > 0" class="summaryBar display_flex_row display_flex_space_between">
                 <div class="summary">{tr($locale_string, $count)}.</div>
 
                 <select n:if="$count > 3" name="docs_sort">
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 730df906..1d96fed3 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -4031,7 +4031,7 @@ hr {
 #docs_page_wrapper .container_white {
     display: flex;
     flex-direction: column;
-    padding: 5px 10px;
+    padding: 10px 10px;
 }
 
 #docs_page_wrapper .docs_page_content.docs_page_gallery .scroll_container {

From 2440f2afd9892d0d1d554d939294e630a5b3b0ad Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 22:45:32 +0300
Subject: [PATCH 07/60] fix: move all apps to search

---
 Web/Presenters/templates/Apps/List.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Apps/List.xml b/Web/Presenters/templates/Apps/List.xml
index fbf4c6cc..c7550ffb 100644
--- a/Web/Presenters/templates/Apps/List.xml
+++ b/Web/Presenters/templates/Apps/List.xml
@@ -16,7 +16,7 @@
 
 {block tabs}
     <div n:attr="id => ($act === 'list' ? 'activetabs' : 'ki')" class="tab">
-        <a n:attr="id => ($act === 'list' ? 'act_tab_a' : 'ki')" href="?act=list">{_all_apps}</a>
+        <a n:attr="id => ($act === 'list' ? 'act_tab_a' : 'ki')" href="/search?q=&section=apps">{_all_apps}</a>
     </div>
 
     <div n:attr="id => ($act === 'installed' ? 'activetabs' : 'ki')" class="tab">

From b9bf98ef0a9f56bfc7da797e91f6e6485af0b20b Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 22:55:17 +0300
Subject: [PATCH 08/60] fix(picker): invalid album

---
 Web/static/js/al_wall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 1f6c0902..e6ed2031 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1434,7 +1434,7 @@ u(document).on("click", "#__photoAttachment", async (e) => {
         window.openvk.photoalbums = await window.OVKAPI.call('photos.getAlbums', {'owner_id': club != 0 ? Math.abs(club) * -1 : window.openvk.current_id})
     }
     window.openvk.photoalbums.items.forEach(item => {
-        u('.ovk-diag-body #albumSelect').append(`<option value="${item.vid}">${ovk_proc_strtr(escapeHtml(item.title), 20)}</option>`)
+        u('.ovk-diag-body #albumSelect').append(`<option value="${item.id}">${ovk_proc_strtr(escapeHtml(item.title), 20)}</option>`)
     })
 })
 

From 02321989a67d7fb9439b312f06a72ed221cf1f37 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:02:17 +0300
Subject: [PATCH 09/60] feat: auto set "from group"

---
 Web/Presenters/templates/components/textArea.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index f1e3d475..d5778ebd 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -33,15 +33,15 @@
                         </script>
                         
                         <label>
-                            <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" /> {_post_as_group}
+                            <input type="checkbox" name="as_group" onchange="onWallAsGroupClick(this)" checked /> {_post_as_group}
                         </label>
-                        <label id="forceSignOpt" style="display: none;">
+                        <label id="forceSignOpt" style="display: block;">
                             <input type="checkbox" name="force_sign" /> {_add_signature}
                         </label>
                     {/if}
                 {/if}
                 
-                <label n:if="$anonEnabled" id="octoberAnonOpt">
+                <label n:if="$anonEnabled" id="octoberAnonOpt" style="display: none;">
                     <input type="checkbox" name="anon" /> {_as_anonymous}
                 </label>
                 

From 6814979c9fafe50a198f9a6b9e5fe41ae41c87f3 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:15:03 +0300
Subject: [PATCH 10/60] feat: add link to audiostatus

---
 Web/Presenters/templates/User/View.xml | 2 +-
 Web/static/css/audios.css              | 3 ++-
 Web/static/js/al_music.js              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index 9c013dd1..f7b600ef 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -419,7 +419,7 @@
                     {else}
                         <div class="page_status" style="display: flex;">
                             <div n:class="audioStatus, $thatIsThisUser ? page_status_edit_button" id="page_status_text">
-                                {$audioStatus->getName()}
+                                <a {if !$thatIsThisUser}href="/audio0_{$audioStatus->getId()}"{/if}>{$audioStatus->getName()}</a>
                             </div>
                         </div>
                     {/if}
diff --git a/Web/static/css/audios.css b/Web/static/css/audios.css
index 89bce6f5..f1d098a3 100644
--- a/Web/static/css/audios.css
+++ b/Web/static/css/audios.css
@@ -763,8 +763,9 @@
     fill-opacity: .7;
 }
 
-.audioStatus span {
+.audioStatus a {
     color: #2B587A;
+    font-weight: bold;
 }
 
 .audioStatus span:hover {
diff --git a/Web/static/js/al_music.js b/Web/static/js/al_music.js
index 9f3247a7..60ca15e0 100644
--- a/Web/static/js/al_music.js
+++ b/Web/static/js/al_music.js
@@ -176,7 +176,7 @@ window.player = new class {
                 }
             }
 
-            if(window.player.listen_coef > 10) {
+            if(window.player.listen_coef > 5) {
                 this.__countListen()
                 window.player.listen_coef = -10
             }

From 21930aecb28aa4ad8c2bf8139f0556eb9980b11c Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:17:43 +0300
Subject: [PATCH 11/60] fix: typo in privacy

---
 Web/Presenters/templates/User/Settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml
index 10e0cd1e..5e60b41f 100644
--- a/Web/Presenters/templates/User/Settings.xml
+++ b/Web/Presenters/templates/User/Settings.xml
@@ -409,7 +409,7 @@
                     </td>
                     <td>
                         <select name="likes.read", style="width: 164px;">
-                            <option value="2" {if $user->getPrivacySetting('likes.read') == 2}selected{/if}>{_privacy_value_anybody}</option>
+                            <option value="2" {if $user->getPrivacySetting('likes.read') == 2}selected{/if}>{_privacy_value_anybody_dative}</option>
                             <option value="0" {if $user->getPrivacySetting('likes.read') == 0}selected{/if}>{_privacy_value_only_me_dative}</option>
                         </select>
                     </td>

From a9d7ff808ae32690940d86e78a42c4cbbf9d4789 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:32:27 +0300
Subject: [PATCH 12/60] fix: don't show age of dead

---
 Web/Presenters/templates/User/View.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
index f7b600ef..b9db5c87 100644
--- a/Web/Presenters/templates/User/View.xml
+++ b/Web/Presenters/templates/User/View.xml
@@ -458,8 +458,8 @@
                         </tr>
                         <tr n:if="!is_null($user->getBirthday())">
                             <td class="label"><span class="nobold">{_birth_date}:</span></td>
-                            <td n:if="$user->getBirthdayPrivacy() == 0" class="data">{$user->getBirthday()->format('%e %B %Y')},
-                                {tr("years", $user->getAge())}</td>
+                            <td n:if="$user->getBirthdayPrivacy() == 0" class="data">{$user->getBirthday()->format('%e %B %Y')}{if $user->onlineStatus() != 2},
+                                {tr("years", $user->getAge())}{/if}</td>
                             <td n:if="$user->getBirthdayPrivacy() == 1" class="data">{$user->getBirthday()->format('%e %B')}</td>
                         </tr>
                     </tbody>

From 8afc7c8c5c9c9aa165580e4829e9cd70d5105a9f Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:44:16 +0300
Subject: [PATCH 13/60] fix: wide avatars at tips

---
 Web/Presenters/DocumentsPresenter.php | 2 +-
 Web/static/css/main.css               | 5 +++++
 Web/static/js/al_wall.js              | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/DocumentsPresenter.php b/Web/Presenters/DocumentsPresenter.php
index 78f17bfc..dce7e4e3 100644
--- a/Web/Presenters/DocumentsPresenter.php
+++ b/Web/Presenters/DocumentsPresenter.php
@@ -75,7 +75,7 @@ final class DocumentsPresenter extends OpenVKPresenter
         $this->template->locale_string = "you_have_x_documents";
         if ($current_tab != 0) {
             $this->template->locale_string = "x_documents_in_tab";
-        } else if ($owner_id < 0) {
+        } elseif ($owner_id < 0) {
             $this->template->locale_string = "group_has_x_documents";
         }
 
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 1d96fed3..38e32431 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -3921,6 +3921,11 @@ hr {
     height: 25px;
 }
 
+.object_fit_ava {
+    object-fit: cover;
+    object-position: top;
+}
+
 .like_tooltip_wrapper .like_tooltip_body a {
     height: 25px;
 }
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index e6ed2031..048c46af 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -902,7 +902,7 @@ tippy.delegate('body', {
 
         that._likesList.items.forEach(item => {
             final_template.find('.like_tooltip_body .like_tooltip_body_grid').append(`
-                <a title="${escapeHtml(item.first_name + " " + item.last_name)}" href='/id${item.id}'><img src='${item.photo_50}' alt='.'></a>
+                <a title="${escapeHtml(item.first_name + " " + item.last_name)}" href='/id${item.id}'><img class="object_fit_ava" src='${item.photo_50}' alt='.'></a>
             `)
         })
         that.setContent(final_template.nodes[0].outerHTML)

From 7a911569168078fc8b1f7d4828dcb3529ed050db Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Fri, 23 May 2025 23:53:34 +0300
Subject: [PATCH 14/60] fix: wrong i18n xhtml text

---
 Web/Presenters/templates/Notes/Create.xml | 2 +-
 Web/Presenters/templates/Notes/Edit.xml   | 2 +-
 locales/en.strings                        | 1 +
 locales/ru.strings                        | 1 +
 locales/ru_lat.strings                    | 1 +
 locales/uk.strings                        | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/Notes/Create.xml b/Web/Presenters/templates/Notes/Create.xml
index e8e2d20e..21e95247 100644
--- a/Web/Presenters/templates/Notes/Create.xml
+++ b/Web/Presenters/templates/Notes/Create.xml
@@ -13,7 +13,7 @@
         <textarea name="html" style="display:none;"></textarea>
         <div id="editor" style="width:600px;height:300px;border:1px solid grey"></div>
         
-        <p><i><a href="/kb/notes">{_something}</a> {_supports_xhtml}</i></p>
+        <p><i>{_something_is_supported_from_xhtml|noescape}</i></p>
         
         <input type="hidden" name="hash" value="{$csrfToken}" />
         <button class="button">{_save}</button>
diff --git a/Web/Presenters/templates/Notes/Edit.xml b/Web/Presenters/templates/Notes/Edit.xml
index b904c72e..ad8b9c80 100644
--- a/Web/Presenters/templates/Notes/Edit.xml
+++ b/Web/Presenters/templates/Notes/Edit.xml
@@ -18,7 +18,7 @@
         <textarea name="html" style="display:none;"></textarea>
         <div id="editor" style="width:600px;height:300px;border:1px solid grey"></div>
         
-        <p><i><a href="/kb/notes">{_something}</a> {_supports_xhtml}</i></p>
+        <p><i>{_something_is_supported_from_xhtml|noescape}</i></p>
         
         <input type="hidden" name="hash" value="{$csrfToken}" />
         <button class="button">{_save}</button>
diff --git a/locales/en.strings b/locales/en.strings
index bca784ef..e1281387 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -619,6 +619,7 @@
 
 "notes_closed" = "You can't attach a note to the post because only you can see them.<br> You can change this in <a href=\"/settings?act=privacy\">settings</a>.";
 "do_not_attach_note" = "Do not attach a note";
+"something_is_supported_from_xhtml" = "<a href='/kb/notes'>Something</a> from (X)HTML supported.";
 "something" = "Something";
 "supports_xhtml" = "from (X)HTML supported.";
 
diff --git a/locales/ru.strings b/locales/ru.strings
index f933d724..f6e49716 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -603,6 +603,7 @@
 
 "notes_closed" = "Вы не можете прикрепить заметку к записи, так как ваши заметки видны только вам.<br><br> Вы можете поменять это в <a href=\"/settings?act=privacy\">настройках</a>.";
 "do_not_attach_note" = "Не прикреплять заметку";
+"something_is_supported_from_xhtml" = "<a href='/kb/notes'>Кое-что</a> из (X)HTML поддерживается.";
 "something" = "Кое-что";
 "supports_xhtml" = "из (X)HTML поддерживается.";
 
diff --git a/locales/ru_lat.strings b/locales/ru_lat.strings
index 2c2845a6..9561fb13 100644
--- a/locales/ru_lat.strings
+++ b/locales/ru_lat.strings
@@ -448,6 +448,7 @@
 
 "notes_closed" = "Vy ne možete prikrepití zametku k zapisi, tak kak vaši zametki vidny tolíko vam.<br><br> Vy možete pomenjatí eto v <a href=\"/settings?act=privacy\">nastrojkah</a>.";
 "do_not_attach_note" = "Ne prikrepljatí zametku";
+"something_is_supported_from_xhtml" = "<a href='/kb/notes'>Koe-čto</a> iz (X)HTML podderživaetsja.";
 "something" = "Koe-čto";
 "supports_xhtml" = "iz (X)HTML podderživaetsja.";
 
diff --git a/locales/uk.strings b/locales/uk.strings
index c54b4769..a9878065 100644
--- a/locales/uk.strings
+++ b/locales/uk.strings
@@ -579,6 +579,7 @@
 
 "notes_closed" = "Ви не можете прикріпити нотатку до запису, оскільки Ваші нотатки видно тільки Вам.<br><br> Ви можете змінити це в <a href=\"/settings?act=privacy\">налаштуваннях</a>.";
 "do_not_attach_note" = "Не прикріплювати нотатку";
+"something_is_supported_from_xhtml" = "<a href='/kb/notes'>Певні</a> теги з (X)HTML підтримується.";
 "something" = "Певні";
 "supports_xhtml" = "теги з (X)HTML підтримується.";
 

From 0ffd195cfd5745ad64899123954c9a90810b6593 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 11:51:09 +0300
Subject: [PATCH 15/60] feat: skip theme styles

---
 Web/Presenters/templates/_includeCSS.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/_includeCSS.xml b/Web/Presenters/templates/_includeCSS.xml
index 5edd88ae..e5c052c6 100644
--- a/Web/Presenters/templates/_includeCSS.xml
+++ b/Web/Presenters/templates/_includeCSS.xml
@@ -17,7 +17,9 @@
             {/if}
         {/if}
 
-        <link rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/stylesheet/styles.css" />
+        {* remove the "n:if" if you having issues with your theme *}
+
+        <link n:if="!$theme->overridesTemplates()" rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/stylesheet/styles.css" />
 
         {if $isXmas}
             <link rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/resource/xmas.css" />

From f8e19d69bc5e10e9d64152ecf1909e8f48cbc229 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 15:50:24 +0300
Subject: [PATCH 16/60] fix(api): simplification

---
 VKAPI/Handlers/Account.php   |   2 +-
 VKAPI/Handlers/Board.php     | 161 ++++++++++----------
 VKAPI/Handlers/Gifts.php     |  95 +++++-------
 VKAPI/Handlers/Groups.php    | 275 +++++------------------------------
 VKAPI/Handlers/Likes.php     |   9 +-
 VKAPI/Handlers/Notes.php     | 164 ++++++---------------
 VKAPI/Handlers/Polls.php     |  10 +-
 Web/Models/Entities/Note.php |   5 -
 Web/Models/Entities/User.php |  14 +-
 9 files changed, 215 insertions(+), 520 deletions(-)

diff --git a/VKAPI/Handlers/Account.php b/VKAPI/Handlers/Account.php
index c8f501b8..ca0911eb 100644
--- a/VKAPI/Handlers/Account.php
+++ b/VKAPI/Handlers/Account.php
@@ -183,7 +183,7 @@ final class Account extends VKAPIRequestHandler
     {
         $this->requireUser();
         if (!OPENVK_ROOT_CONF['openvk']['preferences']['commerce']) {
-            $this->fail(105, "Commerce is disabled on this instance");
+            $this->fail(-105, "Commerce is disabled on this instance");
         }
 
         return (object) ['votes' => $this->getUser()->getCoins()];
diff --git a/VKAPI/Handlers/Board.php b/VKAPI/Handlers/Board.php
index c5b55fa8..c921ee8f 100644
--- a/VKAPI/Handlers/Board.php
+++ b/VKAPI/Handlers/Board.php
@@ -14,7 +14,7 @@ use openvk\Web\Models\Entities\{Topic, Comment, User, Photo, Video};
 
 final class Board extends VKAPIRequestHandler
 {
-    public function addTopic(int $group_id, string $title, string $text = "", bool $from_group = true)
+    public function addTopic(int $group_id, string $title, string $text = null, bool $from_group = true)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -30,6 +30,7 @@ final class Board extends VKAPIRequestHandler
         }
 
         $flags = 0;
+
         if ($from_group == true && $club->canBeModifiedBy($this->getUser())) {
             $flags |= 0b10000000;
         }
@@ -40,17 +41,23 @@ final class Board extends VKAPIRequestHandler
         $topic->setTitle(ovk_proc_strtr($title, 127));
         $topic->setCreated(time());
         $topic->setFlags($flags);
+
         $topic->save();
 
-        if (!empty($text)) {
-            $comment = new Comment();
-            $comment->setOwner($this->getUser()->getId());
-            $comment->setModel(get_class($topic));
-            $comment->setTarget($topic->getId());
-            $comment->setContent($text);
-            $comment->setCreated(time());
-            $comment->setFlags($flags);
-            $comment->save();
+        try {
+            if (!empty($text)) {
+                $comment = new Comment();
+                $comment->setOwner($this->getUser()->getId());
+                $comment->setModel(get_class($topic));
+                $comment->setTarget($topic->getId());
+                $comment->setContent($text);
+                $comment->setCreated(time());
+                $comment->setFlags($flags);
+
+                $comment->save();
+            }
+        } catch(\Throwable $e) {
+            return $topic->getId();
         }
 
         return $topic->getId();
@@ -75,32 +82,35 @@ final class Board extends VKAPIRequestHandler
         return 1;
     }
 
-    public function createComment(int $group_id, int $topic_id, string $message = "", string $attachments = "", bool $from_group = true)
+    public function createComment(int $group_id, int $topic_id, string $message = "", bool $from_group = true)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
-        if (empty($message) && empty($attachments)) {
+        if (empty($message)) {
             $this->fail(100, "Required parameter 'message' missing.");
         }
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
+
         if (!$topic || $topic->isDeleted() || $topic->isClosed()) {
             $this->fail(15, "Access denied");
         }
 
         $flags = 0;
-        if ($from_group != 0 && !is_null($topic->getClub()) && $topic->getClub()->canBeModifiedBy($this->user)) {
+        if ($from_group != 0 && ($topic->getClub()->canBeModifiedBy($this->user))) {
             $flags |= 0b10000000;
         }
 
         $comment = new Comment();
+
         $comment->setOwner($this->getUser()->getId());
         $comment->setModel(get_class($topic));
         $comment->setTarget($topic->getId());
         $comment->setContent($message);
         $comment->setCreated(time());
         $comment->setFlags($flags);
+
         $comment->save();
 
         return $comment->getId();
@@ -113,7 +123,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -129,7 +139,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || $topic->isDeleted() || !$topic->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -147,7 +157,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -158,75 +168,92 @@ final class Board extends VKAPIRequestHandler
         return 1;
     }
 
-    public function getComments(int $group_id, int $topic_id, bool $need_likes = false, int $start_comment_id = 0, int $offset = 0, int $count = 40, bool $extended = false, string $sort = "asc")
+    public function getComments(int $group_id, int $topic_id, bool $need_likes = false, int $offset = 0, int $count = 10, bool $extended = false)
     {
-        # start_comment_id ne robit
         $this->requireUser();
 
+        if ($count < 1 || $count > 100) {
+            $this->fail(4, "Invalid count");
+        }
+
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || $topic->isDeleted()) {
-            $this->fail(5, "Invalid topic");
+        if (!$topic || $topic->isDeleted()) {
+            $this->fail(5, "Not found");
         }
 
-        $arr = [
-            "items" => [],
+        $obj = (object) [
+            "items" => []
         ];
 
-        $comms = array_slice(iterator_to_array($topic->getComments(1, $count + $offset)), $offset);
-        foreach ($comms as $comm) {
-            $arr["items"][] = $this->getApiBoardComment($comm, $need_likes);
+        if ($extended) {
+            $obj->profiles = [];
+            $obj->groups = [];
+        }
+
+        $comments = array_slice(iterator_to_array($topic->getComments(1, $count + $offset)), $offset);
+
+        foreach ($comments as $comment) {
+            $obj->items[] = $comment->toVkApiStruct($this->getUser(), $need_likes);
 
             if ($extended) {
-                if ($comm->getOwner() instanceof \openvk\Web\Models\Entities\User) {
-                    $arr["profiles"][] = $comm->getOwner()->toVkApiStruct();
+                $owner = $comment->getOwner();
+
+                if ($owner instanceof \openvk\Web\Models\Entities\User) {
+                    $obj->profiles[] = $owner->toVkApiStruct();
                 }
 
-                if ($comm->getOwner() instanceof \openvk\Web\Models\Entities\Club) {
-                    $arr["groups"][] = $comm->getOwner()->toVkApiStruct();
+                if ($owner instanceof \openvk\Web\Models\Entities\Club) {
+                    $obj->groups[] = $owner->toVkApiStruct();
                 }
             }
         }
 
-        return $arr;
+        return $obj;
     }
 
-    public function getTopics(int $group_id, string $topic_ids = "", int $order = 1, int $offset = 0, int $count = 40, bool $extended = false, int $preview = 0, int $preview_length = 90)
+    public function getTopics(int $group_id, string $topic_ids = "", int $offset = 0, int $count = 10, bool $extended = false, int $preview = 0, int $preview_length = 90)
     {
-        # order и extended ничё не делают
+        # TODO: $extended
+
         $this->requireUser();
 
-        $arr = [];
+        if ($count < 1 || $count > 100) {
+            $this->fail(4, "Invalid count");
+        }
+
+        $obj = (object)[];
+
         $club = (new ClubsRepo())->get($group_id);
 
+        if (!$club || !$club->canBeViewedBy($this->getUser())) {
+            $this->fail(15, "Access denied");
+        }
+
         $topics = array_slice(iterator_to_array((new TopicsRepo())->getClubTopics($club, 1, $count + $offset)), $offset);
-        $arr["count"] = (new TopicsRepo())->getClubTopicsCount($club);
-        $arr["items"] = [];
-        $arr["default_order"] = $order;
-        $arr["can_add_topics"] = $club->canBeModifiedBy($this->getUser()) ? true : ($club->isEveryoneCanCreateTopics() ? true : false);
-        $arr["profiles"] = [];
+
+        $obj->count = (new TopicsRepo())->getClubTopicsCount($club);
+        $obj->items = [];
+        $obj->profiles = [];
+        $obj->can_add_topics = $club->canBeModifiedBy($this->getUser()) ? true : ($club->isEveryoneCanCreateTopics() ? true : false);
 
         if (empty($topic_ids)) {
             foreach ($topics as $topic) {
-                if ($topic->isDeleted()) {
-                    continue;
-                }
-                $arr["items"][] = $topic->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
+                $obj->items[] = $topic->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
             }
         } else {
             $topics = explode(',', $topic_ids);
 
-            foreach ($topics as $topic) {
-                $id = explode("_", $topic);
-                $topicy = (new TopicsRepo())->getTopicById((int) $id[0], (int) $id[1]);
+            foreach ($topics as $topic_id) {
+                $topic = (new TopicsRepo())->getTopicById($group_id, (int) $topic_id);
 
-                if ($topicy && !$topicy->isDeleted()) {
-                    $arr["items"][] = $topicy->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
+                if ($topic && !$topic->isDeleted()) {
+                    $obj->items[] = $topic->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
                 }
             }
         }
 
-        return $arr;
+        return $obj;
     }
 
     public function openTopic(int $group_id, int $topic_id)
@@ -236,7 +263,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || !$topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || !$topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -248,11 +275,6 @@ final class Board extends VKAPIRequestHandler
         return 1;
     }
 
-    public function restoreComment(int $group_id, int $topic_id, int $comment_id)
-    {
-        $this->fail(501, "Not implemented");
-    }
-
     public function unfixTopic(int $group_id, int $topic_id)
     {
         $this->requireUser();
@@ -260,7 +282,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -275,33 +297,4 @@ final class Board extends VKAPIRequestHandler
 
         return 1;
     }
-
-    private function getApiBoardComment(?Comment $comment, bool $need_likes = false)
-    {
-        $res = (object) [];
-
-        $res->id            = $comment->getId();
-        $res->from_id       = $comment->getOwner()->getId();
-        $res->date          = $comment->getPublicationTime()->timestamp();
-        $res->text          = $comment->getText(false);
-        $res->attachments   = [];
-        $res->likes         = [];
-        if ($need_likes) {
-            $res->likes = [
-                "count"      => $comment->getLikesCount(),
-                "user_likes" => (int) $comment->hasLikeFrom($this->getUser()),
-                "can_like"   => 1, # а чё типо не может ахахаххахах
-            ];
-        }
-
-        foreach ($comment->getChildren() as $attachment) {
-            if ($attachment->isDeleted()) {
-                continue;
-            }
-
-            $res->attachments[] = $attachment->toVkApiStruct();
-        }
-
-        return $res;
-    }
 }
diff --git a/VKAPI/Handlers/Gifts.php b/VKAPI/Handlers/Gifts.php
index fe1232b7..e95493ef 100644
--- a/VKAPI/Handlers/Gifts.php
+++ b/VKAPI/Handlers/Gifts.php
@@ -10,62 +10,44 @@ use openvk\Web\Models\Entities\Notifications\GiftNotification;
 
 final class Gifts extends VKAPIRequestHandler
 {
-    public function get(int $user_id = null, int $count = 10, int $offset = 0)
+    public function get(int $user_id = 0, int $count = 10, int $offset = 0)
     {
+        # There is no extended :)
+
         $this->requireUser();
 
-        $i = 0;
-        $i += $offset;
         $server_url = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
 
-        if ($user_id) {
-            $user = (new UsersRepo())->get($user_id);
-        } else {
-            $user = $this->getUser();
+        if ($user_id < 1) {
+            $user_id = $this->getUser()->getId();
         }
 
+        $user = (new UsersRepo())->get($user_id);
+
         if (!$user || $user->isDeleted()) {
-            $this->fail(177, "Invalid user");
-        }
-
-        if (!$user->canBeViewedBy($this->getUser())) {
             $this->fail(15, "Access denied");
         }
 
-        /*
-        if(!$user->getPrivacyPermission('gifts.read', $this->getUser()))
-            $this->fail(15, "Access denied: this user chose to hide his gifts");*/
-
-
         if (!$user->canBeViewedBy($this->getUser())) {
             $this->fail(15, "Access denied");
         }
 
         $gift_item = [];
+        $user_gifts = array_slice(iterator_to_array($user->getGifts(1, $count)), $offset, $count);
 
-        $userGifts = array_slice(iterator_to_array($user->getGifts(1, $count, false)), $offset);
-
-        if (sizeof($userGifts) < 0) {
-            return null;
-        }
-
-        foreach ($userGifts as $gift) {
-            if ($i < $count) {
-                $gift_item[] = [
-                    "id"        => $i,
-                    "from_id"   => $gift->anon == true ? 0 : $gift->sender->getId(),
-                    "message"   => $gift->caption == null ? "" : $gift->caption,
-                    "date"      => $gift->sent->timestamp(),
-                    "gift"      => [
-                        "id"          => $gift->gift->getId(),
-                        "thumb_256"   => $server_url . $gift->gift->getImage(2),
-                        "thumb_96"    => $server_url . $gift->gift->getImage(2),
-                        "thumb_48"    => $server_url . $gift->gift->getImage(2),
-                    ],
-                    "privacy"   => 0,
-                ];
-            }
-            $i += 1;
+        foreach ($user_gifts as $gift) {
+            $gift_item[] = [
+                "id"        => $i,
+                "from_id"   => $gift->anon == true ? 0 : $gift->sender->getId(),
+                "message"   => $gift->caption == null ? "" : $gift->caption,
+                "date"      => $gift->sent->timestamp(),
+                "gift"      => [
+                    "id"          => $gift->gift->getId(),
+                    "thumb_256"   => $server_url . $gift->gift->getImage(2),
+                    "thumb_96"    => $server_url . $gift->gift->getImage(2),
+                    "thumb_48"    => $server_url . $gift->gift->getImage(2),
+                ],
+            ];
         }
 
         return $gift_item;
@@ -76,14 +58,14 @@ final class Gifts extends VKAPIRequestHandler
         $this->requireUser();
         $this->willExecuteWriteAction();
 
-        $user = (new UsersRepo())->get((int) $user_ids);
-
         if (!OPENVK_ROOT_CONF['openvk']['preferences']['commerce']) {
-            $this->fail(105, "Commerce is disabled on this instance");
+            $this->fail(-105, "Commerce is disabled on this instance");
         }
 
+        $user = (new UsersRepo())->get((int) $user_ids); # FAKE прогноз погоды (в данном случае user_ids)
+
         if (!$user || $user->isDeleted()) {
-            $this->fail(177, "Invalid user");
+            $this->fail(15, "Access denied");
         }
 
         if (!$user->canBeViewedBy($this->getUser())) {
@@ -93,7 +75,7 @@ final class Gifts extends VKAPIRequestHandler
         $gift  = (new GiftsRepo())->get($gift_id);
 
         if (!$gift) {
-            $this->fail(165, "Invalid gift");
+            $this->fail(15, "Invalid gift");
         }
 
         $price = $gift->getPrice();
@@ -134,24 +116,17 @@ final class Gifts extends VKAPIRequestHandler
         ];
     }
 
-    public function delete()
-    {
-        $this->requireUser();
-        $this->willExecuteWriteAction();
-
-        $this->fail(501, "Not implemented");
-    }
-
-    # в vk кстати называется gifts.getCatalog
     public function getCategories(bool $extended = false, int $page = 1)
     {
+        $this->requireUser();
+
         $cats = (new GiftsRepo())->getCategories($page);
         $categ = [];
         $i = 0;
         $server_url = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
 
         if (!OPENVK_ROOT_CONF['openvk']['preferences']['commerce']) {
-            $this->fail(105, "Commerce is disabled on this instance");
+            $this->fail(-105, "Commerce is disabled on this instance");
         }
 
         foreach ($cats as $cat) {
@@ -184,17 +159,19 @@ final class Gifts extends VKAPIRequestHandler
         $this->requireUser();
 
         if (!OPENVK_ROOT_CONF['openvk']['preferences']['commerce']) {
-            $this->fail(105, "Commerce is disabled on this instance");
+            $this->fail(-105, "Commerce is disabled on this instance");
         }
 
-        if (!(new GiftsRepo())->getCat($id)) {
-            $this->fail(177, "Category not found");
+        $gift_category = (new GiftsRepo())->getCat($id);
+
+        if (!$gift_category) {
+            $this->fail(15, "Category not found");
         }
 
-        $giftz = ((new GiftsRepo())->getCat($id))->getGifts($page);
+        $gifts_list = $gift_category->getGifts($page);
         $gifts = [];
 
-        foreach ($giftz as $gift) {
+        foreach ($gifts_list as $gift) {
             $gifts[] = [
                 "name"         => $gift->getName(),
                 "image"        => $gift->getImage(2),
diff --git a/VKAPI/Handlers/Groups.php b/VKAPI/Handlers/Groups.php
index 7f80d108..7d7a466c 100644
--- a/VKAPI/Handlers/Groups.php
+++ b/VKAPI/Handlers/Groups.php
@@ -107,7 +107,6 @@ final class Groups extends VKAPIRequestHandler
                                 $backgrounds = $usr->getBackDropPictureURLs();
                                 $rClubs[$i]->background = $backgrounds;
                                 break;
-                                # unstandard feild
                             case "suggested_count":
                                 if ($usr->getWallType() != 2) {
                                     $rClubs[$i]->suggested_count = null;
@@ -335,23 +334,6 @@ final class Groups extends VKAPIRequestHandler
         return 1;
     }
 
-    public function create(string $title, string $description = "", string $type = "group", int $public_category = 1, int $public_subcategory = 1, int $subtype = 1)
-    {
-        $this->requireUser();
-        $this->willExecuteWriteAction();
-
-        $club = new Club();
-
-        $club->setName($title);
-        $club->setAbout($description);
-        $club->setOwner($this->getUser()->getId());
-        $club->save();
-
-        $club->toggleSubscription($this->getUser());
-
-        return $this->getById((string) $club->getId());
-    }
-
     public function edit(
         int $group_id,
         string $title = null,
@@ -371,13 +353,15 @@ final class Groups extends VKAPIRequestHandler
         $club = (new ClubsRepo())->get($group_id);
 
         if (!$club) {
-            $this->fail(203, "Club not found");
+            $this->fail(15, "Access denied");
         }
+
         if (!$club || !$club->canBeModifiedBy($this->getUser())) {
-            $this->fail(15, "You can't modify this group.");
+            $this->fail(15, "Access denied");
         }
+
         if (!empty($screen_name) && !$club->setShortcode($screen_name)) {
-            $this->fail(103, "Invalid shortcode.");
+            $this->fail(103, "Invalid screen_name");
         }
 
         !empty($title) ? $club->setName($title) : null;
@@ -404,260 +388,86 @@ final class Groups extends VKAPIRequestHandler
         try {
             $club->save();
         } catch (\TypeError $e) {
-            $this->fail(15, "Nothing changed");
+            return 1;
         } catch (\Exception $e) {
-            $this->fail(18, "An unknown error occurred: maybe you set an incorrect value?");
+            return 0;
         }
 
         return 1;
     }
 
-    public function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0, int $count = 100, string $fields = "", string $filter = "any")
+    public function getMembers(int $group_id, int $offset = 0, int $count = 10, string $fields = "")
     {
-        # bdate,can_post,can_see_all_posts,can_see_audio,can_write_private_message,city,common_count,connections,contacts,country,domain,education,has_mobile,last_seen,lists,online,online_mobile,photo_100,photo_200,photo_200_orig,photo_400_orig,photo_50,photo_max,photo_max_orig,relation,relatives,schools,sex,site,status,universities
-        $club = (new ClubsRepo())->get((int) $group_id);
-        if (!$club) {
-            $this->fail(125, "Invalid group id");
+        $this->requireUser();
+
+        $club = (new ClubsRepo())->get($group_id);
+
+        if (!$club || !$club->canBeViewedBy($this->getUser())) {
+            $this->fail(15, "Access denied");
         }
 
-        $sorter = "follower ASC";
+        $sort_string = "follower ASC";
+        $members = array_slice(iterator_to_array($club->getFollowers(1, $count, $sort_string)), $offset, $count);
 
-        switch ($sort) {
-            default:
-            case "time_asc":
-            case "id_asc":
-                $sorter = "follower ASC";
-                break;
-            case "time_desc":
-            case "id_desc":
-                $sorter = "follower DESC";
-                break;
-        }
+        $obj = (object) [
+            "count" => sizeof($members),
+            "items" => []
+        ];
 
-        $members = array_slice(iterator_to_array($club->getFollowers(1, $count, $sorter)), $offset);
-        $arr = (object) [
-            "count" => count($members),
-            "items" => []];
-
-        $filds = explode(",", $fields);
-
-        $i = 0;
         foreach ($members as $member) {
-            if ($i > $count) {
-                break;
-            }
-
-            $arr->items[] = (object) [
-                "id" => $member->getId(),
-                "first_name" => $member->getFirstName(),
-                "last_name" => $member->getLastName(),
-            ];
-
-            foreach ($filds as $fild) {
-                $canView = $member->canBeViewedBy($this->getUser());
-                switch ($fild) {
-                    case "bdate":
-                        if (!$canView) {
-                            $arr->items[$i]->bdate = "01.01.1970";
-                            break;
-                        }
-
-                        $arr->items[$i]->bdate = $member->getBirthday() ? $member->getBirthday()->format('%e.%m.%Y') : null;
-                        break;
-                    case "can_post":
-                        $arr->items[$i]->can_post = $club->canBeModifiedBy($member);
-                        break;
-                    case "can_see_all_posts":
-                        $arr->items[$i]->can_see_all_posts = 1;
-                        break;
-                    case "can_see_audio":
-                        $arr->items[$i]->can_see_audio = 1;
-                        break;
-                    case "can_write_private_message":
-                        $arr->items[$i]->can_write_private_message = 0;
-                        break;
-                    case "common_count":
-                        $arr->items[$i]->common_count = 420;
-                        break;
-                    case "connections":
-                        $arr->items[$i]->connections = 1;
-                        break;
-                    case "contacts":
-                        if (!$canView) {
-                            $arr->items[$i]->contacts = "secret@gmail.com";
-                            break;
-                        }
-
-                        $arr->items[$i]->contacts = $member->getContactEmail();
-                        break;
-                    case "country":
-                        $arr->items[$i]->country = 1;
-                        break;
-                    case "domain":
-                        $arr->items[$i]->domain = "";
-                        break;
-                    case "education":
-                        $arr->items[$i]->education = "";
-                        break;
-                    case "has_mobile":
-                        $arr->items[$i]->has_mobile = false;
-                        break;
-                    case "last_seen":
-                        if (!$canView) {
-                            $arr->items[$i]->last_seen = 0;
-                            break;
-                        }
-
-                        $arr->items[$i]->last_seen = $member->getOnline()->timestamp();
-                        break;
-                    case "lists":
-                        $arr->items[$i]->lists = "";
-                        break;
-                    case "online":
-                        if (!$canView) {
-                            $arr->items[$i]->online = false;
-                            break;
-                        }
-
-                        $arr->items[$i]->online = $member->isOnline();
-                        break;
-                    case "online_mobile":
-                        if (!$canView) {
-                            $arr->items[$i]->online_mobile = false;
-                            break;
-                        }
-
-                        $arr->items[$i]->online_mobile = $member->getOnlinePlatform() == "android" || $member->getOnlinePlatform() == "iphone" || $member->getOnlinePlatform() == "mobile";
-                        break;
-                    case "photo_100":
-                        $arr->items[$i]->photo_100 = $member->getAvatarURL("tiny");
-                        break;
-                    case "photo_200":
-                        $arr->items[$i]->photo_200 = $member->getAvatarURL("normal");
-                        break;
-                    case "photo_200_orig":
-                        $arr->items[$i]->photo_200_orig = $member->getAvatarURL("normal");
-                        break;
-                    case "photo_400_orig":
-                        $arr->items[$i]->photo_400_orig = $member->getAvatarURL("normal");
-                        break;
-                    case "photo_max":
-                        $arr->items[$i]->photo_max = $member->getAvatarURL("original");
-                        break;
-                    case "photo_max_orig":
-                        $arr->items[$i]->photo_max_orig = $member->getAvatarURL();
-                        break;
-                    case "relation":
-                        $arr->items[$i]->relation = $member->getMaritalStatus();
-                        break;
-                    case "relatives":
-                        $arr->items[$i]->relatives = 0;
-                        break;
-                    case "schools":
-                        $arr->items[$i]->schools = 0;
-                        break;
-                    case "sex":
-                        if (!$canView) {
-                            $arr->items[$i]->sex = -1;
-                            break;
-                        }
-
-                        $arr->items[$i]->sex = $member->isFemale() ? 1 : 2;
-                        break;
-                    case "site":
-                        if (!$canView) {
-                            $arr->items[$i]->site = null;
-                            break;
-                        }
-
-                        $arr->items[$i]->site = $member->getWebsite();
-                        break;
-                    case "status":
-                        if (!$canView) {
-                            $arr->items[$i]->status = "r";
-                            break;
-                        }
-
-                        $arr->items[$i]->status = $member->getStatus();
-                        break;
-                    case "universities":
-                        $arr->items[$i]->universities = 0;
-                        break;
-                }
-            }
-            $i++;
+            $obj->items[] = $member->toVkApiStruct($this->getUser(), $fields);
         }
-        return $arr;
+
+        return $obj;
     }
 
     public function getSettings(string $group_id)
     {
         $this->requireUser();
+
         $club = (new ClubsRepo())->get((int) $group_id);
 
         if (!$club || !$club->canBeModifiedBy($this->getUser())) {
-            $this->fail(15, "You can't get settings of this group.");
+            $this->fail(15, "Access denied");
         }
 
         $arr = (object) [
             "title"          => $club->getName(),
-            "description"    => $club->getDescription() != null ? $club->getDescription() : "",
+            "description"    => $club->getDescription(),
             "address"        => $club->getShortcode(),
-            "wall"           => $club->getWallType(), # отличается от вкшных но да ладно
+            "wall"           => $club->getWallType(), # is different from vk values
             "photos"         => 1,
             "video"          => 0,
             "audio"          => $club->isEveryoneCanUploadAudios() ? 1 : 0,
-            "docs"           => 0,
+            "docs"           => 1,
             "topics"         => $club->isEveryoneCanCreateTopics() == true ? 1 : 0,
-            "wiki"           => 0,
-            "messages"       => 0,
-            "obscene_filter" => 0,
-            "obscene_stopwords" => 0,
-            "obscene_words"  => "",
-            "access"         => 1,
-            "subject"        => 1,
-            "subject_list"   => [
-                0 => "в",
-                1 => "опенвк",
-                2 => "нет",
-                3 => "категорий",
-                4 => "групп",
-            ],
-            "rss"            => "/club" . $club->getId() . "/rss",
             "website"        => $club->getWebsite(),
-            "age_limits"     => 0,
-            "market"         => [],
         ];
 
         return $arr;
     }
 
-    public function isMember(string $group_id, int $user_id, string $user_ids = "", bool $extended = false)
+    public function isMember(string $group_id, int $user_id, int $extended = 0)
     {
         $this->requireUser();
-        $id = $user_id != null ? $user_id : explode(",", $user_ids);
 
-        if ($group_id < 0) {
-            $this->fail(228, "Remove the minus from group_id");
+        $input_club = (new ClubsRepo())->get(abs((int) $group_id));
+        $input_user = (new UsersRepo())->get(abs((int) $user_id));
+
+        if (!$input_club || !$input_club->canBeViewedBy($this->getUser())) {
+            $this->fail(15, "Access denied");
         }
 
-        $club = (new ClubsRepo())->get((int) $group_id);
-        $usver = (new UsersRepo())->get((int) $id);
-
-        if (!$club || $group_id == 0) {
-            $this->fail(203, "Invalid club");
+        if (!$input_user || $input_user->isDeleted()) {
+            $this->fail(15, "Not found");
         }
 
-        if (!$usver || $usver->isDeleted() || $user_id == 0) {
-            $this->fail(30, "Invalid user");
-        }
-
-        if ($extended == false) {
-            return $club->getSubscriptionStatus($usver) ? 1 : 0;
+        if ($extended == 0) {
+            return $input_club->getSubscriptionStatus($input_user) ? 1 : 0;
         } else {
             return (object)
             [
-                "member"     => $club->getSubscriptionStatus($usver) ? 1 : 0,
+                "member"     => $input_club->getSubscriptionStatus($input_user) ? 1 : 0,
                 "request"    => 0,
                 "invitation" => 0,
                 "can_invite" => 0,
@@ -665,11 +475,4 @@ final class Groups extends VKAPIRequestHandler
             ];
         }
     }
-
-    public function remove(int $group_id, int $user_id)
-    {
-        $this->requireUser();
-
-        $this->fail(501, "Not implemented");
-    }
 }
diff --git a/VKAPI/Handlers/Likes.php b/VKAPI/Handlers/Likes.php
index 28a66911..02b880b4 100644
--- a/VKAPI/Handlers/Likes.php
+++ b/VKAPI/Handlers/Likes.php
@@ -118,7 +118,14 @@ final class Likes extends VKAPIRequestHandler
         }
 
         if (!$user->canBeViewedBy($this->getUser())) {
-            $this->fail(1984, "Access denied: you can't see this user");
+            $this->fail(15, "Access denied");
+        }
+
+        if ($user->isPrivateLikes()) {
+            return (object) [
+                "liked"  => 1,
+                "copied" => 1,
+            ];
         }
 
         $postable = null;
diff --git a/VKAPI/Handlers/Notes.php b/VKAPI/Handlers/Notes.php
index bde9df75..1ddb67be 100644
--- a/VKAPI/Handlers/Notes.php
+++ b/VKAPI/Handlers/Notes.php
@@ -13,38 +13,49 @@ use openvk\Web\Models\Entities\{Note, Comment};
 
 final class Notes extends VKAPIRequestHandler
 {
-    public function add(string $title, string $text, int $privacy = 0, int $comment_privacy = 0, string $privacy_view  = "", string $privacy_comment  = "")
+    public function add(string $title, string $text)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
+        if (empty($title)) {
+            $this->fail(100, "Required parameter 'title' missing.");
+        }
+
         $note = new Note();
+
         $note->setOwner($this->getUser()->getId());
         $note->setCreated(time());
         $note->setName($title);
         $note->setSource($text);
         $note->setEdited(time());
+
         $note->save();
 
         return $note->getVirtualId();
     }
 
-    public function createComment(string $note_id, int $owner_id, string $message, int $reply_to = 0, string $attachments = "")
+    public function createComment(int $note_id, int $owner_id, string $message, string $attachments = "")
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
-        $note = (new NotesRepo())->getNoteById((int) $owner_id, (int) $note_id);
+
+        if (empty($message)) {
+            $this->fail(100, "Required parameter 'message' missing.");
+        }
+
+        $note = (new NotesRepo())->getNoteById($owner_id, $note_id);
 
         if (!$note) {
-            $this->fail(180, "Note not found");
+            $this->fail(15, "Access denied");
         }
 
         if ($note->isDeleted()) {
-            $this->fail(189, "Note is deleted");
+            $this->fail(15, "Access denied");
         }
 
         if ($note->getOwner()->isDeleted()) {
-            $this->fail(403, "Owner is deleted");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->canBeViewedBy($this->getUser())) {
@@ -52,11 +63,7 @@ final class Notes extends VKAPIRequestHandler
         }
 
         if (!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser())) {
-            $this->fail(43, "No access");
-        }
-
-        if (empty($message) && empty($attachments)) {
-            $this->fail(100, "Required parameter 'message' missing.");
+            $this->fail(15, "Access denied");
         }
 
         $comment = new Comment();
@@ -67,78 +74,9 @@ final class Notes extends VKAPIRequestHandler
         $comment->setCreated(time());
         $comment->save();
 
-        if (!empty($attachments)) {
-            $attachmentsArr = explode(",", $attachments);
-
-            if (sizeof($attachmentsArr) > 10) {
-                $this->fail(50, "Error: too many attachments");
-            }
-
-            foreach ($attachmentsArr as $attac) {
-                $attachmentType = null;
-
-                if (str_contains($attac, "photo")) {
-                    $attachmentType = "photo";
-                } elseif (str_contains($attac, "video")) {
-                    $attachmentType = "video";
-                } else {
-                    $this->fail(205, "Unknown attachment type");
-                }
-
-                $attachment = str_replace($attachmentType, "", $attac);
-
-                $attachmentOwner = (int) explode("_", $attachment)[0];
-                $attachmentId    = (int) end(explode("_", $attachment));
-
-                $attacc = null;
-
-                if ($attachmentType == "photo") {
-                    $attacc = (new PhotosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Photo does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this photo");
-                    }
-
-                    $comment->attach($attacc);
-                } elseif ($attachmentType == "video") {
-                    $attacc = (new VideosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Video does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this video");
-                    }
-
-                    $comment->attach($attacc);
-                }
-            }
-        }
-
         return $comment->getId();
     }
 
-    public function delete(string $note_id)
-    {
-        $this->requireUser();
-        $this->willExecuteWriteAction();
-
-        $note = (new NotesRepo())->get((int) $note_id);
-
-        if (!$note) {
-            $this->fail(180, "Note not found");
-        }
-
-        if (!$note->canBeModifiedBy($this->getUser())) {
-            $this->fail(15, "Access to note denied");
-        }
-
-        $note->delete();
-
-        return 1;
-    }
-
     public function edit(string $note_id, string $title = "", string $text = "", int $privacy = 0, int $comment_privacy = 0, string $privacy_view  = "", string $privacy_comment  = "")
     {
         $this->requireUser();
@@ -147,15 +85,15 @@ final class Notes extends VKAPIRequestHandler
         $note = (new NotesRepo())->getNoteById($this->getUser()->getId(), (int) $note_id);
 
         if (!$note) {
-            $this->fail(180, "Note not found");
+            $this->fail(15, "Access denied");
         }
 
         if ($note->isDeleted()) {
-            $this->fail(189, "Note is deleted");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->canBeModifiedBy($this->getUser())) {
-            $this->fail(403, "No access");
+            $this->fail(15, "Access denied");
         }
 
         !empty($title) ? $note->setName($title) : null;
@@ -168,29 +106,31 @@ final class Notes extends VKAPIRequestHandler
         return 1;
     }
 
-    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10, int $sort = 0)
+    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10)
     {
         $this->requireUser();
+
         $user = (new UsersRepo())->get($user_id);
 
         if (!$user || $user->isDeleted()) {
-            $this->fail(15, "Invalid user");
+            $this->fail(15, "Access denied");
         }
 
         if (!$user->getPrivacyPermission('notes.read', $this->getUser())) {
-            $this->fail(15, "Access denied: this user chose to hide his notes");
+            $this->fail(15, "Access denied");
         }
 
         if (!$user->canBeViewedBy($this->getUser())) {
             $this->fail(15, "Access denied");
         }
 
-        $nodez = (object) [
+        $notes_return_object = (object) [
             "count" => 0,
-            "notes" => [],
+            "items" => [],
         ];
+
         if (empty($note_ids)) {
-            $nodez->count = (new NotesRepo())->getUserNotesCount($user);
+            $notes_return_object->count = (new NotesRepo())->getUserNotesCount($user);
 
             $notes = array_slice(iterator_to_array((new NotesRepo())->getUserNotes($user, 1, $count + $offset, $sort == 0 ? "ASC" : "DESC")), $offset);
 
@@ -199,25 +139,21 @@ final class Notes extends VKAPIRequestHandler
                     continue;
                 }
 
-                $nodez->notes[] = $note->toVkApiStruct();
+                $notes_return_object->items[] = $note->toVkApiStruct();
             }
         } else {
-            $notes = explode(',', $note_ids);
+            $notes_splitted = explode(',', $note_ids);
 
-            foreach ($notes as $note) {
-                $id    = explode("_", $note);
+            foreach ($notes_splitted as $note_id) {
+                $note = (new NotesRepo())->getNoteById($user_id, $note_id);
 
-                $items = [];
-
-                $note = (new NotesRepo())->getNoteById((int) $id[0], (int) $id[1]);
                 if ($note && !$note->isDeleted()) {
-                    $nodez->notes[] = $note->toVkApiStruct();
-                    $nodez->count++;
+                    $notes_return_object->items[] = $note->toVkApiStruct();
                 }
             }
         }
 
-        return $nodez;
+        return $notes_return_object;
     }
 
     public function getById(int $note_id, int $owner_id, bool $need_wiki = false)
@@ -227,23 +163,23 @@ final class Notes extends VKAPIRequestHandler
         $note = (new NotesRepo())->getNoteById($owner_id, $note_id);
 
         if (!$note) {
-            $this->fail(180, "Note not found");
+            $this->fail(15, "Access denied");
         }
 
         if ($note->isDeleted()) {
-            $this->fail(189, "Note is deleted");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->getOwner() || $note->getOwner()->isDeleted()) {
-            $this->fail(177, "Owner does not exists");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser())) {
-            $this->fail(40, "Access denied: this user chose to hide his notes");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->canBeViewedBy($this->getUser())) {
-            $this->fail(15, "Access to note denied");
+            $this->fail(15, "Access denied");
         }
 
         return $note->toVkApiStruct();
@@ -256,23 +192,23 @@ final class Notes extends VKAPIRequestHandler
         $note = (new NotesRepo())->getNoteById($owner_id, $note_id);
 
         if (!$note) {
-            $this->fail(180, "Note not found");
+            $this->fail(15, "Access denied");
         }
 
         if ($note->isDeleted()) {
-            $this->fail(189, "Note is deleted");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->getOwner()) {
-            $this->fail(177, "Owner does not exists");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser())) {
-            $this->fail(14, "No access");
+            $this->fail(15, "Access denied");
         }
 
         if (!$note->canBeViewedBy($this->getUser())) {
-            $this->fail(15, "Access to note denied");
+            $this->fail(15, "Access denied");
         }
 
         $arr = (object) [
@@ -286,14 +222,4 @@ final class Notes extends VKAPIRequestHandler
 
         return $arr;
     }
-
-    public function getFriendsNotes(int $offset = 0, int $count = 0)
-    {
-        $this->fail(501, "Not implemented");
-    }
-
-    public function restoreComment(int $comment_id = 0, int $owner_id = 0)
-    {
-        $this->fail(501, "Not implemented");
-    }
 }
diff --git a/VKAPI/Handlers/Polls.php b/VKAPI/Handlers/Polls.php
index 8c1842c9..53e3e8da 100755
--- a/VKAPI/Handlers/Polls.php
+++ b/VKAPI/Handlers/Polls.php
@@ -120,11 +120,11 @@ final class Polls extends VKAPIRequestHandler
         $poll = (new PollsRepo())->get($poll_id);
 
         if (!$poll) {
-            $this->fail(251, "Invalid poll");
+            $this->fail(15, "Access denied");
         }
 
         if ($poll->isAnonymous()) {
-            $this->fail(251, "Access denied: poll is anonymous.");
+            $this->fail(15, "Access denied");
         }
 
         $voters = array_slice($poll->getVoters($answer_ids, 1, $offset + $count), $offset);
@@ -175,10 +175,4 @@ final class Polls extends VKAPIRequestHandler
 
         return $this->getById($poll->getId());
     }
-
-    public function edit()
-    {
-        #todo
-        return 1;
-    }
 }
diff --git a/Web/Models/Entities/Note.php b/Web/Models/Entities/Note.php
index 17898a10..a44c421b 100644
--- a/Web/Models/Entities/Note.php
+++ b/Web/Models/Entities/Note.php
@@ -138,18 +138,13 @@ class Note extends Postable
     {
         $res = (object) [];
 
-        $res->type          = "note";
         $res->id            = $this->getVirtualId();
         $res->owner_id      = $this->getOwner()->getId();
         $res->title         = $this->getName();
         $res->text          = $this->getText();
         $res->date          = $this->getPublicationTime()->timestamp();
         $res->comments      = $this->getCommentsCount();
-        $res->read_comments = $this->getCommentsCount();
         $res->view_url      = "/note" . $this->getOwner()->getId() . "_" . $this->getVirtualId();
-        $res->privacy_view  = 1;
-        $res->can_comment   = 1;
-        $res->text_wiki     = "r";
 
         return $res;
     }
diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
index 8749b725..8c345b94 100644
--- a/Web/Models/Entities/User.php
+++ b/Web/Models/Entities/User.php
@@ -1497,7 +1497,7 @@ class User extends RowModel
         return $this->getPrivacySetting("likes.read") == User::PRIVACY_NO_ONE;
     }
 
-    public function toVkApiStruct(?User $user = null, string $fields = ''): object
+    public function toVkApiStruct(?User $relation_user = null, string $fields = ''): object
     {
         $res = (object) [];
 
@@ -1507,8 +1507,8 @@ class User extends RowModel
         $res->deactivated = $this->isDeactivated();
         $res->is_closed   = $this->isClosed();
 
-        if (!is_null($user)) {
-            $res->can_access_closed  = (bool) $this->canBeViewedBy($user);
+        if (!is_null($relation_user)) {
+            $res->can_access_closed  = (bool) $this->canBeViewedBy($relation_user);
         }
 
         if (!is_array($fields)) {
@@ -1564,18 +1564,18 @@ class User extends RowModel
                     $res->real_id = $this->getRealId();
                     break;
                 case "blacklisted_by_me":
-                    if (!$user) {
+                    if (!$relation_user) {
                         break;
                     }
 
-                    $res->blacklisted_by_me = (int) $this->isBlacklistedBy($user);
+                    $res->blacklisted_by_me = (int) $this->isBlacklistedBy($relation_user);
                     break;
                 case "blacklisted":
-                    if (!$user) {
+                    if (!$relation_user) {
                         break;
                     }
 
-                    $res->blacklisted = (int) $user->isBlacklistedBy($this);
+                    $res->blacklisted = (int) $relation_user->isBlacklistedBy($this);
                     break;
                 case "games":
                     $res->games = $this->getFavoriteGames();

From 0c8a441df92484747146d12183b1a491f5b037bb Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 15:58:44 +0300
Subject: [PATCH 17/60] fix(scroll): don't set hash

---
 Web/static/js/al_wall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 048c46af..3ec9348c 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2373,7 +2373,7 @@ async function __processPaginatorNextPage(page)
 
     const new_url = new URL(location.href)
     new_url.hash = page
-    history.replaceState(null, null, new_url)
+    //history.replaceState(null, null, new_url)
 
     if(typeof __scrollHook != 'undefined') {
         __scrollHook(page)

From fbf287bcad036dff7d3b828091f8a2f746171cf4 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:04:08 +0300
Subject: [PATCH 18/60] fix: blacklist paddings

---
 Web/static/css/main.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 38e32431..e66356bc 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -3656,7 +3656,7 @@ hr {
 .entity_vertical_list {
     display: flex;
     flex-direction: column;
-    gap: 3px;
+    gap: 10px;
     height: 197px;
     overflow-y: auto;
 }
@@ -3664,6 +3664,7 @@ hr {
 .entity_vertical_list.scroll_container {
     height: unset;
     overflow-y: unset;
+    padding: 5px;
 }
 
 .entity_vertical_list .entity_vertical_list_item {
@@ -3681,12 +3682,16 @@ hr {
 }
 
 .entity_vertical_list.m_mini .entity_vertical_list_item .first_column {
-    gap: 10px;
+    gap: 13px;
+}
+
+.entity_vertical_list.m_mini .entity_vertical_list_item:hover .first_column a {
+    text-decoration: underline;
 }
 
 .entity_vertical_list.m_mini .entity_vertical_list_item .first_column .avatar img {
-    width: 30px;
-    height: 30px;
+    width: 40px;
+    height: 40px;
 }
 
 .entity_vertical_list .entity_vertical_list_item .avatar {

From a210e3cf460087e5f2982b84e8b6edf1dcabfb2c Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:05:45 +0300
Subject: [PATCH 19/60] fix: ajax on tickets

---
 Web/Presenters/templates/@layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index 9e6475fe..f670dedb 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -210,7 +210,7 @@
                             {var $menuLinksAvaiable   = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')}
                             <div n:if="$canAccessAdminPanel || $canAccessHelpdesk || $menuLinksAvaiable" class="menu_divider"></div>
                             <a href="/admin" class="link" n:if="$canAccessAdminPanel" title="{_admin} [Alt+Shift+A]" accesskey="a" rel="nofollow">{_admin}</a>
-                            <a href="/support/tickets" class="link" n:if="$canAccessHelpdesk" rel="nofollow">{_helpdesk}
+                            <a href="/support/tickets" class="link" n:if="$canAccessHelpdesk">{_helpdesk}
                                 {if $helpdeskTicketNotAnsweredCount > 0}
                                     (<b>{$helpdeskTicketNotAnsweredCount}</b>)
                                 {/if}

From 2948ed91c9a1b03afc83a64e625d187c8d1dfc9b Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:08:00 +0300
Subject: [PATCH 20/60] fix: 500 on followers page

---
 Web/Presenters/templates/Group/Followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Group/Followers.xml b/Web/Presenters/templates/Group/Followers.xml
index e81120fe..0042add1 100644
--- a/Web/Presenters/templates/Group/Followers.xml
+++ b/Web/Presenters/templates/Group/Followers.xml
@@ -55,7 +55,7 @@
         <tbody>
             <tr>
                 <td width="120" valign="top"><span class="nobold">{_pronouns}: </span></td>
-                <td>{$x->isFemale() ? tr("female") : ($x->isNeutral() ? tr("neutral") : tr("male"))}</td>
+                <td>{$user->isFemale() ? tr("female") : ($user->isNeutral() ? tr("neutral") : tr("male"))}</td>
             </tr>
             <tr>
                 <td width="120" valign="top"><span class="nobold">{_registration_date}: </span></td>

From 5f3b594e84416f3922c8ea553d27f5f78df30735 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:10:25 +0300
Subject: [PATCH 21/60] fix: notes picker

---
 Web/static/js/al_wall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 3ec9348c..26fb88fa 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1647,7 +1647,7 @@ u(document).on('click', '#__notesAttachment', async (e) => {
             insert_place.append(tr('no_notes'))    
         }
 
-        notes.notes.forEach(note => {
+        notes.items.forEach(note => {
             is_attached = (form.find(`.upload-item[data-type='note'][data-id='${note.owner_id}_${note.id}']`)).length > 0
             insert_place.append(`
                 <div class='display_flex_row _content' data-attachmentdata="${note.owner_id}_${note.id}" data-name='${escapeHtml(note.title)}'>

From c4129d2cdc377c1aa16970cf73f0a60141c5a850 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:31:15 +0300
Subject: [PATCH 22/60] fix: textarea paddings

---
 Web/static/css/main.css   | 18 ++++++++++++++----
 Web/static/js/al_music.js |  2 +-
 Web/static/js/al_wall.js  |  5 ++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index e66356bc..9da885ff 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -880,7 +880,7 @@ h4 {
 }
 
 .post-geo {
-    margin: 1px 0px;
+    margin: 8px 0px 2px -3px;
     padding: 0 4px;
 }
 
@@ -1570,6 +1570,10 @@ body.scrolled .toTop:hover, .toTop.has_down:hover {
     color: #3c3c3c;
 }
 
+.post-has-geo.appended-geo {
+    padding: 6px 0px;
+}
+
 .post-source #remove_source_button, #small_remove_button {
     display: inline-block;
     background-repeat: no-repeat;
@@ -2670,7 +2674,8 @@ a.poll-retract-vote {
 }
 
 .post-buttons .vertical-attachment .vertical-attachment-content { 
-    max-height: 27px;
+    /*max-height: 27px;*/
+    padding: 3px 2px;
 }
 
 .vertical-attachment .vertical-attachment-content .overflowedName {
@@ -3201,6 +3206,11 @@ a.poll-retract-vote {
     display: flex;
     align-items: center;
     gap: 1px;
+    padding: 5px 9px;
+}
+
+.post-buttons .attachment_note {
+    padding: 3px 0px;
 }
 
 .attachment_note svg {
@@ -4274,8 +4284,8 @@ hr {
 .attachments .docGalleryItem {
     display: block;
     min-width: 170px;
-    height: 170px;
-    width: 50%;
+    min-height: 170px;
+    width: 83%;
     margin-bottom: 4px;
 }
 
diff --git a/Web/static/js/al_music.js b/Web/static/js/al_music.js
index 60ca15e0..3595f1c2 100644
--- a/Web/static/js/al_music.js
+++ b/Web/static/js/al_music.js
@@ -1859,7 +1859,7 @@ function showAudioAttachment(type = 'form', form = null)
             }
             let is_attached = false
             if(type == 'form') {
-                is_attached = (u(form).find(`.post-vertical .vertical-attachment[data-id='${id}']`)).length > 0
+                is_attached = (u(form).find(`.post-vertical .vertical-attachment[data-type='audio'][data-id='${id}']`)).length > 0
             } else {
                 is_attached = (u(form).find(`.PE_audios .vertical-attachment[data-id='${id}']`)).length > 0
             }
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 26fb88fa..5f57bee6 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2439,8 +2439,7 @@ u(document).on('click', '#__sourceAttacher', (e) => {
     MessageBox(tr('add_source'), `
         <div id='source_flex_kunteynir'>
             <span>${tr('set_source_tip')}</span>
-            <!-- давай, копируй ссылку и переходи по ней -->
-            <input type='text' maxlength='400' placeholder='https://www.youtube.com/watch?v=lkWuk_nzzVA'>
+            <input type='text' maxlength='400' placeholder='...'>
         </div>
     `, [tr('cancel')], [
         () => {Function.noop}
@@ -2650,7 +2649,7 @@ u(document).on('click', "#__geoAttacher", async (e) => {
                 ${tplMapIcon}
                 <span>${escapeHtml(geo_name)}</span>
                 <div id="small_remove_button"></div>
-            `)
+            `).addClass("appended-geo")
         }, () => {}]
     })
 

From 13926e00b792a0f1587c31e6f6a6f2a3e53ee996 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:34:13 +0300
Subject: [PATCH 23/60] fix: source window paddings

---
 Web/static/css/main.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 9da885ff..1cb884cb 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -3393,6 +3393,7 @@ body.article .floating_sidebar, body.article .page_content {
     display: flex;
     flex-direction: column;
     gap: 22px;
+    padding: 5px 10px;
 }
 
 .sugglist {

From 57ef9430f868c19b32ddb291f92f978de47be409 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:44:51 +0300
Subject: [PATCH 24/60] feat: enlarge graffiti

---
 Web/static/css/dialog.css | 2 +-
 Web/static/css/main.css   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Web/static/css/dialog.css b/Web/static/css/dialog.css
index 44892fb2..c4fe298b 100644
--- a/Web/static/css/dialog.css
+++ b/Web/static/css/dialog.css
@@ -49,7 +49,7 @@ body.dimmed > .dimmer #absolute_territory {
 .ovk-diag-body {
     padding: 20px;
     overflow-y: auto;
-    max-height: 80vh
+    max-height: 83vh
 }
 
 .ovk-diag-action {
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 1cb884cb..389134a1 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -1888,6 +1888,7 @@ body.scrolled .toTop:hover, .toTop.has_down:hover {
 
 #ovkDraw {
     border: 1px solid #757575;
+    min-height: 510px;
 }
 
 #ovkDraw .lc-drawing.with-gui {
@@ -1896,6 +1897,7 @@ body.scrolled .toTop:hover, .toTop.has_down:hover {
 
 #ovkDraw .literally {
     border-radius: 0;
+    height: 510px;
 }
 
 #ovkDraw .literally .lc-picker,

From ccb1448c15192f6b2709bdebd2ae0f27f63f98ad Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 16:47:44 +0300
Subject: [PATCH 25/60] fix: add margin at post page

---
 Web/Presenters/templates/Wall/Post.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml
index 3d136ebd..e7146044 100644
--- a/Web/Presenters/templates/Wall/Post.xml
+++ b/Web/Presenters/templates/Wall/Post.xml
@@ -38,7 +38,7 @@
                  model => "posts",
                  parent => $post }
     </div>
-    <div style="float: left; min-height: 100px; width: 32%;">
+    <div style="float: left; min-height: 100px; width: 32%;padding-left: 10px;width: 30%;">
         <h4>{_actions}</h4>
         {if isset($thisUser)}
             {var $canDelete = $post->canBeDeletedBy($thisUser)}

From 1fc37d5e913fbaa4c8f6c675a0708ee0a59dd7ac Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 17:11:26 +0300
Subject: [PATCH 26/60] feat: count of comments on microblog

---
 Web/Presenters/templates/components/post/microblogpost.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml
index b39b8239..c163154f 100644
--- a/Web/Presenters/templates/components/post/microblogpost.xml
+++ b/Web/Presenters/templates/components/post/microblogpost.xml
@@ -148,7 +148,7 @@
                     {/if}
                 </div>
                 <div n:if="!($forceNoCommentsLink ?? false) && $commentSection == true && $compact == false" class="post-menu-s">
-                    <a n:if="$commentsCount > 3" href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments}</a>
+                    <a n:if="$commentsCount > 3" href="/wall{$post->getPrettyId()}" class="expand_button">{_view_other_comments} ({$commentsCount - 3})</a>
                     {foreach $comments as $comment}
                         {include "../comment.xml", comment => $comment, $compact => true}
                     {/foreach}

From afafb90fbdeeff929f600292a0ea83a3b90d86c9 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 17:27:02 +0300
Subject: [PATCH 27/60] fix: add warning at nospam

---
 Web/Presenters/NoSpamPresenter.php        | 2 +-
 Web/Presenters/templates/NoSpam/Index.xml | 8 +++++++-
 locales/en.strings                        | 2 ++
 locales/ru.strings                        | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/NoSpamPresenter.php b/Web/Presenters/NoSpamPresenter.php
index e6da910b..4d6a07d5 100644
--- a/Web/Presenters/NoSpamPresenter.php
+++ b/Web/Presenters/NoSpamPresenter.php
@@ -102,7 +102,7 @@ final class NoSpamPresenter extends OpenVKPresenter
 
                         $item = new $model($item);
 
-                        if (key_exists("deleted", $item->unwrap()) && $item->isDeleted()) {
+                        if (property_exists($item->unwrap(), "deleted") && $item->isDeleted()) {
                             $item->setDeleted(0);
                             $item->save();
                         }
diff --git a/Web/Presenters/templates/NoSpam/Index.xml b/Web/Presenters/templates/NoSpam/Index.xml
index 0c465af8..d6b5f9cc 100644
--- a/Web/Presenters/templates/NoSpam/Index.xml
+++ b/Web/Presenters/templates/NoSpam/Index.xml
@@ -269,7 +269,13 @@
                 search();
             }
         });
-        $("#apply").on("click", () => { search(Number($("#noSpam-ban-type").val())); })
+        $("#apply").on("click", (e) => { 
+            e.preventDefault() 
+
+            MessageBox(tr("warning"), tr("nospam_prevention"), [tr("no"), tr("yes")], [Function.noop, () => {
+                search(Number($("#noSpam-ban-type").val())); 
+            }]);
+        })
 
         async function selectChange(value) {
             console.log(value);
diff --git a/locales/en.strings b/locales/en.strings
index e1281387..7e5b0425 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -2322,6 +2322,8 @@
 "roll_back" = "rollback";
 "roll_backed" = "rollbacked";
 
+"nospam_prevention" = "This action will affect a lot of data. Are you sure you want to apply?";
+
 /* RSS */
 
 "post_deact_in_general" = "Page deletion";
diff --git a/locales/ru.strings b/locales/ru.strings
index f6e49716..6bfb2527 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -2217,6 +2217,8 @@
 "roll_back" = "откатить";
 "roll_backed" = "откачено";
 
+"nospam_prevention" = "Данное действие затронет множество данных. Вы действительно хотите применить?";
+
 /* RSS */
 
 "post_deact_in_general" = "Удаление страницы";

From ff988cccaf222326cb449ba6a129ff5feb43bd36 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 17:53:44 +0300
Subject: [PATCH 28/60] fix: followers scroll

---
 Web/Presenters/GroupPresenter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php
index ba9ec1f4..b0a67cda 100644
--- a/Web/Presenters/GroupPresenter.php
+++ b/Web/Presenters/GroupPresenter.php
@@ -135,7 +135,7 @@ final class GroupPresenter extends OpenVKPresenter
 
         $this->template->paginatorConf = (object) [
             "count"   => $this->template->count,
-            "page"    => $this->queryParam("p") ?? 1,
+            "page"    => (int)($this->queryParam("p") ?? 1),
             "amount"  => 10,
             "perPage" => OPENVK_DEFAULT_PER_PAGE,
         ];

From 8a82952f0dfe14c068a776c826b3a8fd6f4d6dc9 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 19:02:15 +0300
Subject: [PATCH 29/60] fix: infinty scroll for high screens

---
 VKAPI/Handlers/Board.php  | 6 +++---
 VKAPI/Handlers/Groups.php | 2 +-
 Web/static/js/al_wall.js  | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/VKAPI/Handlers/Board.php b/VKAPI/Handlers/Board.php
index c921ee8f..e2e9b86b 100644
--- a/VKAPI/Handlers/Board.php
+++ b/VKAPI/Handlers/Board.php
@@ -56,7 +56,7 @@ final class Board extends VKAPIRequestHandler
 
                 $comment->save();
             }
-        } catch(\Throwable $e) {
+        } catch (\Throwable $e) {
             return $topic->getId();
         }
 
@@ -183,7 +183,7 @@ final class Board extends VKAPIRequestHandler
         }
 
         $obj = (object) [
-            "items" => []
+            "items" => [],
         ];
 
         if ($extended) {
@@ -222,7 +222,7 @@ final class Board extends VKAPIRequestHandler
             $this->fail(4, "Invalid count");
         }
 
-        $obj = (object)[];
+        $obj = (object) [];
 
         $club = (new ClubsRepo())->get($group_id);
 
diff --git a/VKAPI/Handlers/Groups.php b/VKAPI/Handlers/Groups.php
index 7d7a466c..6492ca20 100644
--- a/VKAPI/Handlers/Groups.php
+++ b/VKAPI/Handlers/Groups.php
@@ -411,7 +411,7 @@ final class Groups extends VKAPIRequestHandler
 
         $obj = (object) [
             "count" => sizeof($members),
-            "items" => []
+            "items" => [],
         ];
 
         foreach ($members as $member) {
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 5f57bee6..841e5ac4 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2375,6 +2375,9 @@ async function __processPaginatorNextPage(page)
     new_url.hash = page
     //history.replaceState(null, null, new_url)
 
+    showMoreObserver.disconnect()
+    showMoreObserver.observe(u('.paginator:not(.paginator-at-top)').nodes[0])
+
     if(typeof __scrollHook != 'undefined') {
         __scrollHook(page)
     }

From 86f8b0f923fba6ce42bc7d7c86f6f07fc2543451 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 21:47:11 +0300
Subject: [PATCH 30/60] feat: add comments sort

---
 Web/Models/Entities/Postable.php              |   4 ++--
 Web/Presenters/WallPresenter.php              |   6 +++++-
 Web/Presenters/templates/Wall/Post.xml        |   3 ++-
 .../templates/components/comments.xml         |  15 ++++++++++++-
 Web/static/css/main.css                       |  20 ++++++++++++++++++
 Web/static/img/wall.png                       | Bin 2161 -> 2561 bytes
 locales/en.strings                            |   3 +++
 locales/ru.strings                            |   3 +++
 8 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/Web/Models/Entities/Postable.php b/Web/Models/Entities/Postable.php
index 75d774b5..b9309c45 100644
--- a/Web/Models/Entities/Postable.php
+++ b/Web/Models/Entities/Postable.php
@@ -75,9 +75,9 @@ abstract class Postable extends Attachable
         return new DateTime($edited);
     }
 
-    public function getComments(int $page, ?int $perPage = null): \Traversable
+    public function getComments(int $page, ?int $perPage = null, string $sort = "ASC"): \Traversable
     {
-        return (new Comments())->getCommentsByTarget($this, $page, $perPage);
+        return (new Comments())->getCommentsByTarget($this, $page, $perPage, $sort);
     }
 
     public function getCommentsCount(): int
diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index f4a8e898..0add4c0c 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -469,7 +469,11 @@ final class WallPresenter extends OpenVKPresenter
         }
         $this->template->cCount   = $post->getCommentsCount();
         $this->template->cPage    = (int) ($_GET["p"] ?? 1);
-        $this->template->comments = iterator_to_array($post->getComments($this->template->cPage));
+        $this->template->sort = $this->queryParam("sort") ?? "asc";
+
+        $input_sort = $this->template->sort == "asc" ? "ASC" : "DESC";
+
+        $this->template->comments = iterator_to_array($post->getComments($this->template->cPage, null, $input_sort));
     }
 
     public function renderLike(int $wall, int $post_id): void
diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml
index e7146044..ee526065 100644
--- a/Web/Presenters/templates/Wall/Post.xml
+++ b/Web/Presenters/templates/Wall/Post.xml
@@ -36,7 +36,8 @@
                  count => $cCount,
                  page => $cPage,
                  model => "posts",
-                 parent => $post }
+                 parent => $post,
+                 sort => $sort}
     </div>
     <div style="float: left; min-height: 100px; width: 32%;padding-left: 10px;width: 30%;">
         <h4>{_actions}</h4>
diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml
index 53253b5f..3c9a858e 100644
--- a/Web/Presenters/templates/components/comments.xml
+++ b/Web/Presenters/templates/components/comments.xml
@@ -1,5 +1,18 @@
-<h4 n:if="$showTitle ?? true">{_comments} ({$count})</h4>
+<div>
+    <h4 n:if="$showTitle ?? true">{_comments} ({$count})</h4>
 
+    {if !is_null($sort) && $count > 5}
+        <a class="sort_link" n:attr="href => $sort == 'desc' ? '?sort=asc' : '?sort=desc'">
+            {if $sort == 'desc'}
+                {_new_first}
+            {else}
+                {_old_first}
+            {/if}
+
+            <div n:class="sort_link_icon, $sort == 'desc' ? sort_link_icon_desc : sort_link_icon_asc"></div>
+        </a>
+    {/if}
+</div>
 <div n:ifset="$thisUser" id="standaloneCommentBox">
     {var $commentsURL = "/al_comments/create/$model/" . $parent->getId()}
     {var $club = $parent instanceof \openvk\Web\Models\Entities\Post && $parent->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($parent->getTargetWall())) : $club}
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 389134a1..8dd47fd7 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -4314,3 +4314,23 @@ hr {
 .deleted_mark_average {
     padding: 5px 61px;
 }
+
+.sort_link {
+    padding: 5px 2px;
+    display: inline-block;
+}
+
+.sort_link_icon {
+    background: url(/assets/packages/static/openvk/img/wall.png?v=3) no-repeat;
+    display: inline-block;
+    height: 11px;
+    width: 9px;
+}
+
+.sort_link_icon_desc {
+    background-position: 0px -15px;
+}
+
+.sort_link_icon_asc {
+    background-position: -11px -15px;
+}
diff --git a/Web/static/img/wall.png b/Web/static/img/wall.png
index 197dca8d39ae2bce46709d3f264ab181353c787e..e8577b9c46829845f4a7e18c3da9172dce9b199e 100644
GIT binary patch
delta 2514
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
Ig_&pEze1SX_5c6?

delta 2111
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
A_W%F@

diff --git a/locales/en.strings b/locales/en.strings
index 7e5b0425..4c3c4595 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -868,6 +868,9 @@
 "sort_up" = "Sort by ID up";
 "sort_down" = "Sort by ID down";
 
+"new_first" = "New frist";
+"old_first" = "Old first";
+
 /* Videos */
 
 "videos" = "Videos";
diff --git a/locales/ru.strings b/locales/ru.strings
index 6bfb2527..16a44e02 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -826,6 +826,9 @@
 "sort_up" = "Сортировать по дате создания вверх";
 "sort_down" = "Сортировать по дате создания вниз";
 
+"new_first" = "Сначала новые";
+"old_first" = "Сначала старые";
+
 /* Videos */
 
 "videos" = "Видеозаписи";

From 07bde0e64931f4dbfbc4adb8976aad93a025afcc Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 22:03:06 +0300
Subject: [PATCH 31/60] fix: router recursion

---
 Web/static/js/router.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Web/static/js/router.js b/Web/static/js/router.js
index 4882926a..fa4fdbda 100644
--- a/Web/static/js/router.js
+++ b/Web/static/js/router.js
@@ -401,8 +401,10 @@ window.addEventListener('popstate', (e) => {
         return
     }*/
 
-    window.router.route({
-        url: location.href,
-        push_state: false,
-    })
+    if(e.state != null) {
+        window.router.route({
+            url: location.href,
+            push_state: false,
+        })
+    }
 })

From c07cac857a7087851e398063e7ee8f94a60465a9 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 22:05:57 +0300
Subject: [PATCH 32/60] feat: make doc width 60%

---
 Web/static/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 8dd47fd7..bc23a268 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -4288,7 +4288,7 @@ hr {
     display: block;
     min-width: 170px;
     min-height: 170px;
-    width: 83%;
+    width: 60%;
     margin-bottom: 4px;
 }
 

From a84829b72d938897a1b2c132a24775984734e3ed Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 22:20:23 +0300
Subject: [PATCH 33/60] fix: wrong comments when editing

---
 Web/Presenters/InternalAPIPresenter.php | 4 ++--
 Web/static/js/al_wall.js                | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Web/Presenters/InternalAPIPresenter.php b/Web/Presenters/InternalAPIPresenter.php
index 2e3a33ca..f12e4859 100644
--- a/Web/Presenters/InternalAPIPresenter.php
+++ b/Web/Presenters/InternalAPIPresenter.php
@@ -146,7 +146,7 @@ final class InternalAPIPresenter extends OpenVKPresenter
     {
         if ($_SERVER["REQUEST_METHOD"] !== "POST") {
             header("HTTP/1.1 405 Method Not Allowed");
-            exit("ты‍ не по адресу");
+            $this->redirect("/");
         }
 
         $type = $this->queryParam("type", false);
@@ -165,7 +165,7 @@ final class InternalAPIPresenter extends OpenVKPresenter
         if ($type == 'post') {
             $this->template->_template = 'components/post.xml';
             $this->template->post = $post;
-            $this->template->commentSection = true;
+            $this->template->commentSection = $this->queryParam("from_page") == "another";
         } elseif ($type == 'comment') {
             $this->template->_template = 'components/comment.xml';
             $this->template->comment = $post;
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 841e5ac4..cb529d55 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1125,7 +1125,14 @@ u(document).on("click", "#editPost", async (e) => {
                 return
             }
             
-            const new_post_html = await (await fetch(`/iapi/getPostTemplate/${id[0]}_${id[1]}?type=${type}`, {
+            let is_at_post_page = false
+            try {
+                if(location.pathname.indexOf("wall") != -1 && location.pathname.split("_").length == 2) {
+                    is_at_post_page = true
+                }
+            } catch(e) {}
+
+            const new_post_html = await (await fetch(`/iapi/getPostTemplate/${id[0]}_${id[1]}?type=${type}&from_page=${is_at_post_page ? "post" : "another"}`, {
                 'method': 'POST'
             })).text()
             u(ev.target).removeClass('lagged')

From 7792a11e3fdc0046a53ee46c701ddc8d66cfde7a Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 22:23:49 +0300
Subject: [PATCH 34/60] fix: careless topic deletion

---
 Web/Presenters/templates/Topics/Edit.xml | 2 +-
 Web/static/js/al_wall.js                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/Topics/Edit.xml b/Web/Presenters/templates/Topics/Edit.xml
index 0f3a7a5d..d719341f 100644
--- a/Web/Presenters/templates/Topics/Edit.xml
+++ b/Web/Presenters/templates/Topics/Edit.xml
@@ -40,7 +40,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <a class="button" href="/topic{$topic->getPrettyId()}/delete?hash={urlencode($csrfToken)}">{_delete_topic}</a>
+                        <a id="_anotherDelete" class="button" href="/topic{$topic->getPrettyId()}/delete?hash={urlencode($csrfToken)}">{_delete_topic}</a>
                     </td>
                     <td>
                         <input type="hidden" name="hash" value="{$csrfToken}" />
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index cb529d55..0c55c4b4 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -606,7 +606,7 @@ function reportClub(club_id) {
     ]);
 }
 
-$(document).on("click", "#_photoDelete, #_videoDelete", function(e) {
+$(document).on("click", "#_photoDelete, #_videoDelete, #_anotherDelete", function(e) {
     var formHtml = "<form id='tmpPhDelF' action='" + u(this).attr("href") + "' >";
     formHtml    += "<input type='hidden' name='hash' value='" + u("meta[name=csrf]").attr("value") + "' />";
     formHtml    += "</form>";

From 1943913713045821f68e4640bfe515289dfe97c5 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 23:13:13 +0300
Subject: [PATCH 35/60] feat: autostart gif

---
 Web/static/js/al_wall.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 0c55c4b4..7d3b7139 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2962,3 +2962,28 @@ u(document).on("submit", "#additional_fields_form", (e) => {
         }
     }) 
 })
+
+if(Number(localStorage.getItem('ux.gif_autoplay') ?? 0) == 1) {
+    const showMoreObserver = new IntersectionObserver(entries => {
+        entries.forEach(async x => {
+            doc_item = x.target.closest(".docGalleryItem")
+            if(doc_item.querySelector(".play-button") != null) {
+                if(x.isIntersecting) {
+                    doc_item.classList.add("playing")
+                } else {
+                    doc_item.classList.remove("playing")
+                }
+            }
+        })
+    }, {
+        root: null,
+        rootMargin: '0px',
+        threshold: 0,
+    })
+    
+    if(u('.docGalleryItem').length > 0) {
+        u('.docGalleryItem').nodes.forEach(item => {
+            showMoreObserver.observe(item)
+        })
+    }
+}

From e72e310f7f30bf101119f1bca25a5c7701645835 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sat, 24 May 2025 23:51:28 +0300
Subject: [PATCH 36/60] feat: video not unlisted af. editing

---
 Web/Presenters/VideosPresenter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Web/Presenters/VideosPresenter.php b/Web/Presenters/VideosPresenter.php
index e2e1a6f4..84878540 100644
--- a/Web/Presenters/VideosPresenter.php
+++ b/Web/Presenters/VideosPresenter.php
@@ -133,6 +133,7 @@ final class VideosPresenter extends OpenVKPresenter
         if ($_SERVER["REQUEST_METHOD"] === "POST") {
             $video->setName(empty($this->postParam("name")) ? null : $this->postParam("name"));
             $video->setDescription(empty($this->postParam("desc")) ? null : $this->postParam("desc"));
+            $video->setUnlisted(false);
             $video->save();
 
             $this->flash("succ", tr("changes_saved"), tr("changes_saved_video_comment"));

From 88c1430c9a74f333fd1302350ca4b76fe8437e0f Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 25 May 2025 10:56:39 +0300
Subject: [PATCH 37/60] feat(comms): warning before deletion

---
 Web/Presenters/templates/components/comment.xml |  2 +-
 Web/static/js/al_wall.js                        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index c4e0de08..37c9cba2 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -44,7 +44,7 @@
                         {if !$timeOnly}
                             {if $comment->canBeDeletedBy($thisUser)}
                                 |
-                                <a href="/comment{$comment->getId()}/delete">{_delete}</a>
+                                <a href="/comment{$comment->getId()}/delete" id="_ajaxDelete">{_delete}</a>
                             {/if}
                             {if $comment->canBeEditedBy($thisUser)}
                                 |
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 7d3b7139..9d529b5c 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -606,6 +606,21 @@ function reportClub(club_id) {
     ]);
 }
 
+$(document).on("click", "#_ajaxDelete", function(e) {
+    MessageBox(tr('warning'), tr('question_confirm'), [
+        tr('yes'),
+        tr('no')
+    ], [
+        () => {
+            window.router.route(e.target.href)
+        },
+        Function.noop
+    ]);
+    
+    e.stopPropagation()
+    return e.preventDefault();
+});
+
 $(document).on("click", "#_photoDelete, #_videoDelete, #_anotherDelete", function(e) {
     var formHtml = "<form id='tmpPhDelF' action='" + u(this).attr("href") + "' >";
     formHtml    += "<input type='hidden' name='hash' value='" + u("meta[name=csrf]").attr("value") + "' />";

From 37b00e27d453576b3bea1f06e05d145384d47d58 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 25 May 2025 11:06:50 +0300
Subject: [PATCH 38/60] fix: audio playing on report page

---
 Web/static/js/al_music.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Web/static/js/al_music.js b/Web/static/js/al_music.js
index 3595f1c2..0ea6fd5e 100644
--- a/Web/static/js/al_music.js
+++ b/Web/static/js/al_music.js
@@ -845,22 +845,14 @@ u(document).on('click', '.audioEntry .playerButton > .playIcon', async (e) => {
 
     if(!window.player.hasTrackWithId(id) && !window.player.isAtAudiosPage()) {
         let _nodes = null
-        if(u(e.target).closest('.attachments').length > 0) {
-            window.player.connectionType = '.attachments'
-            _nodes = u(e.target).closest('.attachments').find('.audioEmbed').nodes
-        } else if(u(e.target).closest('.content_list').length > 0) {
-            window.player.connectionType = '.content_list'
-            _nodes = u(e.target).closest('.content_list').find('.audioEmbed').nodes
-        } else if(u(e.target).closest('.generic_audio_list').length > 0) {
-            window.player.connectionType = '.generic_audio_list'
-            _nodes = u(e.target).closest('.generic_audio_list').find('.audioEmbed').nodes
-        } else if(u(e.target).closest('.audiosInsert').length > 0) {
-            window.player.connectionType = '.audiosInsert'
-            _nodes = u(e.target).closest('.audiosInsert').find('.audioEmbed').nodes
-        } else if(u(e.target).closest('.scroll_container').length > 0) {
-            window.player.connectionType = '.scroll_container'
-            _nodes = u(e.target).closest('.scroll_container').find('.audioEmbed').nodes
-        }
+
+        try_these_containers = [".attachments", ".content_list", ".generic_audio_list", ".audiosInsert", ".scroll_container", ".container_gray"]
+        try_these_containers.forEach(__container => {
+            if(u(e.target).closest(__container).length > 0) {
+                window.player.connectionType = __container
+                _nodes = u(e.target).closest(__container).find('.audioEmbed').nodes
+            }
+        })
 
         window.player.tracks = []
         _nodes.forEach(el => {

From 6d9381e48cb8ac65ae14621c40ef1ed2fe542e74 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 25 May 2025 11:21:08 +0300
Subject: [PATCH 39/60] feat: tickets text length to 200

---
 Web/Presenters/templates/Support/List.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Support/List.xml b/Web/Presenters/templates/Support/List.xml
index a1898eed..254efc24 100644
--- a/Web/Presenters/templates/Support/List.xml
+++ b/Web/Presenters/templates/Support/List.xml
@@ -42,6 +42,6 @@
 {block description}
     {var $author = $x->getUser()}
     
-    {ovk_proc_strtr($x->getContext(), 50)}<br/>
+    {ovk_proc_strtr($x->getContext(), 200)}<br/>
     <span class="nobold">{_author}: </span> <a href="{$author->getURL()}">{$author->getCanonicalName()}</a>
 {/block}

From 199844ae857880aecf172f46a48e35a125c57993 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 25 May 2025 11:26:22 +0300
Subject: [PATCH 40/60] feat: warning on post delete button

---
 Web/Presenters/templates/Wall/Post.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml
index ee526065..6f4ee86e 100644
--- a/Web/Presenters/templates/Wall/Post.xml
+++ b/Web/Presenters/templates/Wall/Post.xml
@@ -48,7 +48,7 @@
             {/if}
         {/if}
         
-        <a n:if="$canDelete ?? false" class="profile_link" style="display:block;width:96%;" href="/wall{$post->getPrettyId()}/delete">{_delete}</a>
+        <a n:if="$canDelete ?? false" id="_ajaxDelete" class="profile_link" style="display:block;width:96%;" href="/wall{$post->getPrettyId()}/delete">{_delete}</a>
         <a
             n:if="isset($thisUser) && $thisUser->getChandlerUser()->can('access')->model('admin')->whichBelongsTo(NULL) AND $post->getEditTime()"
             style="display:block;width:96%;"

From 1f8303dd153833ab5ea8413be14e308dd587d74a Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Sun, 25 May 2025 11:32:35 +0300
Subject: [PATCH 41/60] feat: showArticle() css changes

---
 Web/static/css/main.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index bc23a268..614b4258 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -3228,6 +3228,10 @@ a.poll-retract-vote {
     height: 12px;
 }
 
+.attachments .attachment_note {
+    padding: 5px 5px;
+}
+
 #notesList
 {
     overflow-y: scroll;
@@ -3264,7 +3268,7 @@ body.article .floating_sidebar, body.article .page_content {
     display: none;
     position: absolute;
     z-index: 128;
-    width: 100%;
+    width: 98%;
     min-height: 100vh;
     padding: 20px;
     box-sizing: border-box;
@@ -3298,6 +3302,7 @@ body.article .floating_sidebar, body.article .page_content {
 .articleView_author > div {
     display: flex;
     flex-direction: column;
+    margin-top: 3px;
 }
 
 .articleView_author > div > span {

From 6c5f60aebc68e6695a3de887142b40f419dc5475 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Mon, 26 May 2025 21:41:34 +0300
Subject: [PATCH 42/60] fix: space between types

---
 Web/Presenters/GroupPresenter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php
index b0a67cda..a38dacaa 100644
--- a/Web/Presenters/GroupPresenter.php
+++ b/Web/Presenters/GroupPresenter.php
@@ -135,7 +135,7 @@ final class GroupPresenter extends OpenVKPresenter
 
         $this->template->paginatorConf = (object) [
             "count"   => $this->template->count,
-            "page"    => (int)($this->queryParam("p") ?? 1),
+            "page"    => (int) ($this->queryParam("p") ?? 1),
             "amount"  => 10,
             "perPage" => OPENVK_DEFAULT_PER_PAGE,
         ];

From e1dc5c67d640e88363b872eaeb476bfe2d443986 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Mon, 26 May 2025 21:45:40 +0300
Subject: [PATCH 43/60] fix: theme id != "mobile_ovk"

---
 Web/Presenters/templates/_includeCSS.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/_includeCSS.xml b/Web/Presenters/templates/_includeCSS.xml
index e5c052c6..2553c981 100644
--- a/Web/Presenters/templates/_includeCSS.xml
+++ b/Web/Presenters/templates/_includeCSS.xml
@@ -19,7 +19,7 @@
 
         {* remove the "n:if" if you having issues with your theme *}
 
-        <link n:if="!$theme->overridesTemplates()" rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/stylesheet/styles.css" />
+        <link n:if="$theme->getId() != 'mobile_ovk'" rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/stylesheet/styles.css" />
 
         {if $isXmas}
             <link rel="stylesheet" href="/themepack/{$theme->getId()}/{$theme->getVersion()}/resource/xmas.css" />

From a6820d3ae0ab9da50b72305fdca5c7a91a5f0cf7 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Mon, 26 May 2025 23:22:41 +0300
Subject: [PATCH 44/60] feat: playlist cover is unlisted

---
 Web/Models/Entities/Playlist.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Web/Models/Entities/Playlist.php b/Web/Models/Entities/Playlist.php
index fedb2d98..4265d7e1 100644
--- a/Web/Models/Entities/Playlist.php
+++ b/Web/Models/Entities/Playlist.php
@@ -260,6 +260,7 @@ class Playlist extends MediaCollection
         $cover->setDescription("Playlist cover image");
         $cover->setFile($file);
         $cover->setCreated(time());
+        $cover->setSystem(true);
         $cover->save();
 
         $this->setCover_photo_id($cover->getId());

From b05d39e27ad6cbcb7289476de2406e0c5b2dd88b Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Mon, 26 May 2025 23:54:14 +0300
Subject: [PATCH 45/60] feat: provide id on upload context

---
 Web/Presenters/templates/components/textArea.xml | 2 +-
 Web/static/js/al_wall.js                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index d5778ebd..b4b2ff72 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -2,7 +2,7 @@
 {var $textAreaId = ($post ?? NULL) === NULL ? (++$GLOBALS["textAreaCtr"]) : $post->getId()}
 {var $textAreaId = ($custom_id ?? NULL) === NULL ? $textAreaId : $custom_id}
 
-<div id="write" class='model_content_textarea' style="padding: 5px 0;">
+<div id="write" class='model_content_textarea' style="padding: 5px 0;" data-id="{$owner}">
     <form action="{$route}" method="post" enctype="multipart/form-data" style="margin:0;">
         <textarea id="wall-post-input{$textAreaId}" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
         <div>
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 9d529b5c..c288bfdc 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1191,6 +1191,7 @@ async function __uploadToTextarea(file, textareaNode) {
     const form_data = new FormData
     form_data.append('photo_0', file)
     form_data.append('count', 1)
+    form_data.append('upload_context', textareaNode.nodes[0].dataset.id)
     form_data.append("hash", u("meta[name=csrf]").attr("value"))
     
     if(filetype == 'photo') {

From e5db5fd8b00b94d3e6d6d967d59546381c1e524c Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 13:38:29 +0300
Subject: [PATCH 46/60] fix: not add photo to album if wrong

---
 Web/Presenters/PhotosPresenter.php            | 28 +++++++++++--------
 .../templates/components/textArea.xml         |  2 +-
 Web/static/js/al_wall.js                      |  3 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Web/Presenters/PhotosPresenter.php b/Web/Presenters/PhotosPresenter.php
index 6c294fdd..9bc150cb 100644
--- a/Web/Presenters/PhotosPresenter.php
+++ b/Web/Presenters/PhotosPresenter.php
@@ -272,21 +272,25 @@ final class PhotosPresenter extends OpenVKPresenter
         $this->assertUserLoggedIn();
         $this->willExecuteWriteAction(true);
 
+        $upload_context = $this->queryParam("upload_context");
+
         if (is_null($this->queryParam("album"))) {
-            $album = $this->albums->getUserWallAlbum($this->user->identity);
+            if ((int) $upload_context == $this->user->id) {
+                $album = $this->albums->getUserWallAlbum($this->user->identity);
+            }
         } else {
             [$owner, $id] = explode("_", $this->queryParam("album"));
             $album = $this->albums->get((int) $id);
         }
 
-        if (!$album) {
-            $this->flashFail("err", tr("error"), tr("error_adding_to_deleted"), 500, true);
+        if ($_SERVER["REQUEST_METHOD"] == "GET" || $this->queryParam("act") == "finish") {
+            if (!$album) {
+                $this->flashFail("err", tr("error"), tr("error_adding_to_deleted"));
+            }
         }
 
-        # Для быстрой загрузки фоток из пикера фотографий нужен альбом, но юзер не может загружать фото
-        # в системные альбомы, так что так.
-        if (is_null($this->user) || !is_null($this->queryParam("album")) && !$album->canBeModifiedBy($this->user->identity)) {
-            $this->flashFail("err", tr("error_access_denied_short"), tr("error_access_denied"), 500, true);
+        if ($album && !$album->canBeModifiedBy($this->user->identity)) {
+            $this->flashFail("err", tr("error_access_denied_short"), tr("error_access_denied"));
         }
 
         if ($_SERVER["REQUEST_METHOD"] === "POST") {
@@ -306,8 +310,6 @@ final class PhotosPresenter extends OpenVKPresenter
 
                     $phot->setDescription($description);
                     $phot->save();
-
-                    $album = $phot->getAlbum();
                 }
 
                 $this->returnJson(["success" => true,
@@ -346,9 +348,11 @@ final class PhotosPresenter extends OpenVKPresenter
                     $this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию в $name.", 500, true);
                 }
 
-                $album->addPhoto($photo);
-                $album->setEdited(time());
-                $album->save();
+                if ($album != null) {
+                    $album->addPhoto($photo);
+                    $album->setEdited(time());
+                    $album->save();
+                }
             }
 
             $this->returnJson(["success" => true,
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml
index b4b2ff72..2be32280 100644
--- a/Web/Presenters/templates/components/textArea.xml
+++ b/Web/Presenters/templates/components/textArea.xml
@@ -2,7 +2,7 @@
 {var $textAreaId = ($post ?? NULL) === NULL ? (++$GLOBALS["textAreaCtr"]) : $post->getId()}
 {var $textAreaId = ($custom_id ?? NULL) === NULL ? $textAreaId : $custom_id}
 
-<div id="write" class='model_content_textarea' style="padding: 5px 0;" data-id="{$owner}">
+<div id="write" class='model_content_textarea' style="padding: 5px 0;" data-id="{is_null($owner) || gettype($owner) == 'integer' ? $owner : $owner->getId()}">
     <form action="{$route}" method="post" enctype="multipart/form-data" style="margin:0;">
         <textarea id="wall-post-input{$textAreaId}" placeholder="{_write}" name="text" style="width: 100%;resize: none;" class="small-textarea"></textarea>
         <div>
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index c288bfdc..7c87a89b 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1191,7 +1191,6 @@ async function __uploadToTextarea(file, textareaNode) {
     const form_data = new FormData
     form_data.append('photo_0', file)
     form_data.append('count', 1)
-    form_data.append('upload_context', textareaNode.nodes[0].dataset.id)
     form_data.append("hash", u("meta[name=csrf]").attr("value"))
     
     if(filetype == 'photo') {
@@ -1199,7 +1198,7 @@ async function __uploadToTextarea(file, textareaNode) {
         const rand = random_int(0, 1000)
         textareaNode.find('.post-horizontal').append(`<a id='temp_filler${rand}' class="upload-item lagged"><img src='${temp_url}'></a>`)
         
-        const res = await fetch(`/photos/upload`, {
+        const res = await fetch(`/photos/upload?upload_context=${textareaNode.nodes[0].dataset.id}`, {
             method: 'POST',
             body: form_data
         })

From 7e0fba27799b3e920be32e47fbdcbf4e60eeaed7 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 13:44:20 +0300
Subject: [PATCH 47/60] fix(picker): albums select

---
 Web/static/js/al_wall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 7c87a89b..68ec3853 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1366,7 +1366,7 @@ u(document).on("click", "#__photoAttachment", async (e) => {
             if(album == 0) {
                 photos = await window.OVKAPI.call('photos.getAll', {'owner_id': window.openvk.current_id, 'photo_sizes': 1, 'count': photos_per_page, 'offset': page * photos_per_page})
             } else {
-                photos = await window.OVKAPI.call('photos.get', {'owner_id': window.openvk.current_id, 'album_id': album, 'photo_sizes': 1, 'count': photos_per_page, 'offset': page * photos_per_page})
+                photos = await window.OVKAPI.call('photos.get', {'owner_id': club != 0 ? Math.abs(club) * -1 : window.openvk.current_id, 'album_id': album, 'photo_sizes': 1, 'count': photos_per_page, 'offset': page * photos_per_page})
             }
         } catch(e) {
             u("#attachment_insert_count h4").html(tr("is_x_photos", -1))

From ce5a742c7da1d3fe319f455eacff90f71f4d98cc Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 13:45:52 +0300
Subject: [PATCH 48/60] fix(albums): "my photos" on same id

---
 Web/Presenters/templates/Photos/AlbumList.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml
index ad025ae3..fcc1f266 100644
--- a/Web/Presenters/templates/Photos/AlbumList.xml
+++ b/Web/Presenters/templates/Photos/AlbumList.xml
@@ -5,7 +5,7 @@
 {block title}{_albums} {$owner->getCanonicalName()}{/block}
 
 {block header}
-    {if isset($thisUser) && $thisUser->getId() == $owner->getId()}
+    {if isset($thisUser) && $thisUser->getId() == $owner->getRealId()}
         {_my_photos}
     {else}
         <a href="{$owner->getURL()}">

From ed8c166d7d77150d5291c9c34d31dcf9db54b9c1 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 13:47:30 +0300
Subject: [PATCH 49/60] fix(albums): "you have" on same id

---
 Web/Presenters/templates/Photos/AlbumList.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml
index fcc1f266..c5c92290 100644
--- a/Web/Presenters/templates/Photos/AlbumList.xml
+++ b/Web/Presenters/templates/Photos/AlbumList.xml
@@ -18,7 +18,7 @@
 {block size}
     <div style="padding-bottom: 0px; padding-top: 0;" class="summaryBar">
         <div class="summary">
-            {if !is_null($thisUser) && $owner->getId() === $thisUser->getId()}
+            {if !is_null($thisUser) && $owner->getRealId() === $thisUser->getId()}
                 {tr("albums_list", $count)}
             {else}
                 {tr("albums", $count)}

From 7b055e863ce4b5909ad5598ea4c3080b6926bf98 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 14:00:58 +0300
Subject: [PATCH 50/60] feat: add focus on status edit

---
 Web/static/js/al_wall.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 68ec3853..7a1b34f0 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -2572,7 +2572,12 @@ u(document).on('mouseover mousemove mouseout', `div[data-tip='simple']`, (e) =>
 })
 
 function setStatusEditorShown(shown) {
-    document.getElementById("status_editor").style.display = shown ? "block" : "none";
+    if(shown) {
+        document.getElementById("status_editor").style.display = "block"
+        document.querySelector("#status_editor input").focus()
+    } else {
+        document.getElementById("status_editor").style.display = "none"
+    }
 }
 
 u(document).on('click', (event) => {

From a16b1cdef6bafb9ece159252a86ae95cdfdc9612 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 14:17:12 +0300
Subject: [PATCH 51/60] feat(wall.delete): explain condition

---
 VKAPI/Handlers/Wall.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php
index 798aa5a3..9113eb6e 100644
--- a/VKAPI/Handlers/Wall.php
+++ b/VKAPI/Handlers/Wall.php
@@ -1104,13 +1104,18 @@ final class Wall extends VKAPIRequestHandler
 
         $post = (new PostsRepo())->getPostById($owner_id, $post_id, true);
         if (!$post || $post->isDeleted()) {
-            $this->fail(583, "Invalid post");
+            $this->fail(15, "Not found");
         }
 
         $wallOwner = $post->getWallOwner();
 
+        # trying to solve the condition below.
+        # $post->getTargetWall() < 0 - if post on wall of club
+        # !$post->getWallOwner()->canBeModifiedBy($this->getUser()) - group is cannot be modifiet by %user%
+        # $post->getWallOwner()->getWallType() != 1 - wall is not open
+        # $post->getSuggestionType() == 0 - post is not suggested
         if ($post->getTargetWall() < 0 && !$post->getWallOwner()->canBeModifiedBy($this->getUser()) && $post->getWallOwner()->getWallType() != 1 && $post->getSuggestionType() == 0) {
-            $this->fail(12, "Access denied: you can't delete your accepted post.");
+            $this->fail(15, "Access denied");
         }
 
         if ($post->getOwnerPost() == $this->getUser()->getId() || $post->getTargetWall() == $this->getUser()->getId() || $owner_id < 0 && $wallOwner->canBeModifiedBy($this->getUser())) {

From e82cb5d6d7dc734da357a3abb308fd07d90bffa0 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 14:43:33 +0300
Subject: [PATCH 52/60] fix: undefined fields

---
 VKAPI/Handlers/Gifts.php | 1 -
 VKAPI/Handlers/Notes.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/VKAPI/Handlers/Gifts.php b/VKAPI/Handlers/Gifts.php
index e95493ef..9ee5d222 100644
--- a/VKAPI/Handlers/Gifts.php
+++ b/VKAPI/Handlers/Gifts.php
@@ -37,7 +37,6 @@ final class Gifts extends VKAPIRequestHandler
 
         foreach ($user_gifts as $gift) {
             $gift_item[] = [
-                "id"        => $i,
                 "from_id"   => $gift->anon == true ? 0 : $gift->sender->getId(),
                 "message"   => $gift->caption == null ? "" : $gift->caption,
                 "date"      => $gift->sent->timestamp(),
diff --git a/VKAPI/Handlers/Notes.php b/VKAPI/Handlers/Notes.php
index 1ddb67be..9e07454e 100644
--- a/VKAPI/Handlers/Notes.php
+++ b/VKAPI/Handlers/Notes.php
@@ -106,7 +106,7 @@ final class Notes extends VKAPIRequestHandler
         return 1;
     }
 
-    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10)
+    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10, int $sort = 0)
     {
         $this->requireUser();
 

From e7ec66b7028b3f33ce8221e9e2a3ef9e3e912c58 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 18:43:27 +0300
Subject: [PATCH 53/60] fix: hide reply button at closed topic

---
 Web/Presenters/templates/components/comments.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml
index 3c9a858e..4e78ebe7 100644
--- a/Web/Presenters/templates/components/comments.xml
+++ b/Web/Presenters/templates/components/comments.xml
@@ -24,7 +24,7 @@
 {if sizeof($comments) > 0}
     <div class='scroll_container'>
         <div class='scroll_node' n:foreach="$comments as $comment">
-            {include "comment.xml", comment => $comment}
+            {include "comment.xml", comment => $comment, no_reply_button => $readOnly}
         </div>
     </div>
     <div style="margin-top: 11px;">

From a9fef861c49491fa4226cc4cca2bc7d4dd37d670 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 18:45:23 +0300
Subject: [PATCH 54/60] feat(topic edit): label for checkboxes

---
 Web/Presenters/templates/Topics/Edit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Web/Presenters/templates/Topics/Edit.xml b/Web/Presenters/templates/Topics/Edit.xml
index d719341f..49a6156b 100644
--- a/Web/Presenters/templates/Topics/Edit.xml
+++ b/Web/Presenters/templates/Topics/Edit.xml
@@ -33,9 +33,9 @@
                     </td>
                     <td>
                         {if $topic->getClub()->canBeModifiedBy($thisUser)}
-                            <input type="checkbox" name="pin" n:attr="checked => $topic->isPinned()" /> {_pin_topic}<br />
+                            <label><input type="checkbox" name="pin" n:attr="checked => $topic->isPinned()" /> {_pin_topic}</label><br />
                         {/if}
-                        <input type="checkbox" name="close" n:attr="checked => $topic->isClosed()" /> {_close_topic}
+                        <label><input type="checkbox" name="close" n:attr="checked => $topic->isClosed()" /> {_close_topic}</label>
                     </td>
                 </tr>
                 <tr>

From 70db59b35c76933046a4b565853745639d65f8b1 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 18:47:05 +0300
Subject: [PATCH 55/60] feat(topic create) delete deprec. js

---
 Web/Presenters/templates/Topics/Create.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Web/Presenters/templates/Topics/Create.xml b/Web/Presenters/templates/Topics/Create.xml
index 659a50d4..0f95ecf9 100644
--- a/Web/Presenters/templates/Topics/Create.xml
+++ b/Web/Presenters/templates/Topics/Create.xml
@@ -76,14 +76,4 @@
 
         <input type="hidden" name="hash" value="{$csrfToken}" />
     </form>
-
-    <script>
-        $(document).ready(() => {
-            u("#post-buttons1 .postFileSel").on("change", function() {
-                handleUpload.bind(this, 1)();
-            });
-
-            setupWallPostInputHandlers(1);
-        });
-    </script>
 {/block}

From d5128ced484a376a3a8249b74e5f38e57889e798 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 18:52:08 +0300
Subject: [PATCH 56/60] feat: ajloader styles change

---
 Web/static/css/main.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 614b4258..7aa433d2 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -3840,12 +3840,13 @@ hr {
     display: none;
     position: fixed;
     top: -10%;
-    background: rgba(26, 26, 26, 0.9);;
+    background: rgba(0, 0, 0, 0.8);
+    box-shadow: 0px 0px 2px 0px black;
     padding-top: 12px;
     width: 91px;
     height: 25px;
     text-align: center;
-    border-radius: 1px;
+    border-radius: 2px;
     margin: auto;
     left: 0;
     right: 0;

From 3fea659b9852672493c26073cf57c9eeb9bbfcf6 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 19:24:11 +0300
Subject: [PATCH 57/60] feat: "sent" at gifts page

---
 Web/Presenters/templates/Gifts/UserGifts.xml | 6 ++++++
 locales/en.strings                           | 1 +
 locales/ru.strings                           | 1 +
 3 files changed, 8 insertions(+)

diff --git a/Web/Presenters/templates/Gifts/UserGifts.xml b/Web/Presenters/templates/Gifts/UserGifts.xml
index b84fdcbf..650e475e 100644
--- a/Web/Presenters/templates/Gifts/UserGifts.xml
+++ b/Web/Presenters/templates/Gifts/UserGifts.xml
@@ -34,6 +34,12 @@
                     </a>
                 </td>
             </tr>
+            <tr>
+                <td><span class="nobold">{_sent}: </span></td>
+                <td>
+                    {$x->sent}
+                </td>
+            </tr>
             <tr n:if="!empty($x->caption)">
                 <td><span class="nobold">{_comment}: </span></td>
                 <td>{$x->caption}</td>
diff --git a/locales/en.strings b/locales/en.strings
index 4c3c4595..0948fd78 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -1200,6 +1200,7 @@
 "coins_other" = "$1 votes";
 
 "users_gifts" = "Gifts";
+"sent" = "Sent";
 
 /* Apps */
 "app" = "Application";
diff --git a/locales/ru.strings b/locales/ru.strings
index 16a44e02..274a6b6b 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -1142,6 +1142,7 @@
 "coins_many" = "$1 голосов";
 "coins_other" = "$1 голосов";
 "users_gifts" = "Подарки";
+"sent" = "Отправлено";
 
 /* Apps */
 "app" = "Приложение";

From bd98c3c6c1d3c6f03253f97ed3308814b76cbecf Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 19:29:52 +0300
Subject: [PATCH 58/60] fix: hide anon gift name

---
 Web/Presenters/templates/Gifts/UserGifts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Gifts/UserGifts.xml b/Web/Presenters/templates/Gifts/UserGifts.xml
index 650e475e..53bdc207 100644
--- a/Web/Presenters/templates/Gifts/UserGifts.xml
+++ b/Web/Presenters/templates/Gifts/UserGifts.xml
@@ -28,7 +28,7 @@
         <tbody>
             <tr>
                 <td><span class="nobold">{_sender}: </span></td>
-                <td>
+                <td n:if="!$x->anon">
                     <a href="{$x->sender->getURL()}">
                         {$x->sender->getFullName()}
                     </a>

From 12926f317d07310777744eb3e0054419e1cfa238 Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 19:40:56 +0300
Subject: [PATCH 59/60] fix: revert previous

---
 Web/Presenters/templates/Gifts/UserGifts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Presenters/templates/Gifts/UserGifts.xml b/Web/Presenters/templates/Gifts/UserGifts.xml
index 53bdc207..650e475e 100644
--- a/Web/Presenters/templates/Gifts/UserGifts.xml
+++ b/Web/Presenters/templates/Gifts/UserGifts.xml
@@ -28,7 +28,7 @@
         <tbody>
             <tr>
                 <td><span class="nobold">{_sender}: </span></td>
-                <td n:if="!$x->anon">
+                <td>
                     <a href="{$x->sender->getURL()}">
                         {$x->sender->getFullName()}
                     </a>

From b97783f144f9512967d06df416df0c4c72306a5e Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 27 May 2025 22:29:24 +0300
Subject: [PATCH 60/60] fix(photos): don't check rights of deleted album

---
 Web/Models/Entities/Photo.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php
index 57ab2b8a..b0ee2e83 100644
--- a/Web/Models/Entities/Photo.php
+++ b/Web/Models/Entities/Photo.php
@@ -336,7 +336,12 @@ class Photo extends Media
 
     public function getAlbum(): ?Album
     {
-        return (new Albums())->getAlbumByPhotoId($this);
+        $album = (new Albums())->getAlbumByPhotoId($this);
+        if (!$album || $album->isDeleted()) {
+            return null;
+        }
+
+        return $album;
     }
 
     public function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object