mirror of
https://github.com/openvk/openvk
synced 2024-12-22 08:31:18 +03:00
feat(privacy): blacklist v2 (#1183)
* Перенос ветки blacklist (#900) * Blacklist * Config * upd * Added restrictions in the users.get method * ok * Update en.strings * ok 2.0 --------- Co-authored-by: Vladimir Barinov <veselcraft@icloud.com> * Create 00038-blacklist.sql * typo xd * Blacklists: Make it barely work (xd) * БЛЯЯЯЯЯЯЯЯТЬ * remove all * account.ban, account.unban, account.getBanned * rewrite ui * add link * add ignore button to blacklisted users * fields blacklisted_by_me, blacklisted * ad ability to blacklist when you ar blacklisted --------- Co-authored-by: n1rwana <me@n1rwana.xyz> Co-authored-by: Vladimir Barinov <veselcraft@icloud.com> Co-authored-by: n1rwana <aydashkin@vk.com>
This commit is contained in:
parent
2e70a26283
commit
bec9079e36
18 changed files with 439 additions and 10 deletions
|
@ -228,4 +228,72 @@ final class Account extends VKAPIRequestHandler
|
|||
|
||||
return (object) ['votes' => $this->getUser()->getCoins()];
|
||||
}
|
||||
|
||||
function ban(int $owner_id): int
|
||||
{
|
||||
$this->requireUser();
|
||||
$this->willExecuteWriteAction();
|
||||
|
||||
if($owner_id < 0)
|
||||
return 1;
|
||||
|
||||
if($owner_id == $this->getUser()->getId())
|
||||
$this->fail(15, "Access denied: cannot blacklist yourself");
|
||||
|
||||
$config_limit = OPENVK_ROOT_CONF['openvk']['preferences']['blacklists']['limit'] ?? 100;
|
||||
$user_blocks = $this->getUser()->getBlacklistSize();
|
||||
if(($user_blocks + 1) > $config_limit)
|
||||
$this->fail(-7856, "Blacklist limit exceeded");
|
||||
|
||||
$entity = get_entity_by_id($owner_id);
|
||||
if(!$entity || $entity->isDeleted())
|
||||
return 0;
|
||||
|
||||
if($entity->isBlacklistedBy($this->getUser()))
|
||||
return 1;
|
||||
|
||||
$this->getUser()->addToBlacklist($entity);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
function unban(int $owner_id): int
|
||||
{
|
||||
$this->requireUser();
|
||||
$this->willExecuteWriteAction();
|
||||
|
||||
if($owner_id < 0)
|
||||
return 1;
|
||||
|
||||
if($owner_id == $this->getUser()->getId())
|
||||
return 1;
|
||||
|
||||
$entity = get_entity_by_id($owner_id);
|
||||
if(!$entity || $entity->isDeleted())
|
||||
return 0;
|
||||
|
||||
if(!$entity->isBlacklistedBy($this->getUser()))
|
||||
return 1;
|
||||
|
||||
$this->getUser()->removeFromBlacklist($entity);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
function getBanned(int $offset = 0, int $count = 100, string $fields = ""): object
|
||||
{
|
||||
$this->requireUser();
|
||||
|
||||
$result = (object)[
|
||||
'count' => $this->getUser()->getBlacklistSize(),
|
||||
'items' => [],
|
||||
];
|
||||
$banned = $this->getUser()->getBlacklist($offset, $count);
|
||||
foreach($banned as $ban) {
|
||||
if(!$ban) continue;
|
||||
$result->items[] = $ban->toVkApiStruct($this->getUser(), $fields);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -266,6 +266,20 @@ final class Users extends VKAPIRequestHandler
|
|||
case 'nickname':
|
||||
$response[$i]->nickname = $usr->getPseudo();
|
||||
break;
|
||||
case 'blacklisted_by_me':
|
||||
if(!$authuser) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$response[$i]->blacklisted_by_me = (int)$usr->isBlacklistedBy($this->getUser());
|
||||
break;
|
||||
case 'blacklisted':
|
||||
if(!$authuser) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$response[$i]->blacklisted = (int)$this->getUser()->isBlacklistedBy($usr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ use openvk\Web\Themes\{Themepack, Themepacks};
|
|||
use openvk\Web\Util\DateTime;
|
||||
use openvk\Web\Models\RowModel;
|
||||
use openvk\Web\Models\Entities\{Photo, Message, Correspondence, Gift, Audio};
|
||||
use openvk\Web\Models\Repositories\{Applications, Bans, Comments, Notes, Posts, Users, Clubs, Albums, Gifts, Notifications, Videos, Photos};
|
||||
use openvk\Web\Models\Repositories\{Applications, Bans, Comments, Notes, Posts, Users, Clubs, Albums, Gifts, Notifications, Videos, Photos};
|
||||
use openvk\Web\Models\Exceptions\InvalidUserNameException;
|
||||
use Nette\Database\Table\ActiveRow;
|
||||
use Chandler\Database\DatabaseConnection;
|
||||
|
@ -511,7 +511,7 @@ class User extends RowModel
|
|||
else if($user->getId() === $this->getId())
|
||||
return true;
|
||||
|
||||
if($permission != "messages.write" && !$this->canBeViewedBy($user))
|
||||
if(/*$permission != "messages.write" && */!$this->canBeViewedBy($user, true))
|
||||
return false;
|
||||
|
||||
switch($permStatus) {
|
||||
|
@ -1228,11 +1228,16 @@ class User extends RowModel
|
|||
return (bool) $this->getRecord()->activated;
|
||||
}
|
||||
|
||||
function isAdmin(): bool
|
||||
{
|
||||
return $this->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL);
|
||||
}
|
||||
|
||||
function isDead(): bool
|
||||
{
|
||||
return $this->onlineStatus() == 2;
|
||||
}
|
||||
|
||||
|
||||
function getUnbanTime(): ?string
|
||||
{
|
||||
$ban = (new Bans)->get((int) $this->getRecord()->block_reason);
|
||||
|
@ -1289,17 +1294,21 @@ class User extends RowModel
|
|||
return $this->getRecord()->profile_type;
|
||||
}
|
||||
|
||||
function canBeViewedBy(?User $user = NULL): bool
|
||||
function canBeViewedBy(?User $user = NULL, bool $blacklist_check = true): bool
|
||||
{
|
||||
if(!is_null($user)) {
|
||||
if($this->getId() == $user->getId()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if($user->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)) {
|
||||
if($user->isAdmin() && !(OPENVK_ROOT_CONF['openvk']['preferences']['blacklists']['applyToAdmins'] ?? true)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if($blacklist_check && ($this->isBlacklistedBy($user) || $user->isBlacklistedBy($this))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if($this->getProfileType() == 0) {
|
||||
return true;
|
||||
} else {
|
||||
|
@ -1409,6 +1418,20 @@ class User extends RowModel
|
|||
case 'real_id':
|
||||
$res->real_id = $this->getRealId();
|
||||
break;
|
||||
case "blacklisted_by_me":
|
||||
if(!$user) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$res->blacklisted_by_me = (int)$this->isBlacklistedBy($user);
|
||||
break;
|
||||
case "blacklisted":
|
||||
if(!$user) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$res->blacklisted = (int)$user->isBlacklistedBy($this);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1486,6 +1509,76 @@ class User extends RowModel
|
|||
return DatabaseConnection::i()->getContext()->table("ignored_sources")->where("owner", $this->getId())->count();
|
||||
}
|
||||
|
||||
function isBlacklistedBy(?User $user = NULL): bool
|
||||
{
|
||||
if(!$user)
|
||||
return false;
|
||||
|
||||
$ctx = DatabaseConnection::i()->getContext();
|
||||
$data = [
|
||||
"author" => $user->getId(),
|
||||
"target" => $this->getRealId(),
|
||||
];
|
||||
|
||||
$sub = $ctx->table("blacklist_relations")->where($data);
|
||||
return $sub->count() > 0;
|
||||
}
|
||||
|
||||
function addToBlacklist(?User $user)
|
||||
{
|
||||
DatabaseConnection::i()->getContext()->table("blacklist_relations")->insert([
|
||||
"author" => $this->getRealId(),
|
||||
"target" => $user->getRealId(),
|
||||
"created" => time(),
|
||||
]);
|
||||
|
||||
DatabaseConnection::i()->getContext()->table("subscriptions")->where([
|
||||
"follower" => $user->getId(),
|
||||
"model" => static::class,
|
||||
"target" => $this->getId(),
|
||||
])->delete();
|
||||
|
||||
DatabaseConnection::i()->getContext()->table("subscriptions")->where([
|
||||
"follower" => $this->getId(),
|
||||
"model" => static::class,
|
||||
"target" => $user->getId(),
|
||||
])->delete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function removeFromBlacklist(?User $user): bool
|
||||
{
|
||||
DatabaseConnection::i()->getContext()->table("blacklist_relations")->where([
|
||||
"author" => $this->getRealId(),
|
||||
"target" => $user->getRealId(),
|
||||
])->delete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function getBlacklist(int $offset = 0, int $limit = 10)
|
||||
{
|
||||
$sources = DatabaseConnection::i()->getContext()->table("blacklist_relations")->where("author", $this->getId())->limit($limit, $offset)->order('created ASC');
|
||||
$output_array = [];
|
||||
|
||||
foreach($sources as $source) {
|
||||
$entity_id = (int)$source->target ;
|
||||
$entity = (new Users)->get($entity_id);
|
||||
if(!$entity)
|
||||
continue;
|
||||
|
||||
$output_array[] = $entity;
|
||||
}
|
||||
|
||||
return $output_array;
|
||||
}
|
||||
|
||||
function getBlacklistSize()
|
||||
{
|
||||
return DatabaseConnection::i()->getContext()->table("blacklist_relations")->where("author", $this->getId())->count();
|
||||
}
|
||||
|
||||
use Traits\TBackDrops;
|
||||
use Traits\TSubscribable;
|
||||
use Traits\TAudioStatuses;
|
||||
|
|
|
@ -119,7 +119,7 @@ final class GroupPresenter extends OpenVKPresenter
|
|||
$this->template->paginatorConf = (object) [
|
||||
"count" => $this->template->count,
|
||||
"page" => $this->queryParam("p") ?? 1,
|
||||
"amount" => NULL,
|
||||
"amount" => 10,
|
||||
"perPage" => OPENVK_DEFAULT_PER_PAGE,
|
||||
];
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@ final class PhotosPresenter extends OpenVKPresenter
|
|||
if(!$user) $this->notFound();
|
||||
if (!$user->getPrivacyPermission('photos.read', $this->user->identity ?? NULL))
|
||||
$this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
|
||||
|
||||
$this->template->albums = $this->albums->getUserAlbums($user, (int)($this->queryParam("p") ?? 1));
|
||||
$this->template->count = $this->albums->getUserAlbumsCount($user);
|
||||
$this->template->owner = $user;
|
||||
|
@ -161,8 +162,10 @@ final class PhotosPresenter extends OpenVKPresenter
|
|||
{
|
||||
$photo = $this->photos->getByOwnerAndVID($ownerId, $photoId);
|
||||
if(!$photo || $photo->isDeleted()) $this->notFound();
|
||||
|
||||
if(!$photo->canBeViewedBy($this->user->identity))
|
||||
$this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
|
||||
|
||||
if(!is_null($this->queryParam("from"))) {
|
||||
if(preg_match("%^album([0-9]++)$%", $this->queryParam("from"), $matches) === 1) {
|
||||
$album = $this->albums->get((int) $matches[1]);
|
||||
|
|
|
@ -22,17 +22,29 @@ final class UserPresenter extends OpenVKPresenter
|
|||
function __construct(Users $users)
|
||||
{
|
||||
$this->users = $users;
|
||||
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
function renderView(int $id): void
|
||||
{
|
||||
$user = $this->users->get($id);
|
||||
|
||||
if(!$user || $user->isDeleted() || !$user->canBeViewedBy($this->user->identity)) {
|
||||
if(!is_null($user) && $user->isDeactivated()) {
|
||||
$this->template->_template = "User/deactivated.xml";
|
||||
|
||||
$this->template->user = $user;
|
||||
} else if($this->user->identity->isBlacklistedBy($user)) {
|
||||
$this->template->_template = "User/blacklisted.xml";
|
||||
|
||||
$this->template->blacklist_status = $user->isBlacklistedBy($this->user->identity);
|
||||
$this->template->ignore_status = $user->isIgnoredBy($this->user->identity);
|
||||
$this->template->user = $user;
|
||||
} else if($user->isBlacklistedBy($this->user->identity)) {
|
||||
$this->template->_template = "User/blacklisted_pov.xml";
|
||||
|
||||
$this->template->ignore_status = $user->isIgnoredBy($this->user->identity);
|
||||
$this->template->user = $user;
|
||||
} else if(!is_null($user) && !$user->canBeViewedBy($this->user->identity)) {
|
||||
$this->template->_template = "User/private.xml";
|
||||
|
@ -57,6 +69,7 @@ final class UserPresenter extends OpenVKPresenter
|
|||
|
||||
if($id !== $this->user->id) {
|
||||
$this->template->ignore_status = $user->isIgnoredBy($this->user->identity);
|
||||
$this->template->blacklist_status = $user->isBlacklistedBy($this->user->identity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -578,7 +591,7 @@ final class UserPresenter extends OpenVKPresenter
|
|||
$this->flash("succ", tr("changes_saved"), tr("changes_saved_comment"));
|
||||
}
|
||||
$this->template->mode = in_array($this->queryParam("act"), [
|
||||
"main", "security", "privacy", "finance", "finance.top-up", "interface"
|
||||
"main", "security", "privacy", "finance", "finance.top-up", "interface", "blacklist"
|
||||
]) ? $this->queryParam("act")
|
||||
: "main";
|
||||
|
||||
|
@ -591,6 +604,19 @@ final class UserPresenter extends OpenVKPresenter
|
|||
|
||||
$this->template->qrCodeType = substr($qrCode[0], 5);
|
||||
$this->template->qrCodeData = $qrCode[1];
|
||||
} else if($this->template->mode === "blacklist") {
|
||||
$page = (int)($this->queryParam('p') ?? 1);
|
||||
$count = 10;
|
||||
$offset = ($page - 1) * $count;
|
||||
|
||||
$this->template->blSize = $this->user->identity->getBlacklistSize();
|
||||
$this->template->blItems = $this->user->identity->getBlacklist($offset, $count);
|
||||
$this->template->paginatorConf = (object) [
|
||||
"count" => $this->template->blSize,
|
||||
"page" => $page,
|
||||
"amount" => sizeof($this->template->blItems),
|
||||
"perPage" => OPENVK_DEFAULT_PER_PAGE,
|
||||
];
|
||||
}
|
||||
|
||||
$this->template->user = $user;
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
{var $isFinance = $mode === 'finance'}
|
||||
{var $isFinanceTU = $mode === 'finance.top-up'}
|
||||
{var $isInterface = $mode === 'interface'}
|
||||
{var $isBl = $mode === 'blacklist'}
|
||||
|
||||
<div class="tabs">
|
||||
<div n:attr="id => ($isMain ? 'activetabs' : 'ki')" class="tab">
|
||||
|
@ -24,6 +25,9 @@
|
|||
<div n:attr="id => ($isPrivacy ? 'activetabs' : 'ki')" class="tab">
|
||||
<a n:attr="id => ($isPrivacy ? 'act_tab_a' : 'ki')" href="/settings?act=privacy">{_privacy}</a>
|
||||
</div>
|
||||
<div n:attr="id => ($isBl ? 'activetabs' : 'ki')" class="tab">
|
||||
<a n:attr="id => ($isBl ? 'act_tab_a' : 'ki')" href="/settings?act=blacklist">{_blacklist}</a>
|
||||
</div>
|
||||
<div n:if="OPENVK_ROOT_CONF['openvk']['preferences']['commerce']" n:attr="id => (($isFinance || $isFinanceTU) ? 'activetabs' : 'ki')" class="tab">
|
||||
<a n:attr="id => (($isFinance || $isFinanceTU) ? 'act_tab_a' : 'ki')" href="/settings?act=finance">{_points}</a>
|
||||
</div>
|
||||
|
@ -713,7 +717,29 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
|
||||
{elseif $isBl}
|
||||
{if $blSize < 1}
|
||||
{include "../components/error.xml", description => tr("bl_count_zero_desc")}
|
||||
{else}
|
||||
<h4 style="margin-bottom: 10px;">{tr("bl_count", $blSize)}.</h4>
|
||||
<div class='entity_vertical_list mini m_mini scroll_container'>
|
||||
<div n:foreach="$blItems as $item" class="entity_vertical_list_item scroll_node">
|
||||
<div class="first_column">
|
||||
<a href="{$item->getURL()}" class="avatar">
|
||||
<img src='{$item->getAvatarURL()}'>
|
||||
</a>
|
||||
<div class="info">
|
||||
<b class="noOverflow">
|
||||
<a href="{$item->getURL()}">
|
||||
{$item->getCanonicalName()}
|
||||
</a>
|
||||
</b>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{include "../components/paginator.xml", conf => $paginatorConf}
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
|
|
|
@ -165,6 +165,9 @@
|
|||
</form>
|
||||
{/if}
|
||||
|
||||
<a n:if="!$blacklist_status" id="_bl_toggler" data-name="{$user->getMorphedName('genitive', false)}" data-val="1" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_add}</a>
|
||||
{* 4 admins *}
|
||||
<a n:if="$blacklist_status" id="_bl_toggler" data-val="0" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_remove}</a>
|
||||
<a class="profile_link" style="display:block;width:96%;" href="javascript:reportUser({$user->getId()})">{_report}</a>
|
||||
<a n:if="!$user->isHideFromGlobalFeedEnabled()" class="profile_link" style="display:block;width:96%;" id="__ignoreSomeone" data-val='{!$ignore_status ? 1 : 0}' data-id="{$user->getId()}">
|
||||
{if !$ignore_status}{_ignore_user}{else}{_unignore_user}{/if}
|
||||
|
|
42
Web/Presenters/templates/User/blacklisted.xml
Normal file
42
Web/Presenters/templates/User/blacklisted.xml
Normal file
|
@ -0,0 +1,42 @@
|
|||
{extends "../@layout.xml"}
|
||||
{block title}{$user->getCanonicalName()}{/block}
|
||||
|
||||
{block header}
|
||||
{$user->getCanonicalName()}
|
||||
<img n:if="$user->isVerified()"
|
||||
class="name-checkmark"
|
||||
src="/assets/packages/static/openvk/img/checkmark.png"
|
||||
/>
|
||||
{/block}
|
||||
|
||||
{block content}
|
||||
<div class="left_small_block">
|
||||
<div>
|
||||
<img src="{$user->getAvatarUrl('normal')}"
|
||||
alt="{$user->getCanonicalName()}"
|
||||
style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
|
||||
</div>
|
||||
<div id="profile_links" n:if="isset($thisUser)">
|
||||
<a class="profile_link" style="display:block;width:96%;" href="javascript:reportUser({$user->getId()})">{_report}</a>
|
||||
<a n:if="!$blacklist_status" id="_bl_toggler" data-name="{$user->getMorphedName('genitive', false)}" data-val="1" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_add}</a>
|
||||
<a n:if="$blacklist_status" id="_bl_toggler" data-val="0" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_remove}</a>
|
||||
<a n:if="!$user->isHideFromGlobalFeedEnabled()" class="profile_link" style="display:block;width:96%;" id="__ignoreSomeone" data-val='{!$ignore_status ? 1 : 0}' data-id="{$user->getId()}">
|
||||
{if !$ignore_status}{_ignore_user}{else}{_unignore_user}{/if}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="right_big_block">
|
||||
<div class="page_info">
|
||||
<div class="accountInfo clearFix">
|
||||
<div class="profileName">
|
||||
<h2>{$user->getFullName()}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="msg msg_yellow" style="width: 93%;margin-top: 10px;">
|
||||
{var $m = $user->isFemale() ? "f" : "m"}
|
||||
{tr("limited_access_to_page_$m", $user->getFirstName())}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/block}
|
40
Web/Presenters/templates/User/blacklisted_pov.xml
Normal file
40
Web/Presenters/templates/User/blacklisted_pov.xml
Normal file
|
@ -0,0 +1,40 @@
|
|||
{extends "../@layout.xml"}
|
||||
{block title}{$user->getCanonicalName()}{/block}
|
||||
|
||||
{block header}
|
||||
{$user->getCanonicalName()}
|
||||
<img n:if="$user->isVerified()"
|
||||
class="name-checkmark"
|
||||
src="/assets/packages/static/openvk/img/checkmark.png"
|
||||
/>
|
||||
{/block}
|
||||
|
||||
{block content}
|
||||
<div class="left_small_block">
|
||||
<div>
|
||||
<img src="{$user->getAvatarUrl('normal')}"
|
||||
alt="{$user->getCanonicalName()}"
|
||||
style="width: 100%; image-rendering: -webkit-optimize-contrast;" />
|
||||
</div>
|
||||
<div id="profile_links" n:if="isset($thisUser)">
|
||||
<a n:if="!$blacklist_status" id="_bl_toggler" data-val="0" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_remove}</a>
|
||||
<a n:if="!$user->isHideFromGlobalFeedEnabled()" class="profile_link" style="display:block;width:96%;" id="__ignoreSomeone" data-val='{!$ignore_status ? 1 : 0}' data-id="{$user->getId()}">
|
||||
{if !$ignore_status}{_ignore_user}{else}{_unignore_user}{/if}
|
||||
</a>
|
||||
<a class="profile_link" style="display:block;width:96%;" href="javascript:reportUser({$user->getId()})">{_report}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="right_big_block">
|
||||
<div class="page_info">
|
||||
<div class="accountInfo clearFix">
|
||||
<div class="profileName">
|
||||
<h2>{$user->getFullName()}</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="msg msg_yellow" style="width: 93%;margin-top: 10px;">
|
||||
{tr("you_blacklisted", $user->getMorphedName("genitive", false))}.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/block}
|
|
@ -41,6 +41,7 @@
|
|||
<input type="submit" class="profile_link" value="{_friends_reject}" style="width: 194px;" />
|
||||
</form>
|
||||
{/if}
|
||||
<a id="_bl_toggler" data-name="{$user->getMorphedName('genitive', false)}" data-val="1" data-id="{$user->getRealId()}" class="profile_link" style="display:block;width:96%;">{_bl_add}</a>
|
||||
<a class="profile_link" style="display:block;width:96%;" href="javascript:reportUser({$user->getId()})">{_report}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -3597,6 +3597,11 @@ hr {
|
|||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.entity_vertical_list.scroll_container {
|
||||
height: unset;
|
||||
overflow-y: unset;
|
||||
}
|
||||
|
||||
.entity_vertical_list .entity_vertical_list_item {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
@ -3611,6 +3616,15 @@ hr {
|
|||
gap: 4px;
|
||||
}
|
||||
|
||||
.entity_vertical_list.m_mini .entity_vertical_list_item .first_column {
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.entity_vertical_list.m_mini .entity_vertical_list_item .first_column .avatar img {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
.entity_vertical_list .entity_vertical_list_item .avatar {
|
||||
display: block;
|
||||
}
|
||||
|
|
|
@ -2587,3 +2587,42 @@ async function changeStatus() {
|
|||
document.status_popup_form.submit.innerHTML = tr("send");
|
||||
document.status_popup_form.submit.disabled = false;
|
||||
}
|
||||
|
||||
u(document).on('click', '#_bl_toggler', async (e) => {
|
||||
e.preventDefault()
|
||||
|
||||
const target = u(e.target)
|
||||
const val = Number(target.attr('data-val'))
|
||||
const id = Number(target.attr('data-id'))
|
||||
const name = target.attr('data-name')
|
||||
|
||||
const fallback = (e) => {
|
||||
fastError(e.message)
|
||||
target.removeClass('lagged')
|
||||
}
|
||||
|
||||
if(val == 1) {
|
||||
const msg = new CMessageBox({
|
||||
title: tr('addition_to_bl'),
|
||||
body: `<span>${escapeHtml(tr('adding_to_bl_sure', name))}</span>`,
|
||||
buttons: [tr('yes'), tr('no')],
|
||||
callbacks: [async () => {
|
||||
try {
|
||||
target.addClass('lagged')
|
||||
await window.OVKAPI.call('account.ban', {'owner_id': id})
|
||||
window.router.route(location.href)
|
||||
} catch(e) {
|
||||
fallback(e)
|
||||
}
|
||||
}, () => Function.noop]
|
||||
})
|
||||
} else {
|
||||
try {
|
||||
target.addClass('lagged')
|
||||
await window.OVKAPI.call('account.unban', {'owner_id': id})
|
||||
window.router.route(location.href)
|
||||
} catch(e) {
|
||||
fallback(e)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -296,7 +296,7 @@ u(document).on('submit', 'form', async (e) => {
|
|||
if(e.defaultPrevented) {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
if(u('#ajloader').hasClass('shown')) {
|
||||
e.preventDefault()
|
||||
return
|
||||
|
|
8
install/sqls/00052-blacklist.sql
Normal file
8
install/sqls/00052-blacklist.sql
Normal file
|
@ -0,0 +1,8 @@
|
|||
CREATE TABLE `blacklist_relations` (
|
||||
`index` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`author` BIGINT UNSIGNED NOT NULL,
|
||||
`target` BIGINT UNSIGNED NOT NULL,
|
||||
`created` BIGINT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`index`)
|
||||
) ENGINE = InnoDB;
|
||||
ALTER TABLE `blacklist_relations` ADD INDEX(`author`, `target`);
|
|
@ -1699,6 +1699,7 @@
|
|||
"admin_commerce_disabled" = "Commerce has been disabled by the system administrator";
|
||||
"admin_commerce_disabled_desc" = "The voucher and gift settings will be saved, but will have no effect.";
|
||||
|
||||
"admin_privacy_warning" = "Be careful with this information";
|
||||
"admin_longpool_broken" = "Longpool is broken and will not work!";
|
||||
"admin_longpool_broken_desc" = "Make sure file at the path <code>$1</code> exist and have correct rights and ownership.";
|
||||
|
||||
|
@ -1815,6 +1816,28 @@
|
|||
"cookies_popup_content" = "Just like how kids love cookies, this website uses Cookies to identify your session and nothing more. Check <a href='/privacy'>our privacy policy</a> for more information.";
|
||||
"cookies_popup_agree" = "Accept";
|
||||
|
||||
/* Blacklist */
|
||||
|
||||
"blacklist" = "Blacklist";
|
||||
"user_blacklisted_you" = "This user has blacklisted you.";
|
||||
"user_blacklisted" = "$1 has been blacklisted";
|
||||
"user_removed_from_the_blacklist" = "$1 has been removed from the blacklist.";
|
||||
|
||||
"adding_to_bl_sure" = "You sure you want to blacklist $1?";
|
||||
|
||||
"bl_count_zero_desc" = "There are no users on your blacklist yet.";
|
||||
"bl_count_zero" = "There are no users on your blacklist";
|
||||
"bl_count_one" = "You have one user on your blacklist";
|
||||
"bl_count_few" = "You have $1 users on your blacklist";
|
||||
"bl_count_many" = "You have $1 users on your blacklist";
|
||||
"bl_count_other" = "You have $1 users on your blacklist";
|
||||
|
||||
"you_blacklisted" = "You blacklisted $1";
|
||||
"bl_add" = "Add to blacklist";
|
||||
"bl_remove" = "Remove from blacklist";
|
||||
|
||||
"addition_to_bl" = "Addition to blacklist";
|
||||
|
||||
/* Away */
|
||||
|
||||
"transition_is_blocked" = "Transition is blocked";
|
||||
|
|
|
@ -1591,8 +1591,11 @@
|
|||
"admin_about_instance" = "Инстанция";
|
||||
"admin_commerce_disabled" = "Коммерция отключена системным администратором";
|
||||
"admin_commerce_disabled_desc" = "Настройки ваучеров и подарков будут сохранены, но не будут оказывать никакого влияния.";
|
||||
|
||||
"admin_privacy_warning" = "Будьте осторожны с этой информацией";
|
||||
"admin_longpool_broken" = "Longpool сломан!";
|
||||
"admin_longpool_broken_desc" = "Проверьте, существует ли файл по пути <code>$1</code> и выданы ли у него правильные права на запись.";
|
||||
|
||||
"admin_banned_links" = "Заблокированные ссылки";
|
||||
"admin_banned_link" = "Ссылка";
|
||||
"admin_banned_domain" = "Домен";
|
||||
|
@ -1690,6 +1693,7 @@
|
|||
"edit_action" = "Изменить";
|
||||
"transfer" = "Передать";
|
||||
"close" = "Закрыть";
|
||||
"success" = "Успех";
|
||||
"warning" = "Внимание";
|
||||
"question_confirm" = "Это действие нельзя отменить. Вы действительно уверены в том что хотите сделать?";
|
||||
"confirm_m" = "Подтвердить";
|
||||
|
@ -1708,6 +1712,28 @@
|
|||
"cookies_popup_content" = "Все дети любят печенье, поэтому этот веб-сайт использует Cookies для того, чтобы идентифицировать вашу сессию и ничего более. Ознакомьтесь с нашей <a href='/privacy'>политикой конфиденциальности</a> для получения дополнительной информации.";
|
||||
"cookies_popup_agree" = "Согласен";
|
||||
|
||||
/* Blacklist */
|
||||
|
||||
"blacklist" = "Чёрный список";
|
||||
"user_blacklisted_you" = "Пользователь внёс Вас в чёрный список.";
|
||||
"user_blacklisted" = "$1 занесён в чёрный список.";
|
||||
"user_removed_from_the_blacklist" = "$1 удалён из чёрного списка.";
|
||||
|
||||
"adding_to_bl_sure" = "Вы уверены, что хотите внести $1 в чёрный список?";
|
||||
|
||||
"bl_count_zero_desc" = "В вашем чёрном списке ещё нет пользователей.";
|
||||
"bl_count_zero" = "В вашем чёрном списке нет пользователей";
|
||||
"bl_count_one" = "В вашем чёрном списке один пользователь";
|
||||
"bl_count_few" = "В вашем чёрном списке $1 пользователя";
|
||||
"bl_count_many" = "В вашем чёрном списке $1 пользователей";
|
||||
"bl_count_other" = "В вашем чёрном списке $1 пользователей";
|
||||
|
||||
"you_blacklisted" = "Вы внесли $1 в чёрный список";
|
||||
"bl_add" = "Добавить в чёрный список";
|
||||
"bl_remove" = "Удалить из чёрного списка";
|
||||
|
||||
"addition_to_bl" = "Добавление в чёрный список";
|
||||
|
||||
/* Away */
|
||||
|
||||
"transition_is_blocked" = "Переход по ссылке заблокирован";
|
||||
|
|
|
@ -38,6 +38,9 @@ openvk:
|
|||
maxViolations: 50
|
||||
maxViolationsAge: 120
|
||||
autoban: true
|
||||
blacklists:
|
||||
limit: 100
|
||||
applyToAdmins: true
|
||||
registration:
|
||||
enable: true
|
||||
disablingReason: ""
|
||||
|
|
Loading…
Reference in a new issue