Skip to content

feat(reports): ability to exclude from global feed #1443

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
n1rwana wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(reports): ability to exclude from global feed #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions Web/Models/Entities/Report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,15 @@ public function getContentObject()
}
}

public function getAuthor(): RowModel
public function getAuthor(?bool $realPostAuthor = false): RowModel
{
return $this->getContentObject()->getOwner();
if ($this->getContentType() == "user")
return $this->getContentObject();

if (!in_array($this->getContentType(), ["post", "comment", "note", "topic"]))
return $this->getContentObject()->getOwner();

return $this->getContentObject()->getOwner(!$realPostAuthor, $realPostAuthor);
}

public function getReportAuthor(): User
Expand All @@ -103,7 +109,7 @@ public function getReportAuthor(): User
public function banUser($initiator)
{
$reason = $this->getContentType() !== "user" ? ("**content-" . $this->getContentType() . "-" . $this->getContentId() . "**") : ("Подозрительная активность");
$this->getAuthor()->ban($reason, false, time() + $this->getAuthor()->getNewBanTime(), $initiator);
$this->getAuthor()->ban($reason, false, time() + $this->getAuthor(true)->getNewBanTime(), $initiator);
}

public function deleteContent()
Expand Down
19 changes: 19 additions & 0 deletions Web/Presenters/ReportPresenter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,25 @@ public function renderAction(int $id): void
if (!$report || $report->isDeleted()) {
$this->notFound();
}

if ($report->getContentType() === "user" && $this->postParam("excludeUserFromGlobalFeed")) {
$reportedUser = $report->getContentObject();
$reportedUser->setHide_Global_Feed(1);
$reportedUser->save();
}

if ($report->getContentType() !== "user" && $this->postParam("excludeAuthorFromGlobalFeed")) {
$reportedContentAuthor = $report->getAuthor(true);
$reportedContentAuthor->setHide_Global_Feed(1);
$reportedContentAuthor->save();
}

if (($report->getContentType() === "group" || $report->getAuthor()->getId() != $report->getAuthor(true)->getId()) && $this->postParam("excludeGroupFromGlobalFeed")) {
$reportedGroup = $report->getContentType() === "group" ? $report->getContentObject() : $report->getAuthor();
$reportedGroup->setHide_From_Global_Feed(1);
$reportedGroup->setEnforce_Hiding_From_Global_Feed(1);
$reportedGroup->save();
}

if ($this->postParam("ban")) {
$report->deleteContent();
Expand Down
13 changes: 12 additions & 1 deletion Web/Presenters/templates/Report/View.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,19 @@
<b>{_comment}:</b> {$report->getReason()}
</p>
{include "ViewContent.xml", type => $report->getContentType(), object => $report->getContentObject()}
<center>
<form action="/admin/reportAction{$report->getId()}" method="post">
<div n:if="$report->getContentType() == 'user'">
<input type='checkbox' name='excludeUserFromGlobalFeed' id="excludeUserFromGlobalFeed"> {_report_force_exclude_user_from_global_feed|noescape}
</div>
<div n:if="$report->getContentType() != 'user'">
<input type='checkbox' name='excludeAuthorFromGlobalFeed' id="excludeAuthorFromGlobalFeed">
{_report_force_exclude_author_from_global_feed|noescape} (<a href="{$report->getAuthor(true)->getUrl()}" target="_blank">{$report->getAuthor(true)->getCanonicalName()}</a>)
</div>
<div n:if="$report->getAuthor()->getId() != $report->getAuthor(true)->getId() || $report->getContentType() == 'group'">
<input type='checkbox' name='excludeGroupFromGlobalFeed' id="excludeGroupFromGlobalFeed">
{_report_force_exclude_group_from_global_feed|noescape}
{if $report->getContentType() != 'group'}(<a href="{$report->getAuthor()->getUrl()}" target="_blank">{$report->getAuthor()->getCanonicalName()}</a>){/if}
</div>
<center>
<form n:if="$report->getContentType() != 'group'" action="/admin/reportAction{$report->getId()}" method="post">
<input type="hidden" name="hash" value="{$csrfToken}"/>
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 @@ -2332,6 +2332,11 @@

"nospam_prevention" = "This action will affect a lot of data. Are you sure you want to apply?";

"report_force_exclude_author_from_global_feed" = "Exclude <b>content author</b> from global feed";
"report_force_exclude_user_from_global_feed" = "Exclude <b>user</b> from global feed";
"report_force_exclude_group_from_global_feed" = "Exclude <b>group</b> from global feed";


/* RSS */

"post_deact_in_general" = "Page deletion";
Expand Down
4 changes: 4 additions & 0 deletions locales/ru.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,6 +2227,10 @@

"nospam_prevention" = "Данное действие затронет множество данных. Вы действительно хотите применить?";

"report_force_exclude_author_from_global_feed" = "Исключить <b>автора контента</b> из глобальной ленты";
"report_force_exclude_user_from_global_feed" = "Исключить <b>пользователя</b> из глобальной ленты";
"report_force_exclude_group_from_global_feed" = "Исключить <b>сообщество</b> из глобальной ленты";

/* RSS */

"post_deact_in_general" = "Удаление страницы";
Expand Down
Loading