Merge cf3a664143 into a3634c19cf

Web/Presenters/WallPresenter.php

@@ -200,6 +200,7 @@ final class WallPresenter extends OpenVKPresenter
         foreach ($posts->page((int) ($_GET["p"] ?? 1), $perPage) as $post) {
             $this->template->posts[] = $this->posts->get($post->id);
         }
+        $this->template->feedIgnoreButton = true;
     }
 
     public function renderGlobalFeed(): void
@@ -240,6 +241,7 @@ final class WallPresenter extends OpenVKPresenter
         foreach ($posts as $post) {
             $this->template->posts[] = $this->posts->get($post->id);
         }
+        $this->template->feedIgnoreButton = true;
     }
 
     public function renderHashtagFeed(string $hashtag): void

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

@@ -58,8 +58,11 @@
                     <span n:if="$post->isPinned()" class="nobold">{_pinned}</span>
 
                     <a n:if="$canBeDeleted && !($forceNoDeleteLink ?? false) && $compact == false" class="delete" href="/wall{$post->getPrettyId()}/delete"></a>
+
                     <a n:if="!$canBeDeleted" class="report" title="{_report}" href="javascript:reportPost({$post->getId()})"></a>
 
+                    <a n:if="$feedIgnoreButton && !$canBeDeleted" class="delete" id="__ignoreSomeoneFeed" title="{_feed_ignore}" data-val='1' data-id="{$wallOwner->getRealId()}"></a>
+                    
                     {if $canBePinned && !($forceNoPinLink ?? false) && $compact == false}
                         {if $post->isPinned()}
                             <a class="pin" href="/wall{$post->getPrettyId()}/pin?act=unpin&hash={rawurlencode($csrfToken)}"></a>

Web/static/css/main.css

@@ -918,6 +918,15 @@ h4 {
     }
 }
 
+.post-hidden {
+    display: none;
+}
+
+.ignore-message {
+    padding: 5px 0;
+}
+
+
 .small-textarea {
     height: 24px;
 }

Web/static/css/microblog.css

@@ -86,6 +86,16 @@
     background-color: rgb(240, 240, 240);
 }
 
+.ignore {
+    float: right;
+    height: 16px;
+    width: 16px;
+    overflow: auto;
+    background: url("/assets/packages/static/openvk/img/ignore.png") no-repeat 0 0;
+    opacity: 0.1;
+    transition-duration: 0.3s;
+}
+
 .report {
     float: right;
     height: 16px;
@@ -96,6 +106,19 @@
     transition-duration: 0.3s;
 }
 
+.ignore:hover {
+    opacity: 0.4;
+}
+
+.post-hidden {
+    display: none;
+}
+
+.ignore-message {
+    padding: 5px 0;
+    border-bottom: 1px #ddd solid;
+}
+
 .report:hover {
     opacity: 0.4;
 }

locales/en.strings

@@ -359,6 +359,11 @@
 "subscriptions_one" = "$1 subscription";
 "subscriptions_other" = "$1 subscriptions";
 
+"feed_user_ignored" = "User will no longer appear in the feed.";
+"feed_club_ignored" = "Club will no longer appear in the feed.";
+"feed_unignore" = "Restore.";
+"feed_ignore" = "Not interested";
+
 /* Group */
 
 "group" = "Group";

locales/ru.strings

@@ -290,6 +290,11 @@
 "change_geo_name" = "Изменить название точки";
 "change_geo_name_new" = "Новое название";
 
+"feed_user_ignored" = "Пользователь больше не будет появляться в ленте.";
+"feed_club_ignored" = "Группа больше не будет появляться в ленте.";
+"feed_unignore" = "Вернуть.";
+"feed_ignore" = "Не интересно";
+
 /* Friends */
 
 "friends" = "Друзья";

locales/uk.strings

@@ -280,6 +280,11 @@
 "change_geo_name" = "Змінити назву розташування";
 "change_geo_name_new" = "Нова назва";
 
+"feed_user_ignored" = "Користувач більше не з'являтиметься у стрічці.";
+"feed_club_ignored" = "Спiльнота більше не з'являтиметься у стрічці.";
+"feed_unignore" = "Повернути.";
+"feed_ignore" = "Не цікаво";
+
 /* Friends */
 
 "friends" = "Друзі";