From 3d2036345b51225096e69e4fd3661358c3bcb24d Mon Sep 17 00:00:00 2001
From: mrilyew <99399973+mrilyew@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:18:57 +0300
Subject: [PATCH] -comments search, arrow keys on tips

---
 Web/Models/Entities/Playlist.php          | 15 ++++++++
 Web/Presenters/SearchPresenter.php        |  6 +---
 Web/Presenters/templates/@layout.xml      |  1 -
 Web/Presenters/templates/Search/Index.xml | 11 +-----
 Web/static/css/main.css                   |  2 +-
 Web/static/js/al_navigation.js            | 42 ++++++++++++++++++++++-
 Web/static/js/al_wall.js                  |  2 +-
 locales/en.strings                        |  6 ++--
 locales/ru.strings                        |  4 +--
 9 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/Web/Models/Entities/Playlist.php b/Web/Models/Entities/Playlist.php
index 29a6aa75..ac36b4f3 100644
--- a/Web/Models/Entities/Playlist.php
+++ b/Web/Models/Entities/Playlist.php
@@ -41,6 +41,21 @@ class Playlist extends MediaCollection
     {
         return $this->getRecord()->length;
     }
+    
+    function fetchClassic(int $offset = 0, ?int $limit = NULL): \Traversable
+    {
+        $related = $this->getRecord()->related("$this->relTableName.collection")
+            ->limit($limit ?? OPENVK_DEFAULT_PER_PAGE, $offset)
+            ->order("index ASC");
+
+        foreach($related as $rel) {
+            $media = $rel->ref($this->entityTableName, "media");
+            if(!$media)
+                continue;
+
+            yield new $this->entityClassName($media);
+        }
+    }
 
     function getAudios(int $offset = 0, ?int $limit = NULL, ?int $shuffleSeed = NULL): \Traversable
     {
diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php
index 47f3ee16..72c34e89 100644
--- a/Web/Presenters/SearchPresenter.php
+++ b/Web/Presenters/SearchPresenter.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
 use openvk\Web\Models\Entities\{User, Club};
-use openvk\Web\Models\Repositories\{Users, Clubs, Posts, Comments, Videos, Applications, Audios};
+use openvk\Web\Models\Repositories\{Users, Clubs, Posts, Videos, Applications, Audios};
 use Chandler\Database\DatabaseConnection;
 
 final class SearchPresenter extends OpenVKPresenter
@@ -9,10 +9,8 @@ final class SearchPresenter extends OpenVKPresenter
     private $users;
     private $clubs;
     private $posts;
-    private $comments;
     private $videos;
     private $apps;
-    private $notes;
     private $audios;
     
     function __construct()
@@ -20,7 +18,6 @@ final class SearchPresenter extends OpenVKPresenter
         $this->users    = new Users;
         $this->clubs    = new Clubs;
         $this->posts    = new Posts;
-        $this->comments = new Comments;
         $this->videos   = new Videos;
         $this->apps     = new Applications;
         $this->audios   = new Audios;
@@ -45,7 +42,6 @@ final class SearchPresenter extends OpenVKPresenter
             "groups"   => "clubs", 
             "users"    => "users",
             "posts"    => "posts",
-            "comments" => "comments",
             "videos"   => "videos",
             "audios"   => "audios",
             "apps"     => "apps",
diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index c62a6e31..b54ef44c 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -123,7 +123,6 @@
                                                 <option n:attr="selected => $_REQUEST['section'] == 'users'" value="users">{_s_by_people}</option>
                                                 <option n:attr="selected => $_REQUEST['section'] == 'groups'" value="groups">{_s_by_groups}</option>
                                                 <option n:attr="selected => $_REQUEST['section'] == 'posts'" value="posts">{_s_by_posts}</option>
-                                                <option n:attr="selected => $_REQUEST['section'] == 'comments'" value="comments">{_s_by_comments}</option>
                                                 <option n:attr="selected => $_REQUEST['section'] == 'videos'" value="videos">{_s_by_videos}</option>
                                                 <option n:attr="selected => $_REQUEST['section'] == 'apps'" value="apps">{_s_by_apps}</option>
                                                 <option n:attr="selected => $_REQUEST['section'] == 'audios'" value="audios">{_s_by_audios}</option>
diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml
index 77c2bd43..76143507 100644
--- a/Web/Presenters/templates/Search/Index.xml
+++ b/Web/Presenters/templates/Search/Index.xml
@@ -224,14 +224,6 @@
                                 <script n:if='$count > 0 && !empty($query)'>
                                     highlightText({$query}, '.page_wrap_content_main', [".post:not(.comment) > tbody > tr > td > .post-content > .text .really_text"])
                                 </script>
-                            {elseif $section === 'comments'}
-                                <div class='search_content' n:foreach="$data as $dat">
-                                    {include "../components/comment.xml", no_reply_button => true, comment => $dat, correctLink => true}
-                                </div>
-
-                                <script n:if='$count > 0 && !empty($query)'>
-                                    highlightText({$query}, '.page_wrap_content_main', [".text .really_text"])
-                                </script>
                             {elseif $section === 'videos'}
                                 <div class='search_content' n:foreach="$data as $dat">
                                     {include "../components/video.xml", video => $dat}
@@ -266,7 +258,6 @@
                             <a n:attr="id => $section === 'users' ? 'used'"    href="/search?section=users&q={urlencode($query)}">    {_s_people}</a>
                             <a n:attr="id => $section === 'groups' ? 'used'"   href="/search?section=groups&q={urlencode($query)}">   {_s_groups}</a>
                             <a n:attr="id => $section === 'posts' ? 'used'"    href="/search?section=posts&q={urlencode($query)}">    {_s_posts}</a>
-                            <a n:attr="id => $section === 'comments' ? 'used'" href="/search?section=comments&q={urlencode($query)}"> {_s_comments}</a>
                             <a n:attr="id => $section === 'videos' ? 'used'"   href="/search?section=videos&q={urlencode($query)}">   {_s_videos}</a>
                             <a n:attr="id => $section === 'apps' ? 'used'"     href="/search?section=apps&q={urlencode($query)}">     {_s_apps}</a>
                             <a n:attr="id => $section === 'audios' ? 'used'"   href="/search?section=audios&q={urlencode($query)}">   {_s_audios}</a>
@@ -400,7 +391,7 @@
             </label>
             <label>
                 {_genre}
-                <select name='genre' form="search_form">
+                <select name='genre' form="search_form" data-default='any'>
                     <option n:attr="selected: empty($_REQUEST['genre'])" value="any">{_s_any_single}</option>
                     <option n:foreach='\openvk\Web\Models\Entities\Audio::genres as $genre' n:attr="selected: $_REQUEST['genre'] == $genre" value="{$genre}">
                         {$genre}
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index f60fffbd..54951da3 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -2564,7 +2564,7 @@ a.poll-retract-vote {
     line-height: 12px;
 }
 
-.header_navigation #search_box #searchBoxFastTips a:hover {
+.header_navigation #search_box #searchBoxFastTips a:hover, .header_navigation #search_box #searchBoxFastTips a:focus {
     background: #f3f3f3;
 }
 
diff --git a/Web/static/js/al_navigation.js b/Web/static/js/al_navigation.js
index 4af2ce27..dc56817b 100644
--- a/Web/static/js/al_navigation.js
+++ b/Web/static/js/al_navigation.js
@@ -75,7 +75,7 @@ u(`#search_box input[type='search']`).on('input', async (e) => {
             results = await fetch(`/method/video.search?auth_mechanism=roaming&q=${query}&count=10&sort=4&extended=1`)
             break
         case 'audios_playlists':
-            results = await fetch(`/method/audio.searchAlbums?auth_mechanism=roaming&query=${query}&count=10`)
+            results = await fetch(`/method/audio.searchAlbums?auth_mechanism=roaming&query=${query}&limit=10`)
             break
     }
 
@@ -148,3 +148,43 @@ u(`#search_box input[type='search']`).on('input', async (e) => {
         `)
     })
 })
+
+u(document).on('keydown', `#search_box input[type='search'], #searchBoxFastTips a`, (e) => {
+    const u_tips = u('#searchBoxFastTips a')
+    if(u_tips.length < 1) {
+        return
+    }
+
+    const focused = u('#searchBoxFastTips a:focus').nodes[0]
+
+    // up
+    switch(e.keyCode) {
+        case 38:
+            e.preventDefault()
+            if(!focused) {
+                u_tips.nodes[0].focus()
+                return
+            }
+
+            if(focused.previousSibling) {
+                focused.previousSibling.focus()
+            }
+
+            break
+        // down
+        case 40:
+            e.preventDefault()
+            if(!focused) {
+                u_tips.nodes[0].focus()
+                return
+            }
+
+            if(focused.nextSibling) {
+                focused.nextSibling.focus()
+            } else {
+                u_tips.nodes[0].focus()
+            }
+
+            break
+    }
+})
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 60b44438..3278810d 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -279,7 +279,7 @@ function OpenMiniature(e, photo, post, photo_id, type = "post") {
                             tempDetailsSection[index] = element.innerHTML;
 
                             if(index == imagesIndex) {
-                                u(".ovk-photo-details").last().innerHTML = element.innerHTML;
+                                u(".ovk-photo-details").last().innerHTML = element.innerHTML ?? '';
                             }
 
                             document.querySelectorAll(".ovk-photo-details .bsdn").forEach(bsdnInitElement)
diff --git a/locales/en.strings b/locales/en.strings
index 9426e8ec..1d1a7d82 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -641,7 +641,7 @@
 "apply_style_for_this_device" = "Apply style only for this device";
 
 "search_for_groups" = "Search for groups";
-"search_for_users" = "Search for people";
+"search_for_users" = "Search for users";
 "search_for_posts" = "Search for posts";
 "search_for_comments" = "Search for comments";
 "search_for_videos" = "Search for videos";
@@ -1993,7 +1993,7 @@
 
 /* Search */
 
-"s_people" = "People";
+"s_people" = "Users";
 "s_groups" = "Clubs";
 "s_apps" = "Applications";
 "s_posts" = "Posts";
@@ -2002,7 +2002,7 @@
 "s_audios" = "Music";
 "s_audios_playlists" = "Playlists";
 
-"s_by_people" = "for people";
+"s_by_people" = "for users";
 "s_by_groups" = "for groups";
 "s_by_posts" = "for posts";
 "s_by_comments" = "for comments";
diff --git a/locales/ru.strings b/locales/ru.strings
index 4ea2e649..2c42312b 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -1883,7 +1883,7 @@
 
 /* Search */
 
-"s_people" = "Люди";
+"s_people" = "Пользователи";
 "s_groups" = "Группы";
 "s_apps" = "Приложения";
 "s_posts" = "Записи";
@@ -1892,7 +1892,7 @@
 "s_audios" = "Аудио";
 "s_audios_playlists" = "Плейлисты";
 
-"s_by_people" = "по людям";
+"s_by_people" = "по пользователям";
 "s_by_groups" = "по группам";
 "s_by_posts" = "по записям";
 "s_by_comments" = "по комментариям";