Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-09-21 16:38:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix 500 in photos.get

Browse source 
when album does not exists
This commit is contained in:
lalka2018 2023-11-05 15:19:06 +03:00
parent a2473c68fe
commit 49d62543ba
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
VKAPI/Handlers/Photos.php
View file

@ -432,13 +432,11 @@ final class Photos extends VKAPIRequestHandler
if(empty($photo_ids)) { if(empty($photo_ids)) {
$album = (new Albums)->getAlbumByOwnerAndId($owner_id, $album_id); $album = (new Albums)->getAlbumByOwnerAndId($owner_id, $album_id);
if(!$album->getOwner()->getPrivacyPermission('photos.read', $this->getUser())) { if(!$album || $album->isDeleted())
$this->fail(21, "This user chose to hide his albums.");
}
if(!$album || $album->isDeleted()) {
$this->fail(21, "Invalid album"); $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); $photos = array_slice(iterator_to_array($album->getPhotos(1, $count + $offset)), $offset);
$res["count"] = sizeof($photos); $res["count"] = sizeof($photos);
@ -456,8 +454,7 @@ final class Photos extends VKAPIRequestHandler
"items" => [] "items" => []
]; ];
foreach($photos as $photo) foreach($photos as $photo) {
{
$id = explode("_", $photo); $id = explode("_", $photo);
$phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]); $phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]);

4
Web/Models/Repositories/Albums.php
View file

@ -130,7 +130,7 @@ class Albums
"owner" => $owner, "owner" => $owner,
"id" => $id "id" => $id
])->fetch(); ])->fetch();
return new Album($album); return $album ? new Album($album) : NULL;
} }
} }