Blacklists: Make it barely work (xd)

OpenVK · Jul 19, 2023 · d25c2ee · d25c2ee
1 parent dda86b1
commit d25c2ee
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/Web/Models/Entities/BlacklistItem.php b/Web/Models/Entities/BlacklistItem.php
@@ -28,4 +28,6 @@ function getCreationDate(): DateTime
     {
         return new DateTime($this->getRecord()->created);
     }
+
+
 }
diff --git a/Web/Models/Repositories/Blacklists.php b/Web/Models/Repositories/Blacklists.php
@@ -24,7 +24,11 @@ function getList(User $user, $page = 1): \Traversable
 
     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
@@ -37,6 +41,9 @@ function isBanned(User $author, User $target): bool
         if (!$author || !$target)
             return FALSE;
 
+        bdump($this->getByAuthorAndTarget($author->getId(), $target->getId()), "хуита какая-то вроде для бл*клиста");
+
+
         return !is_null($this->getByAuthorAndTarget($author->getId(), $target->getId()));
     }
 }
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
@@ -34,14 +34,14 @@ function renderView(int $id): void
 
         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()) {

diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml
@@ -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>

diff --git a/install/sqls/00038-blacklist.sql b/install/sqls/00038-blacklist.sql
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,6 @@ function getCreationDate(): DateTime @@
         {
             return new DateTime($this->getRecord()->created);
         }
     }