Merge branch 'openvk:master' into instance_mtn

tinelix · Nov 8, 2023 · c59ba66 · c59ba66
2 parents 32be0cd + c9665ac
commit c59ba66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/VKAPI/Handlers/Photos.php b/VKAPI/Handlers/Photos.php
@@ -432,13 +432,11 @@ function get(int $owner_id, int $album_id, string $photo_ids = "", bool $extende
         if(empty($photo_ids)) {
             $album = (new Albums)->getAlbumByOwnerAndId($owner_id, $album_id);
 
-            if(!$album->getOwner()->getPrivacyPermission('photos.read', $this->getUser())) {
-                $this->fail(21, "This user chose to hide his albums.");
-            }
-
-            if(!$album || $album->isDeleted()) {
+            if(!$album || $album->isDeleted())
                 $this->fail(21, "Invalid album");
-            }
+
+            if(!$album->getOwner()->getPrivacyPermission('photos.read', $this->getUser()))
+                $this->fail(21, "This user chose to hide his albums.");
 
             $photos = array_slice(iterator_to_array($album->getPhotos(1, $count + $offset)), $offset);
             $res["count"] = sizeof($photos);
@@ -456,8 +454,7 @@ function get(int $owner_id, int $album_id, string $photo_ids = "", bool $extende
                 "items" => []
             ];
 
-            foreach($photos as $photo)
-            {
+            foreach($photos as $photo) {
                 $id = explode("_", $photo);
 
                 $phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]);

diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
@@ -720,8 +720,8 @@ function generate2faBackupCodes(): void
 
         for($i = 0; $i < 10 - $this->get2faBackupCodeCount(); $i++) {
             $codes[] = [
-                owner => $this->getId(),
-                code => random_int(10000000, 99999999)
+                "owner" => $this->getId(),
+                "code" => random_int(10000000, 99999999)
             ];
         }
 

diff --git a/Web/Models/Repositories/Albums.php b/Web/Models/Repositories/Albums.php
@@ -130,7 +130,7 @@ function getAlbumByOwnerAndId(int $owner, int $id)
             "owner" => $owner,
             "id"    => $id
         ])->fetch();
-        
-        return new Album($album);
+
+        return $album ? new Album($album) : NULL;
     }
 }