Skip to content

feat(FeedIgnore): added ignore feature to the feed posts #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xRy0 wants to merge 15 commits into
base: master
Choose a base branch
from
Open

feat(FeedIgnore): added ignore feature to the feed posts #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c26e642
feat(FeedIgnore): added draft of ignore feature to the feed posts
xRy0 May 20, 2025
2764746
fix(FeedIgnore): Linter is crazy xd
xRy0 May 20, 2025
033a04e
style: created css class for button
xRy0 May 20, 2025
ddefa14
style: fix hover
xRy0 May 20, 2025
90a3352
feat(FeedIgnore): remove garbage logic
xRy0 May 20, 2025
47b14a4
feat(FeedIgnore): icon now have sense
xRy0 May 20, 2025
a2af0f8
feat(FeedIgnore): check is global feed
xRy0 May 20, 2025
67d8f4e
feat(FeedIgnore): design rework
xRy0 May 20, 2025
cb015a5
feat(FeedIgnore): added js listner
xRy0 May 20, 2025
37a9c2f
feat(FeedIgnore): added strings
xRy0 May 20, 2025
3151fa7
Merge branch 'master' into FeedIgnore
xRy0 May 20, 2025
f3f06ec
feat(FeedIgnore): added uk strings
xRy0 May 20, 2025
c38c12f
Merge branch 'FeedIgnore' of https://github.com/xRy0/openvk into Feed…
xRy0 May 20, 2025
d52e655
feat(FeedIgnore): changed icon
xRy0 May 27, 2025
cf3a664
Merge branch 'master' into FeedIgnore
xRy0 Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Web/Presenters/WallPresenter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ public function renderFeed(): void
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
Expand Down Expand Up @@ -240,6 +241,7 @@ public function renderGlobalFeed(): void
foreach ($posts as $post) {
$this->template->posts[] = $this->posts->get($post->id);
}
$this->template->feedIgnoreButton = true;
}

public function renderHashtagFeed(string $hashtag): void
Expand Down
3 changes: 3 additions & 0 deletions Web/Presenters/templates/components/post/microblogpost.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@
<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()}
Expand Down
9 changes: 9 additions & 0 deletions Web/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,15 @@ h4 {
}
}

.post-hidden {
display: none;
}

.ignore-message {
padding: 5px 0;
}


.small-textarea {
height: 24px;
}
Expand Down
23 changes: 23 additions & 0 deletions Web/static/css/microblog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
5 changes: 5 additions & 0 deletions locales/en.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 5 additions & 0 deletions locales/ru.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,11 @@
"change_geo_name" = "Изменить название точки";
"change_geo_name_new" = "Новое название";

"feed_user_ignored" = "Пользователь больше не будет появляться в ленте.";
"feed_club_ignored" = "Группа больше не будет появляться в ленте.";
"feed_unignore" = "Вернуть.";
"feed_ignore" = "Не интересно";

/* Friends */

"friends" = "Друзья";
Expand Down
5 changes: 5 additions & 0 deletions locales/uk.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,11 @@
"change_geo_name" = "Змінити назву розташування";
"change_geo_name_new" = "Нова назва";

"feed_user_ignored" = "Користувач більше не з'являтиметься у стрічці.";
"feed_club_ignored" = "Спiльнота більше не з'являтиметься у стрічці.";
"feed_unignore" = "Повернути.";
"feed_ignore" = "Не цікаво";

/* Friends */

"friends" = "Друзі";
Expand Down