From dafc18c11804954a734b1bbbe10d92e04c09edda Mon Sep 17 00:00:00 2001
From: lalka2016 <99399973+lalka2016@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:01:54 +0300
Subject: [PATCH] Maybe it works

---
 Web/Models/Entities/User.php                  |  5 ++
 Web/Presenters/PhotosPresenter.php            |  4 +-
 Web/Presenters/UserPresenter.php              |  3 +
 Web/Presenters/templates/@listView.xml        |  4 +-
 Web/Presenters/templates/Notes/List.xml       |  4 +-
 Web/Presenters/templates/User/Settings.xml    | 11 ++++
 Web/Presenters/templates/Wall/Feed.xml        |  8 ++-
 Web/Presenters/templates/Wall/HashtagFeed.xml |  2 +-
 Web/Presenters/templates/Wall/Wall.xml        |  2 +-
 .../templates/components/comment.xml          |  2 +-
 .../templates/components/comments.xml         |  2 +
 .../templates/components/paginator.xml        | 17 ++----
 .../templates/components/paginators/new.xml   |  5 ++
 .../templates/components/paginators/old.xml   | 12 ++++
 Web/Presenters/templates/components/post.xml  |  2 +
 Web/Presenters/templates/components/wall.xml  |  2 +-
 Web/static/css/main.css                       | 20 +++++++
 Web/static/js/al_comments.js                  |  2 +-
 Web/static/js/al_mentions.js                  |  5 ++
 Web/static/js/al_wall.js                      | 59 ++++++++++++++++++-
 install/sqls/000XX-better-paginator.sql       |  1 +
 locales/en.strings                            |  9 +++
 locales/ru.strings                            |  8 +++
 23 files changed, 163 insertions(+), 26 deletions(-)
 create mode 100644 Web/Presenters/templates/components/paginators/new.xml
 create mode 100644 Web/Presenters/templates/components/paginators/old.xml
 create mode 100644 install/sqls/000XX-better-paginator.sql

diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
index d132e015..215c7cba 100644
--- a/Web/Models/Entities/User.php
+++ b/Web/Models/Entities/User.php
@@ -1113,6 +1113,11 @@ class User extends RowModel
         return true;
     }
 
+    function getPaginatorType()
+    {
+        return $this->getRecord()->paginator_type;
+    }
+
     function toVkApiStruct(): object
     {
         $res = (object) [];
diff --git a/Web/Presenters/PhotosPresenter.php b/Web/Presenters/PhotosPresenter.php
index 345b2c60..5aea8a7e 100644
--- a/Web/Presenters/PhotosPresenter.php
+++ b/Web/Presenters/PhotosPresenter.php
@@ -27,7 +27,7 @@ final class PhotosPresenter extends OpenVKPresenter
             if(!$user) $this->notFound();
             if (!$user->getPrivacyPermission('photos.read', $this->user->identity ?? NULL))
                 $this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
-            $this->template->albums  = $this->albums->getUserAlbums($user, $this->queryParam("p") ?? 1);
+            $this->template->albums  = $this->albums->getUserAlbums($user, (int)($this->queryParam("p") ?? 1));
             $this->template->count   = $this->albums->getUserAlbumsCount($user);
             $this->template->owner   = $user;
             $this->template->canEdit = false;
@@ -36,7 +36,7 @@ final class PhotosPresenter extends OpenVKPresenter
         } else {
             $club = (new Clubs)->get(abs($owner));
             if(!$club) $this->notFound();
-            $this->template->albums  = $this->albums->getClubAlbums($club, $this->queryParam("p") ?? 1);
+            $this->template->albums  = $this->albums->getClubAlbums($club, (int)($this->queryParam("p") ?? 1));
             $this->template->count   = $this->albums->getClubAlbumsCount($club);
             $this->template->owner   = $club;
             $this->template->canEdit = false;
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index 9cfa3654..ada4652a 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -471,6 +471,9 @@ final class UserPresenter extends OpenVKPresenter
 
                 if(in_array($this->postParam("main_page"), [0, 1]))
                     $user->setMain_Page((int) $this->postParam("main_page"));
+
+                if(in_array($this->postParam("paginator"), [0, 1]))
+                    $user->setPaginator_type((int) $this->postParam("paginator"));
             } else if($_GET['act'] === "lMenu") {
                 $settings = [
                     "menu_bildoj"    => "photos",
diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml
index 34739b59..decd1cd0 100644
--- a/Web/Presenters/templates/@listView.xml
+++ b/Web/Presenters/templates/@listView.xml
@@ -15,11 +15,11 @@
             {ifset specpage}
                 {include specpage, x => $dat}
             {else}
-                <div class="container_gray">
+                <div class="container_gray infContainer">
                     {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
 
                     {if sizeof($data) > 0}
-                        <div class="content" n:foreach="$data as $dat">
+                        <div class="content infObj" n:foreach="$data as $dat">
                             <table>
                                 <tbody>
                                     <tr>
diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml
index 36c48fd3..03ac2df2 100644
--- a/Web/Presenters/templates/Notes/List.xml
+++ b/Web/Presenters/templates/Notes/List.xml
@@ -60,12 +60,12 @@
         }
     </style>
 
-    <div class="container_gray" style="background: white; border-top: none;">
+    <div class="container_gray infContainer" style="background: white; border-top: none;">
 
         {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
         {if sizeof($data) > 0}
 
-        <div n:foreach="$data as $dat">
+        <div n:foreach="$data as $dat" class="infObj">
             <div class="profile_thumb">
                 <a href="{$owner->getURL()}">
                 <img src="{$owner->getAvatarUrl('miniscule')}" style="width: 50px;">
diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml
index e61f900d..95a2af19 100644
--- a/Web/Presenters/templates/User/Settings.xml
+++ b/Web/Presenters/templates/User/Settings.xml
@@ -562,6 +562,17 @@
                             </select>
                         </td>
                     </tr>
+                    <tr>
+                        <td width="120" valign="top">
+                            <span class="nobold">{_ui_settings_paginator}</span>
+                        </td>
+                        <td>
+                            <select name="paginator">
+                                <option value="0" {if $user->getPaginatorType() == 0}selected{/if}>{_ui_settings_paginator_old}</option>
+                                <option value="1" {if $user->getPaginatorType() == 1}selected{/if}>{_ui_settings_paginator_new}</option>
+                            </select>
+                        </td>
+                    </tr>
                     <tr>
                         <td width="120" valign="top" align="right">
                             <input type="checkbox" name="theme_for_session" value="1">
diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml
index 5ed1e2fb..82b96fd6 100644
--- a/Web/Presenters/templates/Wall/Feed.xml
+++ b/Web/Presenters/templates/Wall/Feed.xml
@@ -19,12 +19,14 @@
         {include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost", graffiti => true, polls => true, notes => true}
     </div>
     
+    <div class="infContainer">
     {foreach $posts as $post}
         <a name="postGarter={$post->getId()}"></a>
         {include "../components/post.xml", post => $post, onWallOf => true, commentSection => true}
     {/foreach}
+    </div>
 
-    <div class="postFeedBottom">
+    <div class="postFeedBottom" n:if="$thisUser->getPaginatorType() == 0">
         <div class="postFeedPaginator">
             {include "../components/paginator.xml", conf => $paginatorConf}
         </div>
@@ -43,6 +45,10 @@
         </div>
     </div>
 
+    {if $thisUser->getPaginatorType() == 1}
+        {include "../components/paginator.xml", conf => $paginatorConf}
+    {/if}
+
     <script>
         u("#pageSelect").nodes[0].value = {$paginatorConf->perPage};
         
diff --git a/Web/Presenters/templates/Wall/HashtagFeed.xml b/Web/Presenters/templates/Wall/HashtagFeed.xml
index 96da865a..cd121afa 100644
--- a/Web/Presenters/templates/Wall/HashtagFeed.xml
+++ b/Web/Presenters/templates/Wall/HashtagFeed.xml
@@ -6,7 +6,7 @@
 {/block}
 
 {block content}
-    <center>
+    <center class="infContainer">
         {foreach $posts as $post}
             <a name="postGarter={$post->getId()}"></a>
             
diff --git a/Web/Presenters/templates/Wall/Wall.xml b/Web/Presenters/templates/Wall/Wall.xml
index a9f8845f..6077271e 100644
--- a/Web/Presenters/templates/Wall/Wall.xml
+++ b/Web/Presenters/templates/Wall/Wall.xml
@@ -19,7 +19,7 @@
                 {include "../components/textArea.xml", route => "/wall$owner/makePost"}
             </div>
             
-            <div class="content">
+            <div class="content infContainer">
                 {if sizeof($posts) > 0}
                     {foreach $posts as $post}
                         <a name="postGarter={$post->getId()}"></a>
diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml
index 0016e4e5..a32558e7 100644
--- a/Web/Presenters/templates/components/comment.xml
+++ b/Web/Presenters/templates/components/comment.xml
@@ -3,7 +3,7 @@
 {var $postId = $comment->getTarget() instanceof \openvk\Web\Models\Entities\Post ? $comment->getTarget()->getId() : NULL}
 
 <a name="cid={$comment->getId()}"></a>
-<table border="0" style="font-size: 11px;" class="post comment" id="_comment{$comment->getId()}" data-comment-id="{$comment->getId()}" data-owner-id="{$author->getId()}" data-from-group="{$comment->getOwner() instanceof $Club}" n:attr="data-post-id => $postId">
+<table border="0" style="font-size: 11px;" class="post comment infObj" id="_comment{$comment->getId()}" data-comment-id="{$comment->getId()}" data-owner-id="{$author->getId()}" data-from-group="{$comment->getOwner() instanceof $Club}" n:attr="data-post-id => $postId">
     <tbody>
         <tr>
             <td width="30" valign="top">
diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml
index 3290e35c..b34e620e 100644
--- a/Web/Presenters/templates/components/comments.xml
+++ b/Web/Presenters/templates/components/comments.xml
@@ -8,6 +8,7 @@
     {/if}
 </div>
 
+<div class="infContainer">
 {if sizeof($comments) > 0}
     {foreach $comments as $comment}
         {include "comment.xml", comment => $comment}
@@ -18,5 +19,6 @@
 {else}
     {_comments_tip}
 {/if}
+</div>
 
 {script "js/al_comments.js"}
diff --git a/Web/Presenters/templates/components/paginator.xml b/Web/Presenters/templates/components/paginator.xml
index 90d60715..3bc48fc2 100644
--- a/Web/Presenters/templates/components/paginator.xml
+++ b/Web/Presenters/templates/components/paginator.xml
@@ -1,12 +1,7 @@
-{var $space = 3}
-{var $pageCount = ceil($conf->count / $conf->perPage)}
+{var $isNewPaginator = isset($thisUser) && (bool)$thisUser->getPaginatorType()}
 
-<div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" style="padding: 8px;">
-    <div n:class="paginator, ($conf->atBottom ?? false) ? paginator-at-bottom">
-        <a n:if="$conf->page > $space" n:attr="class => ($conf->page === 1 ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => 1]), 'k', '&', PHP_QUERY_RFC3986)}">&laquo;</a>
-        {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++}
-            <a n:if="$j > 0 && $j <= $pageCount" n:attr="class => ($conf->page === $j ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $j]), 'k', '&', PHP_QUERY_RFC3986)}">{$j}</a>
-        {/for}
-        <a n:if="$conf->page <= $pageCount-$space" n:attr="class => ($conf->page === $pageCount ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $pageCount]), 'k', '&', PHP_QUERY_RFC3986)}">&raquo;</a>
-    </div>
-</div>
+{if $isNewPaginator}
+    {include "paginators/new.xml", conf => $conf}
+{else}
+    {include "paginators/old.xml", conf => $conf}
+{/if}
diff --git a/Web/Presenters/templates/components/paginators/new.xml b/Web/Presenters/templates/components/paginators/new.xml
new file mode 100644
index 00000000..38102752
--- /dev/null
+++ b/Web/Presenters/templates/components/paginators/new.xml
@@ -0,0 +1,5 @@
+{var $pageCount = ceil($conf->count / $conf->perPage)}
+
+<div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage) && $conf->page < $pageCount" class="showMore" data-pageсount="{$pageCount}" data-page="{$conf->page}">
+    {_show_more}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/paginators/old.xml b/Web/Presenters/templates/components/paginators/old.xml
new file mode 100644
index 00000000..90d60715
--- /dev/null
+++ b/Web/Presenters/templates/components/paginators/old.xml
@@ -0,0 +1,12 @@
+{var $space = 3}
+{var $pageCount = ceil($conf->count / $conf->perPage)}
+
+<div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" style="padding: 8px;">
+    <div n:class="paginator, ($conf->atBottom ?? false) ? paginator-at-bottom">
+        <a n:if="$conf->page > $space" n:attr="class => ($conf->page === 1 ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => 1]), 'k', '&', PHP_QUERY_RFC3986)}">&laquo;</a>
+        {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++}
+            <a n:if="$j > 0 && $j <= $pageCount" n:attr="class => ($conf->page === $j ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $j]), 'k', '&', PHP_QUERY_RFC3986)}">{$j}</a>
+        {/for}
+        <a n:if="$conf->page <= $pageCount-$space" n:attr="class => ($conf->page === $pageCount ? 'active')" href="?{http_build_query(array_merge($_GET, ['p' => $pageCount]), 'k', '&', PHP_QUERY_RFC3986)}">&raquo;</a>
+    </div>
+</div>
diff --git a/Web/Presenters/templates/components/post.xml b/Web/Presenters/templates/components/post.xml
index dcc87bbe..38ad7e1c 100644
--- a/Web/Presenters/templates/components/post.xml
+++ b/Web/Presenters/templates/components/post.xml
@@ -1,7 +1,9 @@
 {var $microblogEnabled = isset($thisUser) ? $thisUser->hasMicroblogEnabled() : false}
 
+<div class="infObj">
 {if $microblogEnabled}
     {include "post/microblogpost.xml", post => $post, commentSection => $commentSection}
 {else}
     {include "post/oldpost.xml", post => $post}
 {/if}
+</div>
\ No newline at end of file
diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml
index 7d205781..21218cde 100644
--- a/Web/Presenters/templates/components/wall.xml
+++ b/Web/Presenters/templates/components/wall.xml
@@ -11,7 +11,7 @@
             {include "../components/textArea.xml", route => "/wall$owner/makePost", graffiti => true, polls => true, notes => true}
         </div>
         
-        <div class="content">
+        <div class="content infContainer">
             {if sizeof($posts) > 0}
                 {foreach $posts as $post}
                     <a name="postGarter={$post->getId()}"></a>
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index bbbe4d28..cedfaa90 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2695,4 +2695,24 @@ body.article .floating_sidebar, body.article .page_content {
     position: absolute;
     right: 22px;
     font-size: 12px;
+}
+
+.small_red_button {
+    float: right;
+    font-weight: bold;
+}
+
+.small_red_button a {
+    color: #B0B0B0;
+}
+
+.small_red_button a:hover {
+    color: #a7a7a7;
+}
+
+.showMore {
+    text-align: center;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/Web/static/js/al_comments.js b/Web/static/js/al_comments.js
index f4172428..050f1ee7 100644
--- a/Web/static/js/al_comments.js
+++ b/Web/static/js/al_comments.js
@@ -1,4 +1,4 @@
-u(".comment-reply").on("click", function(e) {
+$(document).on("click", ".comment-reply", function(e) {
     let comment   = u(e.target).closest(".post");
     let authorId  = comment.data("owner-id");
     let authorNm  = u(".post-author > a > b", comment.first()).text().trim();
diff --git a/Web/static/js/al_mentions.js b/Web/static/js/al_mentions.js
index 1be77563..4deb139e 100644
--- a/Web/static/js/al_mentions.js
+++ b/Web/static/js/al_mentions.js
@@ -19,6 +19,8 @@ var tooltipTemplate = Handlebars.compile(`
     </table>
 `);
 
+function initMentions() {
+
 tippy(".mention", {
     theme: "light vk",
     content: "⌛",
@@ -40,3 +42,6 @@ tippy(".mention", {
         that.setContent(tooltipTemplate(res));
     }
 });
+}
+
+initMentions()
\ No newline at end of file
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index bb349c14..cf0a91b8 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -75,7 +75,7 @@ function initGraffiti(id) {
     });
 }
 
-u(".post-like-button").on("click", function(e) {
+$(document).on("click", ".post-like-button", function(e) {
     e.preventDefault();
     
     var thisBtn = u(this).first();
@@ -118,7 +118,7 @@ function setupWallPostInputHandlers(id) {
     });
 }
 
-u("#write > form").on("keydown", function(event) {
+$(document).on("keydown", "#write > form", function(event) {
     if(event.ctrlKey && event.keyCode === 13)
         this.submit();
 });
@@ -152,6 +152,8 @@ var tooltipClientNoInfoTemplate = Handlebars.compile(`
     </table>
 `);
 
+function initTooltips() {
+
 tippy(".client_app", {
     theme: "light vk",
     content: "⌛",
@@ -189,6 +191,10 @@ tippy(".client_app", {
     }
 });
 
+}
+
+initTooltips()
+
 function addNote(textareaId, nid)
 {
     if(nid > 0) {
@@ -262,4 +268,51 @@ async function showArticle(note_id) {
     u("#articleText").html(`<h1 class="articleView_nameHeading">${note.title}</h1>` + note.html);
     u("body").removeClass("dimmed");
     u("body").addClass("article");
-}
\ No newline at end of file
+}
+
+$(document).on("click", ".showMore", async (e) => {
+    e.currentTarget.innerHTML = `<img id="loader" src="/assets/packages/static/openvk/img/loading_mini.gif">`
+    let url = new URL(location.href)
+    let newPage = Number(e.currentTarget.dataset.page) + 1
+    url.searchParams.set("p", newPage)
+
+    let xhr = new XMLHttpRequest
+    xhr.open("GET", url)
+
+    let container = document.querySelector(".infContainer")
+
+    function _errorWhenLoading() {
+        e.currentTarget.innerHTML = tr("error_loading_objects")
+    }
+
+    function _updateButton() {
+        e.currentTarget.setAttribute("data-page", newPage)
+        e.currentTarget.innerHTML = tr("show_more")
+
+        container.append(e.currentTarget)
+
+        console.info("Page " + newPage + " of " + e.currentTarget.dataset.pageсount)
+        if(Number(e.currentTarget.dataset.pageсount) == newPage) {
+            e.currentTarget.remove()
+        }
+    }
+
+    xhr.onload = () => {
+        let parser = new DOMParser
+        let result = parser.parseFromString(xhr.responseText, "text/html");
+        let objects = result.querySelectorAll(".infObj")
+
+        for(const obj of objects) {
+            container.insertAdjacentHTML("beforeend", obj.outerHTML)
+        }
+
+        initMentions()
+        initTooltips()
+        _updateButton()
+    }
+
+    xhr.onerror = () => {_errorWhenLoading()}
+    xhr.ontimeout = () => {_errorWhenLoading()}
+
+    xhr.send()
+})
\ No newline at end of file
diff --git a/install/sqls/000XX-better-paginator.sql b/install/sqls/000XX-better-paginator.sql
new file mode 100644
index 00000000..00e1c93b
--- /dev/null
+++ b/install/sqls/000XX-better-paginator.sql
@@ -0,0 +1 @@
+ALTER TABLE `profiles` ADD `paginator_type` TINYINT(1) NOT NULL DEFAULT '0' AFTER `client_name`; 
diff --git a/locales/en.strings b/locales/en.strings
index ce4ac0bf..e9a82c1f 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -552,6 +552,10 @@
 "ui_settings_view_of_posts_old" = "Old";
 "ui_settings_view_of_posts_microblog" = "Microblog";
 "ui_settings_main_page" = "Main page";
+"ui_settings_paginator" = "Paginator";
+"ui_settings_paginator_old" = "Old (pages)";
+"ui_settings_paginator_new" = "New (infinite scroll)";
+
 "ui_settings_sessions" = "Sessions";
 
 "additional_links" = "Additional links";
@@ -1216,6 +1220,11 @@
 "paginator_page" = "Page $1";
 "paginator_next" = "Next";
 
+/* Paginator (new) */
+
+"show_more" = "show more";
+"error_loading_objects" = "Error when loading new objects. Try to reload page";
+
 /* About */
 
 "about_openvk" = "About OpenVK";
diff --git a/locales/ru.strings b/locales/ru.strings
index d4b85c79..009a5a04 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -523,6 +523,9 @@
 "ui_settings_view_of_posts_old" = "Старый";
 "ui_settings_view_of_posts_microblog" = "Микроблог";
 "ui_settings_main_page" = "Главная страница";
+"ui_settings_paginator" = "Пагинатор";
+"ui_settings_paginator_old" = "Старый (постраничный)";
+"ui_settings_paginator_new" = "Новый (бесконечная прокрутка)";
 "ui_settings_sessions" = "Сессии";
 "additional_links" = "Дополнительные ссылки";
 "ad_poster" = "Рекламный плакат";
@@ -1103,6 +1106,11 @@
 "paginator_page" = "Страница $1";
 "paginator_next" = "Дальше";
 
+/* Paginator (new) */
+
+"show_more" = "показать больше";
+"error_loading_objects" = "Не удалось загрузить новые объекты. Попробуйте обновить страницу";
+
 /* About */
 
 "about_openvk" = "Об OpenVK";