Merge 59513bf2e2 into be65f81a4a

VKAPI/Handlers/Board.php

@@ -14,8 +14,7 @@ use openvk\Web\Models\Entities\{Topic, Comment, User, Photo, Video};
 
 final class Board extends VKAPIRequestHandler
 {
-    # 13/13
+    public function addTopic(int $group_id, string $title, string $text = "", bool $from_group = true)
-    public function addTopic(int $group_id, string $title, string $text = "", bool $from_group = true, string $attachments = "")
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -23,15 +22,14 @@ final class Board extends VKAPIRequestHandler
         $club = (new ClubsRepo())->get($group_id);
 
         if (!$club) {
-            $this->fail(403, "Invalid club");
+            $this->fail(15, "Access denied");
         }
 
         if (!$club->canBeModifiedBy($this->getUser()) && !$club->isEveryoneCanCreateTopics()) {
-            $this->fail(403, "Access to club denied");
+            $this->fail(15, "Access denied");
         }
 
         $flags = 0;
-
         if ($from_group == true && $club->canBeModifiedBy($this->getUser())) {
             $flags |= 0b10000000;
         }
@@ -53,59 +51,6 @@ final class Board extends VKAPIRequestHandler
             $comment->setCreated(time());
             $comment->setFlags($flags);
             $comment->save();
-
-            if (!empty($attachments)) {
-                $attachmentsArr = explode(",", $attachments);
-                # блин а мне это везде копировать типа
-
-                if (sizeof($attachmentsArr) > 10) {
-                    $this->fail(50, "Error: too many attachments");
-                }
-
-                foreach ($attachmentsArr as $attac) {
-                    $attachmentType = null;
-
-                    if (str_contains($attac, "photo")) {
-                        $attachmentType = "photo";
-                    } elseif (str_contains($attac, "video")) {
-                        $attachmentType = "video";
-                    } else {
-                        $this->fail(205, "Unknown attachment type");
-                    }
-
-                    $attachment = str_replace($attachmentType, "", $attac);
-
-                    $attachmentOwner = (int) explode("_", $attachment)[0];
-                    $attachmentId    = (int) end(explode("_", $attachment));
-
-                    $attacc = null;
-
-                    if ($attachmentType == "photo") {
-                        $attacc = (new PhotosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                        if (!$attacc || $attacc->isDeleted()) {
-                            $this->fail(100, "Photo does not exists");
-                        }
-                        if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                            $this->fail(43, "You do not have access to this photo");
-                        }
-
-                        $comment->attach($attacc);
-                    } elseif ($attachmentType == "video") {
-                        $attacc = (new VideosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                        if (!$attacc || $attacc->isDeleted()) {
-                            $this->fail(100, "Video does not exists");
-                        }
-                        if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                            $this->fail(43, "You do not have access to this video");
-                        }
-
-                        $comment->attach($attacc);
-                    }
-
-                }
-
-            }
-
         }
 
         return $topic->getId();
@@ -118,7 +63,7 @@ final class Board extends VKAPIRequestHandler
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
 
-        if (!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+        if (!$topic || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
             return 0;
         }
 
@@ -140,21 +85,15 @@ final class Board extends VKAPIRequestHandler
         }
 
         $topic = (new TopicsRepo())->getTopicById($group_id, $topic_id);
-
         if (!$topic || $topic->isDeleted() || $topic->isClosed()) {
-            $this->fail(100, "Topic is deleted, closed or invalid.");
+            $this->fail(15, "Access denied");
         }
 
         $flags = 0;
-
         if ($from_group != 0 && !is_null($topic->getClub()) && $topic->getClub()->canBeModifiedBy($this->user)) {
             $flags |= 0b10000000;
         }
 
-        if (strlen($message) > 300) {
-            $this->fail(20, "Comment is too long.");
-        }
-
         $comment = new Comment();
         $comment->setOwner($this->getUser()->getId());
         $comment->setModel(get_class($topic));
@@ -164,74 +103,9 @@ final class Board extends VKAPIRequestHandler
         $comment->setFlags($flags);
         $comment->save();
 
-        if (!empty($attachments)) {
-            $attachmentsArr = explode(",", $attachments);
-
-            if (sizeof($attachmentsArr) > 10) {
-                $this->fail(50, "Error: too many attachments");
-            }
-
-            foreach ($attachmentsArr as $attac) {
-                $attachmentType = null;
-
-                if (str_contains($attac, "photo")) {
-                    $attachmentType = "photo";
-                } elseif (str_contains($attac, "video")) {
-                    $attachmentType = "video";
-                } else {
-                    $this->fail(205, "Unknown attachment type");
-                }
-
-                $attachment = str_replace($attachmentType, "", $attac);
-
-                $attachmentOwner = (int) explode("_", $attachment)[0];
-                $attachmentId    = (int) end(explode("_", $attachment));
-
-                $attacc = null;
-
-                if ($attachmentType == "photo") {
-                    $attacc = (new PhotosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Photo does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this photo");
-                    }
-
-                    $comment->attach($attacc);
-                } elseif ($attachmentType == "video") {
-                    $attacc = (new VideosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Video does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this video");
-                    }
-
-                    $comment->attach($attacc);
-                }
-            }
-        }
-
         return $comment->getId();
     }
 
-    public function deleteComment(int $comment_id, int $group_id = 0, int $topic_id = 0)
-    {
-        $this->requireUser();
-        $this->willExecuteWriteAction();
-
-        $comment = (new CommentsRepo())->get($comment_id);
-
-        if ($comment->isDeleted() || !$comment || !$comment->canBeDeletedBy($this->getUser())) {
-            $this->fail(403, "Access to comment denied");
-        }
-
-        $comment->delete();
-
-        return 1;
-    }
-
     public function deleteTopic(int $group_id, int $topic_id)
     {
         $this->requireUser();
@@ -248,25 +122,6 @@ final class Board extends VKAPIRequestHandler
         return 1;
     }
 
-    public function editComment(string $message, string $attachments, int $comment_id, int $group_id = 0, int $topic_id = 0)
-    {
-        # FIXME
-        /*
-        $this->requireUser();
-        $this->willExecuteWriteAction();
-
-        $comment = (new CommentsRepo)->get($comment_id);
-
-        if($comment->getOwner() != $this->getUser()->getId())
-            $this->fail(15, "Access to comment denied");
-
-        $comment->setContent($message);
-        $comment->setEdited(time());
-        $comment->save();
-        */
-        return 1;
-    }
-
     public function editTopic(int $group_id, int $topic_id, string $title)
     {
         $this->requireUser();

VKAPI/Handlers/Photos.php

@@ -248,7 +248,7 @@ final class Photos extends VKAPIRequestHandler
         ];
     }
 
-    public function createAlbum(string $title, int $group_id = 0, string $description = "", int $privacy = 0)
+    public function createAlbum(string $title, int $group_id = 0, string $description = "")
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -257,7 +257,7 @@ final class Photos extends VKAPIRequestHandler
             $club = (new Clubs())->get((int) $group_id);
 
             if (!$club || !$club->canBeModifiedBy($this->getUser())) {
-                $this->fail(20, "Invalid club");
+                $this->fail(15, "Access denied");
             }
         }
 
@@ -271,162 +271,133 @@ final class Photos extends VKAPIRequestHandler
         return $album->toVkApiStruct($this->getUser());
     }
 
-    public function editAlbum(int $album_id, int $owner_id, string $title, string $description = "", int $privacy = 0)
+    public function editAlbum(int $album_id, int $owner_id, string $title = null, string $description = null, int $privacy = 0)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
         $album = (new Albums())->getAlbumByOwnerAndId($owner_id, $album_id);
 
-        if (!$album || $album->isDeleted()) {
+        if (!$album || $album->isDeleted() || $album->isCreatedBySystem()) {
-            $this->fail(2, "Invalid album");
+            $this->fail(114, "Invalid album id");
         }
-
-        if (empty($title)) {
-            $this->fail(25, "Title is empty");
-        }
-
-        if ($album->isCreatedBySystem()) {
-            $this->fail(40, "You can't change system album");
-        }
-
         if (!$album->canBeModifiedBy($this->getUser())) {
-            $this->fail(2, "Access to album denied");
+            $this->fail(15, "Access denied");
         }
 
+        if (!is_null($title) && !empty($title) && !ctype_space($title)) {
             $album->setName($title);
+        }
+        if (!is_null($description)) {
             $album->setDescription($description);
-
-        $album->save();
-
-        return $album->toVkApiStruct($this->getUser());
         }
 
-    public function getAlbums(int $owner_id, string $album_ids = "", int $offset = 0, int $count = 100, bool $need_system = true, bool $need_covers = true, bool $photo_sizes = false)
+        try {
+            $album->save();
+        } catch (\Throwable $e) {
+            return 1;
+        }
+
+        return 1;
+    }
+
+    public function getAlbums(int $owner_id = null, string $album_ids = "", int $offset = 0, int $count = 100, bool $need_system = true, bool $need_covers = true, bool $photo_sizes = false)
     {
         $this->requireUser();
 
-        $res = [];
+        $res = [
+            "count" => 0,
+            "items" => [],
+        ];
+        $albums_list = [];
+        if ($owner_id == null && empty($album_ids)) {
+            $owner_id = $this->getUser()->getId();
+        }
 
         if (empty($album_ids)) {
+            $owner = get_entity_by_id($owner_id);
+            if (!$owner || !$owner->canBeViewedBy($this->getUser())) {
+                $this->fail(15, "Access denied");
+            }
+            if ($owner_id > 0 && !$owner->getPrivacyPermission('photos.read', $this->getUser())) {
+                $this->fail(15, "Access denied");
+            }
+
+            $albums_list = null;
             if ($owner_id > 0) {
-                $user   = (new UsersRepo())->get($owner_id);
+                # TODO rewrite to offset
-
+                $albums_list = array_slice(iterator_to_array((new Albums())->getUserAlbums($owner, 1, $count + $offset)), $offset);
-                $res = [
+                $res["count"] = (new Albums())->getUserAlbumsCount($owner);
-                    "count" => (new Albums())->getUserAlbumsCount($user),
+            } else {
-                    "items" => [],
+                $albums_list = array_slice(iterator_to_array((new Albums())->getClubAlbums($owner, 1, $count + $offset)), $offset);
-                ];
+                $res["count"] = (new Albums())->getClubAlbumsCount($owner);
-
-                if (!$user || $user->isDeleted()) {
-                    $this->fail(2, "Invalid user");
-                }
-
-                if (!$user->getPrivacyPermission('photos.read', $this->getUser())) {
-                    $this->fail(21, "This user chose to hide his albums.");
-                }
-
-                $albums = array_slice(iterator_to_array((new Albums())->getUserAlbums($user, 1, $count + $offset)), $offset);
-
-                foreach ($albums as $album) {
-                    if (!$need_system && $album->isCreatedBySystem()) {
-                        continue;
-                    }
-                    $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
             }
         } else {
-                $club   = (new Clubs())->get($owner_id * -1);
+            $album_ids = explode(',', $album_ids);
-
+            foreach ($album_ids as $album_id) {
-                $res = [
+                $album = (new Albums())->getAlbumByOwnerAndId((int) $owner_id, (int) $album_id);
-                    "count" => (new Albums())->getClubAlbumsCount($club),
+                if (!$album || $album->isDeleted() || !$album->canBeViewedBy($this->getUser())) {
-                    "items" => [],
-                ];
-
-                if (!$club) {
-                    $this->fail(2, "Invalid club");
-                }
-
-                $albums = array_slice(iterator_to_array((new Albums())->getClubAlbums($club, 1, $count + $offset)), $offset);
-
-                foreach ($albums as $album) {
-                    if (!$need_system && $album->isCreatedBySystem()) {
                     continue;
                 }
-                    $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
+
+                $albums_list[] = $album;
             }
         }
 
-        } else {
+        foreach ($albums_list as $album) {
-            $albums = explode(',', $album_ids);
+            if (!$need_system && $album->isCreatedBySystem()) { # TODO use queries
-
-            $res = [
-                "count" => sizeof($albums),
-                "items" => [],
-            ];
-
-            foreach ($albums as $album) {
-                $id = explode("_", $album);
-
-                $album = (new Albums())->getAlbumByOwnerAndId((int) $id[0], (int) $id[1]);
-                if ($album && !$album->isDeleted()) {
-                    if (!$need_system && $album->isCreatedBySystem()) {
                 continue;
             }
+
             $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
         }
-            }
-        }
 
         return $res;
     }
 
-    public function getAlbumsCount(int $user_id = 0, int $group_id = 0)
+    public function getAlbumsCount(int $user_id = null, int $group_id = null)
     {
         $this->requireUser();
 
-        if ($user_id == 0 && $group_id == 0 || $user_id > 0 && $group_id > 0) {
+        if (is_null($user_id) && is_null($group_id)) {
-            $this->fail(21, "Select user_id or group_id");
+            $user_id = $this->getUser()->getId();
         }
 
-        if ($user_id > 0) {
+        if (!is_null($user_id)) {
-            $us = (new UsersRepo())->get($user_id);
+            $__user = (new UsersRepo())->get($user_id);
-            if (!$us || $us->isDeleted()) {
+            if (!$__user || $__user->isDeleted() || !$__user->getPrivacyPermission('photos.read', $this->getUser())) {
-                $this->fail(21, "Invalid user");
+                $this->fail(15, "Access denied");
             }
 
-            if (!$us->getPrivacyPermission('photos.read', $this->getUser())) {
+            return (new Albums())->getUserAlbumsCount($__user);
-                $this->fail(21, "This user chose to hide his albums.");
+        }
+        if (!is_null($group_id)) {
+            $__club = (new Clubs())->get($group_id);
+            if (!$__club || !$__club->canBeViewedBy($this->getUser())) {
+                $this->fail(15, "Access denied");
             }
 
-            return (new Albums())->getUserAlbumsCount($us);
+            return (new Albums())->getClubAlbumsCount($__club);
         }
 
-        if ($group_id > 0) {
+        return 0;
-            $cl = (new Clubs())->get($group_id);
-            if (!$cl) {
-                $this->fail(21, "Invalid club");
-            }
-
-            return (new Albums())->getClubAlbumsCount($cl);
-        }
     }
 
     public function getById(string $photos, bool $extended = false, bool $photo_sizes = false)
     {
         $this->requireUser();
 
-        $phts = explode(",", $photos);
+        $photos_splitted_list = explode(",", $photos);
         $res = [];
-
+        if (sizeof($photos_splitted_list) > 78) {
-        foreach ($phts as $phota) {
+            $this->fail(-78, "Photos count must not exceed limit");
-            $ph    = explode("_", $phota);
-            $photo = (new PhotosRepo())->getByOwnerAndVID((int) $ph[0], (int) $ph[1]);
-
-            if (!$photo || $photo->isDeleted()) {
-                $this->fail(21, "Invalid photo");
         }
 
-            if (!$photo->canBeViewedBy($this->getUser())) {
+        foreach ($photos_splitted_list as $photo_id) {
-                $this->fail(15, "Access denied");
+            $photo_s_id = explode("_", $photo_id);
+            $photo = (new PhotosRepo())->getByOwnerAndVID((int) $photo_s_id[0], (int) $photo_s_id[1]);
+            if (!$photo || $photo->isDeleted() || !$photo->canBeViewedBy($this->getUser())) {
+                continue;
             }
 
             $res[] = $photo->toVkApiStruct($photo_sizes, $extended);
@@ -443,12 +414,7 @@ final class Photos extends VKAPIRequestHandler
 
         if (empty($photo_ids)) {
             $album = (new Albums())->getAlbumByOwnerAndId($owner_id, $album_id);
-
+            if (!$album || $album->isDeleted() || !$album->canBeViewedBy($this->getUser())) {
-            if (!$album || $album->isDeleted()) {
-                $this->fail(21, "Invalid album");
-            }
-
-            if (!$album->canBeViewedBy($this->getUser())) {
                 $this->fail(15, "Access denied");
             }
 
@@ -459,11 +425,15 @@ final class Photos extends VKAPIRequestHandler
                 if (!$photo || $photo->isDeleted()) {
                     continue;
                 }
+
                 $res["items"][] = $photo->toVkApiStruct($photo_sizes, $extended);
             }
 
         } else {
-            $photos = explode(',', $photo_ids);
+            $photos = array_unique(explode(',', $photo_ids));
+            if (sizeof($photos) > 78) {
+                $this->fail(-78, "Photos count must not exceed limit");
+            }
 
             $res = [
                 "count" => sizeof($photos),
@@ -473,10 +443,12 @@ final class Photos extends VKAPIRequestHandler
             foreach ($photos as $photo) {
                 $id = explode("_", $photo);
 
-                $phot = (new PhotosRepo())->getByOwnerAndVID((int) $id[0], (int) $id[1]);
+                $photo_entity = (new PhotosRepo())->getByOwnerAndVID((int) $id[0], (int) $id[1]);
-                if ($phot && !$phot->isDeleted() && $phot->canBeViewedBy($this->getUser())) {
+                if (!$photo_entity || $photo_entity->isDeleted() || !$photo_entity->canBeViewedBy($this->getUser())) {
-                    $res["items"][] = $phot->toVkApiStruct($photo_sizes, $extended);
+                    continue;
                 }
+
+                $res["items"][] = $photo_entity->toVkApiStruct($photo_sizes, $extended);
             }
         }
 
@@ -490,12 +462,8 @@ final class Photos extends VKAPIRequestHandler
 
         $album = (new Albums())->get($album_id);
 
-        if (!$album || $album->canBeModifiedBy($this->getUser())) {
+        if (!$album || $album->isDeleted() || $album->isCreatedBySystem() || !$album->canBeModifiedBy($this->getUser())) {
-            $this->fail(21, "Invalid album");
+            $this->fail(15, "Access denied");
-        }
-
-        if ($album->isDeleted()) {
-            $this->fail(22, "Album already deleted");
         }
 
         $album->delete();
@@ -510,12 +478,8 @@ final class Photos extends VKAPIRequestHandler
 
         $photo = (new PhotosRepo())->getByOwnerAndVID($owner_id, $photo_id);
 
-        if (!$photo) {
+        if (!$photo || $photo->isDeleted() || !$photo->canBeModifiedBy($this->getUser())) {
-            $this->fail(21, "Invalid photo");
+            $this->fail(21, "Access denied");
-        }
-
-        if ($photo->isDeleted()) {
-            $this->fail(21, "Photo is deleted");
         }
 
         if (!empty($caption)) {
@@ -526,60 +490,48 @@ final class Photos extends VKAPIRequestHandler
         return 1;
     }
 
-    public function delete(int $owner_id, int $photo_id, string $photos = "")
+    public function delete(int $owner_id = null, int $photo_id = null, string $photos = null)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
 
-        if (empty($photos)) {
+        if (!$owner_id) {
+            $owner_id = $this->getUser()->getId();
+        }
+
+        if (is_null($photos)) {
+            if (is_null($photo_id)) {
+                return 0;
+            }
+
             $photo = (new PhotosRepo())->getByOwnerAndVID($owner_id, $photo_id);
-
+            if (!$photo || $photo->isDeleted() || !$photo->canBeModifiedBy($this->getUser())) {
-            if ($this->getUser()->getId() !== $photo->getOwner()->getId()) {
+                return 1;
-                $this->fail(21, "You can't delete another's photo");
-            }
-
-            if (!$photo) {
-                $this->fail(21, "Invalid photo");
-            }
-
-            if ($photo->isDeleted()) {
-                $this->fail(21, "Photo is already deleted");
             }
 
             $photo->delete();
         } else {
-            $photozs = explode(',', $photos);
+            $photos_list = array_unique(explode(',', $photos));
-
+            if (sizeof($photos_list) > 10) {
-            foreach ($photozs as $photo) {
+                $this->fail(-78, "Photos count must not exceed limit");
-                $id = explode("_", $photo);
-
-                $phot = (new PhotosRepo())->getByOwnerAndVID((int) $id[0], (int) $id[1]);
-
-                if ($this->getUser()->getId() !== $phot->getOwner()->getId()) {
-                    $this->fail(21, "You can't delete another's photo");
             }
 
-                if (!$phot) {
+            foreach ($photos_list as $photo_id) {
-                    $this->fail(21, "Invalid photo");
+                $id = explode("_", $photo_id);
+                $photo = (new PhotosRepo())->getByOwnerAndVID((int) $id[0], (int) $id[1]);
+                if (!$photo || $photo->isDeleted() || !$photo->canBeModifiedBy($this->getUser())) {
+                    continue;
                 }
 
-                if ($phot->isDeleted()) {
+                $photo->delete();
-                    $this->fail(21, "Photo already deleted");
-                }
-
-                $phot->delete();
             }
         }
 
         return 1;
     }
 
-    public function getAllComments(int $owner_id, int $album_id, bool $need_likes = false, int $offset = 0, int $count = 100)
+    # Поскольку комментарии едины, можно использовать метод "wall.deleteComment".
-    {
+    /*public function deleteComment(int $comment_id, int $owner_id = 0)
-        $this->fail(501, "Not implemented");
-    }
-
-    public function deleteComment(int $comment_id, int $owner_id = 0)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -596,9 +548,9 @@ final class Photos extends VKAPIRequestHandler
         $comment->delete();
 
         return 1;
-    }
+    }*/
 
-    public function createComment(int $owner_id, int $photo_id, string $message = "", string $attachments = "", bool $from_group = false)
+    public function createComment(int $owner_id, int $photo_id, string $message = "", bool $from_group = false)
     {
         $this->requireUser();
         $this->willExecuteWriteAction();
@@ -609,12 +561,8 @@ final class Photos extends VKAPIRequestHandler
 
         $photo = (new PhotosRepo())->getByOwnerAndVID($owner_id, $photo_id);
 
-        if (!$photo || $photo->isDeleted()) {
+        if (!$photo || $photo->isDeleted() || !$photo->canBeViewedBy($this->getUser())) {
-            $this->fail(180, "Invalid photo");
+            $this->fail(15, "Access denied");
-        }
-
-        if (!$photo->canBeViewedBy($this->getUser())) {
-            $this->fail(15, "Access to photo denied");
         }
 
         $comment = new Comment();
@@ -625,55 +573,6 @@ final class Photos extends VKAPIRequestHandler
         $comment->setCreated(time());
         $comment->save();
 
-        if (!empty($attachments)) {
-            $attachmentsArr = explode(",", $attachments);
-
-            if (sizeof($attachmentsArr) > 10) {
-                $this->fail(50, "Error: too many attachments");
-            }
-
-            foreach ($attachmentsArr as $attac) {
-                $attachmentType = null;
-
-                if (str_contains($attac, "photo")) {
-                    $attachmentType = "photo";
-                } elseif (str_contains($attac, "video")) {
-                    $attachmentType = "video";
-                } else {
-                    $this->fail(205, "Unknown attachment type");
-                }
-
-                $attachment = str_replace($attachmentType, "", $attac);
-
-                $attachmentOwner = (int) explode("_", $attachment)[0];
-                $attachmentId    = (int) end(explode("_", $attachment));
-
-                $attacc = null;
-
-                if ($attachmentType == "photo") {
-                    $attacc = (new PhotosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Photo does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this photo");
-                    }
-
-                    $comment->attach($attacc);
-                } elseif ($attachmentType == "video") {
-                    $attacc = (new VideosRepo())->getByOwnerAndVID($attachmentOwner, $attachmentId);
-                    if (!$attacc || $attacc->isDeleted()) {
-                        $this->fail(100, "Video does not exists");
-                    }
-                    if ($attacc->getOwner()->getId() != $this->getUser()->getId()) {
-                        $this->fail(43, "You do not have access to this video");
-                    }
-
-                    $comment->attach($attacc);
-                }
-            }
-        }
-
         return $comment->getId();
     }
 
@@ -682,16 +581,12 @@ final class Photos extends VKAPIRequestHandler
         $this->requireUser();
 
         if ($owner_id < 0) {
-            $this->fail(4, "This method doesn't works with clubs");
+            $this->fail(-413, "Clubs are not supported");
         }
 
         $user = (new UsersRepo())->get($owner_id);
-        if (!$user) {
+        if (!$user || !$user->getPrivacyPermission('photos.read', $this->getUser())) {
-            $this->fail(4, "Invalid user");
+            $this->fail(15, "Access denied");
-        }
-
-        if (!$user->getPrivacyPermission('photos.read', $this->getUser())) {
-            $this->fail(21, "This user chose to hide his albums.");
         }
 
         $photos = (new PhotosRepo())->getEveryUserPhoto($user, $offset, $count);
@@ -717,12 +612,8 @@ final class Photos extends VKAPIRequestHandler
         $photo = (new PhotosRepo())->getByOwnerAndVID($owner_id, $photo_id);
         $comms = array_slice(iterator_to_array($photo->getComments(1, $offset + $count)), $offset);
 
-        if (!$photo || $photo->isDeleted()) {
+        if (!$photo || $photo->isDeleted() || !$photo->canBeViewedBy($this->getUser())) {
-            $this->fail(4, "Invalid photo");
+            $this->fail(15, "Access denied");
-        }
-
-        if (!$photo->canBeViewedBy($this->getUser())) {
-            $this->fail(21, "Access denied");
         }
 
         $res = [

Web/Models/Entities/Album.php

@@ -26,7 +26,9 @@ class Album extends MediaCollection
     {
         $coverPhoto = $this->getCoverPhoto();
         if (!$coverPhoto) {
-            return "/assets/packages/static/openvk/img/camera_200.png";
+            $server_url = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
+
+            return $server_url . "/assets/packages/static/openvk/img/camera_200.png";
         }
 
         return $coverPhoto->getURL();
@@ -92,14 +94,13 @@ class Album extends MediaCollection
     {
         $res = (object) [];
 
-        $res->id              = $this->getPrettyId();
+        $res->id              = $this->getId();
-        $res->vid             = $this->getId();
         $res->thumb_id        = !is_null($this->getCoverPhoto()) ? $this->getCoverPhoto()->getPrettyId() : 0;
-        $res->owner_id        = $this->getOwner()->getId();
+        $res->owner_id        = $this->getOwner()->getRealId();
         $res->title           = $this->getName();
         $res->description     = $this->getDescription();
         $res->created         = $this->getCreationTime()->timestamp();
-        $res->updated         = $this->getEditTime() ? $this->getEditTime()->timestamp() : null;
+        $res->updated         = $this->getEditTime() ? $this->getEditTime()->timestamp() : $res->created;
         $res->size            = $this->size();
         $res->privacy_comment = 1;
         $res->upload_by_admins_only = 1;

Web/Models/Entities/Club.php

@@ -323,7 +323,7 @@ class Club extends RowModel
         return sizeof($this->getFollowersQuery());
     }
 
-    public function getFollowers(int $page = 1, int $perPage = 6, string $sort = "follower ASC"): \Traversable
+    public function getFollowers(int $page = 1, int $perPage = 6, string $sort = "target DESC"): \Traversable
     {
         $rels = $this->getFollowersQuery($sort)->page($page, $perPage);
 

Web/Models/Entities/Photo.php

@@ -349,7 +349,6 @@ class Photo extends Media
         $res->width    = $this->getDimensions()[0];
         $res->height   = $this->getDimensions()[1];
         $res->date     = $res->created = $this->getPublicationTime()->timestamp();
-
         if ($photo_sizes) {
             $res->sizes = array_values($this->getVkApiSizes());
             $res->src_small    = $res->photo_75 = $this->getURLBySizeId("miniscule");
@@ -359,14 +358,19 @@ class Photo extends Media
             $res->src_xxbig    = $res->photo_1280 = $this->getURLBySizeId("larger");
             $res->src_xxxbig   = $res->photo_2560 = $this->getURLBySizeId("original");
             $res->src_original = $res->url = $this->getURLBySizeId("UPLOADED_MAXRES");
+            $res->orig_photo   = [
+                "height" => $res->height,
+                "width" => $res->width,
+                "type" => "base",
+                "url" => $this->getURL(),
+            ];
         }
 
         if ($extended) {
-            $res->likes       = $this->getLikesCount(); # их нету но пусть будут
+            $res->likes       = $this->getLikesCount();
             $res->comments    = $this->getCommentsCount();
-            $res->tags        = 0;
             $res->can_comment = 1;
-            $res->can_repost  = 0;
+            $res->can_repost  = 1;
         }
 
         return $res;

Web/Models/Entities/User.php

@@ -306,10 +306,10 @@ class User extends RowModel
             $content_type = $matches[1];
             $content_id = (int) $matches[2];
             if (in_array($content_type, ["noSpamTemplate", "user"])) {
-                $reason = "Подозрительная активность";
+                $reason = $this->getRawBanReason();
             } else {
                 if ($for !== "banned") {
-                    $reason = "Подозрительная активность";
+                    $reason = $this->getRawBanReason();
                 } else {
                     $reason = [$this->getTextForContentBan($content_type), $content_type];
                     switch ($content_type) {

Web/Models/Repositories/Photos.php

@@ -51,6 +51,7 @@ class Photos
             "deleted"  => 0,
             "system"   => 0,
             "private"  => 0,
+            "anonymous" => 0,
         ])->order("id DESC");
 
         foreach ($photos->limit($limit, $offset) as $photo) {
@@ -65,6 +66,7 @@ class Photos
             "deleted"  => 0,
             "system"   => 0,
             "private"  => 0,
+            "anonymous" => 0,
         ]);
 
         return sizeof($photos);

Web/Presenters/templates/Audio/List.xml

@@ -91,7 +91,7 @@
         {/if}
     </script>
 
-    <div class='summaryBarHideable summaryBar summaryBarFlex padding' style="margin: 0px -10px;width: 99.5%;display: none;">
+    <div n:if="isset($audios)" class='summaryBarHideable summaryBar summaryBarFlex padding' style="margin: 0px -10px;width: 99.5%;display: none;">
         <div class='summary'>
             <b>{tr("is_x_audio", $audiosCount)}</b>
         </div>

Web/Presenters/templates/User/Settings.xml

@@ -596,6 +596,17 @@
             </table>
         </form>
 
+        <table cellspacing="7" cellpadding="0" width="60%" border="0" align="center" id="_js_settings">
+            <tbody>
+                <tr>
+                    <td width="120" valign="top" align="right"></td>
+                    <td>
+                        <a href="javascript:openJsSettings()">{_ui_settings_window}</a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        
         <h4>{_ui_settings_sidebar}</h4>
         <form action="/settings?act=lMenu" method="POST" enctype="multipart/form-data">
             <table cellspacing="7" cellpadding="0" width="60%" border="0" align="center">

Web/static/css/bsdn.css

@@ -99,6 +99,7 @@ button.bsdn_playButton {
     padding-left: 0;
     font-size: 22px;
     cursor: pointer;
+    width: 22px;
 }
 
 .bsdn_fullScreenButton, .bsdn_repeatButton {

Web/static/css/main.css

@@ -2919,7 +2919,6 @@ a.poll-retract-vote {
     position: relative;
 }
 
-/* не говновёрстка, а пиксель-пёрфект) */
 .page_header.search_expanded.search_expanded_at_all #search_and_one_more_wrapper {
     width: 547px;
 }

Web/static/js/al_feed.js

@@ -68,7 +68,7 @@ u(document).on('click', '#__feed_settings_link', (e) => {
     `
 
     MessageBox(tr("feed_settings"), body, [tr("close")], [Function.noop])
-    u('.ovk-diag-body').attr('style', 'padding:0px;height: 255px;')
+    u('.ovk-diag-body').attr('style', 'padding:0px;height: 255px;overflow: hidden;')
 
     async function __switchTab(tab) 
     {
@@ -84,8 +84,6 @@ u(document).on('click', '#__feed_settings_link', (e) => {
                 const CURRENT_PERPAGE = Number(__temp_url.searchParams.get('posts') ?? 10)
                 const CURRENT_PAGE = Number(__temp_url.searchParams.get('p') ?? 1)
                 const CURRENT_RETURN_BANNED = Number(__temp_url.searchParams.get('return_banned') ?? 0)
-                const CURRENT_AUTO_SCROLL = Number(localStorage.getItem('ux.auto_scroll') ?? 1)
-                const CURRENT_DISABLE_AJAX = Number(localStorage.getItem('ux.disable_ajax_routing') ?? 0)
                 const COUNT = [1, 5, 10, 20, 30, 40, 50]
                 u('#_feed_settings_container #__content').html(`
                     <table cellspacing="7" cellpadding="0" border="0" align="center">
@@ -116,26 +114,6 @@ u(document).on('click', '#__feed_settings_link', (e) => {
                                     <label for='showIgnored'>${tr('show_ignored_sources')}</label>
                                 </td>
                             </tr>
-                            <tr>
-                                <td width="120" valign="top">
-                                    <span class="nobold">
-                                        <input type='checkbox' data-act='localstorage_item' data-inverse="1" name='ux.disable_ajax_routing' id="ux.disable_ajax_routing" ${CURRENT_DISABLE_AJAX == 0 ? 'checked' : ''}>
-                                    </span>
-                                </td>
-                                <td>
-                                    <label for='ux.disable_ajax_routing'>${tr('ajax_routing')}</label>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td width="120" valign="top">
-                                    <span class="nobold">
-                                        <input type='checkbox' data-act='localstorage_item' name='ux.auto_scroll' id="ux.auto_scroll" ${CURRENT_AUTO_SCROLL == 1 ? 'checked' : ''}>
-                                    </span>
-                                </td>
-                                <td>
-                                    <label for='ux.auto_scroll'>${tr('auto_scroll')}</label>
-                                </td>
-                            </tr>
                             <tr>
                                 <td width="120" valign="top">
                                 </td>
@@ -299,3 +277,32 @@ u(document).on('change', `input[data-act='localstorage_item']`, (e) => {
 
     localStorage.setItem(e.target.name, Number(e.target.checked))
 })
+
+function openJsSettings() {
+    const CURRENT_AUTO_SCROLL = Number(localStorage.getItem('ux.auto_scroll') ?? 1)
+    const CURRENT_DISABLE_AJAX = Number(localStorage.getItem('ux.disable_ajax_routing') ?? 0)
+
+    u("#_js_settings td").remove()
+    u("#_js_settings").append(`
+        <tr>
+            <td width="120" valign="top">
+                <span class="nobold">
+                    <input type='checkbox' data-act='localstorage_item' data-inverse="1" name='ux.disable_ajax_routing' id="ux.disable_ajax_routing" ${CURRENT_DISABLE_AJAX == 0 ? 'checked' : ''}>
+                </span>
+            </td>
+            <td>
+                <label for='ux.disable_ajax_routing'>${tr('ajax_routing')}</label>
+            </td>
+        </tr>
+        <tr>
+            <td width="120" valign="top">
+                <span class="nobold">
+                    <input type='checkbox' data-act='localstorage_item' name='ux.auto_scroll' id="ux.auto_scroll" ${CURRENT_AUTO_SCROLL == 1 ? 'checked' : ''}>
+                </span>
+            </td>
+            <td>
+                <label for='ux.auto_scroll'>${tr('auto_scroll')}</label>
+            </td>
+        </tr>    
+    `)
+}

locales/en.strings

@@ -703,6 +703,7 @@
 "round_avatars" = "Round";
 
 "apply_style_for_this_device" = "Apply style only for this device";
+"ui_settings_window" = "Advanced settings";
 
 "search_for_groups" = "Search for groups";
 "search_for_users" = "Search for users";

locales/ru.strings

@@ -676,6 +676,7 @@
 "cut" = "Квадратные";
 "round_avatars" = "Круглые";
 "apply_style_for_this_device" = "Применить стиль только для этого устройства";
+"ui_settings_window" = "Дополнительные настройки";
 "search_for_groups" = "Поиск групп";
 "search_for_users" = "Поиск людей";
 "search_for_posts" = "Поиск записей";

themepacks/midnight/stylesheet.css

@@ -660,3 +660,17 @@ ul {
 .doc_icon.no_image span::before {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAKCAYAAABmBXS+AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAABXSURBVChTY2RAAoFe9ZuEBOR93314uHn9tkY/qDADE5QGA5ACZBoGUBThAkQpYkyOmvcfysYJiDMJROAzbe6yJEZ4EGBTCFIAolHCCVkhTAFWgGkiAwMAzxkZ3qVQ7YEAAAAASUVORK5CYII=");
 }
+
+.bigPlayer .bigPlayerWrapper .absoluteButtons > div {
+    background: #1e1a2b;
+    border: 1px solid #2c2640;
+}
+
+.insertedPhoto {
+    background: #1e1a2b;
+    border: 1px solid #403a56;
+}
+
+.ovk-modal-player-window #ovk-player-info {
+    background: #0e0b1a;
+}