Compare commits

...

2 commits

Author SHA1 Message Date
veselcraft
cf23022626
БЛЯЯЯЯЯЯЯЯТЬ 2023-07-20 02:36:34 +03:00
veselcraft
d25c2ee183
Blacklists: Make it barely work (xd) 2023-07-20 02:35:09 +03:00
4 changed files with 12 additions and 8 deletions

View file

@ -24,7 +24,11 @@ class Blacklists
function getByAuthorAndTarget(int $author, int $target): ?BlacklistItem
{
return new BlacklistItem($this->blacklists->where(["author" => $author, "target" => $target])->fetch());
$fetch = $this->blacklists->where(["author" => $author, "target" => $target])->fetch();
if ($fetch)
return new BlacklistItem($fetch);
else
return null;
}
function getCount(User $user): int

View file

@ -34,14 +34,14 @@ final class UserPresenter extends OpenVKPresenter
if ($this->user->identity)
if ($this->blacklists->isBanned($user, $this->user->identity)) {
if ($this->user->identity->isAdmin()) {
if (OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["blacklists"]["applyToAdmins"]) {
$this->flashFail("err", tr("forbidden"), tr("user_blacklisted_you"));
}
} else {
if ($this->user->identity->isAdmin()) {
if (OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["blacklists"]["applyToAdmins"]) {
$this->flashFail("err", tr("forbidden"), tr("user_blacklisted_you"));
}
} else {
$this->flashFail("err", tr("forbidden"), tr("user_blacklisted_you"));
}
}
if(!$user || $user->isDeleted()) {
if(!is_null($user) && $user->isDeactivated()) {

View file

@ -394,7 +394,7 @@
<div class="right_big_block">
<div class="page_info">
<div n:if="$isBlacklistedByThem AND $thisUser->isAdmin() AND $thisUser->getId() !== $user->getId()" class="user-alert">
<b>{admin_privacy_warning}:</b>
<b>{_admin_privacy_warning}:</b>
<br/>
{_user_blacklisted_you}
</div>

View file

@ -2,6 +2,6 @@ CREATE TABLE `blacklists` (
`index` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`author` BIGINT UNSIGNED NOT NULL,
`target` BIGINT UNSIGNED NOT NULL,
`created` DATETIME NOT NULL,
`created` BIGINT UNSIGNED NOT NULL,
PRIMARY KEY (`index`)
) ENGINE = InnoDB;