Merge a4d5bb8088 into 3ceb27e532

build(composer.lock): update dependencies
fix(docker): set openvk dir as workdir
2024-11-14 19:19:14 +03:00 · 2024-11-03 07:57:17 +00:00 · 2024-11-03 00:20:54 +03:00 · 2024-11-03 00:05:40 +03:00 · 2024-11-02 14:16:42 +03:00 · 2024-11-02 13:02:34 +03:00
25 changed files with 407 additions and 285 deletions
--- a/Web/Presenters/NotesPresenter.php
+++ b/Web/Presenters/NotesPresenter.php
@ -22,15 +22,10 @@ final class NotesPresenter extends OpenVKPresenter
        if(!$user->getPrivacyPermission('notes.read', $this->user->identity ?? NULL))
            $this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
        
-        $this->template->notes = $this->notes->getUserNotes($user, (int)($this->queryParam("p") ?? 1));
+        $this->template->page  = (int)($this->queryParam("p") ?? 1);
+        $this->template->notes = $this->notes->getUserNotes($user, $this->template->page);
        $this->template->count = $this->notes->getUserNotesCount($user);
        $this->template->owner = $user;
-        $this->template->paginatorConf = (object) [
-            "count"   => $this->template->count,
-            "page"    => $this->queryParam("p") ?? 1,
-            "amount"  => NULL,
-            "perPage" => OPENVK_DEFAULT_PER_PAGE,
-        ];
    }
    
    function renderView(int $owner, int $note_id): void
--- a/Web/Presenters/SearchPresenter.php
+++ b/Web/Presenters/SearchPresenter.php
@ -125,5 +125,6 @@ final class SearchPresenter extends OpenVKPresenter
        ];
        $this->template->extendedPaginatorConf = clone $this->template->paginatorConf;
        $this->template->extendedPaginatorConf->space = 11;
+        $this->template->paginatorConf->atTop = true;
    }
 }
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@ -82,7 +82,14 @@
        {/if}

        <div class="toTop">
-            ⬆ {_to_top}
+            <div id='to_up'>
+                <svg id="to_up_icon" viewBox="0 0 10 6"><polygon points="0 6 5 0 10 6 0 6"/></svg>
+                <span>{_to_top}</span>
+            </div>
+            
+            <div id='to_back'>
+                <svg id="to_back_icon" viewBox="0 0 10 6"><polygon points="0 0 5 6 10 0 0 0"/></svg>
+            </div>
        </div>

        <div class="layout">
--- a/Web/Presenters/templates/@listView.xml
+++ b/Web/Presenters/templates/@listView.xml
@ -19,7 +19,7 @@
            {ifset specpage}
                {include specpage, x => $dat}
            {else}
-                <div class="container_gray">
+                <div class="container_gray {ifset noscroll}no_scroll_container{else}scroll_container{/ifset}">
                    {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}

                    {ifset top}
@ -27,7 +27,7 @@
                    {/ifset}

                    {if sizeof($data) > 0}
-                        <div class="content" n:foreach="$data as $dat">
+                        <div class="scroll_node content" n:foreach="$data as $dat">
                            <table>
                                <tbody n:attr="id => is_null($table_body_id) ? NULL : $table_body_id">
                                    <tr>
--- a/Web/Presenters/templates/Audio/List.xml
+++ b/Web/Presenters/templates/Audio/List.xml
@ -64,8 +64,8 @@
            <div n:if="$audiosCount <= 0" style='height: 50%;'>
                {include "../components/content_error.xml", description => $ownerId > 0 ? ($ownerId == $thisUser->getId() ? tr("no_audios_thisuser") : tr("no_audios_user")) : tr("no_audios_club")}
            </div>
-            <div n:if="$audiosCount > 0" class="infContainer">
-                <div class="infObj" n:foreach="$audios as $audio">
+            <div n:if="$audiosCount > 0" class="scroll_container infContainer">
+                <div class="scroll_node infObj" n:foreach="$audios as $audio">
                    {include "player.xml", audio => $audio, club => $club}
                </div>
            </div>
@ -86,10 +86,10 @@
                {include "../components/content_error.xml", description => $ownerId > 0 ? ($ownerId == $thisUser->getId() ? tr("no_playlists_thisuser") : tr("no_playlists_user")) : tr("no_playlists_club")}
            </div>

-            <div class="infContainer playlistContainer" n:if="$playlistsCount > 0">
-                {foreach $playlists as $playlist}
+            <div class="scroll_container infContainer playlistContainer" n:if="$playlistsCount > 0">
+                <div class='scroll_node' n:foreach='$playlists as $playlist'>
                    {include 'playlistListView.xml', playlist => $playlist}
-                {/foreach}
+                </div>
            </div>

            <div>
--- a/Web/Presenters/templates/Audio/Playlist.xml
+++ b/Web/Presenters/templates/Audio/Playlist.xml
@ -67,11 +67,11 @@
                    <hr style="color: #f7f7f7;">
                </div>
            </div>
-            <div class="audiosContainer infContainer" style="margin-top: 14px;">
+            <div class="audiosContainer scroll_container infContainer" style="margin-top: 14px;">
                {if $count < 1}
                    {_empty_playlist}
                {else}  
-                    <div class="infObj" n:foreach="$audios as $audio">
+                    <div class="scroll_node" n:foreach="$audios as $audio">
                        {include "player.xml", audio => $audio}
                    </div>

--- a/Web/Presenters/templates/Gifts/Pick.xml
+++ b/Web/Presenters/templates/Gifts/Pick.xml
@ -12,8 +12,8 @@
 {/block}

 {block content}
-    <div class="gift_grid">
-        <div n:foreach="$gifts as $gift" n:class="gift_sel, !$gift->canUse($thisUser) ? disabled" data-gift="{$gift->getId()}">
+    <div class="gift_grid scroll_container">
+        <div n:foreach="$gifts as $gift" n:class="scroll_node, gift_sel, !$gift->canUse($thisUser) ? disabled" data-gift="{$gift->getId()}">
            <img class="gift_pic" src="{$gift->getImage(2)}" alt="{_gift}" loading=lazy />

            <strong class="gift_price">
--- a/Web/Presenters/templates/Group/Suggested.xml
+++ b/Web/Presenters/templates/Group/Suggested.xml
@ -12,9 +12,9 @@
        {include "../components/error.xml", title => "", description => $type == "my" ? tr("no_suggested_posts_by_you") : tr("no_suggested_posts_by_people")}
    {else}
        <h4 id="cound">{if $type == "my"}{tr("suggested_posts_in_group_by_you", $count)}{else}{tr("suggested_posts_in_group", $count)}{/if}</h4>
-        <div id="postz" class="infContainer">
+        <div id="postz" class="infContainer scroll_container">
            {var $microblog = $thisUser->hasMicroblogEnabled()}
-            <div class="infObj" n:foreach="$posts as $post">
+            <div class="infObj scroll_node" n:foreach="$posts as $post">
                {if $microblog}
                    {include "../components/post/microblogpost.xml", post => $post, commentSection => false, suggestion => true, forceNoCommentsLink => true, forceNoPinLink => true, forceNoLike => true, forceNoShareLink => true, forceNoDeleteLink => false}
                {else}
--- a/Web/Presenters/templates/Messenger/Index.xml
+++ b/Web/Presenters/templates/Messenger/Index.xml
@ -17,9 +17,9 @@
    </div>

    {if sizeof($corresps) > 0}
-        <div class="crp-list">
+        <div class="crp-list scroll_container">
            <div n:foreach="$corresps as $coresp"
-                 class="crp-entry"
+                 class="scroll_node crp-entry"
                 onmousedown="window.location.href = {$coresp->getURL()};" >
                {var $recipient = $coresp->getCorrespondents()[1]}
                {var $lastMsg   = $coresp->getPreviewMessage()}
--- a/Web/Presenters/templates/Notes/List.xml
+++ b/Web/Presenters/templates/Notes/List.xml
@ -1,6 +1,5 @@
 {extends "../@listView.xml"}
 {var $iterator = iterator_to_array($notes)}
-{var $page     = $paginatorConf->page}

 {block title}{_notes}{/block}

@ -60,12 +59,12 @@
        }
    </style>

-    <div class="container_gray" style="background: white; border-top: none;">
+    <div class="container_gray scroll_container" 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 class='scroll_node' n:foreach="$data as $dat">
            <div class="profile_thumb">
                <a href="{$owner->getURL()}">
                <img src="{$owner->getAvatarUrl('miniscule')}" style="width: 50px;">
@ -106,7 +105,15 @@
                </div>
            </article>    
        </div>      
-
+        
+        {include "../components/paginator.xml", conf => (object) [
+            "page"     => $page,
+            "count"    => $count,
+            "amount"   => sizeof($data),
+            "perPage"  => 10,
+            "atBottom" => true,
+        ]}
+        
        {else}
            {if isset($thisUser) && $thisUser->getId() == $owner->getId()}

--- a/Web/Presenters/templates/Notification/Feed.xml
+++ b/Web/Presenters/templates/Notification/Feed.xml
@ -21,8 +21,8 @@
 </div>
 {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)}
 {if sizeof($data) > 0}
-<div>
-    <table class="post post-divider" border="0" style="font-size: 11px;" n:foreach="$data as $dat">
+<div n:class="$mode !== 'new' ? scroll_container">
+    <table class="scroll_node post post-divider" border="0" style="font-size: 11px;" n:foreach="$data as $dat">
        <tbody>
            <tr>
                {var $sxModel = $dat->getModel(1)}
--- a/Web/Presenters/templates/Photos/Album.xml
+++ b/Web/Presenters/templates/Photos/Album.xml
@ -30,10 +30,10 @@
    {/if}
    <br/><br/>
    {if $album->getPhotosCount() > 0}
-        <div class="container_gray album-flex">
+        <div class="container_gray scroll_container album-flex">
            {foreach $photos as $photo}
                {php if($photo->isDeleted()) continue; }
-                <div class="album-photo">
+                <div class="album-photo scroll_node">
                    <a
                    n:if="!is_null($thisUser) && $album->canBeModifiedBy($thisUser)"
                    href="/album{$album->getPrettyId()}/remove_photo/{$photo->getId()}" class="album-photo--delete">
--- a/Web/Presenters/templates/Search/Index.xml
+++ b/Web/Presenters/templates/Search/Index.xml
@ -29,10 +29,10 @@
                </div>

                <div class='page_wrap_content' id='search_page'>
-                    <div n:class='page_wrap_content_main, $section == "audios" && $count > 0 ? audios_padding'>
+                    <div n:class='page_wrap_content_main, $section != "posts" ? scroll_container, $section == "audios" && $count > 0 ? audios_padding'>
                        {if $count > 0}
                            {if $section === 'users'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content content def_row_content' n:foreach="$data as $dat">
                                    <table>
                                        <tbody>
                                            <tr>
@ -125,10 +125,14 @@
                                </div>

                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', ['text'])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', ['text'])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'groups'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content content def_row_content' n:foreach="$data as $dat">
                                    <table>
                                        <tbody>
                                            <tr>
@ -180,10 +184,14 @@
                                </div>

                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', ['text', "td[data-highlight='_clubDesc']"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', ['text', "td[data-highlight='_clubDesc']"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'apps'}
-                                <div class='search_content content def_row_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content content def_row_content' n:foreach="$data as $dat">
                                    <table>
                                        <tbody>
                                            <tr>
@ -210,10 +218,14 @@
                                </div>

                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', ['text', "span[data-highlight='_appDesc']"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', ['text', "span[data-highlight='_appDesc']"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'posts'}
-                                <div class='search_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content' n:foreach="$data as $dat">
                                    {if !$dat || $dat->getWallOwner()->isHideFromGlobalFeedEnabled()}
                                        {_closed_group_post}.
                                    {else}
@ -222,31 +234,47 @@
                                </div>

                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', [".post:not(.comment) > tbody > tr > td > .post-content > .text .really_text"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', [".post:not(.comment) > tbody > tr > td > .post-content > .text .really_text"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'videos'}
-                                <div class='search_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content' n:foreach="$data as $dat">
                                    {include "../components/video.xml", video => $dat}
                                </div>    

                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', [".video_name", ".video_description"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', [".video_name", ".video_description"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'audios'}
-                                <div class='search_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content' n:foreach="$data as $dat">
                                    {include "../Audio/player.xml", audio => $dat}
                                </div>
                                
                                <script n:if="$count > 0 && !empty($query) && empty($_REQUEST['only_performers'])">
-                                    highlightText({$query}, '.page_wrap_content_main', [".mediaInfo .performer a", ".mediaInfo .title"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', [".mediaInfo .performer a", ".mediaInfo .title"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {elseif $section === 'audios_playlists'}
-                                <div class='search_content' n:foreach="$data as $dat">
+                                <div class='scroll_node search_content' n:foreach="$data as $dat">
                                    {include "../Audio/playlistListView.xml", playlist => $dat}
                                </div>

                                <script n:if="$count > 0 && !empty($query) && empty($_REQUEST['only_performers'])">
-                                    highlightText({$query}, '.page_wrap_content_main', [".playlistName", ".playlistDesc"])
+                                    function __scrollHook(page) {
+                                        highlightText({$query}, '.page_wrap_content_main', [".playlistName", ".playlistDesc"])
+                                    }
+
+                                    __scrollHook()
                                </script>
                            {/if}
                        {else}
--- a/Web/Presenters/templates/User/Groups.xml
+++ b/Web/Presenters/templates/User/Groups.xml
@ -2,6 +2,7 @@
 {var $iterator = $user->getClubs($page, $admin)}
 {var $count    = $user->getClubCount($admin)}

+{block noscroll}{/block}
 {block title}
    {_groups}
 {/block} 
--- a/Web/Presenters/templates/components/comments.xml
+++ b/Web/Presenters/templates/components/comments.xml
@ -9,9 +9,11 @@
 </div>

 {if sizeof($comments) > 0}
-    {foreach $comments as $comment}
-        {include "comment.xml", comment => $comment}
-    {/foreach}
+    <div class='scroll_container'>
+        <div class='scroll_node' n:foreach="$comments as $comment">
+            {include "comment.xml", comment => $comment}
+        </div>
+    </div>
    <div style="margin-top: 11px;">
        {include "paginator.xml", conf => (object) ["page" => $page, "count" => $count, "amount" => sizeof($comments), "perPage" => 10]}
    </div>
--- a/Web/Presenters/templates/components/paginator.xml
+++ b/Web/Presenters/templates/components/paginator.xml
@ -2,7 +2,7 @@
 {var $pageCount = ceil($conf->count / $conf->perPage)}

 <div n:if="!($conf->page === 1 && $conf->count <= $conf->perPage)" n:attr="style => (!$conf->tidy ? 'padding: 8px;')">
-    <div n:class="paginator, ($conf->atBottom ?? false) ? paginator-at-bottom, ($conf->tidy ? 'tidy')">
+    <div n:class="paginator, (($conf->atTop || $atTop) ?? false) ? paginator-at-top, ($conf->atBottom ?? false) ? paginator-at-bottom, ($conf->tidy ? 'tidy')">
        <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>
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@ -1381,7 +1381,7 @@ textarea {

 .toTop {
    position: fixed;
-    padding: 20px;
+    padding: 12px;
    width: 100px;
    height: 100%;
    background-color: #f3f3f3;
@ -1391,9 +1391,34 @@ textarea {
    opacity: 0;
    transition: .1s all;
    z-index: 129;
+    user-select: none;
 }

-body.scrolled .toTop:hover {
+.toTop > div svg {
+    display: inline-block;
+    margin-right: 2px;
+    width: 8px;
+    height: 7px;
+    fill: #3f3f3f;
+}
+
+.toTop > div span {
+    font-weight: bold;
+}
+
+.toTop.has_down #to_up, .toTop #to_back {
+    display: none;
+}
+
+.toTop.has_down #to_back {
+    display: block;
+}
+
+.toTop.has_down {
+    opacity: .3;
+}
+
+body.scrolled .toTop:hover, .toTop.has_down:hover {
    opacity: .5;
    cursor: pointer;
 }
--- 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) {
+u(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();
--- a/Web/static/js/al_music.js
+++ b/Web/static/js/al_music.js
@ -641,6 +641,35 @@ class bigPlayer {
            duration: this.tracks["currentTrack"].length
        })
    }
+
+    loadContextPage(page, lesser = false) {
+        const formdata = new FormData()
+        formdata.append("context", this.context["context_type"])
+        formdata.append("context_entity", this.context["context_id"])
+        formdata.append("hash", u("meta[name=csrf]").attr("value"))
+        formdata.append("page", page)
+
+        ky.post("/audios/context", {
+            hooks: {
+                afterResponse: [
+                    async (_request, _options, response) => {
+                        const newArr = await response.json()
+
+                        if(lesser)
+                            this.tracks["tracks"] = newArr["items"].concat(this.tracks["tracks"])
+                        else
+                            this.tracks["tracks"] = this.tracks["tracks"].concat(newArr["items"])
+
+                        this.context["playedPages"].push(String(newArr["page"]))
+                        
+                        this.updateButtons()
+                        console.info("Loaded context for page " + page)
+                    }
+                ]
+            }, 
+            body: formdata
+        })
+    }
 }

 document.addEventListener("DOMContentLoaded", function() {
--- a/Web/static/js/al_suggestions.js
+++ b/Web/static/js/al_suggestions.js
@ -201,7 +201,7 @@ $(document).on("click", ".sugglist a", (e) => {
 })

 // нажатие на пагинатор у постов предложки
-$(document).on("click", "#postz .paginator a", (e) => {
+/*$(document).on("click", "#postz .paginator a", (e) => {
    e.preventDefault()
    
    ky(e.currentTarget.href, {
@ -228,4 +228,4 @@ $(document).on("click", "#postz .paginator a", (e) => {
            ]
        }
    })
-})
+})*/
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@ -1644,6 +1644,79 @@ $(document).on("click", ".avatarDelete", (e) => {
    ]);
 })

+async function __processPaginatorNextPage(page)
+{
+    const container = u('.scroll_container')
+    const container_node = '.scroll_node'
+    const parser = new DOMParser
+
+    const replace_url = new URL(location.href)
+    replace_url.searchParams.set('p', page)
+
+    const new_content = await fetch(replace_url.href)
+    const new_content_response = await new_content.text()
+    const parsed_content = parser.parseFromString(new_content_response, 'text/html')
+
+    const nodes = parsed_content.querySelectorAll(container_node)
+    nodes.forEach(node => {
+        container.append(node)
+    })
+
+    u(`.paginator:not(.paginator-at-top)`).html(parsed_content.querySelector('.paginator:not(.paginator-at-top)').innerHTML)
+    // fffffuck
+    if(u(`.paginator:not(.paginator-at-top)`).nodes[0].closest('.scroll_container')) {
+        container.nodes[0].append(u(`.paginator:not(.paginator-at-top)`).nodes[0].parentNode)
+    }
+    
+    if(window.player) {
+        window.player.loadContextPage(page)
+    }
+
+    if(typeof __scrollHook != 'undefined') {
+        __scrollHook(page)
+    }
+}
+
+const showMoreObserver = new IntersectionObserver(entries => {
+    entries.forEach(async x => {
+        if(x.isIntersecting) {
+            if(u('.scroll_container').length < 1) {
+                return
+            }
+            
+            const target = u(x.target)
+            if(target.length < 1 || target.hasClass('paginator-at-top')) {
+                return
+            }
+
+            const current_url = new URL(location.href)
+            if(current_url.searchParams && !isNaN(parseInt(current_url.searchParams.get('p')))) {
+                return
+            }
+
+            target.addClass('lagged')
+            const active_tab = target.find('.active')
+            const next_page  = u(active_tab.nodes[0] ? active_tab.nodes[0].nextElementSibling : null)
+            if(next_page.length < 1) {
+                u('.paginator:not(.paginator-at-top)').removeClass('lagged')
+                return
+            }
+
+            const page_number = Number(next_page.html())
+            await __processPaginatorNextPage(page_number)
+            u('.paginator:not(.paginator-at-top)').removeClass('lagged')
+        }
+    })
+}, {
+    root: null,
+    rootMargin: '0px',
+    threshold: 0,
+})
+
+if(u('.paginator:not(.paginator-at-top)').length > 0) {
+    showMoreObserver.observe(u('.paginator:not(.paginator-at-top)').nodes[0])
+}
+
 u(document).on('click', '#__sourceAttacher', (e) => {
    MessageBox(tr('add_source'), `
        <div id='source_flex_kunteynir'>
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@ -90,7 +90,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
    });
    /* @rem-pai why this func wasn't named as "#_deleteDialog"? It looks universal IMO */

-    u("#_noteDelete").on("click", function(e) {
+    u(document).on("click", "#_noteDelete", 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>";
@ -167,7 +167,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
        return false;
    });

-    u("#_submitUserSubscriptionAction").handle("submit", async function(e) {
+    u(document).handle("submit", "#_submitUserSubscriptionAction", async function(e) {
        u(this).nodes[0].parentElement.classList.add('loading');
        u(this).nodes[0].parentElement.classList.add('disable');
        console.log(e.target);
@ -518,7 +518,7 @@ function highlightText(searchText, container_selector, selectors = []) {
                node.parentNode.insertBefore(tempDiv.firstChild, node)
            }
            node.parentNode.removeChild(node)
-        } else if(node.nodeType === 1 && node.tagName !== 'SCRIPT' && node.tagName !== 'BR' && node.tagName !== 'STYLE') {
+        } else if(node.nodeType === 1 && node.tagName !== 'SCRIPT' && node.tagName !== 'BR' && node.tagName !== 'STYLE' && !node.classList.contains('highlight')) {
            Array.from(node.childNodes).forEach(highlightNode);
        }
    }
--- a/Web/static/js/scroll.js
+++ b/Web/static/js/scroll.js
@ -1,14 +1,35 @@
 window.addEventListener("scroll", function(e) {
    if(window.scrollY < 100) {
+        if(window.temp_y_scroll) {
+            u('.toTop').addClass('has_down')
+        }
        document.body.classList.toggle("scrolled", false);
    } else {
        document.body.classList.toggle("scrolled", true);
+        u('.toTop').removeClass('has_down')
    }
 });

 u(".toTop").on("click", function(e) {
-    window.scrollTo({
-        top: 0,
-        behavior: "smooth"
-    });
-});
+    const y_scroll = window.scrollY
+    const scroll_margin = 20
+
+    if(y_scroll > 100) {
+        window.temp_y_scroll = y_scroll
+        window.scrollTo(0, scroll_margin)
+        window.scrollTo({
+            top: 0,
+            behavior: "smooth"
+        })
+    } else {
+        if(window.temp_y_scroll) {
+            window.scrollTo(0, window.temp_y_scroll - scroll_margin)
+            window.scrollTo({
+                top: window.temp_y_scroll,
+                behavior: "smooth"
+            })
+        }
+    }
+
+    u(document).trigger('scroll')
+})
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "0d3b0eb1916eaf088444ef637743284a",
+    "content-hash": "987e26c5520b71fccd0cd31de00eead2",
    "packages": [
        {
            "name": "al/emoji-detector",
@ -197,16 +197,16 @@
        },
        {
            "name": "chillerlan/php-settings-container",
-            "version": "3.2.0",
+            "version": "3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/chillerlan/php-settings-container.git",
-                "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6"
+                "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/8f93648fac8e6bacac8e00a8d325eba4950295e6",
-                "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6",
+                "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/95ed3e9676a1d47cab2e3174d19b43f5dbf52681",
+                "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681",
                "shasum": ""
            },
            "require": {
@ -214,15 +214,16 @@
                "php": "^8.1"
            },
            "require-dev": {
-                "phan/phan": "^5.4",
                "phpmd/phpmd": "^2.15",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-deprecation-rules": "^1.2",
                "phpunit/phpunit": "^10.5",
-                "squizlabs/php_codesniffer": "^3.9"
+                "squizlabs/php_codesniffer": "^3.10"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "chillerlan\\Settings\\": "src/"
+                    "chillerlan\\Settings\\": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -258,7 +259,7 @@
                    "type": "ko_fi"
                }
            ],
-            "time": "2024-03-02T20:07:15+00:00"
+            "time": "2024-07-16T11:13:48+00:00"
        },
        {
            "name": "erusev/parsedown",
@ -266,20 +267,20 @@
            "source": {
                "type": "git",
                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "1ff038273949df7d6a455352659a878f3c89b29c"
+                "reference": "582f9f9cd12a894a0901bef1652854a3c5a1d874"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/1ff038273949df7d6a455352659a878f3c89b29c",
-                "reference": "1ff038273949df7d6a455352659a878f3c89b29c",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/582f9f9cd12a894a0901bef1652854a3c5a1d874",
+                "reference": "582f9f9cd12a894a0901bef1652854a3c5a1d874",
                "shasum": ""
            },
            "require": {
                "ext-mbstring": "*",
-                "php": ">=5.3.0"
+                "php": ">=7.1"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8.35"
+                "phpunit/phpunit": "^7.5|^8.5|^9.6"
            },
            "default-branch": true,
            "type": "library",
@ -309,7 +310,7 @@
                "issues": "https://github.com/erusev/parsedown/issues",
                "source": "https://github.com/erusev/parsedown/tree/master"
            },
-            "time": "2024-03-12T05:27:45+00:00"
+            "time": "2024-10-12T07:06:08+00:00"
        },
        {
            "name": "ezyang/htmlpurifier",
@ -317,12 +318,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "4828fdf45a93eeeacfcbcc855f96f9a7e6b4ed44"
+                "reference": "cb56001e54359df7ae76dc522d08845dc741621b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/4828fdf45a93eeeacfcbcc855f96f9a7e6b4ed44",
-                "reference": "4828fdf45a93eeeacfcbcc855f96f9a7e6b4ed44",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b",
+                "reference": "cb56001e54359df7ae76dc522d08845dc741621b",
                "shasum": ""
            },
            "require": {
@ -369,9 +370,9 @@
            ],
            "support": {
                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/master"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0"
            },
-            "time": "2024-03-13T03:41:45+00:00"
+            "time": "2024-11-01T03:51:45+00:00"
        },
        {
            "name": "guzzlehttp/guzzle",
@ -678,12 +679,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/JamesHeinrich/getID3.git",
-                "reference": "143af3325ee40e77c5d041d3f674c8bdd4762dc7"
+                "reference": "eb358a0d4943c0cc23e783f1a72141f46153c13a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/143af3325ee40e77c5d041d3f674c8bdd4762dc7",
-                "reference": "143af3325ee40e77c5d041d3f674c8bdd4762dc7",
+                "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/eb358a0d4943c0cc23e783f1a72141f46153c13a",
+                "reference": "eb358a0d4943c0cc23e783f1a72141f46153c13a",
                "shasum": ""
            },
            "require": {
@ -738,7 +739,7 @@
                "issues": "https://github.com/JamesHeinrich/getID3/issues",
                "source": "https://github.com/JamesHeinrich/getID3/tree/master"
            },
-            "time": "2024-03-26T12:26:30+00:00"
+            "time": "2024-09-20T19:45:51+00:00"
        },
        {
            "name": "league/uri",
@ -1099,20 +1100,20 @@
        },
        {
            "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                "psr/http-message": "^1.0 || ^2.0"
            },
            "type": "library",
@ -1136,7 +1137,7 @@
                    "homepage": "https://www.php-fig.org/"
                }
            ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
            "keywords": [
                "factory",
                "http",
@ -1148,9 +1149,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
            },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
        },
        {
            "name": "psr/http-message",
@ -1318,21 +1319,22 @@
            "source": {
                "type": "git",
                "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "5659341b5da400dafd5672171215f4534c06236b"
+                "reference": "12d3cdf0fc2a73e9438ded5a5a82fb353b68d718"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5659341b5da400dafd5672171215f4534c06236b",
-                "reference": "5659341b5da400dafd5672171215f4534c06236b",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/12d3cdf0fc2a73e9438ded5a5a82fb353b68d718",
+                "reference": "12d3cdf0fc2a73e9438ded5a5a82fb353b68d718",
                "shasum": ""
            },
            "require": {
                "ext-ctype": "*",
                "ext-json": "*",
-                "league/uri": "^7.4@dev",
-                "league/uri-interfaces": "^7.3",
+                "league/uri": "^7.4",
+                "league/uri-interfaces": "^7.4",
                "php": ">=8.1",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
+                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.30"
            },
            "require-dev": {
                "bamarni/composer-bin-plugin": "^1.4",
@ -1347,8 +1349,7 @@
                "zurb/foundation": "~6.7.0"
            },
            "suggest": {
-                "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
-                "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
+                "ext-mbstring": "For best performance, mbstring should be installed as it is faster than the polyfill"
            },
            "default-branch": true,
            "type": "library",
@ -1392,7 +1393,7 @@
                "issues": "https://github.com/scssphp/scssphp/issues",
                "source": "https://github.com/scssphp/scssphp/tree/main"
            },
-            "time": "2024-01-13T13:17:46+00:00"
+            "time": "2024-10-24T15:03:30+00:00"
        },
        {
            "name": "symfony/console",
@ -1400,12 +1401,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e"
+                "reference": "108d436c2af470858bdaba3257baab3a74172017"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/108d436c2af470858bdaba3257baab3a74172017",
+                "reference": "108d436c2af470858bdaba3257baab3a74172017",
                "shasum": ""
            },
            "require": {
@ -1491,20 +1492,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-02-20T16:33:57+00:00"
+            "time": "2024-10-08T07:27:17+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                "shasum": ""
            },
            "require": {
@ -1513,7 +1514,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@ -1542,7 +1543,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
            },
            "funding": [
                {
@ -1558,27 +1559,30 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v6.4.3",
+            "version": "v7.2.0-BETA1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
-                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/polyfill-ctype": "~1.8",
                "symfony/polyfill-mbstring": "~1.8"
            },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0"
+            },
            "type": "library",
            "autoload": {
                "psr-4": {
@ -1605,7 +1609,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
+                "source": "https://github.com/symfony/filesystem/tree/v7.2.0-BETA1"
            },
            "funding": [
                {
@ -1621,24 +1625,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-23T14:51:35+00:00"
+            "time": "2024-10-25T15:15:23+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "provide": {
                "ext-ctype": "*"
@ -1684,7 +1688,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
            },
            "funding": [
                {
@ -1700,24 +1704,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "suggest": {
                "ext-intl": "For best performance"
@ -1762,7 +1766,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
            },
            "funding": [
                {
@ -1778,26 +1782,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
-                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
            },
            "suggest": {
                "ext-intl": "For best performance"
@ -1846,7 +1849,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
            },
            "funding": [
                {
@ -1862,24 +1865,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "suggest": {
                "ext-intl": "For best performance"
@ -1927,7 +1930,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
            },
            "funding": [
                {
@ -1943,24 +1946,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "provide": {
                "ext-mbstring": "*"
@ -2007,7 +2010,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
            },
            "funding": [
                {
@ -2023,97 +2026,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.29.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
-                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-php73",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "type": "library",
            "extra": {
@ -2156,7 +2086,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0"
            },
            "funding": [
                {
@ -2172,24 +2102,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
            },
            "type": "library",
            "extra": {
@ -2236,7 +2166,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
            },
            "funding": [
                {
@ -2252,25 +2182,26 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/container": "^1.1|^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2"
@ -2278,7 +2209,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@ -2318,7 +2249,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
            },
            "funding": [
                {
@ -2334,20 +2265,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v6.4.4",
+            "version": "v6.4.13",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9"
+                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
-                "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9",
+                "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
+                "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627",
                "shasum": ""
            },
            "require": {
@ -2404,7 +2335,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.4"
+                "source": "https://github.com/symfony/string/tree/v6.4.13"
            },
            "funding": [
                {
@ -2420,7 +2351,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-02-01T13:16:41+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
        },
        {
            "name": "vearutop/php-obscene-censor-rus",
@ -2525,12 +2456,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/wapmorgan/Morphos.git",
-                "reference": "302b56636cf604ad07e20020076d8a4880554286"
+                "reference": "d22876709756b538a52b30a50a3f37cd89efeb91"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/wapmorgan/Morphos/zipball/302b56636cf604ad07e20020076d8a4880554286",
-                "reference": "302b56636cf604ad07e20020076d8a4880554286",
+                "url": "https://api.github.com/repos/wapmorgan/Morphos/zipball/d22876709756b538a52b30a50a3f37cd89efeb91",
+                "reference": "d22876709756b538a52b30a50a3f37cd89efeb91",
                "shasum": ""
            },
            "require": {
@ -2592,7 +2523,7 @@
                "issues": "https://github.com/wapmorgan/Morphos/issues",
                "source": "https://github.com/wapmorgan/Morphos/tree/master"
            },
-            "time": "2024-03-26T07:24:27+00:00"
+            "time": "2024-09-26T12:41:09+00:00"
        },
        {
            "name": "whichbrowser/parser",
@ -2600,12 +2531,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/WhichBrowser/Parser-PHP.git",
-                "reference": "1044880bc792dbce5948fbff22ae731c43c280d9"
+                "reference": "581d614d686bfbec3529ad60562a5213ac5d8d72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/WhichBrowser/Parser-PHP/zipball/1044880bc792dbce5948fbff22ae731c43c280d9",
-                "reference": "1044880bc792dbce5948fbff22ae731c43c280d9",
+                "url": "https://api.github.com/repos/WhichBrowser/Parser-PHP/zipball/581d614d686bfbec3529ad60562a5213ac5d8d72",
+                "reference": "581d614d686bfbec3529ad60562a5213ac5d8d72",
                "shasum": ""
            },
            "require": {
@ -2629,8 +2560,7 @@
            "autoload": {
                "psr-4": {
                    "WhichBrowser\\": [
-                        "src/",
-                        "tests/src/"
+                        "src/"
                    ]
                }
            },
@ -2655,28 +2585,28 @@
            ],
            "support": {
                "issues": "https://github.com/WhichBrowser/Parser-PHP/issues",
-                "source": "https://github.com/WhichBrowser/Parser-PHP/tree/v2.1.7"
+                "source": "https://github.com/WhichBrowser/Parser-PHP/tree/v2.1.8"
            },
-            "time": "2022-04-19T20:14:54+00:00"
+            "time": "2024-04-17T12:47:41+00:00"
        }
    ],
    "packages-dev": [],
    "aliases": [],
    "minimum-stability": "beta",
    "stability-flags": {
-        "whichbrowser/parser": 20,
-        "james-heinrich/getid3": 20,
-        "rybakit/msgpack": 20,
-        "wapmorgan/binary-stream": 20,
        "al/emoji-detector": 20,
-        "ezyang/htmlpurifier": 20,
-        "scssphp/scssphp": 20,
-        "lfkeitel/phptotp": 20,
-        "vearutop/php-obscene-censor-rus": 20,
-        "erusev/parsedown": 20,
        "bhaktaraz/php-rss-generator": 20,
+        "erusev/parsedown": 20,
+        "ezyang/htmlpurifier": 20,
+        "james-heinrich/getid3": 20,
+        "lfkeitel/phptotp": 20,
+        "rybakit/msgpack": 20,
+        "scssphp/scssphp": 20,
        "symfony/console": 20,
-        "wapmorgan/morphos": 20
+        "vearutop/php-obscene-censor-rus": 20,
+        "wapmorgan/binary-stream": 20,
+        "wapmorgan/morphos": 20,
+        "whichbrowser/parser": 20
    },
    "prefer-stable": false,
    "prefer-lowest": false,
@ -2684,8 +2614,9 @@
        "php": "~7.3||~8.1",
        "ext-openssl": "*",
        "ext-simplexml": "*",
-        "ext-sodium": "*"
+        "ext-sodium": "*",
+        "ext-iconv": "*"
    },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
--- a/install/automated/docker/openvk.Dockerfile
+++ b/install/automated/docker/openvk.Dockerfile
@ -57,4 +57,6 @@ VOLUME [ "/opt/chandler/extensions/available/openvk/tmp/api-storage/audios" ]
 VOLUME [ "/opt/chandler/extensions/available/openvk/tmp/api-storage/photos" ]
 VOLUME [ "/opt/chandler/extensions/available/openvk/tmp/api-storage/videos" ]

-USER www-data
+USER www-data
+
+WORKDIR /opt/chandler/extensions/available/openvk
Author	SHA1	Message	Date
mrilyew	6e97bb58bb	Merge `a4d5bb8088` into `3ceb27e532`	2024-11-03 07:57:17 +00:00
Alexander Minkin	3ceb27e532	build(composer.lock): update dependencies	2024-11-03 00:20:54 +03:00
Alexander Minkin	99a2e3a8e6	fix(docker): set openvk dir as workdir So that opening a shell with `docker compose exec openvk bash` would lead to openvk dir instead of ~/html which is not used	2024-11-03 00:05:40 +03:00
mrilyew	a4d5bb8088	Merge branch 'master' into infinityscroll2	2024-11-02 14:16:42 +03:00
mrilyew	c4fec2bf97	rework to up button	2024-11-02 13:02:34 +03:00
mrilyew	389f0b4bb4	allow comments scroll	2024-11-02 12:13:17 +03:00
mrilyew	8fc47ff6cd	rewrite	2024-11-02 11:16:25 +03:00