OpenVK
+# 
OpenVK
_[Русский](README_RU.md)_
**OpenVK** is an attempt to create a simple CMS that ~~cosplays~~ imitates old VKontakte. Code provided here is not stable yet.
-VKontakte belongs to Pavel Durov and VK Group.
+VKontakte belongs to VK (formerly Mail.ru Group).
-To be honest, we don't know whether if it even works. However, this version is maintained and we will be happy to accept your bugreports [in our bug tracker](https://github.com/openvk/openvk/projects/1). You should also be able to submit them using [ticketing system](https://openvk.su/support?act=new) (you will need an OpenVK account for this).
+To be honest, we don't know whether if it even works. However, this version is maintained and we will be happy to accept your bugreports [in our bug tracker](https://github.com/openvk/openvk/projects/1). You should also be able to submit them using [ticketing system](https://ovk.to/support?act=new) (you will need an OpenVK account for this).
## When's the release?
@@ -26,11 +26,19 @@ However, OVK makes use of Chandler Application Server. This software requires ex
If you want, you can add your instance to the list above so that people can register there.
+### System requirements
+
+Here is our minimum hardware recommendation:
+
+* **CPU: Recent** (AMD Zen2 or equivalent) quad-core 2GHz+ CPU
+* **RAM:** At least 2GB RAM (we recommend 6GB or 8GB for OpenVK with Kafka)
+* **Minimum database space:** 10GB
+
### Installation procedure
-1. Install PHP 7.4, web-server, Composer, Node.js, Yarn and [Chandler](https://github.com/openvk/chandler)
+1. Install PHP 7.4, web-server, Composer, Node.js, NPM and [Chandler](https://github.com/openvk/chandler)
-* PHP 8.1 is supported too, however it was not tested carefully, so be aware.
+* PHP 8 is still being tested; the functionality of the engine on this version of PHP is not yet guaranteed.
2. Install MySQL-compatible database.
@@ -57,7 +65,7 @@ ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions
7. Copy `openvk-example.yml` to `openvk.yml` and change options to your liking
8. Run `composer install` in OpenVK directory
9. Run `composer install` in commitcaptcha directory
-10. Move to `Web/static/js` and execute `yarn install`
+10. Move to `Web/static/js` and execute `npm install`
11. Set `openvk` as your root app in `chandler.yml`
Once you are done, you can login as a system administrator on the network itself (no registration required):
@@ -66,12 +74,12 @@ Once you are done, you can login as a system administrator on the network itself
* **Password**: `admin`
* It is recommended to change the password of the built-in account or disable it.
-💡Confused? Full installation walkthrough is available [here](https://docs.openvk.uk/openvk_engine/centos8_installation/) (CentOS 8 [and](https://almalinux.org/) [family](https://yum.oracle.com/oracle-linux-isos.html)).
+💡 Confused? Full installation walkthrough is available [here](https://docs.ovk.to/openvk_engine/centos8_installation/) (CentOS 8 [and](https://almalinux.org/) [family](https://yum.oracle.com/oracle-linux-isos.html)).
### Looking for Docker or Kubernetes deployment?
See `install/automated/docker/README.md` and `install/automated/kubernetes/README.md` for Docker and Kubernetes deployment instructions.
-### If my website uses OpenVK, should I release it's sources?
+### If my website uses OpenVK, should I release its sources?
It depends. You can keep the sources to yourself if you do not plan to distribute your website binaries. If your website software must be distributed, it can stay non-OSS provided the OpenVK is not used as a primary application and is not modified. If you modified OpenVK for your needs or your work is based on it and you are planning to redistribute this, then you should license it under terms of any LGPL-compatible license (like OSL, GPL, LGPL etc).
@@ -80,7 +88,7 @@ It depends. You can keep the sources to yourself if you do not plan to distribut
You may reach out to us via:
* [Bug Tracker](https://github.com/openvk/openvk/projects/1)
-* [Ticketing System](https://openvk.su/support?act=new)
+* [Ticketing System](https://ovk.to/support?act=new)
* Telegram Chat: Go to [our channel](https://t.me/openvkenglish) and open discussion in our channel menu.
* [Reddit](https://www.reddit.com/r/openvk/)
* [GitHub Discussions](https://github.com/openvk/openvk/discussions)
diff --git a/README_RU.md b/README_RU.md
index cc4f672fa..d59cef44f 100644
--- a/README_RU.md
+++ b/README_RU.md
@@ -1,12 +1,12 @@
-# OpenVK
+# OpenVK
_[English](README.md)_
**OpenVK** — это попытка создать простую CMS, которая ~~косплеит~~ имитирует старый ВКонтакте. На данный момент, представленный здесь исходный код проекта пока не является стабильным.
-ВКонтакте принадлежит Павлу Дурову и VK Group.
+ВКонтакте принадлежит VK (в прошлом Mail.ru Group).
-Честно говоря, мы даже не знаем, работает ли она вообще. Однако, эта версия поддерживается, и мы будем рады принять ваши сообщения об ошибках [в нашем баг-трекере](https://github.com/openvk/openvk/projects/1). Вы также можете отправлять их через [вкладку "Помощь"](https://openvk.su/support?act=new) (для этого вам понадобится учетная запись OpenVK).
+Честно говоря, мы даже не знаем, работает ли она вообще. Однако, эта версия поддерживается, и мы будем рады принять ваши сообщения об ошибках [в нашем баг-трекере](https://github.com/openvk/openvk/projects/1). Вы также можете отправлять их через [вкладку "Помощь"](https://ovk.to/support?act=new) (для этого вам понадобится учетная запись OpenVK).
## Когда выйдет релизная версия?
@@ -28,9 +28,9 @@ _[English](README.md)_
### Процедура установки
-1. Установите PHP 7.4, веб-сервер, Composer, Node.js, Yarn и [Chandler](https://github.com/openvk/chandler)
+1. Установите PHP 7.4, веб-сервер, Composer, Node.js, NPM и [Chandler](https://github.com/openvk/chandler)
-* PHP 8 еще **не** тестировался, поэтому не стоит ожидать, что он будет работать (UPD: он не работает).
+* PHP 8 пока ещё тестируется, работоспособность движка на этой версии PHP пока не гарантируется.
2. Установите MySQL-совместимую базу данных.
@@ -57,7 +57,7 @@ ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions
7. Скопируйте `openvk-example.yml` в `openvk.yml` и измените параметры под свои нужды
8. Запустите `composer install` в директории OpenVK
9. Запустите `composer install` в директории commitcaptcha
-10. Перейдите в `Web/static/js` и выполните `yarn install`
+10. Перейдите в `Web/static/js` и выполните `npm install`
11. Установите `openvk` в качестве корневого приложения в файле `chandler.yml`
После этого вы можете войти как системный администратор в саму сеть (регистрация не требуется):
@@ -66,7 +66,7 @@ ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions
* **Пароль**: `admin`
* Перед использованием встроенной учетной записи рекомендуется сменить пароль или отключить её.
-💡Запутались? Полное руководство по установке доступно [здесь](https://docs.openvk.uk/openvk_engine/centos8_installation/) (CentOS 8 [и](https://almalinux.org/ru/) [семейство](https://yum.oracle.com/oracle-linux-isos.html)).
+💡Запутались? Полное руководство по установке доступно [здесь](https://docs.ovk.to/openvk_engine/centos8_installation/) (CentOS 8 [и](https://almalinux.org/ru/) [семейство](https://yum.oracle.com/oracle-linux-isos.html)).
# Установка в Docker/Kubernetes
Подробные иструкции можно найти в `install/automated/docker/README.md` и `install/automated/kubernetes/README.md` соответственно.
@@ -80,7 +80,7 @@ ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions
Вы можете связаться с нами через:
* [Баг-трекер](https://github.com/openvk/openvk/projects/1)
-* [Помощь в OVK](https://openvk.su/support?act=new)
+* [Помощь в OVK](https://ovk.to/support?act=new)
* Telegram-чат: Перейдите на [наш канал](https://t.me/openvk) и откройте обсуждение в меню нашего канала.
* [Reddit](https://www.reddit.com/r/openvk/)
* [GitHub Discussions](https://github.com/openvk/openvk/discussions)
diff --git a/ServiceAPI/Apps.php b/ServiceAPI/Apps.php
index 6504c23e9..a09dc49fa 100644
--- a/ServiceAPI/Apps.php
+++ b/ServiceAPI/Apps.php
@@ -1,8 +1,11 @@
withdrawCoins();
$resolve($coins);
}
+
+ function getRegularToken(string $clientName, bool $acceptsStale, callable $resolve, callable $reject): void
+ {
+ $token = NULL;
+ $stale = true;
+ if($acceptsStale)
+ $token = (new APITokens)->getStaleByUser($this->user->getId(), $clientName);
+
+ if(is_null($token)) {
+ $stale = false;
+ $token = new APIToken;
+ $token->setUser($this->user);
+ $token->setPlatform($clientName ?? (new WhichBrowser\Parser(getallheaders()))->toString());
+ $token->save();
+ }
+
+ $resolve([
+ 'is_stale' => $stale,
+ 'token' => $token->getFormattedToken(),
+ ]);
+ }
}
\ No newline at end of file
diff --git a/ServiceAPI/Notes.php b/ServiceAPI/Notes.php
new file mode 100644
index 000000000..ea76267e6
--- /dev/null
+++ b/ServiceAPI/Notes.php
@@ -0,0 +1,44 @@
+user = $user;
+ $this->notes = new NoteRepo;
+ }
+
+ function getNote(int $noteId, callable $resolve, callable $reject): void
+ {
+ $note = $this->notes->get($noteId);
+ if(!$note || $note->isDeleted())
+ $reject(83, "Note is gone");
+
+ $noteOwner = $note->getOwner();
+ assert($noteOwner instanceof User);
+ if(!$noteOwner->getPrivacyPermission("notes.read", $this->user))
+ $reject(160, "You don't have permission to access this note");
+
+ if(!$note->canBeViewedBy($this->user))
+ $reject(15, "Access to note denied");
+
+ $resolve([
+ "title" => $note->getName(),
+ "link" => "/note" . $note->getPrettyId(),
+ "html" => $note->getText(),
+ "created" => (string) $note->getPublicationTime(),
+ "author" => [
+ "name" => $noteOwner->getCanonicalName(),
+ "ava" => $noteOwner->getAvatarUrl(),
+ "link" => $noteOwner->getURL(),
+ ],
+ ]);
+ }
+}
diff --git a/ServiceAPI/Wall.php b/ServiceAPI/Wall.php
index 628ceb227..ed7251ac9 100644
--- a/ServiceAPI/Wall.php
+++ b/ServiceAPI/Wall.php
@@ -2,25 +2,34 @@
namespace openvk\ServiceAPI;
use openvk\Web\Models\Entities\Post;
use openvk\Web\Models\Entities\User;
-use openvk\Web\Models\Repositories\Posts;
+use openvk\Web\Models\Repositories\{Posts, Notes, Videos};
class Wall implements Handler
{
protected $user;
protected $posts;
+ protected $notes;
function __construct(?User $user)
{
$this->user = $user;
$this->posts = new Posts;
+ $this->notes = new Notes;
+ $this->videos = new Videos;
}
function getPost(int $id, callable $resolve, callable $reject): void
{
$post = $this->posts->get($id);
if(!$post || $post->isDeleted())
- $reject("No post with id=$id");
+ $reject(53, "No post with id=$id");
+
+ if($post->getSuggestionType() != 0)
+ $reject(25, "Can't get suggested post");
+ if(!$post->canBeViewedBy($this->user))
+ $reject(12, "Access denied");
+
$res = (object) [];
$res->id = $post->getId();
$res->wall = $post->getTargetWall();
diff --git a/VKAPI/Handlers/Account.php b/VKAPI/Handlers/Account.php
index a20c42be2..dcdf18c00 100644
--- a/VKAPI/Handlers/Account.php
+++ b/VKAPI/Handlers/Account.php
@@ -7,19 +7,32 @@ final class Account extends VKAPIRequestHandler
function getProfileInfo(): object
{
$this->requireUser();
-
- return (object) [
- "first_name" => $this->getUser()->getFirstName(),
- "id" => $this->getUser()->getId(),
- "last_name" => $this->getUser()->getLastName(),
- "home_town" => $this->getUser()->getHometown(),
- "status" => $this->getUser()->getStatus(),
- "bdate" => is_null($this->getUser()->getBirthday()) ? '01.01.1970' : $this->getUser()->getBirthday()->format('%e.%m.%Y'),
- "bdate_visibility" => $this->getUser()->getBirthdayPrivacy(),
+ $user = $this->getUser();
+ $return_object = (object) [
+ "first_name" => $user->getFirstName(),
+ "photo_200" => $user->getAvatarURL("normal"),
+ "nickname" => $user->getPseudo(),
+ "is_service_account" => false,
+ "id" => $user->getId(),
+ "is_verified" => $user->isVerified(),
+ "verification_status" => $user->isVerified() ? 'verified' : 'unverified',
+ "last_name" => $user->getLastName(),
+ "home_town" => $user->getHometown(),
+ "status" => $user->getStatus(),
+ "bdate" => is_null($user->getBirthday()) ? '01.01.1970' : $user->getBirthday()->format('%e.%m.%Y'),
+ "bdate_visibility" => $user->getBirthdayPrivacy(),
"phone" => "+420 ** *** 228", # TODO
- "relation" => $this->getUser()->getMaritalStatus(),
- "sex" => $this->getUser()->isFemale() ? 1 : 2
+ "relation" => $user->getMaritalStatus(),
+ "screen_name" => $user->getShortCode(),
+ "sex" => $user->isFemale() ? 1 : 2,
+ #"email" => $user->getEmail(),
];
+
+ $audio_status = $user->getCurrentAudioStatus();
+ if(!is_null($audio_status))
+ $return_object->audio_status = $audio_status->toVkApiStruct($user);
+
+ return $return_object;
}
function getInfo(): object
@@ -151,4 +164,68 @@ function saveProfileInfo(string $first_name = "", string $last_name = "", string
return (object) $output;
}
+
+ function getBalance(): object
+ {
+ $this->requireUser();
+ if(!OPENVK_ROOT_CONF['openvk']['preferences']['commerce'])
+ $this->fail(105, "Commerce is disabled on this instance");
+
+ return (object) ['votes' => $this->getUser()->getCoins()];
+ }
+
+ function getOvkSettings(): object
+ {
+ $this->requireUser();
+ $user = $this->getUser();
+
+ $settings_list = (object)[
+ 'avatar_style' => $user->getStyleAvatar(),
+ 'style' => $user->getStyle(),
+ 'show_rating' => !$user->prefersNotToSeeRating(),
+ 'nsfw_tolerance' => $user->getNsfwTolerance(),
+ 'post_view' => $user->hasMicroblogEnabled() ? 'microblog' : 'old',
+ 'main_page' => $user->getMainPage() == 0 ? 'my_page' : 'news',
+ ];
+
+ return $settings_list;
+ }
+
+ function sendVotes(int $receiver, int $value, string $message = ""): object
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if(!OPENVK_ROOT_CONF["openvk"]["preferences"]["commerce"])
+ $this->fail(-105, "Commerce is disabled on this instance");
+
+ if($receiver < 0)
+ $this->fail(-248, "Invalid receiver id");
+
+ if($value < 1)
+ $this->fail(-248, "Invalid value");
+
+ if(iconv_strlen($message) > 255)
+ $this->fail(-249, "Message is too long");
+
+ if($this->getUser()->getCoins() < $value)
+ $this->fail(-252, "Not enough votes");
+
+ $receiver_entity = (new \openvk\Web\Models\Repositories\Users)->get($receiver);
+ if(!$receiver_entity || $receiver_entity->isDeleted())
+ $this->fail(-250, "Invalid receiver");
+
+ if($receiver_entity->getId() === $this->getUser()->getId())
+ $this->fail(-251, "Can't transfer votes to yourself");
+
+ $this->getUser()->setCoins($this->getUser()->getCoins() - $value);
+ $this->getUser()->save();
+
+ $receiver_entity->setCoins($receiver_entity->getCoins() + $value);
+ $receiver_entity->save();
+
+ (new \openvk\Web\Models\Entities\Notifications\CoinsTransferNotification($receiver_entity, $this->getUser(), $value, $message))->emit();
+
+ return (object) ['votes' => $this->getUser()->getCoins()];
+ }
}
diff --git a/VKAPI/Handlers/Audio.php b/VKAPI/Handlers/Audio.php
index 3fa68e722..e0991af92 100644
--- a/VKAPI/Handlers/Audio.php
+++ b/VKAPI/Handlers/Audio.php
@@ -1,22 +1,793 @@
fail(0404, "Audio not found");
+ else if(!$audio->canBeViewedBy($this->getUser()))
+ $this->fail(201, "Access denied to audio(" . $audio->getPrettyId() . ")");
+
+ # рофлан ебало
+ $privApi = $hash && $GLOBALS["csrfCheck"];
+ $audioObj = $audio->toVkApiStruct($this->getUser());
+ if(!$privApi) {
+ $audioObj->manifest = false;
+ $audioObj->keys = false;
+ }
+
+ if($need_user) {
+ $user = (new \openvk\Web\Models\Repositories\Users)->get($audio->getOwner()->getId());
+ $audioObj->user = (object) [
+ "id" => $user->getId(),
+ "photo" => $user->getAvatarUrl(),
+ "name" => $user->getCanonicalName(),
+ "name_gen" => $user->getCanonicalName(),
+ ];
+ }
+
+ return $audioObj;
+ }
+
+ private function streamToResponse(EntityStream $es, int $offset, int $count, ?string $hash = NULL): object
+ {
+ $items = [];
+ foreach($es->offsetLimit($offset, $count) as $audio) {
+ $items[] = $this->toSafeAudioStruct($audio, $hash);
+ }
+
+ return (object) [
+ "count" => sizeof($items),
+ "items" => $items,
+ ];
+ }
+
+ private function validateGenre(?string& $genre_str, ?int $genre_id): void
+ {
+ if(!is_null($genre_str)) {
+ if(!in_array($genre_str, AEntity::genres))
+ $this->fail(8, "Invalid genre_str");
+ } else if(!is_null($genre_id)) {
+ $genre_str = array_flip(AEntity::vkGenres)[$genre_id] ?? NULL;
+ if(!$genre_str)
+ $this->fail(8, "Invalid genre ID $genre_id");
+ }
+ }
+
+ private function audioFromAnyId(string $id): ?AEntity
+ {
+ $descriptor = explode("_", $id);
+ if(sizeof($descriptor) === 1) {
+ if(ctype_digit($descriptor[0])) {
+ $audio = (new Audios)->get((int) $descriptor[0]);
+ } else {
+ $aid = base64_decode($descriptor[0], true);
+ if(!$aid)
+ $this->fail(8, "Invalid audio $id");
+
+ $audio = (new Audios)->get((int) $aid);
+ }
+ } else if(sizeof($descriptor) === 2) {
+ $audio = (new Audios)->getByOwnerAndVID((int) $descriptor[0], (int) $descriptor[1]);
+ } else {
+ $this->fail(8, "Invalid audio $id");
+ }
+
+ return $audio;
+ }
+
+ function getById(string $audios, ?string $hash = NULL, int $need_user = 0): object
+ {
+ $this->requireUser();
+
+ $audioIds = array_unique(explode(",", $audios));
+ if(sizeof($audioIds) === 1) {
+ $audio = $this->audioFromAnyId($audioIds[0]);
+
+ return (object) [
+ "count" => 1,
+ "items" => [
+ $this->toSafeAudioStruct($audio, $hash, (bool) $need_user),
+ ],
+ ];
+ } else if(sizeof($audioIds) > 6000) {
+ $this->fail(1980, "Can't get more than 6000 audios at once");
+ }
+
+ $audios = [];
+ foreach($audioIds as $id)
+ $audios[] = $this->getById($id, $hash)->items[0];
+
+ return (object) [
+ "count" => sizeof($audios),
+ "items" => $audios,
+ ];
+ }
+
+ function isLagtrain(string $audio_id): int
+ {
+ $this->requireUser();
+
+ $audio = $this->audioFromAnyId($audio_id);
+ if(!$audio)
+ $this->fail(0404, "Audio not found");
+
+ # Possible information disclosure risks are acceptable :D
+ return (int) (strpos($audio->getName(), "Lagtrain") !== false);
+ }
+
+ // TODO stub
+ function getRecommendations(): object
+ {
+ return (object) [
+ "count" => 0,
+ "items" => [],
+ ];
+ }
+
+ function getPopular(?int $genre_id = NULL, ?string $genre_str = NULL, int $offset = 0, int $count = 100, ?string $hash = NULL): object
+ {
+ $this->requireUser();
+ $this->validateGenre($genre_str, $genre_id);
+
+ $results = (new Audios)->getGlobal(Audios::ORDER_POPULAR, $genre_str);
+
+ return $this->streamToResponse($results, $offset, $count, $hash);
+ }
+
+ function getFeed(?int $genre_id = NULL, ?string $genre_str = NULL, int $offset = 0, int $count = 100, ?string $hash = NULL): object
+ {
+ $this->requireUser();
+ $this->validateGenre($genre_str, $genre_id);
+
+ $results = (new Audios)->getGlobal(Audios::ORDER_NEW, $genre_str);
+
+ return $this->streamToResponse($results, $offset, $count, $hash);
+ }
+
+ function search(string $q, int $auto_complete = 0, int $lyrics = 0, int $performer_only = 0, int $sort = 2, int $search_own = 0, int $offset = 0, int $count = 30, ?string $hash = NULL): object
+ {
+ $this->requireUser();
+
+ if(($auto_complete + $search_own) != 0)
+ $this->fail(10, "auto_complete and search_own are not supported");
+ else if($count > 300 || $count < 1)
+ $this->fail(8, "count is invalid: $count");
+
+ $results = (new Audios)->search($q, $sort, (bool) $performer_only, (bool) $lyrics);
+
+ return $this->streamToResponse($results, $offset, $count, $hash);
+ }
+
+ function getCount(int $owner_id, int $uploaded_only = 0): int
+ {
+ $this->requireUser();
+
+ if($owner_id < 0) {
+ $owner_id *= -1;
+ $group = (new Clubs)->get($owner_id);
+ if(!$group)
+ $this->fail(0404, "Group not found");
+
+ return (new Audios)->getClubCollectionSize($group);
+ }
+
+ $user = (new \openvk\Web\Models\Repositories\Users)->get($owner_id);
+ if(!$user)
+ $this->fail(0404, "User not found");
+
+ if(!$user->getPrivacyPermission("audios.read", $this->getUser()))
+ $this->fail(15, "Access denied");
+
+ if($uploaded_only) {
+ return DatabaseConnection::i()->getContext()->table("audios")
+ ->where([
+ "deleted" => false,
+ "owner" => $owner_id,
+ ])->count();
+ }
+
+ return (new Audios)->getUserCollectionSize($user);
+ }
+
+ function get(int $owner_id = 0, int $album_id = 0, string $audio_ids = '', int $need_user = 1, int $offset = 0, int $count = 100, int $uploaded_only = 0, int $need_seed = 0, ?string $shuffle_seed = NULL, int $shuffle = 0, ?string $hash = NULL): object
{
- $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"];
-
- return (object) [
- "count" => 1,
- "items" => [(object) [
- "id" => 1,
- "owner_id" => 1,
- "artist" => "В ОВК ПОКА НЕТ МУЗЫКИ",
- "title" => "ЖДИТЕ :)))",
- "duration" => 22,
- "url" => $serverUrl . "/assets/packages/static/openvk/audio/nomusic.mp3"
- ]]
- ];
+ $this->requireUser();
+
+ $shuffleSeed = NULL;
+ $shuffleSeedStr = NULL;
+ if($shuffle == 1) {
+ if(!$shuffle_seed) {
+ if($need_seed == 1) {
+ $shuffleSeed = openssl_random_pseudo_bytes(6);
+ $shuffleSeedStr = base64_encode($shuffleSeed);
+ $shuffleSeed = hexdec(bin2hex($shuffleSeed));
+ } else {
+ $hOffset = ((int) date("i") * 60) + (int) date("s");
+ $thisHour = time() - $hOffset;
+ $shuffleSeed = $thisHour + $this->getUser()->getId();
+ $shuffleSeedStr = base64_encode(hex2bin(dechex($shuffleSeed)));
+ }
+ } else {
+ $shuffleSeed = hexdec(bin2hex(base64_decode($shuffle_seed)));
+ $shuffleSeedStr = $shuffle_seed;
+ }
+ }
+
+ if($album_id != 0) {
+ $album = (new Audios)->getPlaylist($album_id);
+ if(!$album)
+ $this->fail(0404, "album_id invalid");
+ else if(!$album->canBeViewedBy($this->getUser()))
+ $this->fail(600, "Can't open this album for reading");
+
+ $songs = [];
+ $list = $album->getAudios($offset, $count, $shuffleSeed);
+
+ foreach($list as $song)
+ $songs[] = $this->toSafeAudioStruct($song, $hash, $need_user == 1);
+
+ $response = (object) [
+ "count" => sizeof($songs),
+ "items" => $songs,
+ ];
+ if(!is_null($shuffleSeed))
+ $response->shuffle_seed = $shuffleSeedStr;
+
+ return $response;
+ }
+
+ if(!empty($audio_ids)) {
+ $audio_ids = explode(",", $audio_ids);
+ if(!$audio_ids)
+ $this->fail(10, "Audio::get@L0d186:explode(string): Unknown error");
+ else if(sizeof($audio_ids) < 1)
+ $this->fail(8, "Invalid audio_ids syntax");
+
+ if(!is_null($shuffleSeed))
+ $audio_ids = knuth_shuffle($audio_ids, $shuffleSeed);
+
+ $obj = $this->getById(implode(",", $audio_ids), $hash, $need_user);
+ if(!is_null($shuffleSeed))
+ $obj->shuffle_seed = $shuffleSeedStr;
+
+ return $obj;
+ }
+
+ $dbCtx = DatabaseConnection::i()->getContext();
+ if($uploaded_only == 1) {
+ if($owner_id <= 0)
+ $this->fail(8, "uploaded_only can only be used with owner_id > 0");
+
+ $user = (new \openvk\Web\Models\Repositories\Users)->get($owner_id);
+
+ if(!$user)
+ $this->fail(0602, "Invalid user");
+
+ if(!$user->getPrivacyPermission("audios.read", $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his audios");
+
+ if(!is_null($shuffleSeed)) {
+ $audio_ids = [];
+ $query = $dbCtx->table("audios")->select("virtual_id")->where([
+ "owner" => $owner_id,
+ "deleted" => 0,
+ ]);
+
+ foreach($query as $res)
+ $audio_ids[] = $res->virtual_id;
+
+ $audio_ids = knuth_shuffle($audio_ids, $shuffleSeed);
+ $audio_ids = array_slice($audio_ids, $offset, $count);
+ $audio_q = ""; # audio.getById query
+ foreach($audio_ids as $aid)
+ $audio_q .= ",$owner_id" . "_$aid";
+
+ $obj = $this->getById(substr($audio_q, 1), $hash, $need_user);
+ $obj->shuffle_seed = $shuffleSeedStr;
+
+ return $obj;
+ }
+
+ $res = (new Audios)->getByUploader((new \openvk\Web\Models\Repositories\Users)->get($owner_id));
+
+ return $this->streamToResponse($res, $offset, $count, $hash, $need_user);
+ }
+
+ $query = $dbCtx->table("audio_relations")->select("audio")->where("entity", $owner_id);
+ if(!is_null($shuffleSeed)) {
+ $audio_ids = [];
+ foreach($query as $aid)
+ $audio_ids[] = $aid->audio;
+
+ $audio_ids = knuth_shuffle($audio_ids, $shuffleSeed);
+ $audio_ids = array_slice($audio_ids, $offset, $count);
+ $audio_q = "";
+ foreach($audio_ids as $aid)
+ $audio_q .= ",$aid";
+
+ $obj = $this->getById(substr($audio_q, 1), $hash, $need_user);
+ $obj->shuffle_seed = $shuffleSeedStr;
+
+ return $obj;
+ }
+
+ $items = [];
+
+ if($owner_id > 0) {
+ $user = (new \openvk\Web\Models\Repositories\Users)->get($owner_id);
+
+ if(!$user)
+ $this->fail(50, "Invalid user");
+
+ if(!$user->getPrivacyPermission("audios.read", $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his audios");
+ }
+
+ $audios = (new Audios)->getByEntityID($owner_id, $offset, $count);
+ foreach($audios as $audio)
+ $items[] = $this->toSafeAudioStruct($audio, $hash, $need_user == 1);
+
+ return (object) [
+ "count" => sizeof($items),
+ "items" => $items,
+ ];
}
+
+ function getLyrics(int $lyrics_id): object
+ {
+ $this->requireUser();
+
+ $audio = (new Audios)->get($lyrics_id);
+ if(!$audio || !$audio->getLyrics())
+ $this->fail(0404, "Not found");
+
+ if(!$audio->canBeViewedBy($this->getUser()))
+ $this->fail(201, "Access denied to lyrics");
+
+ return (object) [
+ "lyrics_id" => $lyrics_id,
+ "text" => preg_replace("%\r\n?%", "\n", $audio->getLyrics()),
+ ];
+ }
+
+ function beacon(int $aid, ?int $gid = NULL): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $audio = (new Audios)->get($aid);
+ if(!$audio)
+ $this->fail(0404, "Not Found");
+ else if(!$audio->canBeViewedBy($this->getUser()))
+ $this->fail(201, "Insufficient permissions to listen this audio");
+
+ $group = NULL;
+ if(!is_null($gid)) {
+ $group = (new Clubs)->get($gid);
+ if(!$group)
+ $this->fail(0404, "Not Found");
+ else if(!$group->canBeModifiedBy($this->getUser()))
+ $this->fail(203, "Insufficient rights to this group");
+ }
+
+ return (int) $audio->listen($group ?? $this->getUser());
+ }
+
+ function setBroadcast(string $audio, string $target_ids): array
+ {
+ $this->requireUser();
+
+ [$owner, $aid] = explode("_", $audio);
+ $song = (new Audios)->getByOwnerAndVID((int) $owner, (int) $aid);
+ $ids = [];
+ foreach(explode(",", $target_ids) as $id) {
+ $id = (int) $id;
+ if($id > 0) {
+ if ($id != $this->getUser()->getId()) {
+ $this->fail(600, "Can't listen on behalf of $id");
+ } else {
+ $ids[] = $id;
+ $this->beacon($song->getId());
+ continue;
+ }
+ }
+
+ $group = (new Clubs)->get($id * -1);
+ if(!$group)
+ $this->fail(0404, "Not Found");
+ else if(!$group->canBeModifiedBy($this->getUser()))
+ $this->fail(203,"Insufficient rights to this group");
+
+ $ids[] = $id;
+ $this->beacon($song ? $song->getId() : 0, $id * -1);
+ }
+
+ return $ids;
+ }
+
+ function getBroadcastList(string $filter = "all", int $active = 0, ?string $hash = NULL): object
+ {
+ $this->requireUser();
+
+ if(!in_array($filter, ["all", "friends", "groups"]))
+ $this->fail(8, "Invalid filter $filter");
+
+ $broadcastList = $this->getUser()->getBroadcastList($filter);
+ $items = [];
+ foreach($broadcastList as $res) {
+ $struct = $res->toVkApiStruct();
+ $status = $res->getCurrentAudioStatus();
+
+ $struct->status_audio = $status ? $this->toSafeAudioStruct($status) : NULL;
+ $items[] = $struct;
+ }
+
+ return (object) [
+ "count" => sizeof($items),
+ "items" => $items,
+ ];
+ }
+
+ function edit(int $owner_id, int $audio_id, ?string $artist = NULL, ?string $title = NULL, ?string $text = NULL, ?int $genre_id = NULL, ?string $genre_str = NULL, int $no_search = 0): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $audio = (new Audios)->getByOwnerAndVID($owner_id, $audio_id);
+ if(!$audio)
+ $this->fail(0404, "Not Found");
+ else if(!$audio->canBeModifiedBy($this->getUser()))
+ $this->fail(201, "Insufficient permissions to edit this audio");
+
+ if(!is_null($genre_id)) {
+ $genre = array_flip(AEntity::vkGenres)[$genre_id] ?? NULL;
+ if(!$genre)
+ $this->fail(8, "Invalid genre ID $genre_id");
+
+ $audio->setGenre($genre);
+ } else if(!is_null($genre_str)) {
+ if(!in_array($genre_str, AEntity::genres))
+ $this->fail(8, "Invalid genre ID $genre_str");
+
+ $audio->setGenre($genre_str);
+ }
+
+ $lyrics = 0;
+ if(!is_null($text)) {
+ $audio->setLyrics($text);
+ $lyrics = $audio->getId();
+ }
+
+ if(!is_null($artist))
+ $audio->setPerformer($artist);
+
+ if(!is_null($title))
+ $audio->setName($title);
+
+ $audio->setSearchability(!((bool) $no_search));
+ $audio->setEdited(time());
+ $audio->save();
+
+ return $lyrics;
+ }
+
+ function add(int $audio_id, int $owner_id, ?int $group_id = NULL, ?int $album_id = NULL): string
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if(!is_null($album_id))
+ $this->fail(10, "album_id not implemented");
+
+ // TODO get rid of dups
+ $to = $this->getUser();
+ if(!is_null($group_id)) {
+ $group = (new Clubs)->get($group_id);
+ if(!$group)
+ $this->fail(0404, "Invalid group_id");
+ else if(!$group->canBeModifiedBy($this->getUser()))
+ $this->fail(203, "Insufficient rights to this group");
+
+ $to = $group;
+ }
+
+ $audio = (new Audios)->getByOwnerAndVID($owner_id, $audio_id);
+ if(!$audio)
+ $this->fail(0404, "Not found");
+ else if(!$audio->canBeViewedBy($this->getUser()))
+ $this->fail(201, "Access denied to audio(owner=$owner_id, vid=$audio_id)");
+
+ try {
+ $audio->add($to);
+ } catch(\OverflowException $ex) {
+ $this->fail(300, "Album is full");
+ }
+
+ return $audio->getPrettyId();
+ }
+
+ function delete(int $audio_id, int $owner_id, ?int $group_id = NULL): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $from = $this->getUser();
+ if(!is_null($group_id)) {
+ $group = (new Clubs)->get($group_id);
+ if(!$group)
+ $this->fail(0404, "Invalid group_id");
+ else if(!$group->canBeModifiedBy($this->getUser()))
+ $this->fail(203, "Insufficient rights to this group");
+
+ $from = $group;
+ }
+
+ $audio = (new Audios)->getByOwnerAndVID($owner_id, $audio_id);
+ if(!$audio)
+ $this->fail(0404, "Not found");
+
+ $audio->remove($from);
+
+ return 1;
+ }
+
+ function restore(int $audio_id, int $owner_id, ?int $group_id = NULL, ?string $hash = NULL): object
+ {
+ $this->requireUser();
+
+ $vid = $this->add($audio_id, $owner_id, $group_id);
+
+ return $this->getById($vid, $hash)->items[0];
+ }
+
+ function getAlbums(int $owner_id = 0, int $offset = 0, int $count = 50, int $drop_private = 1): object
+ {
+ $this->requireUser();
+
+ $owner_id = $owner_id == 0 ? $this->getUser()->getId() : $owner_id;
+ $playlists = [];
+
+ if($owner_id > 0 && $owner_id != $this->getUser()->getId()) {
+ $user = (new \openvk\Web\Models\Repositories\Users)->get($owner_id);
+
+ if(!$user->getPrivacyPermission("audios.read", $this->getUser()))
+ $this->fail(50, "Access to playlists denied");
+ }
+
+ foreach((new Audios)->getPlaylistsByEntityId($owner_id, $offset, $count) as $playlist) {
+ if(!$playlist->canBeViewedBy($this->getUser())) {
+ if($drop_private == 1)
+ continue;
+
+ $playlists[] = NULL;
+ continue;
+ }
+
+ $playlists[] = $playlist->toVkApiStruct($this->getUser());
+ }
+
+ return (object) [
+ "count" => sizeof($playlists),
+ "items" => $playlists,
+ ];
+ }
+
+ function searchAlbums(string $query = '', int $offset = 0, int $limit = 25, int $drop_private = 0, int $order = 0, int $from_me = 0): object
+ {
+ $this->requireUser();
+
+ $playlists = [];
+ $params = [];
+ $order_str = (['id', 'length', 'listens'][$order] ?? 'id');
+ if($from_me === 1)
+ $params['from_me'] = $this->getUser()->getId();
+
+ $search = (new Audios)->findPlaylists($query, $params, ['type' => $order_str, 'invert' => false]);
+ foreach($search->offsetLimit($offset, $limit) as $playlist) {
+ if(!$playlist->canBeViewedBy($this->getUser())) {
+ if($drop_private == 0)
+ $playlists[] = NULL;
+
+ continue;
+ }
+
+ $playlists[] = $playlist->toVkApiStruct($this->getUser());
+ }
+
+ return (object) [
+ "count" => $search->size(),
+ "items" => $playlists,
+ ];
+ }
+
+ function addAlbum(string $title, ?string $description = NULL, int $group_id = 0): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $group = NULL;
+ if($group_id != 0) {
+ $group = (new Clubs)->get($group_id);
+ if(!$group)
+ $this->fail(0404, "Invalid group_id");
+ else if(!$group->canBeModifiedBy($this->getUser()))
+ $this->fail(600, "Insufficient rights to this group");
+ }
+
+ $album = new Playlist;
+ $album->setName($title);
+ if(!is_null($group))
+ $album->setOwner($group_id * -1);
+ else
+ $album->setOwner($this->getUser()->getId());
+
+ if(!is_null($description))
+ $album->setDescription($description);
+
+ $album->save();
+ if(!is_null($group))
+ $album->bookmark($group);
+ else
+ $album->bookmark($this->getUser());
+
+ return $album->getId();
+ }
+
+ function editAlbum(int $album_id, ?string $title = NULL, ?string $description = NULL): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($album_id);
+ if(!$album)
+ $this->fail(0404, "Album not found");
+ else if(!$album->canBeModifiedBy($this->getUser()))
+ $this->fail(600, "Insufficient rights to this album");
+
+ if(!is_null($title))
+ $album->setName($title);
+
+ if(!is_null($description))
+ $album->setDescription($description);
+
+ $album->setEdited(time());
+ $album->save();
+
+ return (int) !(!$title && !$description);
+ }
+
+ function deleteAlbum(int $album_id): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($album_id);
+ if(!$album)
+ $this->fail(0404, "Album not found");
+ else if(!$album->canBeModifiedBy($this->getUser()))
+ $this->fail(600, "Insufficient rights to this album");
+
+ $album->delete();
+
+ return 1;
+ }
+
+ function moveToAlbum(int $album_id, string $audio_ids): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($album_id);
+ if(!$album)
+ $this->fail(0404, "Album not found");
+ else if(!$album->canBeModifiedBy($this->getUser()))
+ $this->fail(600, "Insufficient rights to this album");
+
+ $audios = [];
+ $audio_ids = array_unique(explode(",", $audio_ids));
+ if(sizeof($audio_ids) < 1 || sizeof($audio_ids) > 1000)
+ $this->fail(8, "audio_ids must contain at least 1 audio and at most 1000");
+
+ foreach($audio_ids as $audio_id) {
+ $audio = $this->audioFromAnyId($audio_id);
+ if(!$audio)
+ continue;
+ else if(!$audio->canBeViewedBy($this->getUser()))
+ continue;
+
+ $audios[] = $audio;
+ }
+
+ if(sizeof($audios) < 1)
+ return 0;
+
+ $res = 1;
+ try {
+ foreach ($audios as $audio)
+ $res = min($res, (int) $album->add($audio));
+ } catch(\OutOfBoundsException $ex) {
+ return 0;
+ }
+
+ return $res;
+ }
+
+ function removeFromAlbum(int $album_id, string $audio_ids): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($album_id);
+ if(!$album)
+ $this->fail(0404, "Album not found");
+ else if(!$album->canBeModifiedBy($this->getUser()))
+ $this->fail(600, "Insufficient rights to this album");
+
+ $audios = [];
+ $audio_ids = array_unique(explode(",", $audio_ids));
+ if(sizeof($audio_ids) < 1 || sizeof($audio_ids) > 1000)
+ $this->fail(8, "audio_ids must contain at least 1 audio and at most 1000");
+
+ foreach($audio_ids as $audio_id) {
+ $audio = $this->audioFromAnyId($audio_id);
+ if(!$audio)
+ continue;
+ else if($audio->canBeViewedBy($this->getUser()))
+ continue;
+
+ $audios[] = $audio;
+ }
+
+ if(sizeof($audios) < 1)
+ return 0;
+
+ foreach($audios as $audio)
+ $album->remove($audio);
+
+ return 1;
+ }
+
+ function copyToAlbum(int $album_id, string $audio_ids): int
+ {
+ return $this->moveToAlbum($album_id, $audio_ids);
+ }
+
+ function bookmarkAlbum(int $id): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($id);
+ if(!$album)
+ $this->fail(0404, "Not found");
+
+ if(!$album->canBeViewedBy($this->getUser()))
+ $this->fail(600, "Access error");
+
+ return (int) $album->bookmark($this->getUser());
+ }
+
+ function unBookmarkAlbum(int $id): int
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Audios)->getPlaylist($id);
+ if(!$album)
+ $this->fail(0404, "Not found");
+
+ if(!$album->canBeViewedBy($this->getUser()))
+ $this->fail(600, "Access error");
+
+ return (int) $album->unbookmark($this->getUser());
+ }
}
diff --git a/VKAPI/Handlers/Board.php b/VKAPI/Handlers/Board.php
index 3a4412758..b7cb7e690 100644
--- a/VKAPI/Handlers/Board.php
+++ b/VKAPI/Handlers/Board.php
@@ -287,11 +287,10 @@ function getComments(int $group_id, int $topic_id, bool $need_likes = false, int
{
# start_comment_id ne robit
$this->requireUser();
- $this->willExecuteWriteAction();
$topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
- if(!$topic || !$topic->getClub() || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ if(!$topic || !$topic->getClub() || $topic->isDeleted()) {
$this->fail(5, "Invalid topic");
}
@@ -321,21 +320,21 @@ function getTopics(int $group_id, string $topic_ids = "", int $order = 1, int $o
{
# order и extended ничё не делают
$this->requireUser();
- $this->willExecuteWriteAction();
$arr = [];
$club = (new ClubsRepo)->get($group_id);
+
$topics = array_slice(iterator_to_array((new TopicsRepo)->getClubTopics($club, 1, $count + $offset)), $offset);
$arr["count"] = (new TopicsRepo)->getClubTopicsCount($club);
$arr["items"] = [];
$arr["default_order"] = $order;
- $arr["can_add_topics"] = $club->canBeModifiedBy($this->getUser()) ? true : $club->isEveryoneCanCreateTopics() ? true : false;
+ $arr["can_add_topics"] = $club->canBeModifiedBy($this->getUser()) ? true : ($club->isEveryoneCanCreateTopics() ? true : false);
$arr["profiles"] = [];
if(empty($topic_ids)) {
foreach($topics as $topic) {
if($topic->isDeleted()) continue;
- $arr["items"][] = $topic->toVkApiStruct($preview, $preview_length);
+ $arr["items"][] = $topic->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
}
} else {
$topics = explode(',', $topic_ids);
@@ -343,8 +342,9 @@ function getTopics(int $group_id, string $topic_ids = "", int $order = 1, int $o
foreach($topics as $topic) {
$id = explode("_", $topic);
$topicy = (new TopicsRepo)->getTopicById((int)$id[0], (int)$id[1]);
- if($topicy) {
- $arr["items"] = $topicy->toVkApiStruct();
+
+ if($topicy && !$topicy->isDeleted()) {
+ $arr["items"][] = $topicy->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
}
}
}
@@ -406,7 +406,7 @@ private function getApiBoardComment(?Comment $comment, bool $need_likes = false)
$res->id = $comment->getId();
$res->from_id = $comment->getOwner()->getId();
$res->date = $comment->getPublicationTime()->timestamp();
- $res->text = $comment->getText();
+ $res->text = $comment->getText(false);
$res->attachments = [];
$res->likes = [];
if($need_likes) {
diff --git a/VKAPI/Handlers/Friends.php b/VKAPI/Handlers/Friends.php
index f78735209..51046be44 100644
--- a/VKAPI/Handlers/Friends.php
+++ b/VKAPI/Handlers/Friends.php
@@ -4,7 +4,7 @@
final class Friends extends VKAPIRequestHandler
{
- function get(int $user_id, string $fields = "", int $offset = 0, int $count = 100): object
+ function get(int $user_id = 0, string $fields = "", int $offset = 0, int $count = 100): object
{
$i = 0;
$offset++;
@@ -13,11 +13,23 @@ function get(int $user_id, string $fields = "", int $offset = 0, int $count = 10
$users = new UsersRepo;
$this->requireUser();
-
- foreach($users->get($user_id)->getFriends($offset, $count) as $friend) {
- $friends[$i] = $friend->getId();
- $i++;
+
+ if ($user_id == 0) {
+ $user_id = $this->getUser()->getId();
}
+
+ $user = $users->get($user_id);
+
+ if(!$user || $user->isDeleted())
+ $this->fail(100, "Invalid user");
+
+ if(!$user->getPrivacyPermission("friends.read", $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his friends.");
+
+ foreach($user->getFriends($offset, $count) as $friend) {
+ $friends[$i] = $friend->getId();
+ $i++;
+ }
$response = $friends;
@@ -135,7 +147,7 @@ function areFriends(string $user_ids): array
return $response;
}
- function getRequests(string $fields = "", int $offset = 0, int $count = 100, int $extended = 0): object
+ function getRequests(string $fields = "", int $out = 0, int $offset = 0, int $count = 100, int $extended = 0): object
{
if ($count >= 1000)
$this->fail(100, "One of the required parameters was not passed or is invalid.");
@@ -146,9 +158,18 @@ function getRequests(string $fields = "", int $offset = 0, int $count = 100, int
$offset++;
$followers = [];
- foreach($this->getUser()->getFollowers($offset, $count) as $follower) {
- $followers[$i] = $follower->getId();
- $i++;
+ if ($out != 0) {
+ foreach($this->getUser()->getFollowers($offset, $count) as $follower) {
+ $followers[$i] = $follower->getId();
+ $i++;
+ }
+ }
+ else
+ {
+ foreach($this->getUser()->getRequests($offset, $count) as $follower) {
+ $followers[$i] = $follower->getId();
+ $i++;
+ }
}
$response = $followers;
diff --git a/VKAPI/Handlers/Gifts.php b/VKAPI/Handlers/Gifts.php
index 2702924d5..0d1fc5982 100644
--- a/VKAPI/Handlers/Gifts.php
+++ b/VKAPI/Handlers/Gifts.php
@@ -6,19 +6,33 @@
final class Gifts extends VKAPIRequestHandler
{
- function get(int $user_id, int $count = 10, int $offset = 0)
+ function get(int $user_id = NULL, int $count = 10, int $offset = 0)
{
$this->requireUser();
$i = 0;
-
$i += $offset;
+ $server_url = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
- $user = (new UsersRepo)->get($user_id);
+ if($user_id)
+ $user = (new UsersRepo)->get($user_id);
+ else
+ $user = $this->getUser();
if(!$user || $user->isDeleted())
$this->fail(177, "Invalid user");
+ if(!$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
+ /*
+ if(!$user->getPrivacyPermission('gifts.read', $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his gifts");*/
+
+
+ if(!$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
$gift_item = [];
$userGifts = array_slice(iterator_to_array($user->getGifts(1, $count, false)), $offset);
@@ -36,9 +50,9 @@ function get(int $user_id, int $count = 10, int $offset = 0)
"date" => $gift->sent->timestamp(),
"gift" => [
"id" => $gift->gift->getId(),
- "thumb_256" => $gift->gift->getImage(2),
- "thumb_96" => $gift->gift->getImage(2),
- "thumb_48" => $gift->gift->getImage(2)
+ "thumb_256" => $server_url. $gift->gift->getImage(2),
+ "thumb_96" => $server_url . $gift->gift->getImage(2),
+ "thumb_48" => $server_url . $gift->gift->getImage(2)
],
"privacy" => 0
];
@@ -62,6 +76,9 @@ function send(int $user_ids, int $gift_id, string $message = "", int $privacy =
if(!$user || $user->isDeleted())
$this->fail(177, "Invalid user");
+ if(!$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
$gift = (new GiftsRepo)->get($gift_id);
if(!$gift)
@@ -111,12 +128,13 @@ function delete()
$this->fail(501, "Not implemented");
}
- # этих методов не было в ВК, но я их добавил чтобы можно было отобразить список подарков
+ # в vk кстати называется gifts.getCatalog
function getCategories(bool $extended = false, int $page = 1)
{
$cats = (new GiftsRepo)->getCategories($page);
$categ = [];
$i = 0;
+ $server_url = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
if(!OPENVK_ROOT_CONF['openvk']['preferences']['commerce'])
$this->fail(105, "Commerce is disabled on this instance");
@@ -126,8 +144,8 @@ function getCategories(bool $extended = false, int $page = 1)
"name" => $cat->getName(),
"description" => $cat->getDescription(),
"id" => $cat->getId(),
- "thumbnail" => $cat->getThumbnailURL(),
- ];
+ "thumbnail" => $server_url . $cat->getThumbnailURL(),
+ ];
if($extended == true) {
$categ[$i]["localizations"] = [];
@@ -164,7 +182,7 @@ function getGiftsInCategory(int $id, int $page = 1)
"name" => $gift->getName(),
"image" => $gift->getImage(2),
"usages_left" => (int)$gift->getUsagesLeft($this->getUser()),
- "price" => $gift->getPrice(), # голосов
+ "price" => $gift->getPrice(),
"is_free" => $gift->isFree()
];
}
diff --git a/VKAPI/Handlers/Groups.php b/VKAPI/Handlers/Groups.php
index e21c8a095..bd546c3dd 100644
--- a/VKAPI/Handlers/Groups.php
+++ b/VKAPI/Handlers/Groups.php
@@ -2,26 +2,36 @@
namespace openvk\VKAPI\Handlers;
use openvk\Web\Models\Repositories\Clubs as ClubsRepo;
use openvk\Web\Models\Repositories\Users as UsersRepo;
+use openvk\Web\Models\Repositories\Posts as PostsRepo;
use openvk\Web\Models\Entities\Club;
final class Groups extends VKAPIRequestHandler
{
- function get(int $user_id = 0, string $fields = "", int $offset = 0, int $count = 6, bool $online = false): object
+ function get(int $user_id = 0, string $fields = "", int $offset = 0, int $count = 6, bool $online = false, string $filter = "groups"): object
{
$this->requireUser();
+ # InfoApp fix
+ if($filter == "admin" && ($user_id != 0 && $user_id != $this->getUser()->getId())) {
+ $this->fail(15, 'Access denied: filter admin is available only for current user');
+ }
+
+ $clbs = [];
if($user_id == 0) {
- foreach($this->getUser()->getClubs($offset, false, $count, true) as $club)
+ foreach($this->getUser()->getClubs($offset, $filter == "admin", $count, true) as $club)
$clbs[] = $club;
$clbsCount = $this->getUser()->getClubCount();
} else {
$users = new UsersRepo;
$user = $users->get($user_id);
- if(is_null($user))
+ if(is_null($user) || $user->isDeleted())
$this->fail(15, "Access denied");
- foreach($user->getClubs($offset, false, $count, true) as $club)
+ if(!$user->getPrivacyPermission('groups.read', $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his groups.");
+
+ foreach($user->getClubs($offset, $filter == "admin", $count, true) as $club)
$clbs[] = $club;
$clbsCount = $user->getClubCount();
@@ -80,6 +90,23 @@ function get(int $user_id = 0, string $fields = "", int $offset = 0, int $count
break;
case "members_count":
$rClubs[$i]->members_count = $usr->getFollowersCount();
+ break;
+ case "can_suggest":
+ $rClubs[$i]->can_suggest = !$usr->canBeModifiedBy($this->getUser()) && $usr->getWallType() == 2;
+ break;
+ case "background":
+ $backgrounds = $usr->getBackDropPictureURLs();
+ $rClubs[$i]->background = $backgrounds;
+ break;
+ # unstandard feild
+ case "suggested_count":
+ if($usr->getWallType() != 2) {
+ $rClubs[$i]->suggested_count = NULL;
+ break;
+ }
+
+ $rClubs[$i]->suggested_count = $usr->getSuggestedPostsCount($this->getUser());
+
break;
}
}
@@ -188,7 +215,23 @@ function getById(string $group_ids = "", string $group_id = "", string $fields =
case "description":
$response[$i]->description = $clb->getDescription();
break;
- case "contacts":
+ case "can_suggest":
+ $response[$i]->can_suggest = !$clb->canBeModifiedBy($this->getUser()) && $clb->getWallType() == 2;
+ break;
+ case "background":
+ $backgrounds = $clb->getBackDropPictureURLs();
+ $response[$i]->background = $backgrounds;
+ break;
+ # unstandard feild
+ case "suggested_count":
+ if($clb->getWallType() != 2) {
+ $response[$i]->suggested_count = NULL;
+ break;
+ }
+
+ $response[$i]->suggested_count = $clb->getSuggestedPostsCount($this->getUser());
+ break;
+ case "contacts":
$contacts;
$contactTmp = $clb->getManagers(1, true);
@@ -215,23 +258,30 @@ function getById(string $group_ids = "", string $group_id = "", string $fields =
return $response;
}
- function search(string $q, int $offset = 0, int $count = 100)
+ function search(string $q, int $offset = 0, int $count = 100, string $fields = "screen_name,is_admin,is_member,is_advertiser,photo_50,photo_100,photo_200")
{
+ if($count > 100) {
+ $this->fail(100, "One of the parameters specified was missing or invalid: count should be less or equal to 100");
+ }
+
$clubs = new ClubsRepo;
$array = [];
$find = $clubs->find($q);
- foreach ($find as $group)
+ foreach ($find->offsetLimit($offset, $count) as $group)
$array[] = $group->getId();
+
+ if(!$array || sizeof($array) < 1) {
+ return (object) [
+ "count" => 0,
+ "items" => [],
+ ];
+ }
return (object) [
"count" => $find->size(),
- "items" => $this->getById(implode(',', $array), "", "is_admin,is_member,is_advertiser,photo_50,photo_100,photo_200", $offset, $count)
- /*
- * As there is no thing as "fields" by the original documentation
- * i'll just bake this param by the example shown here: https://dev.vk.com/method/groups.search
- */
+ "items" => $this->getById(implode(',', $array), "", $fields)
];
}
@@ -288,11 +338,12 @@ function edit(
string $description = NULL,
string $screen_name = NULL,
string $website = NULL,
- int $wall = NULL,
+ int $wall = -1,
int $topics = NULL,
int $adminlist = NULL,
int $topicsAboveWall = NULL,
- int $hideFromGlobalFeed = NULL)
+ int $hideFromGlobalFeed = NULL,
+ int $audio = NULL)
{
$this->requireUser();
$this->willExecuteWriteAction();
@@ -303,17 +354,34 @@ function edit(
if(!$club || !$club->canBeModifiedBy($this->getUser())) $this->fail(15, "You can't modify this group.");
if(!empty($screen_name) && !$club->setShortcode($screen_name)) $this->fail(103, "Invalid shortcode.");
- !is_null($title) ? $club->setName($title) : NULL;
- !is_null($description) ? $club->setAbout($description) : NULL;
- !is_null($screen_name) ? $club->setShortcode($screen_name) : NULL;
- !is_null($website) ? $club->setWebsite((!parse_url($website, PHP_URL_SCHEME) ? "https://" : "") . $website) : NULL;
- !is_null($wall) ? $club->setWall($wall) : NULL;
- !is_null($topics) ? $club->setEveryone_Can_Create_Topics($topics) : NULL;
- !is_null($adminlist) ? $club->setAdministrators_List_Display($adminlist) : NULL;
- !is_null($topicsAboveWall) ? $club->setDisplay_Topics_Above_Wall($topicsAboveWall) : NULL;
- !is_null($hideFromGlobalFeed) ? $club->setHide_From_Global_Feed($hideFromGlobalFeed) : NULL;
+ !empty($title) ? $club->setName($title) : NULL;
+ !empty($description) ? $club->setAbout($description) : NULL;
+ !empty($screen_name) ? $club->setShortcode($screen_name) : NULL;
+ !empty($website) ? $club->setWebsite((!parse_url($website, PHP_URL_SCHEME) ? "https://" : "") . $website) : NULL;
+
+ try {
+ $wall != -1 ? $club->setWall($wall) : NULL;
+ } catch(\Exception $e) {
+ $this->fail(50, "Invalid wall value");
+ }
+
+ !empty($topics) ? $club->setEveryone_Can_Create_Topics($topics) : NULL;
+ !empty($adminlist) ? $club->setAdministrators_List_Display($adminlist) : NULL;
+ !empty($topicsAboveWall) ? $club->setDisplay_Topics_Above_Wall($topicsAboveWall) : NULL;
- $club->save();
+ if (!$club->isHidingFromGlobalFeedEnforced()) {
+ !empty($hideFromGlobalFeed) ? $club->setHide_From_Global_Feed($hideFromGlobalFeed) : NULL;
+ }
+
+ in_array($audio, [0, 1]) ? $club->setEveryone_can_upload_audios($audio) : NULL;
+
+ try {
+ $club->save();
+ } catch(\TypeError $e) {
+ $this->fail(15, "Nothing changed");
+ } catch(\Exception $e) {
+ $this->fail(18, "An unknown error occurred: maybe you set an incorrect value?");
+ }
return 1;
}
@@ -354,13 +422,20 @@ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0,
$arr->items[] = (object) [
"id" => $member->getId(),
- "name" => $member->getCanonicalName(),
+ "first_name" => $member->getFirstName(),
+ "last_name" => $member->getLastName(),
];
foreach($filds as $fild) {
+ $canView = $member->canBeViewedBy($this->getUser());
switch($fild) {
case "bdate":
- $arr->items[$i]->bdate = $member->getBirthday()->format('%e.%m.%Y');
+ if(!$canView) {
+ $arr->items[$i]->bdate = "01.01.1970";
+ break;
+ }
+
+ $arr->items[$i]->bdate = $member->getBirthday() ? $member->getBirthday()->format('%e.%m.%Y') : NULL;
break;
case "can_post":
$arr->items[$i]->can_post = $club->canBeModifiedBy($member);
@@ -369,7 +444,7 @@ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0,
$arr->items[$i]->can_see_all_posts = 1;
break;
case "can_see_audio":
- $arr->items[$i]->can_see_audio = 0;
+ $arr->items[$i]->can_see_audio = 1;
break;
case "can_write_private_message":
$arr->items[$i]->can_write_private_message = 0;
@@ -381,6 +456,11 @@ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0,
$arr->items[$i]->connections = 1;
break;
case "contacts":
+ if(!$canView) {
+ $arr->items[$i]->contacts = "secret@gmail.com";
+ break;
+ }
+
$arr->items[$i]->contacts = $member->getContactEmail();
break;
case "country":
@@ -396,15 +476,30 @@ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0,
$arr->items[$i]->has_mobile = false;
break;
case "last_seen":
+ if(!$canView) {
+ $arr->items[$i]->last_seen = 0;
+ break;
+ }
+
$arr->items[$i]->last_seen = $member->getOnline()->timestamp();
break;
case "lists":
$arr->items[$i]->lists = "";
break;
case "online":
+ if(!$canView) {
+ $arr->items[$i]->online = false;
+ break;
+ }
+
$arr->items[$i]->online = $member->isOnline();
break;
case "online_mobile":
+ if(!$canView) {
+ $arr->items[$i]->online_mobile = false;
+ break;
+ }
+
$arr->items[$i]->online_mobile = $member->getOnlinePlatform() == "android" || $member->getOnlinePlatform() == "iphone" || $member->getOnlinePlatform() == "mobile";
break;
case "photo_100":
@@ -435,12 +530,27 @@ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0,
$arr->items[$i]->schools = 0;
break;
case "sex":
+ if(!$canView) {
+ $arr->items[$i]->sex = -1;
+ break;
+ }
+
$arr->items[$i]->sex = $member->isFemale() ? 1 : 2;
break;
case "site":
+ if(!$canView) {
+ $arr->items[$i]->site = NULL;
+ break;
+ }
+
$arr->items[$i]->site = $member->getWebsite();
break;
case "status":
+ if(!$canView) {
+ $arr->items[$i]->status = "r";
+ break;
+ }
+
$arr->items[$i]->status = $member->getStatus();
break;
case "universities":
@@ -465,10 +575,10 @@ function getSettings(string $group_id)
"title" => $club->getName(),
"description" => $club->getDescription() != NULL ? $club->getDescription() : "",
"address" => $club->getShortcode(),
- "wall" => $club->canPost() == true ? 1 : 0,
+ "wall" => $club->getWallType(), # отличается от вкшных но да ладно
"photos" => 1,
"video" => 0,
- "audio" => 0,
+ "audio" => $club->isEveryoneCanUploadAudios() ? 1 : 0,
"docs" => 0,
"topics" => $club->isEveryoneCanCreateTopics() == true ? 1 : 0,
"wiki" => 0,
diff --git a/VKAPI/Handlers/Likes.php b/VKAPI/Handlers/Likes.php
index 9501b4335..f9262fa15 100644
--- a/VKAPI/Handlers/Likes.php
+++ b/VKAPI/Handlers/Likes.php
@@ -2,70 +2,205 @@
namespace openvk\VKAPI\Handlers;
use openvk\Web\Models\Repositories\Users as UsersRepo;
use openvk\Web\Models\Repositories\Posts as PostsRepo;
+use openvk\Web\Models\Repositories\Comments as CommentsRepo;
+use openvk\Web\Models\Repositories\Videos as VideosRepo;
+use openvk\Web\Models\Repositories\Photos as PhotosRepo;
+use openvk\Web\Models\Repositories\Notes as NotesRepo;
+
final class Likes extends VKAPIRequestHandler
{
- function add(string $type, int $owner_id, int $item_id): object
- {
- $this->requireUser();
+ function add(string $type, int $owner_id, int $item_id): object
+ {
+ $this->requireUser();
$this->willExecuteWriteAction();
+ $postable = NULL;
switch($type) {
case "post":
$post = (new PostsRepo)->getPostById($owner_id, $item_id);
- if(is_null($post))
- $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
-
- $post->setLike(true, $this->getUser());
-
- return (object) [
- "likes" => $post->getLikesCount()
- ];
+ $postable = $post;
+ break;
+ case "comment":
+ $comment = (new CommentsRepo)->get($item_id);
+ $postable = $comment;
+ break;
+ case "video":
+ $video = (new VideosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $video;
+ break;
+ case "photo":
+ $photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $photo;
+ break;
+ case "note":
+ $note = (new NotesRepo)->getNoteById($owner_id, $item_id);
+ $postable = $note;
+ break;
default:
$this->fail(100, "One of the parameters specified was missing or invalid: incorrect type");
}
- }
- function delete(string $type, int $owner_id, int $item_id): object
- {
- $this->requireUser();
+ if(is_null($postable) || $postable->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
+
+ if(!$postable->canBeViewedBy($this->getUser() ?? NULL)) {
+ $this->fail(2, "Access to postable denied");
+ }
+
+ $postable->setLike(true, $this->getUser());
+
+ return (object) [
+ "likes" => $postable->getLikesCount()
+ ];
+ }
+
+ function delete(string $type, int $owner_id, int $item_id): object
+ {
+ $this->requireUser();
$this->willExecuteWriteAction();
+ $postable = NULL;
switch($type) {
case "post":
$post = (new PostsRepo)->getPostById($owner_id, $item_id);
- if (is_null($post))
- $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
-
- $post->setLike(false, $this->getUser());
- return (object) [
- "likes" => $post->getLikesCount()
- ];
+ $postable = $post;
+ break;
+ case "comment":
+ $comment = (new CommentsRepo)->get($item_id);
+ $postable = $comment;
+ break;
+ case "video":
+ $video = (new VideosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $video;
+ break;
+ case "photo":
+ $photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $photo;
+ break;
+ case "note":
+ $note = (new NotesRepo)->getNoteById($owner_id, $item_id);
+ $postable = $note;
+ break;
default:
$this->fail(100, "One of the parameters specified was missing or invalid: incorrect type");
}
- }
-
+
+ if(is_null($postable) || $postable->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
+
+ if(!$postable->canBeViewedBy($this->getUser() ?? NULL)) {
+ $this->fail(2, "Access to postable denied");
+ }
+
+ if(!is_null($postable)) {
+ $postable->setLike(false, $this->getUser());
+
+ return (object) [
+ "likes" => $postable->getLikesCount()
+ ];
+ }
+ }
+
function isLiked(int $user_id, string $type, int $owner_id, int $item_id): object
- {
- $this->requireUser();
+ {
+ $this->requireUser();
+
+ $user = (new UsersRepo)->get($user_id);
+
+ if(is_null($user) || $user->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: user not found");
+
+ if(!$user->canBeViewedBy($this->getUser())) {
+ $this->fail(1984, "Access denied: you can't see this user");
+ }
+ $postable = NULL;
switch($type) {
case "post":
- $user = (new UsersRepo)->get($user_id);
- if (is_null($user))
- $this->fail(100, "One of the parameters specified was missing or invalid: user not found");
-
$post = (new PostsRepo)->getPostById($owner_id, $item_id);
- if (is_null($post))
- $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
-
- return (object) [
- "liked" => (int) $post->hasLikeFrom($user),
- "copied" => 0 # TODO: handle this
- ];
+ $postable = $post;
+ break;
+ case "comment":
+ $comment = (new CommentsRepo)->get($item_id);
+ $postable = $comment;
+ break;
+ case "video":
+ $video = (new VideosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $video;
+ break;
+ case "photo":
+ $photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ $postable = $photo;
+ break;
+ case "note":
+ $note = (new NotesRepo)->getNoteById($owner_id, $item_id);
+ $postable = $note;
+ break;
default:
$this->fail(100, "One of the parameters specified was missing or invalid: incorrect type");
}
+
+ if(is_null($postable) || $postable->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: object not found");
+
+ if(!$postable->canBeViewedBy($this->getUser())) {
+ $this->fail(665, "Access to postable denied");
+ }
+
+ return (object) [
+ "liked" => (int) $postable->hasLikeFrom($user),
+ "copied" => 0
+ ];
}
+
+ function getList(string $type, int $owner_id, int $item_id, bool $extended = false, int $offset = 0, int $count = 10, bool $skip_own = false)
+ {
+ $this->requireUser();
+
+ $object = NULL;
+
+ switch($type) {
+ case "post":
+ $object = (new PostsRepo)->getPostById($owner_id, $item_id);
+ break;
+ case "comment":
+ $object = (new CommentsRepo)->get($item_id);
+ break;
+ case "photo":
+ $object = (new PhotosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ break;
+ case "video":
+ $object = (new VideosRepo)->getByOwnerAndVID($owner_id, $item_id);
+ break;
+ default:
+ $this->fail(58, "Invalid type");
+ break;
+ }
+
+ if(!$object || $object->isDeleted())
+ $this->fail(56, "Invalid postable");
+
+ if(!$object->canBeViewedBy($this->getUser()))
+ $this->fail(665, "Access to postable denied");
+
+ $res = (object)[
+ "count" => $object->getLikesCount(),
+ "items" => []
+ ];
+
+ $likers = array_slice(iterator_to_array($object->getLikers(1, $offset + $count)), $offset);
+
+ foreach($likers as $liker) {
+ if($skip_own && $liker->getId() == $this->getUser()->getId())
+ continue;
+
+ if(!$extended)
+ $res->items[] = $liker->getId();
+ else
+ $res->items[] = $liker->toVkApiStruct(NULL, 'photo_50');
+ }
+
+ return $res;
+ }
}
diff --git a/VKAPI/Handlers/Messages.php b/VKAPI/Handlers/Messages.php
index bc9035f53..6fc057e06 100644
--- a/VKAPI/Handlers/Messages.php
+++ b/VKAPI/Handlers/Messages.php
@@ -65,7 +65,8 @@ function getById(string $message_ids, int $preview_length = 0, int $extended = 0
];
}
- function send(int $user_id = -1, int $peer_id = -1, string $domain = "", int $chat_id = -1, string $user_ids = "", string $message = "", int $sticker_id = -1, int $forGodSakePleaseDoNotReportAboutMyOnlineActivity = 0)
+ function send(int $user_id = -1, int $peer_id = -1, string $domain = "", int $chat_id = -1, string $user_ids = "", string $message = "", int $sticker_id = -1, int $forGodSakePleaseDoNotReportAboutMyOnlineActivity = 0,
+ string $attachment = "") # интересно почему не attachments
{
$this->requireUser();
$this->willExecuteWriteAction();
@@ -79,7 +80,8 @@ function send(int $user_id = -1, int $peer_id = -1, string $domain = "", int $ch
$this->fail(946, "Chats are not implemented");
else if($sticker_id !== -1)
$this->fail(-151, "Stickers are not implemented");
- else if(empty($message))
+
+ if(empty($message) && empty($attachment))
$this->fail(100, "Message text is empty or invalid");
# lol recursion
@@ -117,6 +119,21 @@ function send(int $user_id = -1, int $peer_id = -1, string $domain = "", int $ch
if(!$msg)
$this->fail(950, "Internal error");
else
+ if(!empty($attachment)) {
+ $attachs = parseAttachments($attachment);
+
+ # Работают только фотки, остальное просто не будет отображаться.
+ if(sizeof($attachs) >= 10)
+ $this->fail(15, "Too many attachments");
+
+ foreach($attachs as $attach) {
+ if($attach && !$attach->isDeleted() && $attach->getOwner()->getId() == $this->getUser()->getId())
+ $msg->attach($attach);
+ else
+ $this->fail(52, "One of the attachments is invalid");
+ }
+ }
+
return $msg->getId();
}
@@ -393,4 +410,49 @@ function getLongPollServer(int $need_pts = 1, int $lp_version = 3, ?int $group_i
return $res;
}
+
+ function edit(int $message_id, string $message = "", string $attachment = "", int $peer_id = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $msg = (new MSGRepo)->get($message_id);
+
+ if(empty($message) && empty($attachment))
+ $this->fail(100, "Required parameter 'message' missing.");
+
+ if(!$msg || $msg->isDeleted())
+ $this->fail(102, "Invalid message");
+
+ if($msg->getSender()->getId() != $this->getUser()->getId())
+ $this->fail(15, "Access to message denied");
+
+ if(!empty($message))
+ $msg->setContent($message);
+
+ $msg->setEdited(time());
+ $msg->save(true);
+
+ if(!empty($attachment)) {
+ $attachs = parseAttachments($attachment);
+ $newAttachmentsCount = sizeof($attachs);
+
+ $postsAttachments = iterator_to_array($msg->getChildren());
+
+ if(sizeof($postsAttachments) >= 10)
+ $this->fail(15, "Message have too many attachments");
+
+ if(($newAttachmentsCount + sizeof($postsAttachments)) > 10)
+ $this->fail(158, "Message will have too many attachments");
+
+ foreach($attachs as $attach) {
+ if($attach && !$attach->isDeleted() && $attach->getOwner()->getId() == $this->getUser()->getId())
+ $msg->attach($attach);
+ else
+ $this->fail(52, "One of the attachments is invalid");
+ }
+ }
+
+ return 1;
+ }
}
diff --git a/VKAPI/Handlers/Newsfeed.php b/VKAPI/Handlers/Newsfeed.php
index d99924304..557a37240 100644
--- a/VKAPI/Handlers/Newsfeed.php
+++ b/VKAPI/Handlers/Newsfeed.php
@@ -32,6 +32,7 @@ function get(string $fields = "", int $start_from = 0, int $start_time = 0, int
->select("id")
->where("wall IN (?)", $ids)
->where("deleted", 0)
+ ->where("suggested", 0)
->where("id < (?)", empty($start_from) ? PHP_INT_MAX : $start_from)
->where("? <= created", empty($start_time) ? 0 : $start_time)
->where("? >= created", empty($end_time) ? PHP_INT_MAX : $end_time)
@@ -47,14 +48,24 @@ function get(string $fields = "", int $start_from = 0, int $start_time = 0, int
return $response;
}
- function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0)
+ function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0, int $rss = 0)
{
$this->requireUser();
- $queryBase = "FROM `posts` LEFT JOIN `groups` ON GREATEST(`posts`.`wall`, 0) = 0 AND `groups`.`id` = ABS(`posts`.`wall`) WHERE (`groups`.`hide_from_global_feed` = 0 OR `groups`.`name` IS NULL) AND `posts`.`deleted` = 0";
+ $queryBase = "FROM `posts` LEFT JOIN `groups` ON GREATEST(`posts`.`wall`, 0) = 0 AND `groups`.`id` = ABS(`posts`.`wall`) LEFT JOIN `profiles` ON LEAST(`posts`.`wall`, 0) = 0 AND `profiles`.`id` = ABS(`posts`.`wall`)";
+ $queryBase .= "WHERE (`groups`.`hide_from_global_feed` = 0 OR `groups`.`name` IS NULL) AND (`profiles`.`profile_type` = 0 OR `profiles`.`first_name` IS NULL) AND `posts`.`deleted` = 0 AND `posts`.`suggested` = 0";
if($this->getUser()->getNsfwTolerance() === User::NSFW_INTOLERANT)
$queryBase .= " AND `nsfw` = 0";
+
+ if($return_banned == 0) {
+ $ignored_sources_ids = $this->getUser()->getIgnoredSources(0, OPENVK_ROOT_CONF['openvk']['preferences']['newsfeed']['ignoredSourcesLimit'] ?? 50, true);
+
+ if(sizeof($ignored_sources_ids) > 0) {
+ $imploded_ids = implode("', '", $ignored_sources_ids);
+ $queryBase .= " AND `posts`.`wall` NOT IN ('$imploded_ids')";
+ }
+ }
$start_from = empty($start_from) ? PHP_INT_MAX : $start_from;
$start_time = empty($start_time) ? 0 : $start_time;
@@ -63,6 +74,25 @@ function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0
$rposts = [];
$ids = [];
+ if($rss == 1) {
+ $channel = new \Bhaktaraz\RSSGenerator\Channel();
+ $channel->title("Global Feed — " . OPENVK_ROOT_CONF['openvk']['appearance']['name'])
+ ->description('OVK Global feed')
+ ->url(ovk_scheme(true) . $_SERVER["HTTP_HOST"] . "/feed/all");
+
+ foreach($posts as $item) {
+ $post = (new PostsRepo)->get($item->id);
+ if(!$post || $post->isDeleted()) {
+ continue;
+ }
+
+ $output = $post->toRss();
+ $output->appendTo($channel);
+ }
+
+ return $channel;
+ }
+
foreach($posts as $post) {
$rposts[] = (new PostsRepo)->get($post->id)->getPrettyId();
$ids[] = $post->id;
@@ -73,4 +103,152 @@ function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0
return $response;
}
+
+ function getByType(string $feed_type = 'top', string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0, int $return_banned = 0)
+ {
+ $this->requireUser();
+
+ switch($feed_type) {
+ case 'top':
+ return $this->getGlobal($fields, $start_from, $start_time, $end_time, $offset, $count, $extended, $return_banned);
+ break;
+ default:
+ return $this->get($fields, $start_from, $start_time, $end_time, $offset, $count, $extended);
+ break;
+ }
+ }
+
+ function getBanned(int $extended = 0, string $fields = "", string $name_case = "nom", int $merge = 0): object
+ {
+ $this->requireUser();
+
+ $offset = 0;
+ $count = OPENVK_ROOT_CONF['openvk']['preferences']['newsfeed']['ignoredSourcesLimit'] ?? 50;
+ $banned = $this->getUser()->getIgnoredSources($offset, $count, ($extended != 1));
+ $return_object = (object) [
+ 'groups' => [],
+ 'members' => [],
+ ];
+
+ if($extended == 0) {
+ foreach($banned as $ban) {
+ if($ban > 0)
+ $return_object->members[] = $ban;
+ else
+ $return_object->groups[] = $ban;
+ }
+ } else {
+ if($merge == 1) {
+ $return_object = (object) [
+ 'count' => sizeof($banned),
+ 'items' => [],
+ ];
+
+ foreach($banned as $ban) {
+ $return_object->items[] = $ban->toVkApiStruct($this->getUser(), $fields);
+ }
+ } else {
+ $return_object = (object) [
+ 'groups' => [],
+ 'profiles' => [],
+ ];
+
+ foreach($banned as $ban) {
+ if($ban->getRealId() > 0)
+ $return_object->profiles[] = $ban->toVkApiStruct($this->getUser(), $fields);
+ else
+ $return_object->groups[] = $ban->toVkApiStruct($this->getUser(), $fields);
+ }
+ }
+ }
+
+ return $return_object;
+ }
+
+ function addBan(string $user_ids = "", string $group_ids = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ # Formatting input ids
+ if(!empty($user_ids)) {
+ $user_ids = array_map(function($el) {
+ return (int)$el;
+ }, explode(',', $user_ids));
+ $user_ids = array_unique($user_ids);
+ } else
+ $user_ids = [];
+
+ if(!empty($group_ids)) {
+ $group_ids = array_map(function($el) {
+ return abs((int)$el) * -1;
+ }, explode(',', $group_ids));
+ $group_ids = array_unique($group_ids);
+ } else
+ $group_ids = [];
+
+ $ids = array_merge($user_ids, $group_ids);
+ if(sizeof($ids) < 1)
+ return 0;
+
+ if(sizeof($ids) > 10)
+ $this->fail(-10, "Limit of 'ids' is 10");
+
+ $config_limit = OPENVK_ROOT_CONF['openvk']['preferences']['newsfeed']['ignoredSourcesLimit'] ?? 50;
+ $user_ignores = $this->getUser()->getIgnoredSourcesCount();
+ if(($user_ignores + sizeof($ids)) > $config_limit) {
+ $this->fail(-50, "Ignoring limit exceeded");
+ }
+
+ $entities = get_entities($ids);
+ $successes = 0;
+ foreach($entities as $entity) {
+ if(!$entity || $entity->getRealId() === $this->getUser()->getRealId() || $entity->isHideFromGlobalFeedEnabled() || $entity->isIgnoredBy($this->getUser())) continue;
+
+ $entity->addIgnore($this->getUser());
+ $successes += 1;
+ }
+
+ return 1;
+ }
+
+ function deleteBan(string $user_ids = "", string $group_ids = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if(!empty($user_ids)) {
+ $user_ids = array_map(function($el) {
+ return (int)$el;
+ }, explode(',', $user_ids));
+ $user_ids = array_unique($user_ids);
+ } else
+ $user_ids = [];
+
+ if(!empty($group_ids)) {
+ $group_ids = array_map(function($el) {
+ return abs((int)$el) * -1;
+ }, explode(',', $group_ids));
+ $group_ids = array_unique($group_ids);
+ } else
+ $group_ids = [];
+
+ $ids = array_merge($user_ids, $group_ids);
+ if(sizeof($ids) < 1)
+ return 0;
+
+ if(sizeof($ids) > 10)
+ $this->fail(-10, "Limit of ids is 10");
+
+ $entities = get_entities($ids);
+ $successes = 0;
+ foreach($entities as $entity) {
+ if(!$entity || $entity->getRealId() === $this->getUser()->getRealId() || !$entity->isIgnoredBy($this->getUser())) continue;
+
+ $entity->removeIgnore($this->getUser());
+ $successes += 1;
+ }
+
+ return 1;
+ }
}
diff --git a/VKAPI/Handlers/Notes.php b/VKAPI/Handlers/Notes.php
index d3dc3468a..620877c9b 100644
--- a/VKAPI/Handlers/Notes.php
+++ b/VKAPI/Handlers/Notes.php
@@ -40,6 +40,12 @@ function createComment(string $note_id, int $owner_id, string $message, int $rep
if($note->getOwner()->isDeleted())
$this->fail(403, "Owner is deleted");
+ if(!$note->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
+ if(!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(43, "No access");
+
if(empty($message) && empty($attachments))
$this->fail(100, "Required parameter 'message' missing.");
@@ -115,21 +121,6 @@ function delete(string $note_id)
return 1;
}
- function deleteComment(int $comment_id, int $owner_id = 0)
- {
- $this->requireUser();
- $this->willExecuteWriteAction();
-
- $comment = (new CommentsRepo)->get($comment_id);
-
- if(!$comment || !$comment->canBeDeletedBy($this->getUser()))
- $this->fail(403, "Access to comment denied");
-
- $comment->delete();
-
- return 1;
- }
-
function edit(string $note_id, string $title = "", string $text = "", int $privacy = 0, int $comment_privacy = 0, string $privacy_view = "", string $privacy_comment = "")
{
$this->requireUser();
@@ -156,25 +147,6 @@ function edit(string $note_id, string $title = "", string $text = "", int $priva
return 1;
}
- function editComment(int $comment_id, string $message, int $owner_id = NULL)
- {
- /*
- $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;
- }
-
function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10, int $sort = 0)
{
$this->requireUser();
@@ -183,6 +155,12 @@ function get(int $user_id, string $note_ids = "", int $offset = 0, int $count =
if(!$user || $user->isDeleted())
$this->fail(15, "Invalid user");
+ if(!$user->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(15, "Access denied: this user chose to hide his notes");
+
+ if(!$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
if(empty($note_ids)) {
$notes = array_slice(iterator_to_array((new NotesRepo)->getUserNotes($user, 1, $count + $offset, $sort == 0 ? "ASC" : "DESC")), $offset);
$nodez = (object) [
@@ -205,7 +183,7 @@ function get(int $user_id, string $note_ids = "", int $offset = 0, int $count =
$items = [];
$note = (new NotesRepo)->getNoteById((int)$id[0], (int)$id[1]);
- if($note) {
+ if($note && !$note->isDeleted()) {
$nodez->notes[] = $note->toVkApiStruct();
}
}
@@ -225,10 +203,16 @@ function getById(int $note_id, int $owner_id, bool $need_wiki = false)
if($note->isDeleted())
$this->fail(189, "Note is deleted");
-
+
if(!$note->getOwner() || $note->getOwner()->isDeleted())
$this->fail(177, "Owner does not exists");
+ if(!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(40, "Access denied: this user chose to hide his notes");
+
+ if(!$note->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access to note denied");
+
return $note->toVkApiStruct();
}
@@ -246,6 +230,12 @@ function getComments(int $note_id, int $owner_id, int $sort = 1, int $offset = 0
if(!$note->getOwner())
$this->fail(177, "Owner does not exists");
+
+ if(!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(14, "No access");
+
+ if(!$note->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access to note denied");
$arr = (object) [
"count" => $note->getCommentsCount(),
diff --git a/VKAPI/Handlers/Notifications.php b/VKAPI/Handlers/Notifications.php
new file mode 100644
index 000000000..8a047f800
--- /dev/null
+++ b/VKAPI/Handlers/Notifications.php
@@ -0,0 +1,83 @@
+requireUser();
+
+ $res = (object)[
+ "items" => [],
+ "profiles" => [],
+ "groups" => [],
+ "last_viewed" => $this->getUser()->getNotificationOffset()
+ ];
+
+ if($count > 100)
+ $this->fail(125, "Count is too big");
+
+ if(!eventdb())
+ $this->fail(1289, "EventDB is disabled on this instance");
+
+ $notifs = array_slice(iterator_to_array((new Notifs)->getNotificationsByUser($this->getUser(), $this->getUser()->getNotificationOffset(), (bool)$archived, 1, $offset + $count)), $offset);
+ $tmpProfiles = [];
+ foreach($notifs as $notif) {
+ $sxModel = $notif->getModel(1);
+
+ if(!method_exists($sxModel, "getAvatarUrl"))
+ $sxModel = $notif->getModel(0);
+
+
+ $tmpProfiles[] = $sxModel instanceof Club ? $sxModel->getId() * -1 : $sxModel->getId();
+ $res->items[] = $notif->toVkApiStruct();
+ }
+
+ foreach(array_unique($tmpProfiles) as $id) {
+ if($id > 0) {
+ $sxModel = (new Users)->get($id);
+ $result = (object)[
+ "uid" => $sxModel->getId(),
+ "first_name" => $sxModel->getFirstName(),
+ "last_name" => $sxModel->getLastName(),
+ "photo" => $sxModel->getAvatarUrl(),
+ "photo_medium_rec" => $sxModel->getAvatarUrl("tiny"),
+ "screen_name" => $sxModel->getShortCode()
+ ];
+
+ $res->profiles[] = $result;
+ } else {
+ $sxModel = (new Clubs)->get(abs($id));
+ $result = $sxModel->toVkApiStruct($this->getUser());
+
+ $res->groups[] = $result;
+ }
+ }
+
+ return $res;
+ }
+
+ function markAsViewed()
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ try {
+ $this->getUser()->updateNotificationOffset();
+ $this->getUser()->save();
+ } catch(\Throwable $e) {
+ return 0;
+ }
+
+ return 1;
+ }
+}
diff --git a/VKAPI/Handlers/Photos.php b/VKAPI/Handlers/Photos.php
index 4ab56832c..1ae99faf7 100644
--- a/VKAPI/Handlers/Photos.php
+++ b/VKAPI/Handlers/Photos.php
@@ -61,7 +61,7 @@ function getOwnerPhotoUploadServer(int $owner_id = 0): object
}
return (object) [
- "upload_url" => $this->getPhotoUploadUrl("photo", isset($club) ? 0 : $club->getId()),
+ "upload_url" => $this->getPhotoUploadUrl("photo", !isset($club) ? 0 : $club->getId()),
];
}
@@ -288,7 +288,6 @@ function editAlbum(int $album_id, int $owner_id, string $title, string $descript
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)
{
$this->requireUser();
- $this->willExecuteWriteAction();
$res = [];
@@ -304,7 +303,6 @@ function getAlbums(int $owner_id, string $album_ids = "", int $offset = 0, int $
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.");
@@ -361,28 +359,22 @@ function getAlbums(int $owner_id, string $album_ids = "", int $offset = 0, int $
function getAlbumsCount(int $user_id = 0, int $group_id = 0)
{
$this->requireUser();
- $this->willExecuteWriteAction();
- if($user_id == 0 && $group_id == 0 || $user_id > 0 && $group_id > 0) {
+ if($user_id == 0 && $group_id == 0 || $user_id > 0 && $group_id > 0)
$this->fail(21, "Select user_id or group_id");
- }
if($user_id > 0) {
-
$us = (new UsersRepo)->get($user_id);
- if(!$us || $us->isDeleted()) {
+ if(!$us || $us->isDeleted())
$this->fail(21, "Invalid user");
- }
- if(!$us->getPrivacyPermission('photos.read', $this->getUser())) {
+ if(!$us->getPrivacyPermission('photos.read', $this->getUser()))
$this->fail(21, "This user chose to hide his albums.");
- }
return (new Albums)->getUserAlbumsCount($us);
}
- if($group_id > 0)
- {
+ if($group_id > 0) {
$cl = (new Clubs)->get($group_id);
if(!$cl) {
$this->fail(21, "Invalid club");
@@ -395,7 +387,6 @@ function getAlbumsCount(int $user_id = 0, int $group_id = 0)
function getById(string $photos, bool $extended = false, bool $photo_sizes = false)
{
$this->requireUser();
- $this->willExecuteWriteAction();
$phts = explode(",", $photos);
$res = [];
@@ -404,17 +395,11 @@ function getById(string $photos, bool $extended = false, bool $photo_sizes = fal
$ph = explode("_", $phota);
$photo = (new PhotosRepo)->getByOwnerAndVID((int)$ph[0], (int)$ph[1]);
- if(!$photo || $photo->isDeleted()) {
+ if(!$photo || $photo->isDeleted())
$this->fail(21, "Invalid photo");
- }
- if($photo->getOwner()->isDeleted()) {
- $this->fail(21, "Owner of this photo is deleted");
- }
-
- if(!$photo->getOwner()->getPrivacyPermission('photos.read', $this->getUser())) {
- $this->fail(21, "This user chose to hide his photos.");
- }
+ if(!$photo->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
$res[] = $photo->toVkApiStruct($photo_sizes, $extended);
}
@@ -425,23 +410,20 @@ function getById(string $photos, bool $extended = false, bool $photo_sizes = fal
function get(int $owner_id, int $album_id, string $photo_ids = "", bool $extended = false, bool $photo_sizes = false, int $offset = 0, int $count = 10)
{
$this->requireUser();
- $this->willExecuteWriteAction();
$res = [];
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->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
$photos = array_slice(iterator_to_array($album->getPhotos(1, $count + $offset)), $offset);
- $res["count"] = sizeof($photos);
+ $res["count"] = $album->size();
foreach($photos as $photo) {
if(!$photo || $photo->isDeleted()) continue;
@@ -456,12 +438,11 @@ 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]);
- if($phot && !$phot->isDeleted()) {
+ if($phot && !$phot->isDeleted() && $phot->canBeViewedBy($this->getUser())) {
$res["items"][] = $phot->toVkApiStruct($photo_sizes, $extended);
}
}
@@ -477,13 +458,11 @@ function deleteAlbum(int $album_id, int $group_id = 0)
$album = (new Albums)->get($album_id);
- if(!$album || $album->canBeModifiedBy($this->getUser())) {
+ if(!$album || $album->canBeModifiedBy($this->getUser()))
$this->fail(21, "Invalid album");
- }
- if($album->isDeleted()) {
+ if($album->isDeleted())
$this->fail(22, "Album already deleted");
- }
$album->delete();
@@ -497,13 +476,11 @@ function edit(int $owner_id, int $photo_id, string $caption = "")
$photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
- if(!$photo) {
+ if(!$photo)
$this->fail(21, "Invalid photo");
- }
- if($photo->isDeleted()) {
+ if($photo->isDeleted())
$this->fail(21, "Photo is deleted");
- }
if(!empty($caption)) {
$photo->setDescription($caption);
@@ -521,17 +498,14 @@ function delete(int $owner_id, int $photo_id, string $photos = "")
if(empty($photos)) {
$photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
- if($this->getUser()->getId() !== $photo->getOwner()->getId()) {
+ if($this->getUser()->getId() !== $photo->getOwner()->getId())
$this->fail(21, "You can't delete another's photo");
- }
- if(!$photo) {
+ if(!$photo)
$this->fail(21, "Invalid photo");
- }
- if($photo->isDeleted()) {
- $this->fail(21, "Photo already deleted");
- }
+ if($photo->isDeleted())
+ $this->fail(21, "Photo is already deleted");
$photo->delete();
} else {
@@ -543,17 +517,14 @@ function delete(int $owner_id, int $photo_id, string $photos = "")
$phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]);
- if($this->getUser()->getId() !== $phot->getOwner()->getId()) {
+ if($this->getUser()->getId() !== $phot->getOwner()->getId())
$this->fail(21, "You can't delete another's photo");
- }
- if(!$phot) {
+ if(!$phot)
$this->fail(21, "Invalid photo");
- }
- if($phot->isDeleted()) {
+ if($phot->isDeleted())
$this->fail(21, "Photo already deleted");
- }
$phot->delete();
}
@@ -573,17 +544,11 @@ function deleteComment(int $comment_id, int $owner_id = 0)
$this->willExecuteWriteAction();
$comment = (new CommentsRepo)->get($comment_id);
- if(!$comment) {
+ if(!$comment)
$this->fail(21, "Invalid comment");
- }
-
- if(!$comment->canBeModifiedBy($this->getUser())) {
- $this->fail(21, "Forbidden");
- }
- if($comment->isDeleted()) {
- $this->fail(4, "Comment already deleted");
- }
+ if(!$comment->canBeModifiedBy($this->getUser()))
+ $this->fail(21, "Access denied");
$comment->delete();
@@ -595,20 +560,16 @@ function createComment(int $owner_id, int $photo_id, string $message = "", strin
$this->requireUser();
$this->willExecuteWriteAction();
- if(empty($message) && empty($attachments)) {
+ if(empty($message) && empty($attachments))
$this->fail(100, "Required parameter 'message' missing.");
- }
$photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
- if(!$photo->getAlbum()->getOwner()->getPrivacyPermission('photos.read', $this->getUser())) {
- $this->fail(21, "This user chose to hide his albums.");
- }
+ if(!$photo || $photo->isDeleted())
+ $this->fail(180, "Invalid photo");
- if(!$photo)
- $this->fail(180, "Photo not found");
- if($photo->isDeleted())
- $this->fail(189, "Photo is deleted");
+ if(!$photo->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access to photo denied");
$comment = new Comment;
$comment->setOwner($this->getUser()->getId());
@@ -667,24 +628,22 @@ function createComment(int $owner_id, int $photo_id, string $message = "", strin
function getAll(int $owner_id, bool $extended = false, int $offset = 0, int $count = 100, bool $photo_sizes = false)
{
$this->requireUser();
- $this->willExecuteWriteAction();
- if($owner_id < 0) {
+ if($owner_id < 0)
$this->fail(4, "This method doesn't works with clubs");
- }
$user = (new UsersRepo)->get($owner_id);
-
- if(!$user) {
+ if(!$user)
$this->fail(4, "Invalid user");
- }
- if(!$user->getPrivacyPermission('photos.read', $this->getUser())) {
+ if(!$user->getPrivacyPermission('photos.read', $this->getUser()))
$this->fail(21, "This user chose to hide his albums.");
- }
- $photos = array_slice(iterator_to_array((new PhotosRepo)->getEveryUserPhoto($user, 1, $count + $offset)), $offset);
- $res = [];
+ $photos = (new PhotosRepo)->getEveryUserPhoto($user, $offset, $count);
+ $res = [
+ "count" => (new PhotosRepo)->getUserPhotosCount($user),
+ "items" => [],
+ ];
foreach($photos as $photo) {
if(!$photo || $photo->isDeleted()) continue;
@@ -697,22 +656,15 @@ function getAll(int $owner_id, bool $extended = false, int $offset = 0, int $cou
function getComments(int $owner_id, int $photo_id, bool $need_likes = false, int $offset = 0, int $count = 100, bool $extended = false, string $fields = "")
{
$this->requireUser();
- $this->willExecuteWriteAction();
$photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
$comms = array_slice(iterator_to_array($photo->getComments(1, $offset + $count)), $offset);
- if(!$photo) {
+ if(!$photo || $photo->isDeleted())
$this->fail(4, "Invalid photo");
- }
- if(!$photo->getAlbum()->getOwner()->getPrivacyPermission('photos.read', $this->getUser())) {
- $this->fail(21, "This user chose to hide his photos.");
- }
-
- if($photo->isDeleted()) {
- $this->fail(4, "Photo is deleted");
- }
+ if(!$photo->canBeViewedBy($this->getUser()))
+ $this->fail(21, "Access denied");
$res = [
"count" => sizeof($comms),
@@ -730,4 +682,4 @@ function getComments(int $owner_id, int $photo_id, bool $need_likes = false, int
return $res;
}
-}
\ No newline at end of file
+}
diff --git a/VKAPI/Handlers/Polls.php b/VKAPI/Handlers/Polls.php
index be947a442..c84f82830 100755
--- a/VKAPI/Handlers/Polls.php
+++ b/VKAPI/Handlers/Polls.php
@@ -104,4 +104,67 @@ function deleteVote(int $poll_id)
$this->fail(8, "how.to. ook.bacon.in.microwova.");
}
}
+
+ function getVoters(int $poll_id, int $answer_ids, int $offset = 0, int $count = 6)
+ {
+ $this->requireUser();
+
+ $poll = (new PollsRepo)->get($poll_id);
+
+ if(!$poll)
+ $this->fail(251, "Invalid poll");
+
+ if($poll->isAnonymous())
+ $this->fail(251, "Access denied: poll is anonymous.");
+
+ $voters = array_slice($poll->getVoters($answer_ids, 1, $offset + $count), $offset);
+ $res = (object)[
+ "answer_id" => $answer_ids,
+ "users" => []
+ ];
+
+ foreach($voters as $voter)
+ $res->users[] = $voter->toVkApiStruct();
+
+ return $res;
+ }
+
+ function create(string $question, string $add_answers, bool $disable_unvote = false, bool $is_anonymous = false, bool $is_multiple = false, int $end_date = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $options = json_decode($add_answers);
+
+ if(!$options || empty($options))
+ $this->fail(62, "Invalid options");
+
+ if(sizeof($options) > ovkGetQuirk("polls.max-opts"))
+ $this->fail(51, "Too many options");
+
+ $poll = new Poll;
+ $poll->setOwner($this->getUser());
+ $poll->setTitle($question);
+ $poll->setMultipleChoice($is_multiple);
+ $poll->setAnonymity($is_anonymous);
+ $poll->setRevotability(!$disable_unvote);
+ $poll->setOptions($options);
+
+ if($end_date > time()) {
+ if($end_date > time() + (DAY * 365))
+ $this->fail(89, "End date is too big");
+
+ $poll->setEndDate($end_date);
+ }
+
+ $poll->save();
+
+ return $this->getById($poll->getId());
+ }
+
+ function edit()
+ {
+ #todo
+ return 1;
+ }
}
diff --git a/VKAPI/Handlers/Status.php b/VKAPI/Handlers/Status.php
index 843f42bdc..5234a7fc5 100644
--- a/VKAPI/Handlers/Status.php
+++ b/VKAPI/Handlers/Status.php
@@ -8,13 +8,27 @@ final class Status extends VKAPIRequestHandler
function get(int $user_id = 0, int $group_id = 0)
{
$this->requireUser();
- if($user_id == 0 && $group_id == 0) {
- return $this->getUser()->getStatus();
- } else {
- if($group_id > 0)
- $this->fail(501, "Group statuses are not implemented");
- else
- return (new UsersRepo)->get($user_id)->getStatus();
+
+ if($user_id == 0 && $group_id == 0)
+ $user_id = $this->getUser()->getId();
+
+ if($group_id > 0)
+ $this->fail(501, "Group statuses are not implemented");
+ else {
+ $user = (new UsersRepo)->get($user_id);
+
+ if(!$user || $user->isDeleted() || !$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Invalid user");
+
+ $audioStatus = $user->getCurrentAudioStatus();
+ if($audioStatus) {
+ return [
+ "status" => $user->getStatus(),
+ "audio" => $audioStatus->toVkApiStruct(),
+ ];
+ }
+
+ return $user->getStatus();
}
}
diff --git a/VKAPI/Handlers/Users.php b/VKAPI/Handlers/Users.php
index 4c61985c7..a847d3280 100644
--- a/VKAPI/Handlers/Users.php
+++ b/VKAPI/Handlers/Users.php
@@ -1,8 +1,9 @@
"DELETED",
"last_name" => "",
"deactivated" => "deleted"
- ];
+ ];
+ } else if($usr->isBanned()) {
+ $response[$i] = (object)[
+ "id" => $usr->getId(),
+ "first_name" => $usr->getFirstName(true),
+ "last_name" => $usr->getLastName(true),
+ "deactivated" => "banned",
+ "ban_reason" => $usr->getBanReason()
+ ];
} else if($usrs[$i] == NULL) {
} else {
$response[$i] = (object)[
"id" => $usr->getId(),
- "first_name" => $usr->getFirstName(),
- "last_name" => $usr->getLastName(),
- "is_closed" => (new Blacklists)->isBanned($usr, $authuser),
- "can_access_closed" => !(new Blacklists)->isBanned($usr, $authuser),
- "blacklisted" => (new Blacklists)->isBanned($usr, $authuser),
+ "first_name" => $usr->getFirstName(true),
+ "last_name" => $usr->getLastName(true),
+ "is_closed" => $usr->isClosed(),
+ "can_access_closed" => (bool)$usr->canBeViewedBy($this->getUser()),
+ "blacklisted" => (new Blacklists)->isBanned($usr, $authuser),
"blacklisted_by_me" => (new Blacklists)->isBanned($authuser, $usr)
];
$flds = explode(',', $fields);
-
- if (!(new Blacklists)->isBanned($usr, $authuser))
- foreach($flds as $field) {
+ $canView = $usr->canBeViewedBy($this->getUser());
+ foreach($flds as $field) {
switch($field) {
case "verified":
$response[$i]->verified = intval($usr->isVerified());
break;
case "sex":
- $response[$i]->sex = $usr->isFemale() ? 1 : 2;
+ $response[$i]->sex = $usr->isFemale() ? 1 : ($usr->isNeutral() ? 0 : 2);
break;
case "has_photo":
$response[$i]->has_photo = is_null($usr->getAvatarPhoto()) ? 0 : 1;
@@ -91,6 +99,12 @@ function get(string $user_ids = "0", string $fields = "", int $offset = 0, int $
case "status":
if($usr->getStatus() != NULL)
$response[$i]->status = $usr->getStatus();
+
+ $audioStatus = $usr->getCurrentAudioStatus();
+
+ if($audioStatus)
+ $response[$i]->status_audio = $audioStatus->toVkApiStruct();
+
break;
case "screen_name":
if($usr->getShortCode() != NULL)
@@ -138,26 +152,122 @@ function get(string $user_ids = "0", string $fields = "", int $offset = 0, int $
];
}
case "music":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->music = $usr->getFavoriteMusic();
break;
case "movies":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->movies = $usr->getFavoriteFilms();
break;
case "tv":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->tv = $usr->getFavoriteShows();
break;
case "books":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->books = $usr->getFavoriteBooks();
break;
case "city":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->city = $usr->getCity();
break;
case "interests":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->interests = $usr->getInterests();
break;
+ case "quotes":
+ if(!$canView) {
+ break;
+ }
+
+ $response[$i]->quotes = $usr->getFavoriteQuote();
+ break;
+ case "email":
+ if(!$canView) {
+ break;
+ }
+
+ $response[$i]->email = $usr->getContactEmail();
+ break;
+ case "telegram":
+ if(!$canView) {
+ break;
+ }
+
+ $response[$i]->telegram = $usr->getTelegram();
+ break;
+ case "about":
+ if(!$canView) {
+ break;
+ }
+
+ $response[$i]->about = $usr->getDescription();
+ break;
case "rating":
+ if(!$canView) {
+ break;
+ }
+
$response[$i]->rating = $usr->getRating();
- break;
+ break;
+ case "counters":
+ $response[$i]->counters = (object) [
+ "friends_count" => $usr->getFriendsCount(),
+ "photos_count" => (new Photos)->getUserPhotosCount($usr),
+ "videos_count" => (new Videos)->getUserVideosCount($usr),
+ "audios_count" => (new Audios)->getUserCollectionSize($usr),
+ "notes_count" => (new Notes)->getUserNotesCount($usr)
+ ];
+ break;
+ case "correct_counters":
+ $response[$i]->counters = (object) [
+ "friends" => $usr->getFriendsCount(),
+ "photos" => (new Photos)->getUserPhotosCount($usr),
+ "videos" => (new Videos)->getUserVideosCount($usr),
+ "audios" => (new Audios)->getUserCollectionSize($usr),
+ "notes" => (new Notes)->getUserNotesCount($usr),
+ "groups" => $usr->getClubCount(),
+ "online_friends" => $usr->getFriendsOnlineCount(),
+ ];
+ break;
+ case "guid":
+ $response[$i]->guid = $usr->getChandlerGUID();
+ break;
+ case 'background':
+ $backgrounds = $usr->getBackDropPictureURLs();
+ $response[$i]->background = $backgrounds;
+ break;
+ case 'reg_date':
+ if(!$canView) {
+ break;
+ }
+
+ $response[$i]->reg_date = $usr->getRegistrationTime()->timestamp();
+ break;
+ case 'is_dead':
+ $response[$i]->is_dead = $usr->isDead();
+ break;
+ case 'nickname':
+ $response[$i]->nickname = $usr->getPseudo();
+ break;
}
}
@@ -181,14 +291,16 @@ function getFollowers(int $user_id, string $fields = "", int $offset = 0, int $c
$users = new UsersRepo;
$this->requireUser();
+
+ $user = $users->get($user_id);
+
+ if(!$user || $user->isDeleted())
+ $this->fail(14, "Invalid user");
- $authuser = $this->getUser();
- $target = $users->get($user_id);
-
- if ((new Blacklists)->isBanned($target, $authuser))
- $this->fail(15, "Access denied: User is blacklisted");
+ if(!$user->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
- foreach($target->getFollowers($offset, $count) as $follower)
+ foreach($users->get($user_id)->getFollowers($offset, $count) as $follower)
$followers[] = $follower->getId();
$response = $followers;
@@ -208,88 +320,112 @@ function search(string $q,
int $count = 100,
string $city = "",
string $hometown = "",
- int $sex = 2,
- int $status = 0, # это про marital status
+ int $sex = 3,
+ int $status = 0, # marital_status
bool $online = false,
- # дальше идут параметры которых нету в vkapi но есть на сайте
- string $profileStatus = "", # а это уже нормальный статус
+ # non standart params:
int $sort = 0,
- int $before = 0,
- int $politViews = 0,
- int $after = 0,
- string $interests = "",
+ int $polit_views = 0,
string $fav_music = "",
string $fav_films = "",
string $fav_shows = "",
- string $fav_books = "",
- string $fav_quotes = ""
+ string $fav_books = ""
)
{
- $users = new UsersRepo;
-
- $sortg = "id ASC";
+ if($count > 100) {
+ $this->fail(100, "One of the parameters specified was missing or invalid: count should be less or equal to 100");
+ }
- $nfilds = $fields;
+ $users = new UsersRepo;
+ $output_sort = ['type' => 'id', 'invert' => false];
+ $output_params = [
+ "ignore_private" => true,
+ ];
switch($sort) {
+ default:
case 0:
- $sortg = "id DESC";
+ $output_sort = ['type' => 'id', 'invert' => false];
break;
case 1:
- $sortg = "id ASC";
- break;
- case 2:
- $sortg = "first_name DESC";
- break;
- case 3:
- $sortg = "first_name ASC";
+ $output_sort = ['type' => 'id', 'invert' => true];
break;
case 4:
- $sortg = "rating DESC";
+ $output_sort = ['type' => 'rating', 'invert' => false];
+ break;
+ }
- if(!str_contains($nfilds, "rating")) {
- $nfilds .= "rating";
- }
+ if(!empty($city))
+ $output_params['city'] = $city;
- break;
- case 5:
- $sortg = "rating DESC";
+ if(!empty($hometown))
+ $output_params['hometown'] = $hometown;
- if(!str_contains($nfilds, "rating")) {
- $nfilds .= "rating";
- }
+ if($sex != 3)
+ $output_params['gender'] = $sex;
- break;
- }
+ if($status != 0)
+ $output_params['marital_status'] = $status;
+
+ if($polit_views != 0)
+ $output_params['polit_views'] = $polit_views;
- $array = [];
+ if(!empty($interests))
+ $output_params['interests'] = $interests;
- $parameters = [
- "city" => !empty($city) ? $city : NULL,
- "hometown" => !empty($hometown) ? $hometown : NULL,
- "gender" => $sex < 2 ? $sex : NULL,
- "maritalstatus" => (bool)$status ? $status : NULL,
- "politViews" => (bool)$politViews ? $politViews : NULL,
- "is_online" => $online ? 1 : NULL,
- "status" => !empty($profileStatus) ? $profileStatus : NULL,
- "before" => $before != 0 ? $before : NULL,
- "after" => $after != 0 ? $after : NULL,
- "interests" => !empty($interests) ? $interests : NULL,
- "fav_music" => !empty($fav_music) ? $fav_music : NULL,
- "fav_films" => !empty($fav_films) ? $fav_films : NULL,
- "fav_shows" => !empty($fav_shows) ? $fav_shows : NULL,
- "fav_books" => !empty($fav_books) ? $fav_books : NULL,
- "fav_quotes" => !empty($fav_quotes) ? $fav_quotes : NULL,
- ];
+ if(!empty($fav_music))
+ $output_params['fav_music'] = $fav_music;
+
+ if(!empty($fav_films))
+ $output_params['fav_films'] = $fav_films;
+
+ if(!empty($fav_shows))
+ $output_params['fav_shows'] = $fav_shows;
+
+ if(!empty($fav_books))
+ $output_params['fav_books'] = $fav_books;
+
+ if($online)
+ $output_params['is_online'] = 1;
- $find = $users->find($q, $parameters, $sortg);
+ $array = [];
+ $find = $users->find($q, $output_params, $output_sort);
- foreach ($find as $user)
+ foreach ($find->offsetLimit($offset, $count) as $user)
$array[] = $user->getId();
+ if(!$array || sizeof($array) < 1) {
+ return (object) [
+ "count" => 0,
+ "items" => [],
+ ];
+ }
+
return (object) [
- "count" => $find->size(),
- "items" => $this->get(implode(',', $array), $nfilds, $offset, $count)
+ "count" => $find->size(),
+ "items" => $this->get(implode(',', $array), $fields)
];
}
+
+ function report(int $user_id, string $type = "spam", string $comment = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if($user_id == $this->getUser()->getId())
+ $this->fail(12, "Can't report yourself.");
+
+ if(sizeof(iterator_to_array((new Reports)->getDuplicates("user", $user_id, NULL, $this->getUser()->getId()))) > 0)
+ return 1;
+
+ $report = new Report;
+ $report->setUser_id($this->getUser()->getId());
+ $report->setTarget_id($user_id);
+ $report->setType("user");
+ $report->setReason($comment);
+ $report->setCreated(time());
+ $report->save();
+
+ return 1;
+ }
}
diff --git a/VKAPI/Handlers/Utils.php b/VKAPI/Handlers/Utils.php
index 5350a64f6..a1c4f3b5f 100644
--- a/VKAPI/Handlers/Utils.php
+++ b/VKAPI/Handlers/Utils.php
@@ -22,7 +22,7 @@ function resolveScreenName(string $screen_name): object
"object_id" => (int) substr($screen_name, strlen("club")),
"type" => "group"
];
- }
+ } else $this->fail(104, "Not found");
} else {
$user = (new Users)->getByShortURL($screen_name);
if($user) {
@@ -39,8 +39,17 @@ function resolveScreenName(string $screen_name): object
"type" => "group"
];
}
-
- return (object) [];
+
+ $this->fail(104, "Not found");
}
}
+
+ function resolveGuid(string $guid): object
+ {
+ $user = (new Users)->getByChandlerUserId($guid);
+ if (is_null($user))
+ $this->fail(104, "Not found");
+
+ return $user->toVkApiStruct($this->getUser());
+ }
}
diff --git a/VKAPI/Handlers/VKAPIRequestHandler.php b/VKAPI/Handlers/VKAPIRequestHandler.php
index d2fcfc74c..4953dbe14 100644
--- a/VKAPI/Handlers/VKAPIRequestHandler.php
+++ b/VKAPI/Handlers/VKAPIRequestHandler.php
@@ -28,7 +28,7 @@ protected function getUser(): ?User
protected function getPlatform(): ?string
{
- return $this->platform;
+ return $this->platform ?? "";
}
protected function userAuthorized(): bool
diff --git a/VKAPI/Handlers/Video.php b/VKAPI/Handlers/Video.php
index 740ccd548..3a14f0484 100755
--- a/VKAPI/Handlers/Video.php
+++ b/VKAPI/Handlers/Video.php
@@ -11,24 +11,55 @@
final class Video extends VKAPIRequestHandler
{
- function get(int $owner_id, string $videos, int $offset = 0, int $count = 30, int $extended = 0): object
+ function get(int $owner_id = 0, string $videos = "", string $fields = "", int $offset = 0, int $count = 30, int $extended = 0): object
{
$this->requireUser();
- if ($videos) {
+ if(!empty($videos)) {
$vids = explode(',', $videos);
-
- foreach($vids as $vid)
- {
+ $profiles = [];
+ $groups = [];
+ foreach($vids as $vid) {
$id = explode("_", $vid);
-
$items = [];
$video = (new VideosRepo)->getByOwnerAndVID(intval($id[0]), intval($id[1]));
- if($video) {
- $items[] = $video->getApiStructure();
+ if($video && !$video->isDeleted()) {
+ $out_video = $video->getApiStructure($this->getUser())->video;
+ $items[] = $out_video;
+ if($out_video['owner_id']) {
+ if($out_video['owner_id'] > 0)
+ $profiles[] = $out_video['owner_id'];
+ else
+ $groups[] = abs($out_video['owner_id']);
+ }
}
}
+
+ if($extended == 1) {
+ $profiles = array_unique($profiles);
+ $groups = array_unique($groups);
+
+ $profilesFormatted = [];
+ $groupsFormatted = [];
+
+ foreach($profiles as $prof) {
+ $profile = (new UsersRepo)->get($prof);
+ $profilesFormatted[] = $profile->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ foreach($groups as $gr) {
+ $group = (new ClubsRepo)->get($gr);
+ $groupsFormatted[] = $group->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ return (object) [
+ "count" => sizeof($items),
+ "items" => $items,
+ "profiles" => $profilesFormatted,
+ "groups" => $groupsFormatted,
+ ];
+ }
return (object) [
"count" => count($items),
@@ -36,16 +67,56 @@ function get(int $owner_id, string $videos, int $offset = 0, int $count = 30, in
];
} else {
if ($owner_id > 0)
- $user = (new UsersRepo)->get($owner_id);
+ $user = (new UsersRepo)->get($owner_id);
else
- $this->fail(1, "Not implemented");
+ $this->fail(1, "Not implemented");
- $videos = (new VideosRepo)->getByUser($user, $offset + 1, $count);
+ if(!$user || $user->isDeleted())
+ $this->fail(14, "Invalid user");
+
+ if(!$user->getPrivacyPermission('videos.read', $this->getUser()))
+ $this->fail(21, "This user chose to hide his videos.");
+
+ $videos = (new VideosRepo)->getByUserLimit($user, $offset, $count);
$videosCount = (new VideosRepo)->getUserVideosCount($user);
$items = [];
- foreach ($videos as $video) {
- $items[] = $video->getApiStructure();
+ $profiles = [];
+ $groups = [];
+ foreach($videos as $video) {
+ $video = $video->getApiStructure($this->getUser())->video;
+ $items[] = $video;
+ if($video['owner_id']) {
+ if($video['owner_id'] > 0)
+ $profiles[] = $video['owner_id'];
+ else
+ $groups[] = abs($video['owner_id']);
+ }
+ }
+
+ if($extended == 1) {
+ $profiles = array_unique($profiles);
+ $groups = array_unique($groups);
+
+ $profilesFormatted = [];
+ $groupsFormatted = [];
+
+ foreach($profiles as $prof) {
+ $profile = (new UsersRepo)->get($prof);
+ $profilesFormatted[] = $profile->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ foreach($groups as $gr) {
+ $group = (new ClubsRepo)->get($gr);
+ $groupsFormatted[] = $group->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ return (object) [
+ "count" => $videosCount,
+ "items" => $items,
+ "profiles" => $profilesFormatted,
+ "groups" => $groupsFormatted,
+ ];
}
return (object) [
@@ -54,4 +125,61 @@ function get(int $owner_id, string $videos, int $offset = 0, int $count = 30, in
];
}
}
+
+ function search(string $q = '', int $sort = 0, int $offset = 0, int $count = 10, bool $extended = false, string $fields = ''): object
+ {
+ $this->requireUser();
+
+ $params = [];
+ $db_sort = ['type' => 'id', 'invert' => false];
+ $videos = (new VideosRepo)->find($q, $params, $db_sort);
+ $items = iterator_to_array($videos->offsetLimit($offset, $count));
+ $count = $videos->size();
+
+ $return_items = [];
+ $profiles = [];
+ $groups = [];
+ foreach($items as $item) {
+ $return_item = $item->getApiStructure($this->getUser());
+ $return_item = $return_item->video;
+ $return_items[] = $return_item;
+
+ if($return_item['owner_id']) {
+ if($return_item['owner_id'] > 0)
+ $profiles[] = $return_item['owner_id'];
+ else
+ $groups[] = abs($return_item['owner_id']);
+ }
+ }
+
+ if($extended) {
+ $profiles = array_unique($profiles);
+ $groups = array_unique($groups);
+
+ $profilesFormatted = [];
+ $groupsFormatted = [];
+
+ foreach($profiles as $prof) {
+ $profile = (new UsersRepo)->get($prof);
+ $profilesFormatted[] = $profile->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ foreach($groups as $gr) {
+ $group = (new ClubsRepo)->get($gr);
+ $groupsFormatted[] = $group->toVkApiStruct($this->getUser(), $fields);
+ }
+
+ return (object) [
+ "count" => $count,
+ "items" => $return_items,
+ "profiles" => $profilesFormatted,
+ "groups" => $groupsFormatted,
+ ];
+ }
+
+ return (object) [
+ "count" => $count,
+ "items" => $return_items,
+ ];
+ }
}
diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php
index ee07f3c12..2fe34d652 100644
--- a/VKAPI/Handlers/Wall.php
+++ b/VKAPI/Handlers/Wall.php
@@ -1,7 +1,7 @@
requireUser();
@@ -25,7 +29,7 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
$items = [];
$profiles = [];
$groups = [];
- $cnt = $posts->getPostCountOnUserWall($owner_id);
+ $cnt = 0;
if ($owner_id > 0)
$wallOnwer = (new UsersRepo)->get($owner_id);
@@ -35,11 +39,56 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
if ($owner_id > 0)
if(!$wallOnwer || $wallOnwer->isDeleted())
$this->fail(18, "User was deleted or banned");
+
+ if(!$wallOnwer->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
else
if(!$wallOnwer)
$this->fail(15, "Access denied: wall is disabled"); // Don't search for logic here pls
- foreach($posts->getPostsFromUsersWall($owner_id, 1, $count, $offset) as $post) {
+ $iteratorv;
+
+ switch($filter) {
+ case "all":
+ $iteratorv = $posts->getPostsFromUsersWall($owner_id, 1, $count, $offset);
+ $cnt = $posts->getPostCountOnUserWall($owner_id);
+ break;
+ case "owner":
+ $iteratorv = $posts->getOwnersPostsFromWall($owner_id, 1, $count, $offset);
+ $cnt = $posts->getOwnersCountOnUserWall($owner_id);
+ break;
+ case "others":
+ $iteratorv = $posts->getOthersPostsFromWall($owner_id, 1, $count, $offset);
+ $cnt = $posts->getOthersCountOnUserWall($owner_id);
+ break;
+ case "postponed":
+ $this->fail(42, "Postponed posts are not implemented.");
+ break;
+ case "suggests":
+ if($owner_id < 0) {
+ if($wallOnwer->getWallType() != 2)
+ $this->fail(125, "Group's wall type is open or closed");
+
+ if($wallOnwer->canBeModifiedBy($this->getUser())) {
+ $iteratorv = $posts->getSuggestedPosts($owner_id * -1, 1, $count, $offset);
+ $cnt = $posts->getSuggestedPostsCount($owner_id * -1);
+ } else {
+ $iteratorv = $posts->getSuggestedPostsByUser($owner_id * -1, $this->getUser()->getId(), 1, $count, $offset);
+ $cnt = $posts->getSuggestedPostsCountByUser($owner_id * -1, $this->getUser()->getId());
+ }
+ } else {
+ $this->fail(528, "Suggested posts avaiable only at groups");
+ }
+
+ break;
+ default:
+ $this->fail(254, "Invalid filter");
+ break;
+ }
+
+ $iteratorv = iterator_to_array($iteratorv);
+
+ foreach($iteratorv as $post) {
$from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId();
$attachments = [];
@@ -53,7 +102,21 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
} else if($attachment instanceof \openvk\Web\Models\Entities\Poll) {
$attachments[] = $this->getApiPoll($attachment, $this->getUser());
} else if ($attachment instanceof \openvk\Web\Models\Entities\Video) {
- $attachments[] = $attachment->getApiStructure();
+ $attachments[] = $attachment->getApiStructure($this->getUser());
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ if(VKAPI_DECL_VER === '4.100') {
+ $attachments[] = $attachment->toVkApiStruct();
+ } else {
+ $attachments[] = [
+ 'type' => 'note',
+ 'note' => $attachment->toVkApiStruct()
+ ];
+ }
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Audio) {
+ $attachments[] = [
+ "type" => "audio",
+ "audio" => $attachment->toVkApiStruct($this->getUser()),
+ ];
} else if ($attachment instanceof \openvk\Web\Models\Entities\Post) {
$repostAttachments = [];
@@ -72,57 +135,52 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
else
$profiles[] = $attachment->getOwner()->getId();
- $post_source = [];
-
- if($attachment->getPlatform(true) === NULL) {
- $post_source = (object)["type" => "vk"];
- } else {
- $post_source = (object)[
- "type" => "api",
- "platform" => $attachment->getPlatform(true)
- ];
- }
-
$repost[] = [
"id" => $attachment->getVirtualId(),
"owner_id" => $attachment->isPostedOnBehalfOfGroup() ? $attachment->getOwner()->getId() * -1 : $attachment->getOwner()->getId(),
"from_id" => $attachment->isPostedOnBehalfOfGroup() ? $attachment->getOwner()->getId() * -1 : $attachment->getOwner()->getId(),
"date" => $attachment->getPublicationTime()->timestamp(),
- "post_type" => "post",
+ "post_type" => $attachment->getVkApiType(),
"text" => $attachment->getText(false),
"attachments" => $repostAttachments,
- "post_source" => $post_source,
+ "post_source" => $attachment->getPostSourceInfo(),
];
+
+ if ($attachment->getTargetWall() > 0)
+ $profiles[] = $attachment->getTargetWall();
+ else
+ $groups[] = abs($attachment->getTargetWall());
+ if($post->isSigned())
+ $profiles[] = $attachment->getOwner()->getId();
}
}
- $post_source = [];
-
- if($post->getPlatform(true) === NULL) {
- $post_source = (object)["type" => "vk"];
- } else {
- $post_source = (object)[
- "type" => "api",
- "platform" => $post->getPlatform(true)
- ];
+ $signerId = NULL;
+ if($post->isSigned()) {
+ $actualAuthor = $post->getOwner(false);
+ $signerId = $actualAuthor->getId();
}
- $items[] = (object)[
+ # TODO "can_pin", "copy_history" и прочее не должны возвращаться, если равны null или false
+ # Ну и ещё всё надо перенести в toVkApiStruct, а то слишком много дублированного кода
+
+ $post_temp_obj = (object)[
"id" => $post->getVirtualId(),
"from_id" => $from_id,
"owner_id" => $post->getTargetWall(),
"date" => $post->getPublicationTime()->timestamp(),
- "post_type" => "post",
+ "post_type" => $post->getVkApiType(),
"text" => $post->getText(false),
"copy_history" => $repost,
- "can_edit" => 0, # TODO
+ "can_edit" => $post->canBeEditedBy($this->getUser()),
"can_delete" => $post->canBeDeletedBy($this->getUser()),
"can_pin" => $post->canBePinnedBy($this->getUser()),
"can_archive" => false, # TODO MAYBE
"is_archived" => false,
"is_pinned" => $post->isPinned(),
+ "is_explicit" => $post->isExplicit(),
"attachments" => $attachments,
- "post_source" => $post_source,
+ "post_source" => $post->getPostSourceInfo(),
"comments" => (object)[
"count" => $post->getCommentsCount(),
"can_post" => 1
@@ -139,14 +197,42 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
]
];
+ if($post->hasSource())
+ $post_temp_obj->copyright = $post->getVkApiCopyright();
+
+ if($signerId)
+ $post_temp_obj->signer_id = $signerId;
+
+ if($post->isDeactivationMessage())
+ $post_temp_obj->final_post = 1;
+
+ $items[] = $post_temp_obj;
+
if ($from_id > 0)
$profiles[] = $from_id;
else
$groups[] = $from_id * -1;
+ if($post->isSigned())
+ $profiles[] = $post->getOwner(false)->getId();
+
$attachments = NULL; # free attachments so it will not clone everythingg
}
+ if($rss == 1) {
+ $channel = new \Bhaktaraz\RSSGenerator\Channel();
+ $channel->title($wallOnwer->getCanonicalName() . " — " . OPENVK_ROOT_CONF['openvk']['appearance']['name'])
+ ->description('Wall of ' . $wallOnwer->getCanonicalName())
+ ->url(ovk_scheme(true) . $_SERVER["HTTP_HOST"] . "/wall" . $wallOnwer->getRealId());
+
+ foreach($iteratorv as $item) {
+ $output = $item->toRss();
+ $output->appendTo($channel);
+ }
+
+ return $channel;
+ }
+
if($extended == 1) {
$profiles = array_unique($profiles);
$groups = array_unique($groups);
@@ -160,9 +246,9 @@ function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 3
"first_name" => $user->getFirstName(),
"id" => $user->getId(),
"last_name" => $user->getLastName(),
- "can_access_closed" => false,
- "is_closed" => false,
- "sex" => $user->isFemale() ? 1 : 2,
+ "can_access_closed" => (bool)$user->canBeViewedBy($this->getUser()),
+ "is_closed" => $user->isClosed(),
+ "sex" => $user->isFemale() ? 1 : ($user->isNeutral() ? 0 : 2),
"screen_name" => $user->getShortCode(),
"photo_50" => $user->getAvatarUrl(),
"photo_100" => $user->getAvatarUrl(),
@@ -214,8 +300,16 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
foreach($psts as $pst) {
$id = explode("_", $pst);
- $post = (new PostsRepo)->getPostById(intval($id[0]), intval($id[1]));
- if($post) {
+ $post = (new PostsRepo)->getPostById(intval($id[0]), intval($id[1]), true);
+
+ if($post && !$post->isDeleted()) {
+ if(!$post->canBeViewedBy($this->getUser()))
+ continue;
+
+ if($post->getSuggestionType() != 0 && !$post->canBeEditedBy($this->getUser())) {
+ continue;
+ }
+
$from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId();
$attachments = [];
$repost = []; // чел высрал семь сигарет 😳 помянем 🕯
@@ -225,7 +319,21 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
} else if($attachment instanceof \openvk\Web\Models\Entities\Poll) {
$attachments[] = $this->getApiPoll($attachment, $user);
} else if ($attachment instanceof \openvk\Web\Models\Entities\Video) {
- $attachments[] = $attachment->getApiStructure();
+ $attachments[] = $attachment->getApiStructure($this->getUser());
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ if(VKAPI_DECL_VER === '4.100') {
+ $attachments[] = $attachment->toVkApiStruct();
+ } else {
+ $attachments[] = [
+ 'type' => 'note',
+ 'note' => $attachment->toVkApiStruct()
+ ];
+ }
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Audio) {
+ $attachments[] = [
+ "type" => "audio",
+ "audio" => $attachment->toVkApiStruct($this->getUser())
+ ];
} else if ($attachment instanceof \openvk\Web\Models\Entities\Post) {
$repostAttachments = [];
@@ -244,17 +352,6 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
else
$profiles[] = $attachment->getOwner()->getId();
- $post_source = [];
-
- if($attachment->getPlatform(true) === NULL) {
- $post_source = (object)["type" => "vk"];
- } else {
- $post_source = (object)[
- "type" => "api",
- "platform" => $attachment->getPlatform(true)
- ];
- }
-
$repost[] = [
"id" => $attachment->getVirtualId(),
"owner_id" => $attachment->isPostedOnBehalfOfGroup() ? $attachment->getOwner()->getId() * -1 : $attachment->getOwner()->getId(),
@@ -263,37 +360,39 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
"post_type" => "post",
"text" => $attachment->getText(false),
"attachments" => $repostAttachments,
- "post_source" => $post_source,
+ "post_source" => $attachment->getPostSourceInfo(),
];
+
+ if ($attachment->getTargetWall() > 0)
+ $profiles[] = $attachment->getTargetWall();
+ else
+ $groups[] = abs($attachment->getTargetWall());
+ if($post->isSigned())
+ $profiles[] = $attachment->getOwner()->getId();
}
}
- $post_source = [];
-
- if($post->getPlatform(true) === NULL) {
- $post_source = (object)["type" => "vk"];
- } else {
- $post_source = (object)[
- "type" => "api",
- "platform" => $post->getPlatform(true)
- ];
+ if($post->isSigned()) {
+ $actualAuthor = $post->getOwner(false);
+ $signerId = $actualAuthor->getId();
}
- $items[] = (object)[
+ $post_temp_obj = (object)[
"id" => $post->getVirtualId(),
"from_id" => $from_id,
"owner_id" => $post->getTargetWall(),
"date" => $post->getPublicationTime()->timestamp(),
- "post_type" => "post",
+ "post_type" => $post->getVkApiType(),
"text" => $post->getText(false),
"copy_history" => $repost,
- "can_edit" => 0, # TODO
+ "can_edit" => $post->canBeEditedBy($this->getUser()),
"can_delete" => $post->canBeDeletedBy($user),
"can_pin" => $post->canBePinnedBy($user),
"can_archive" => false, # TODO MAYBE
"is_archived" => false,
"is_pinned" => $post->isPinned(),
- "post_source" => $post_source,
+ "is_explicit" => $post->isExplicit(),
+ "post_source" => $post->getPostSourceInfo(),
"attachments" => $attachments,
"comments" => (object)[
"count" => $post->getCommentsCount(),
@@ -311,11 +410,25 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
]
];
+ if($post->hasSource())
+ $post_temp_obj->copyright = $post->getVkApiCopyright();
+
+ if($signerId)
+ $post_temp_obj->signer_id = $signerId;
+
+ if($post->isDeactivationMessage())
+ $post_temp_obj->final_post = 1;
+
+ $items[] = $post_temp_obj;
+
if ($from_id > 0)
$profiles[] = $from_id;
else
$groups[] = $from_id * -1;
+ if($post->isSigned())
+ $profiles[] = $post->getOwner(false)->getId();
+
$attachments = NULL; # free attachments so it will not clone everything
$repost = NULL; # same
}
@@ -330,19 +443,28 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
foreach($profiles as $prof) {
$user = (new UsersRepo)->get($prof);
- $profilesFormatted[] = (object)[
- "first_name" => $user->getFirstName(),
- "id" => $user->getId(),
- "last_name" => $user->getLastName(),
- "can_access_closed" => false,
- "is_closed" => false,
- "sex" => $user->isFemale() ? 1 : 2,
- "screen_name" => $user->getShortCode(),
- "photo_50" => $user->getAvatarUrl(),
- "photo_100" => $user->getAvatarUrl(),
- "online" => $user->isOnline(),
- "verified" => $user->isVerified()
- ];
+ if($user) {
+ $profilesFormatted[] = (object)[
+ "first_name" => $user->getFirstName(),
+ "id" => $user->getId(),
+ "last_name" => $user->getLastName(),
+ "can_access_closed" => (bool)$user->canBeViewedBy($this->getUser()),
+ "is_closed" => $user->isClosed(),
+ "sex" => $user->isFemale() ? 1 : 2,
+ "screen_name" => $user->getShortCode(),
+ "photo_50" => $user->getAvatarUrl(),
+ "photo_100" => $user->getAvatarUrl(),
+ "online" => $user->isOnline(),
+ "verified" => $user->isVerified()
+ ];
+ } else {
+ $profilesFormatted[] = (object)[
+ "id" => (int) $prof,
+ "first_name" => "DELETED",
+ "last_name" => "",
+ "deactivated" => "deleted"
+ ];
+ }
}
foreach($groups as $g) {
@@ -371,7 +493,7 @@ function getById(string $posts, int $extended = 0, string $fields = "", User $us
];
}
- function post(string $owner_id, string $message = "", int $from_group = 0, int $signed = 0, string $attachments = ""): object
+ function post(string $owner_id, string $message = "", string $copyright = "", int $from_group = 0, int $signed = 0, string $attachments = "", int $post_id = 0): object
{
$this->requireUser();
$this->willExecuteWriteAction();
@@ -381,7 +503,7 @@ function post(string $owner_id, string $message = "", int $from_group = 0, int $
$wallOwner = ($owner_id > 0 ? (new UsersRepo)->get($owner_id) : (new ClubsRepo)->get($owner_id * -1))
?? $this->fail(18, "User was deleted or banned");
if($owner_id > 0)
- $canPost = $wallOwner->getPrivacyPermission("wall.write", $this->getUser());
+ $canPost = $wallOwner->getPrivacyPermission("wall.write", $this->getUser()) && $wallOwner->canBeViewedBy($this->getUser());
else if($owner_id < 0)
if($wallOwner->canBeModifiedBy($this->getUser()))
$canPost = true;
@@ -392,6 +514,46 @@ function post(string $owner_id, string $message = "", int $from_group = 0, int $
if($canPost == false) $this->fail(15, "Access denied");
+ if($post_id > 0) {
+ if($owner_id > 0)
+ $this->fail(62, "Suggested posts available only at groups");
+
+ $post = (new PostsRepo)->getPostById($owner_id, $post_id, true);
+
+ if(!$post || $post->isDeleted())
+ $this->fail(32, "Invald post");
+
+ if($post->getSuggestionType() == 0)
+ $this->fail(20, "Post is not suggested");
+
+ if($post->getSuggestionType() == 2)
+ $this->fail(16, "Post is declined");
+
+ if(!$post->canBePinnedBy($this->getUser()))
+ $this->fail(51, "Access denied");
+
+ $author = $post->getOwner();
+ $flags = 0;
+ $flags |= 0b10000000;
+
+ if($signed == 1)
+ $flags |= 0b01000000;
+
+ $post->setSuggested(0);
+ $post->setCreated(time());
+ $post->setFlags($flags);
+
+ if(!empty($message) && iconv_strlen($message) > 0)
+ $post->setContent($message);
+
+ $post->save();
+
+ if($author->getId() != $this->getUser()->getId())
+ (new PostAcceptedNotification($author, $post, $post->getWallOwner()))->emit();
+
+ return (object)["post_id" => $post->getVirtualId()];
+ }
+
$anon = OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"];
if($wallOwner instanceof Club && $from_group == 1 && $signed != 1 && $anon) {
$manager = $wallOwner->getManager($this->getUser());
@@ -409,7 +571,17 @@ function post(string $owner_id, string $message = "", int $from_group = 0, int $
if($signed == 1)
$flags |= 0b01000000;
- if(empty($message) && empty($attachments))
+ $parsed_attachments = parseAttachments($attachments, ['photo', 'video', 'note', 'poll', 'audio']);
+ $final_attachments = [];
+ $should_be_suggested = $owner_id < 0 && !$wallOwner->canBeModifiedBy($this->getUser()) && $wallOwner->getWallType() == 2;
+ foreach($parsed_attachments as $attachment) {
+ if($attachment && !$attachment->isDeleted() && $attachment->canBeViewedBy($this->getUser()) &&
+ !(method_exists($attachment, 'getVoters') && $attachment->getOwner()->getId() != $this->getUser()->getId())) {
+ $final_attachments[] = $attachment;
+ }
+ }
+
+ if((empty($message) && (empty($attachments) || sizeof($final_attachments) < 1)))
$this->fail(100, "Required parameter 'message' missing.");
try {
@@ -420,54 +592,23 @@ function post(string $owner_id, string $message = "", int $from_group = 0, int $
$post->setContent($message);
$post->setFlags($flags);
$post->setApi_Source_Name($this->getPlatform());
+
+ if(!is_null($copyright) && !empty($copyright)) {
+ try {
+ $post->setSource($copyright);
+ } catch(\Throwable) {}
+ }
+
+ if($should_be_suggested)
+ $post->setSuggested(1);
+
$post->save();
} catch(\LogicException $ex) {
$this->fail(100, "One of the parameters specified was missing or invalid");
}
- if(!empty($attachments)) {
- $attachmentsArr = explode(",", $attachments);
- # Аттачи такого вида: [тип][id владельца]_[id вложения]
- # Пример: photo1_1
-
- 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");
-
- $post->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");
-
- $post->attach($attacc);
- }
- }
+ foreach($final_attachments as $attachment) {
+ $post->attach($attachment);
}
if($wall > 0 && $wall !== $this->user->identity->getId())
@@ -476,29 +617,60 @@ function post(string $owner_id, string $message = "", int $from_group = 0, int $
return (object)["post_id" => $post->getVirtualId()];
}
- function repost(string $object, string $message = "", int $group_id = 0) {
+ function repost(string $object, string $message = "", string $attachments = "", int $group_id = 0, int $as_group = 0, int $signed = 0) {
$this->requireUser();
$this->willExecuteWriteAction();
$postArray;
- if(preg_match('/wall((?:-?)[0-9]+)_([0-9]+)/', $object, $postArray) == 0)
+ if(preg_match('/(wall|video|photo)((?:-?)[0-9]+)_([0-9]+)/', $object, $postArray) == 0)
$this->fail(100, "One of the parameters specified was missing or invalid: object is incorrect");
-
- $post = (new PostsRepo)->getPostById((int) $postArray[1], (int) $postArray[2]);
- if(!$post || $post->isDeleted()) $this->fail(100, "One of the parameters specified was missing or invalid");
-
+
+ $parsed_attachments = parseAttachments($attachments, ['photo', 'video', 'note', 'audio']);
+ $final_attachments = [];
+ foreach($parsed_attachments as $attachment) {
+ if($attachment && !$attachment->isDeleted() && $attachment->canBeViewedBy($this->getUser()) &&
+ !(method_exists($attachment, 'getVoters') && $attachment->getOwner()->getId() != $this->getUser()->getId())) {
+ $final_attachments[] = $attachment;
+ }
+ }
+
+ $repost_entity = NULL;
+ $repost_type = $postArray[1];
+ switch($repost_type) {
+ default:
+ case 'wall':
+ $repost_entity = (new PostsRepo)->getPostById((int) $postArray[2], (int) $postArray[3]);
+ break;
+ case 'photo':
+ $repost_entity = (new PhotosRepo)->getByOwnerAndVID((int) $postArray[2], (int) $postArray[3]);
+ break;
+ case 'video':
+ $repost_entity = (new VideosRepo)->getByOwnerAndVID((int) $postArray[2], (int) $postArray[3]);
+ break;
+ }
+
+ if(!$repost_entity || $repost_entity->isDeleted() || !$repost_entity->canBeViewedBy($this->getUser())) $this->fail(100, "One of the parameters specified was missing or invalid");
+
$nPost = new Post;
$nPost->setOwner($this->user->getId());
if($group_id > 0) {
- $club = (new ClubsRepo)->get($group_id);
+ $club = (new ClubsRepo)->get($group_id);
if(!$club)
$this->fail(42, "Invalid group");
if(!$club->canBeModifiedBy($this->user))
$this->fail(16, "Access to group denied");
- $nPost->setWall($group_id * -1);
+ $nPost->setWall($club->getRealId());
+ $flags = 0;
+ if($as_group === 1 || $signed === 1)
+ $flags |= 0b10000000;
+
+ if($signed === 1)
+ $flags |= 0b01000000;
+
+ $nPost->setFlags($flags);
} else {
$nPost->setWall($this->user->getId());
}
@@ -506,16 +678,27 @@ function repost(string $object, string $message = "", int $group_id = 0) {
$nPost->setContent($message);
$nPost->setApi_Source_Name($this->getPlatform());
$nPost->save();
- $nPost->attach($post);
-
- if($post->getOwner(false)->getId() !== $this->user->getId() && !($post->getOwner() instanceof Club))
- (new RepostNotification($post->getOwner(false), $post, $this->user))->emit();
+
+ $nPost->attach($repost_entity);
+
+ foreach($parsed_attachments as $attachment) {
+ $nPost->attach($attachment);
+ }
+
+ if($repost_type == 'wall' && $repost_entity->getOwner(false)->getId() !== $this->user->getId() && !($repost_entity->getOwner() instanceof Club))
+ (new RepostNotification($repost_entity->getOwner(false), $repost_entity, $this->user))->emit();
+
+ $repost_count = 1;
+ if($repost_type == 'wall') {
+ $repost_count = $repost_entity->getRepostCount();
+ }
return (object) [
"success" => 1, // 👍
"post_id" => $nPost->getVirtualId(),
- "reposts_count" => $post->getRepostCount(),
- "likes_count" => $post->getLikesCount()
+ "pretty_id" => $nPost->getPrettyId(),
+ "reposts_count" => $repost_count,
+ "likes_count" => $repost_entity->getLikesCount()
];
}
@@ -525,6 +708,9 @@ function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $
$post = (new PostsRepo)->getPostById($owner_id, $post_id);
if(!$post || $post->isDeleted()) $this->fail(100, "One of the parameters specified was missing or invalid");
+
+ if(!$post->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
$comments = (new CommentsRepo)->getCommentsByTarget($post, $offset+1, $count, $sort == "desc" ? "DESC" : "ASC");
@@ -542,6 +728,13 @@ function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $
foreach($comment->getChildren() as $attachment) {
if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
$attachments[] = $this->getApiPhoto($attachment);
+ } elseif($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ $attachments[] = $attachment->toVkApiStruct();
+ } elseif($attachment instanceof \openvk\Web\Models\Entities\Audio) {
+ $attachments[] = [
+ "type" => "audio",
+ "audio" => $attachment->toVkApiStruct($this->getUser()),
+ ];
}
}
@@ -551,7 +744,7 @@ function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $
"date" => $comment->getPublicationTime()->timestamp(),
"text" => $comment->getText(false),
"post_id" => $post->getVirtualId(),
- "owner_id" => $post->isPostedOnBehalfOfGroup() ? $post->getOwner()->getId() * -1 : $post->getOwner()->getId(),
+ "owner_id" => method_exists($post, 'isPostedOnBehalfOfGroup') && $post->isPostedOnBehalfOfGroup() ? $post->getOwner()->getId() * -1 : $post->getOwner()->getId(),
"parents_stack" => [],
"attachments" => $attachments,
"thread" => [
@@ -563,6 +756,9 @@ function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $
]
];
+ if($comment->isFromPostAuthor($post))
+ $item['is_from_post_author'] = true;
+
if($need_likes == true)
$item['likes'] = [
"can_like" => 1,
@@ -599,7 +795,13 @@ function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $
function getComment(int $owner_id, int $comment_id, bool $extended = false, string $fields = "sex,screen_name,photo_50,photo_100,online_info,online") {
$this->requireUser();
- $comment = (new CommentsRepo)->get($comment_id); // один хуй айди всех комментов общий
+ $comment = (new CommentsRepo)->get($comment_id); # один хуй айди всех комментов общий
+
+ if(!$comment || $comment->isDeleted())
+ $this->fail(100, "Invalid comment");
+
+ if(!$comment->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
$profiles = [];
@@ -608,6 +810,18 @@ function getComment(int $owner_id, int $comment_id, bool $extended = false, stri
foreach($comment->getChildren() as $attachment) {
if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
$attachments[] = $this->getApiPhoto($attachment);
+ } elseif($attachment instanceof \openvk\Web\Models\Entities\Video) {
+ $attachments[] = $attachment->getApiStructure();
+ } elseif($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ $attachments[] = [
+ 'type' => 'note',
+ 'note' => $attachment->toVkApiStruct()
+ ];
+ } elseif($attachment instanceof \openvk\Web\Models\Entities\Audio) {
+ $attachments[] = [
+ "type" => "audio",
+ "audio" => $attachment->toVkApiStruct($this->getUser()),
+ ];
}
}
@@ -617,7 +831,7 @@ function getComment(int $owner_id, int $comment_id, bool $extended = false, stri
"date" => $comment->getPublicationTime()->timestamp(),
"text" => $comment->getText(false),
"post_id" => $comment->getTarget()->getVirtualId(),
- "owner_id" => $comment->getTarget()->isPostedOnBehalfOfGroup() ? $comment->getTarget()->getOwner()->getId() * -1 : $comment->getTarget()->getOwner()->getId(),
+ "owner_id" => method_exists($comment->getTarget(), 'isPostedOnBehalfOfGroup') && $comment->getTarget()->isPostedOnBehalfOfGroup() ? $comment->getTarget()->getOwner()->getId() * -1 : $comment->getTarget()->getOwner()->getId(),
"parents_stack" => [],
"attachments" => $attachments,
"likes" => [
@@ -635,6 +849,9 @@ function getComment(int $owner_id, int $comment_id, bool $extended = false, stri
]
];
+ if($comment->isFromPostAuthor())
+ $item['is_from_post_author'] = true;
+
if($extended == true)
$profiles[] = $comment->getOwner()->getId();
@@ -650,22 +867,32 @@ function getComment(int $owner_id, int $comment_id, bool $extended = false, stri
$response['profiles'] = (!empty($profiles) ? (new Users)->get(implode(',', $profiles), $fields) : []);
}
-
-
return $response;
}
- function createComment(int $owner_id, int $post_id, string $message, int $from_group = 0, string $attachments = "") {
+ function createComment(int $owner_id, int $post_id, string $message = "", int $from_group = 0, string $attachments = "") {
$this->requireUser();
$this->willExecuteWriteAction();
$post = (new PostsRepo)->getPostById($owner_id, $post_id);
if(!$post || $post->isDeleted()) $this->fail(100, "Invalid post");
+ if(!$post->canBeViewedBy($this->getUser()))
+ $this->fail(15, "Access denied");
+
if($post->getTargetWall() < 0)
$club = (new ClubsRepo)->get(abs($post->getTargetWall()));
- if(empty($message) && empty($attachments)) {
+ $parsed_attachments = parseAttachments($attachments, ['photo', 'video', 'note', 'audio']);
+ $final_attachments = [];
+ foreach($parsed_attachments as $attachment) {
+ if($attachment && !$attachment->isDeleted() && $attachment->canBeViewedBy($this->getUser()) &&
+ !(method_exists($attachment, 'getVoters') && $attachment->getOwner()->getId() != $this->getUser()->getId())) {
+ $final_attachments[] = $attachment;
+ }
+ }
+
+ if((empty($message) && (empty($attachments) || sizeof($final_attachments) < 1))) {
$this->fail(100, "Required parameter 'message' missing.");
}
@@ -686,47 +913,8 @@ function createComment(int $owner_id, int $post_id, string $message, int $from_g
$this->fail(1, "ошибка про то что коммент большой слишком");
}
- 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);
- }
- }
+ foreach($final_attachments as $attachment) {
+ $comment->attach($attachment);
}
if($post->getOwner()->getId() !== $this->user->getId())
@@ -752,12 +940,200 @@ function deleteComment(int $comment_id) {
return 1;
}
+
+ function delete(int $owner_id, int $post_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $post = (new PostsRepo)->getPostById($owner_id, $post_id, true);
+ if(!$post || $post->isDeleted())
+ $this->fail(583, "Invalid post");
+
+ $wallOwner = $post->getWallOwner();
+
+ if($post->getTargetWall() < 0 && !$post->getWallOwner()->canBeModifiedBy($this->getUser()) && $post->getWallOwner()->getWallType() != 1 && $post->getSuggestionType() == 0)
+ $this->fail(12, "Access denied: you can't delete your accepted post.");
+
+ if($post->getOwnerPost() == $this->getUser()->getId() || $post->getTargetWall() == $this->getUser()->getId() || $owner_id < 0 && $wallOwner->canBeModifiedBy($this->getUser())) {
+ $post->unwire();
+ $post->delete();
+
+ return 1;
+ } else {
+ $this->fail(15, "Access denied");
+ }
+ }
+
+ function edit(int $owner_id, int $post_id, string $message = "", string $attachments = "", string $copyright = NULL, int $explicit = -1, int $from_group = 0, int $signed = 0) {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $parsed_attachments = parseAttachments($attachments, ['photo', 'video', 'note', 'audio', 'poll']);
+ $final_attachments = [];
+ foreach($parsed_attachments as $attachment) {
+ if($attachment && !$attachment->isDeleted() && $attachment->canBeViewedBy($this->getUser()) &&
+ !(method_exists($attachment, 'getVoters') && $attachment->getOwner()->getId() != $this->getUser()->getId())) {
+ $final_attachments[] = $attachment;
+ }
+ }
+
+ if(empty($message) && sizeof($final_attachments) < 1) {
+ $this->fail(-66, "Post will be empty, don't saving.");
+ }
+
+ $post = (new PostsRepo)->getPostById($owner_id, $post_id, true);
+
+ if(!$post || $post->isDeleted())
+ $this->fail(102, "Invalid post");
+
+ if(!$post->canBeEditedBy($this->getUser()))
+ $this->fail(7, "Access to editing denied");
+
+ if(!empty($message) || (empty($message) && sizeof($final_attachments) > 0))
+ $post->setContent($message);
+
+ $post->setEdited(time());
+ if(!is_null($copyright) && !empty($copyright)) {
+ if($copyright == 'remove') {
+ $post->resetSource();
+ } else {
+ try {
+ $post->setSource($copyright);
+ } catch(\Throwable) {}
+ }
+ }
+
+ if($explicit != -1) {
+ $post->setNsfw($explicit == 1);
+ }
+
+ $wallOwner = ($owner_id > 0 ? (new UsersRepo)->get($owner_id) : (new ClubsRepo)->get($owner_id * -1));
+ $flags = 0;
+ if($from_group == 1 && $wallOwner instanceof Club && $wallOwner->canBeModifiedBy($this->getUser()))
+ $flags |= 0b10000000;
+ /*if($signed == 1)
+ $flags |= 0b01000000;*/
+
+ $post->setFlags($flags);
+ $post->save(true);
+
+ if($attachments == 'remove' || sizeof($final_attachments) > 0) {
+ foreach($post->getChildren() as $att) {
+ if(!($att instanceof Post)) {
+ $post->detach($att);
+ }
+ }
+
+ foreach($final_attachments as $attachment) {
+ $post->attach($attachment);
+ }
+ }
+
+ return ["post_id" => $post->getVirtualId()];
+ }
+
+ function editComment(int $comment_id, int $owner_id = 0, string $message = "", string $attachments = "") {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $comment = (new CommentsRepo)->get($comment_id);
+ $parsed_attachments = parseAttachments($attachments, ['photo', 'video', 'note', 'audio']);
+ $final_attachments = [];
+ foreach($parsed_attachments as $attachment) {
+ if($attachment && !$attachment->isDeleted() && $attachment->canBeViewedBy($this->getUser()) &&
+ !(method_exists($attachment, 'getVoters') && $attachment->getOwner()->getId() != $this->getUser()->getId())) {
+ $final_attachments[] = $attachment;
+ }
+ }
+
+ if(empty($message) && sizeof($final_attachments) < 1)
+ $this->fail(100, "Required parameter 'message' missing.");
+
+ if(!$comment || $comment->isDeleted())
+ $this->fail(102, "Invalid comment");
+
+ if(!$comment->canBeEditedBy($this->getUser()))
+ $this->fail(15, "Access to editing comment denied");
+
+ if(!empty($message) || (empty($message) && sizeof($final_attachments) > 0))
+ $comment->setContent($message);
+
+ $comment->setEdited(time());
+ $comment->save(true);
+
+ if(sizeof($final_attachments) > 0) {
+ $comment->unwire();
+ foreach($final_attachments as $attachment) {
+ $comment->attach($attachment);
+ }
+ }
+
+ return 1;
+ }
+
+ function checkCopyrightLink(string $link): int
+ {
+ $this->requireUser();
+
+ try {
+ $result = check_copyright_link($link);
+ } catch(\InvalidArgumentException $e) {
+ $this->fail(3102, "Specified link is incorrect (can't find source)");
+ } catch(\LengthException $e) {
+ $this->fail(3103, "Specified link is incorrect (too long)");
+ } catch(\LogicException $e) {
+ $this->fail(3104, "Link is suspicious");
+ } catch(\Throwable $e) {
+ $this->fail(3102, "Specified link is incorrect");
+ }
+
+ return 1;
+ }
+
+ function pin(int $owner_id, int $post_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $post = (new PostsRepo)->getPostById($owner_id, $post_id);
+ if(!$post || $post->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: post_id is undefined");
+
+ if(!$post->canBePinnedBy($this->getUser()))
+ return 0;
+
+ if($post->isPinned())
+ return 1;
+
+ $post->pin();
+ return 1;
+ }
+
+ function unpin(int $owner_id, int $post_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $post = (new PostsRepo)->getPostById($owner_id, $post_id);
+ if(!$post || $post->isDeleted())
+ $this->fail(100, "One of the parameters specified was missing or invalid: post_id is undefined");
+
+ if(!$post->canBePinnedBy($this->getUser()))
+ return 0;
+
+ if(!$post->isPinned())
+ return 1;
+
+ $post->unpin();
+ return 1;
+ }
private function getApiPhoto($attachment) {
return [
"type" => "photo",
"photo" => [
- "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : NULL,
+ "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : 0,
"date" => $attachment->getPublicationTime()->timestamp(),
"id" => $attachment->getVirtualId(),
"owner_id" => $attachment->getOwner()->getId(),
diff --git a/VKAPI/README.md b/VKAPI/README.md
index 75918afcb..08c8408b0 100644
--- a/VKAPI/README.md
+++ b/VKAPI/README.md
@@ -5,7 +5,7 @@ exceptions. It is still a work-in-progress functionality.
**Note**: requests to API are routed through
openvk.Web.Presenters.VKAPIPresenter, this dir contains only handlers.
-[Documentation for API clients](https://docs.openvk.uk/openvk_engine/api/description/)
+[Documentation for API clients](https://docs.ovk.to/openvk_engine/api/description/)
## Implementing API methods
diff --git a/Web/Models/Entities/APIToken.php b/Web/Models/Entities/APIToken.php
index f5744ec33..0cc531487 100644
--- a/Web/Models/Entities/APIToken.php
+++ b/Web/Models/Entities/APIToken.php
@@ -48,7 +48,7 @@ function revoke(): void
$this->delete();
}
- function save(): void
+ function save(?bool $log = false): void
{
if(is_null($this->getRecord()))
$this->stateChanges("secret", bin2hex(openssl_random_pseudo_bytes(36)));
diff --git a/Web/Models/Entities/Album.php b/Web/Models/Entities/Album.php
index 150cc6257..cc96cc0ba 100644
--- a/Web/Models/Entities/Album.php
+++ b/Web/Models/Entities/Album.php
@@ -67,11 +67,27 @@ function hasPhoto(Photo $photo): bool
return $this->has($photo);
}
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ if($this->isDeleted()) {
+ return false;
+ }
+
+ $owner = $this->getOwner();
+
+ if(get_class($owner) == "openvk\\Web\\Models\\Entities\\User") {
+ return $owner->canBeViewedBy($user) && $owner->getPrivacyPermission('photos.read', $user);
+ } else {
+ return $owner->canBeViewedBy($user);
+ }
+ }
+
function toVkApiStruct(?User $user = NULL, bool $need_covers = false, bool $photo_sizes = false): object
{
$res = (object) [];
$res->id = $this->getPrettyId();
+ $res->vid = $this->getId();
$res->thumb_id = !is_null($this->getCoverPhoto()) ? $this->getCoverPhoto()->getPrettyId() : 0;
$res->owner_id = $this->getOwner()->getId();
$res->title = $this->getName();
diff --git a/Web/Models/Entities/Application.php b/Web/Models/Entities/Application.php
index 74569485f..489756453 100644
--- a/Web/Models/Entities/Application.php
+++ b/Web/Models/Entities/Application.php
@@ -306,11 +306,14 @@ function withdrawCoins(): void
function delete(bool $softly = true): void
{
if($softly)
- throw new \UnexpectedValueException("Can't delete apps softly.");
+ throw new \UnexpectedValueException("Can't delete apps softly."); // why
$cx = DatabaseConnection::i()->getContext();
$cx->table("app_users")->where("app", $this->getId())->delete();
parent::delete(false);
}
+
+ function getPublicationTime(): string
+ { return tr("recently"); }
}
\ No newline at end of file
diff --git a/Web/Models/Entities/Audio.php b/Web/Models/Entities/Audio.php
new file mode 100644
index 000000000..23941f4c4
--- /dev/null
+++ b/Web/Models/Entities/Audio.php
@@ -0,0 +1,479 @@
+ 1,
+ "Pop" => 2,
+ "Rap" => 3,
+ "Hip-Hop" => 3, # VK API lists №3 as Rap & Hip-Hop, but these genres are distinct in OpenVK
+ "Easy Listening" => 4,
+ "House" => 5,
+ "Dance" => 5,
+ "Instrumental" => 6,
+ "Metal" => 7,
+ "Alternative" => 21,
+ "Dubstep" => 8,
+ "Jazz" => 1001,
+ "Blues" => 1001,
+ "Drum & Bass" => 10,
+ "Trance" => 11,
+ "Chanson" => 12,
+ "Ethnic" => 13,
+ "Acoustic" => 14,
+ "Vocal" => 14,
+ "Reggae" => 15,
+ "Classical" => 16,
+ "Indie Pop" => 17,
+ "Speech" => 19,
+ "Disco" => 22,
+ "Other" => 18,
+ ];
+
+ private function fileLength(string $filename): int
+ {
+ if(!Shell::commandAvailable("ffmpeg") || !Shell::commandAvailable("ffprobe"))
+ throw new \Exception();
+
+ $error = NULL;
+ $streams = Shell::ffprobe("-i", $filename, "-show_streams", "-select_streams a", "-loglevel error")->execute($error);
+ if($error !== 0)
+ throw new \DomainException("$filename is not recognized as media container");
+ else if(empty($streams) || ctype_space($streams))
+ throw new \DomainException("$filename does not contain any audio streams");
+
+ $vstreams = Shell::ffprobe("-i", $filename, "-show_streams", "-select_streams v", "-loglevel error")->execute($error);
+
+ # check if audio has cover (attached_pic)
+ preg_match("%attached_pic=([0-1])%", $vstreams, $hasCover);
+ if(!empty($vstreams) && !ctype_space($vstreams) && ((int)($hasCover[1]) !== 1))
+ throw new \DomainException("$filename is a video");
+
+ $durations = [];
+ preg_match_all('%duration=([0-9\.]++)%', $streams, $durations);
+ if(sizeof($durations[1]) === 0)
+ throw new \DomainException("$filename does not contain any meaningful audio streams");
+
+ $length = 0;
+ foreach($durations[1] as $duration) {
+ $duration = floatval($duration);
+ if($duration < 1.0 || $duration > 65536.0)
+ throw new \DomainException("$filename does not contain any meaningful audio streams");
+ else
+ $length = max($length, $duration);
+ }
+
+ return (int) round($length, 0, PHP_ROUND_HALF_EVEN);
+ }
+
+ /**
+ * @throws \Exception
+ */
+ protected function saveFile(string $filename, string $hash): bool
+ {
+ $duration = $this->fileLength($filename);
+
+ $kid = openssl_random_pseudo_bytes(16);
+ $key = openssl_random_pseudo_bytes(16);
+ $tok = openssl_random_pseudo_bytes(28);
+ $ss = ceil($duration / 15);
+
+ $this->stateChanges("kid", $kid);
+ $this->stateChanges("key", $key);
+ $this->stateChanges("token", $tok);
+ $this->stateChanges("segment_size", $ss);
+ $this->stateChanges("length", $duration);
+
+ try {
+ $args = [
+ str_replace("enabled", "available", OPENVK_ROOT),
+ str_replace("enabled", "available", $this->getBaseDir()),
+ $hash,
+ $filename,
+
+ bin2hex($kid),
+ bin2hex($key),
+ bin2hex($tok),
+ $ss,
+ ];
+
+ if(Shell::isPowershell()) {
+ Shell::powershell("-executionpolicy bypass", "-File", __DIR__ . "/../shell/processAudio.ps1", ...$args)
+ ->start();
+ } else {
+ Shell::bash(__DIR__ . "/../shell/processAudio.sh", ...$args) // Pls workkkkk
+ ->start(); // idk, not tested :")
+ }
+
+ # Wait until processAudio will consume the file
+ $start = time();
+ while(file_exists($filename))
+ if(time() - $start > 5)
+ throw new \RuntimeException("Timed out waiting FFMPEG");
+
+ } catch(UnknownCommandException $ucex) {
+ exit(OPENVK_ROOT_CONF["openvk"]["debug"] ? "bash/pwsh is not installed" : VIDEOS_FRIENDLY_ERROR);
+ }
+
+ return true;
+ }
+
+ function getTitle(): string
+ {
+ return $this->getRecord()->name;
+ }
+
+ function getPerformer(): string
+ {
+ return $this->getRecord()->performer;
+ }
+
+ function getPerformers(): array
+ {
+ return explode(", ", $this->getRecord()->performer);
+ }
+
+ function getName(): string
+ {
+ return $this->getPerformer() . " — " . $this->getTitle();
+ }
+
+ function getDownloadName(): string
+ {
+ return preg_replace('/[\\/:*?"<>|]/', '_', str_replace(' ', '_', $this->getName()));
+ }
+
+ function getGenre(): ?string
+ {
+ return $this->getRecord()->genre;
+ }
+
+ function getLyrics(): ?string
+ {
+ return !is_null($this->getRecord()->lyrics) ? htmlspecialchars($this->getRecord()->lyrics, ENT_DISALLOWED | ENT_XHTML) : NULL;
+ }
+
+ function getLength(): int
+ {
+ return $this->getRecord()->length;
+ }
+
+ function getFormattedLength(): string
+ {
+ $len = $this->getLength();
+ $mins = floor($len / 60);
+ $secs = $len - ($mins * 60);
+
+ return (
+ str_pad((string) $mins, 2, "0", STR_PAD_LEFT)
+ . ":" .
+ str_pad((string) $secs, 2, "0", STR_PAD_LEFT)
+ );
+ }
+
+ function getSegmentSize(): float
+ {
+ return $this->getRecord()->segment_size;
+ }
+
+ function getListens(): int
+ {
+ return $this->getRecord()->listens;
+ }
+
+ function getOriginalURL(bool $force = false): string
+ {
+ $disallowed = !OPENVK_ROOT_CONF["openvk"]["preferences"]["music"]["exposeOriginalURLs"] && !$force;
+ if(!$this->isAvailable() || $disallowed)
+ return ovk_scheme(true)
+ . $_SERVER["HTTP_HOST"] . ":"
+ . $_SERVER["HTTP_PORT"]
+ . "/assets/packages/static/openvk/audio/nomusic.mp3";
+
+ $key = bin2hex($this->getRecord()->token);
+
+ return str_replace(".mpd", "_fragments", $this->getURL()) . "/original_$key.mp3";
+ }
+
+ function getURL(?bool $force = false): string
+ {
+ if ($this->isWithdrawn()) return "";
+
+ return parent::getURL();
+ }
+
+ function getKeys(): array
+ {
+ $keys[bin2hex($this->getRecord()->kid)] = bin2hex($this->getRecord()->key);
+
+ return $keys;
+ }
+
+ function isAnonymous(): bool
+ {
+ return false;
+ }
+
+ function isExplicit(): bool
+ {
+ return (bool) $this->getRecord()->explicit;
+ }
+
+ function isWithdrawn(): bool
+ {
+ return (bool) $this->getRecord()->withdrawn;
+ }
+
+ function isUnlisted(): bool
+ {
+ return (bool) $this->getRecord()->unlisted;
+ }
+
+ # NOTICE may flush model to DB if it was just processed
+ function isAvailable(): bool
+ {
+ if($this->getRecord()->processed)
+ return true;
+
+ # throttle requests to isAvailable to prevent DoS attack if filesystem is actually an S3 storage
+ if(time() - $this->getRecord()->checked < 5)
+ return false;
+
+ try {
+ $fragments = str_replace(".mpd", "_fragments", $this->getFileName());
+ $original = "original_" . bin2hex($this->getRecord()->token) . ".mp3";
+ if(file_exists("$fragments/$original")) {
+ # Original gets uploaded after fragments
+ $this->stateChanges("processed", 0x01);
+
+ return true;
+ }
+ } finally {
+ $this->stateChanges("checked", time());
+ $this->save();
+ }
+
+ return false;
+ }
+
+ function isInLibraryOf($entity): bool
+ {
+ return sizeof(DatabaseConnection::i()->getContext()->table("audio_relations")->where([
+ "entity" => $entity->getId() * ($entity instanceof Club ? -1 : 1),
+ "audio" => $this->getId(),
+ ])) != 0;
+ }
+
+ function add($entity): bool
+ {
+ if($this->isInLibraryOf($entity))
+ return false;
+
+ $entityId = $entity->getId() * ($entity instanceof Club ? -1 : 1);
+ $audioRels = DatabaseConnection::i()->getContext()->table("audio_relations");
+ if(sizeof($audioRels->where("entity", $entityId)) > 65536)
+ throw new \OverflowException("Can't have more than 65536 audios in a playlist");
+
+ $audioRels->insert([
+ "entity" => $entityId,
+ "audio" => $this->getId(),
+ ]);
+
+ return true;
+ }
+
+ function remove($entity): bool
+ {
+ if(!$this->isInLibraryOf($entity))
+ return false;
+
+ DatabaseConnection::i()->getContext()->table("audio_relations")->where([
+ "entity" => $entity->getId() * ($entity instanceof Club ? -1 : 1),
+ "audio" => $this->getId(),
+ ])->delete();
+
+ return true;
+ }
+
+ function listen($entity, Playlist $playlist = NULL): bool
+ {
+ $listensTable = DatabaseConnection::i()->getContext()->table("audio_listens");
+ $lastListen = $listensTable->where([
+ "entity" => $entity->getRealId(),
+ "audio" => $this->getId(),
+ ])->order("index DESC")->fetch();
+
+ if(!$lastListen || (time() - $lastListen->time >= $this->getLength())) {
+ $listensTable->insert([
+ "entity" => $entity->getRealId(),
+ "audio" => $this->getId(),
+ "time" => time(),
+ "playlist" => $playlist ? $playlist->getId() : NULL,
+ ]);
+
+ if($entity instanceof User) {
+ $this->stateChanges("listens", ($this->getListens() + 1));
+ $this->save();
+
+ if($playlist) {
+ $playlist->incrementListens();
+ $playlist->save();
+ }
+ }
+
+ $entity->setLast_played_track($this->getId());
+ $entity->save();
+
+ return true;
+ }
+
+ $lastListen->update([
+ "time" => time(),
+ ]);
+
+ return false;
+ }
+
+ /**
+ * Returns compatible with VK API 4.x, 5.x structure.
+ *
+ * Always sets album(_id) to NULL at this time.
+ * If genre is not present in VK genre list, fallbacks to "Other".
+ * The url and manifest properties will be set to false if the audio can't be played (processing, removed).
+ *
+ * Aside from standard VK properties, this method will also return some OVK extended props:
+ * 1. added - Is in the library of $user?
+ * 2. editable - Can be edited by $user?
+ * 3. withdrawn - Removed due to copyright request?
+ * 4. ready - Can be played at this time?
+ * 5. genre_str - Full name of genre, NULL if it's undefined
+ * 6. manifest - URL to MPEG-DASH manifest
+ * 7. keys - ClearKey DRM keys
+ * 8. explicit - Marked as NSFW?
+ * 9. searchable - Can be found via search?
+ * 10. unique_id - Unique ID of audio
+ *
+ * @notice that in case if exposeOriginalURLs is set to false in config, "url" will always contain link to nomusic.mp3,
+ * unless $forceURLExposure is set to true.
+ *
+ * @notice may trigger db flush if the audio is not processed yet, use with caution on unsaved models.
+ *
+ * @param ?User $user user, relative to whom "added", "editable" will be set
+ * @param bool $forceURLExposure force set "url" regardless of config
+ */
+ function toVkApiStruct(?User $user = NULL, bool $forceURLExposure = false): object
+ {
+ $obj = (object) [];
+ $obj->unique_id = base64_encode((string) $this->getId());
+ $obj->id = $obj->aid = $this->getVirtualId();
+ $obj->artist = $this->getPerformer();
+ $obj->title = $this->getTitle();
+ $obj->duration = $this->getLength();
+ $obj->album_id = $obj->album = NULL; # i forgor to implement
+ $obj->url = false;
+ $obj->manifest = false;
+ $obj->keys = false;
+ $obj->genre_id = $obj->genre = self::vkGenres[$this->getGenre() ?? ""] ?? 18; # return Other if no match
+ $obj->genre_str = $this->getGenre();
+ $obj->owner_id = $this->getOwner()->getId();
+ if($this->getOwner() instanceof Club)
+ $obj->owner_id *= -1;
+
+ $obj->lyrics = NULL;
+ if(!is_null($this->getLyrics()))
+ $obj->lyrics = $this->getId();
+
+ $obj->added = $user && $this->isInLibraryOf($user);
+ $obj->editable = $user && $this->canBeModifiedBy($user);
+ $obj->searchable = !$this->isUnlisted();
+ $obj->explicit = $this->isExplicit();
+ $obj->withdrawn = $this->isWithdrawn();
+ $obj->ready = $this->isAvailable() && !$obj->withdrawn;
+ if($obj->ready) {
+ $obj->url = $this->getOriginalURL($forceURLExposure);
+ $obj->manifest = $this->getURL();
+ $obj->keys = $this->getKeys();
+ }
+
+ return $obj;
+ }
+
+ function setOwner(int $oid): void
+ {
+ # WARNING: API implementation won't be able to handle groups like that, don't remove
+ if($oid <= 0)
+ throw new \OutOfRangeException("Only users can be owners of audio!");
+
+ $this->stateChanges("owner", $oid);
+ }
+
+ function setGenre(string $genre): void
+ {
+ if(!in_array($genre, Audio::genres)) {
+ $this->stateChanges("genre", NULL);
+ return;
+ }
+
+ $this->stateChanges("genre", $genre);
+ }
+
+ function setCopyrightStatus(bool $withdrawn = true): void {
+ $this->stateChanges("withdrawn", $withdrawn);
+ }
+
+ function setSearchability(bool $searchable = true): void {
+ $this->stateChanges("unlisted", !$searchable);
+ }
+
+ function setToken(string $tok): void {
+ throw new \LogicException("Changing keys is not supported.");
+ }
+
+ function setKid(string $kid): void {
+ throw new \LogicException("Changing keys is not supported.");
+ }
+
+ function setKey(string $key): void {
+ throw new \LogicException("Changing keys is not supported.");
+ }
+
+ function setLength(int $len): void {
+ throw new \LogicException("Changing length is not supported.");
+ }
+
+ function setSegment_Size(int $len): void {
+ throw new \LogicException("Changing length is not supported.");
+ }
+
+ function delete(bool $softly = true): void
+ {
+ $ctx = DatabaseConnection::i()->getContext();
+ $ctx->table("audio_relations")->where("audio", $this->getId())
+ ->delete();
+ $ctx->table("audio_listens")->where("audio", $this->getId())
+ ->delete();
+ $ctx->table("playlist_relations")->where("media", $this->getId())
+ ->delete();
+
+ parent::delete($softly);
+ }
+}
diff --git a/Web/Models/Entities/Ban.php b/Web/Models/Entities/Ban.php
new file mode 100644
index 000000000..3962c6cbf
--- /dev/null
+++ b/Web/Models/Entities/Ban.php
@@ -0,0 +1,66 @@
+getRecord()->id;
+ }
+
+ function getReason(): ?string
+ {
+ return $this->getRecord()->reason;
+ }
+
+ function getUser(): ?User
+ {
+ return (new Users)->get($this->getRecord()->user);
+ }
+
+ function getInitiator(): ?User
+ {
+ return (new Users)->get($this->getRecord()->initiator);
+ }
+
+ function getStartTime(): int
+ {
+ return $this->getRecord()->iat;
+ }
+
+ function getEndTime(): int
+ {
+ return $this->getRecord()->exp;
+ }
+
+ function getTime(): int
+ {
+ return $this->getRecord()->time;
+ }
+
+ function isPermanent(): bool
+ {
+ return $this->getEndTime() === 0;
+ }
+
+ function isRemovedManually(): bool
+ {
+ return (bool) $this->getRecord()->removed_manually;
+ }
+
+ function isOver(): bool
+ {
+ return $this->isRemovedManually();
+ }
+
+ function whoRemoved(): ?User
+ {
+ return (new Users)->get($this->getRecord()->removed_by);
+ }
+}
diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php
index b321a4761..6121b69d8 100644
--- a/Web/Models/Entities/Club.php
+++ b/Web/Models/Entities/Club.php
@@ -3,7 +3,7 @@
use openvk\Web\Util\DateTime;
use openvk\Web\Models\RowModel;
use openvk\Web\Models\Entities\{User, Manager};
-use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Managers};
+use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Managers, Posts};
use Nette\Database\Table\{ActiveRow, GroupedSelection};
use Chandler\Database\DatabaseConnection as DB;
use Chandler\Security\User as ChandlerUser;
@@ -23,6 +23,10 @@ class Club extends RowModel
const NOT_RELATED = 0;
const SUBSCRIBED = 1;
const REQUEST_SENT = 2;
+
+ const WALL_CLOSED = 0;
+ const WALL_OPEN = 1;
+ const WALL_LIMITED = 2;
function getId(): int
{
@@ -38,13 +42,19 @@ function getAvatarPhoto(): ?Photo
return iterator_to_array($avPhotos)[0] ?? NULL;
}
- function getAvatarUrl(string $size = "miniscule"): string
+ function getAvatarUrl(string $size = "miniscule", $avPhoto = NULL): string
{
$serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
- $avPhoto = $this->getAvatarPhoto();
+ if(!$avPhoto)
+ $avPhoto = $this->getAvatarPhoto();
return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURLBySizeId($size);
}
+
+ function getWallType(): int
+ {
+ return $this->getRecord()->wall;
+ }
function getAvatarLink(): string
{
@@ -143,6 +153,11 @@ function isHideFromGlobalFeedEnabled(): bool
return (bool) $this->getRecord()->hide_from_global_feed;
}
+ function isHidingFromGlobalFeedEnforced(): bool
+ {
+ return (bool) $this->getRecord()->enforce_hiding_from_global_feed;
+ }
+
function getType(): int
{
return $this->getRecord()->type;
@@ -182,6 +197,14 @@ function setShortCode(?string $code = NULL): ?bool
$this->stateChanges("shortcode", $code);
return true;
}
+
+ function setWall(int $type)
+ {
+ if($type > 2 || $type < 0)
+ throw new \LogicException("Invalid wall");
+
+ $this->stateChanges("wall", $type);
+ }
function isSubscriptionAccepted(User $user): bool
{
@@ -224,7 +247,7 @@ function getPostViewStats(bool $unique = false): ?array
"shape" => "spline",
"color" => "#597da3",
],
- "name" => $unique ? "Полный охват" : "Все просмотры",
+ "name" => $unique ? tr("full_coverage") : tr("all_views"),
],
"subs" => [
"x" => array_reverse(range(1, 7)),
@@ -235,7 +258,7 @@ function getPostViewStats(bool $unique = false): ?array
"color" => "#b05c91",
],
"fill" => "tozeroy",
- "name" => $unique ? "Охват подписчиков" : "Просмотры подписчиков",
+ "name" => $unique ? tr("subs_coverage") : tr("subs_views"),
],
"viral" => [
"x" => array_reverse(range(1, 7)),
@@ -246,7 +269,7 @@ function getPostViewStats(bool $unique = false): ?array
"color" => "#4d9fab",
],
"fill" => "tozeroy",
- "name" => $unique ? "Виральный охват" : "Виральные просмотры",
+ "name" => $unique ? tr("viral_coverage") : tr("viral_views"),
],
];
}
@@ -272,7 +295,7 @@ function getFollowersQuery(string $sort = "follower ASC"): GroupedSelection
return false;
}
- return $query;
+ return $query->group("follower");
}
function getFollowersCount(): int
@@ -291,6 +314,21 @@ function getFollowers(int $page = 1, int $perPage = 6, string $sort = "follower
yield $rel;
}
}
+
+ function getSuggestedPostsCount(User $user = NULL)
+ {
+ $count = 0;
+
+ if(is_null($user))
+ return NULL;
+
+ if($this->canBeModifiedBy($user))
+ $count = (new Posts)->getSuggestedPostsCount($this->getId());
+ else
+ $count = (new Posts)->getSuggestedPostsCountByUser($this->getId(), $user->getId());
+
+ return $count;
+ }
function getManagers(int $page = 1, bool $ignoreHidden = false): \Traversable
{
@@ -351,44 +389,112 @@ function canBeModifiedBy(User $user): bool
}
function getWebsite(): ?string
- {
- return $this->getRecord()->website;
- }
+ {
+ return $this->getRecord()->website;
+ }
+
+ function ban(string $reason): void
+ {
+ $this->setBlock_Reason($reason);
+ $this->save();
+ }
+
+ function unban(): void
+ {
+ $this->setBlock_Reason(null);
+ $this->save();
+ }
+
+ function canBeViewedBy(?User $user = NULL)
+ {
+ return is_null($this->getBanReason());
+ }
function getAlert(): ?string
{
return $this->getRecord()->alert;
}
+
+ function getRealId(): int
+ {
+ return $this->getId() * -1;
+ }
+
+ function isEveryoneCanUploadAudios(): bool
+ {
+ return (bool) $this->getRecord()->everyone_can_upload_audios;
+ }
+
+ function canUploadAudio(?User $user): bool
+ {
+ if(!$user)
+ return NULL;
+
+ return $this->isEveryoneCanUploadAudios() || $this->canBeModifiedBy($user);
+ }
+
+ function getAudiosCollectionSize()
+ {
+ return (new \openvk\Web\Models\Repositories\Audios)->getClubCollectionSize($this);
+ }
- function toVkApiStruct(?User $user = NULL): object
+ function toVkApiStruct(?User $user = NULL, string $fields = ''): object
{
- $res = [];
+ $res = (object) [];
$res->id = $this->getId();
$res->name = $this->getName();
- $res->screen_name = $this->getShortCode();
- $res->is_closed = 0;
+ $res->screen_name = $this->getShortCode() ?? "club".$this->getId();
+ $res->is_closed = false;
+ $res->type = 'group';
+ $res->is_member = $user ? (int)$this->getSubscriptionStatus($user) : 0;
$res->deactivated = NULL;
- $res->is_admin = $this->canBeModifiedBy($user);
+ $res->can_access_closed = true;
- if($this->canBeModifiedBy($user)) {
- $res->admin_level = 3;
+ if(!is_array($fields))
+ $fields = explode(',', $fields);
+
+ $avatar_photo = $this->getAvatarPhoto();
+ foreach($fields as $field) {
+ switch($field) {
+ case 'verified':
+ $res->verified = (int)$this->isVerified();
+ break;
+ case 'site':
+ $res->site = $this->getWebsite();
+ break;
+ case 'description':
+ $res->description = $this->getDescription();
+ break;
+ case 'background':
+ $res->background = $this->getBackDropPictureURLs();
+ break;
+ case 'photo_50':
+ $res->photo_50 = $this->getAvatarUrl('miniscule', $avatar_photo);
+ break;
+ case 'photo_100':
+ $res->photo_100 = $this->getAvatarUrl('tiny', $avatar_photo);
+ break;
+ case 'photo_200':
+ $res->photo_200 = $this->getAvatarUrl('normal', $avatar_photo);
+ break;
+ case 'photo_max':
+ $res->photo_max = $this->getAvatarUrl('original', $avatar_photo);
+ break;
+ case 'members_count':
+ $res->members_count = $this->getFollowersCount();
+ break;
+ case 'real_id':
+ $res->real_id = $this->getRealId();
+ break;
+ }
}
- $res->is_member = $this->getSubscriptionStatus($user) ? 1 : 0;
-
- $res->type = "group";
- $res->photo_50 = $this->getAvatarUrl("miniscule");
- $res->photo_100 = $this->getAvatarUrl("tiny");
- $res->photo_200 = $this->getAvatarUrl("normal");
-
- $res->can_create_topic = $this->canBeModifiedBy($user) ? 1 : $this->isEveryoneCanCreateTopics() ? 1 : 0;
-
- $res->can_post = $this->canBeModifiedBy($user) ? 1 : $this->canPost() ? 1 : 0;
-
- return (object) $res;
+ return $res;
}
use Traits\TBackDrops;
use Traits\TSubscribable;
+ use Traits\TAudioStatuses;
+ use Traits\TIgnorable;
}
diff --git a/Web/Models/Entities/Comment.php b/Web/Models/Entities/Comment.php
index bd833a82a..acd5d7b57 100644
--- a/Web/Models/Entities/Comment.php
+++ b/Web/Models/Entities/Comment.php
@@ -11,7 +11,7 @@ class Comment extends Post
function getPrettyId(): string
{
- return $this->getRecord()->id;
+ return (string)$this->getRecord()->id;
}
function getVirtualId(): int
@@ -28,6 +28,11 @@ function getTarget(): ?Postable
return $entity;
}
+ function getPageURL(): string
+ {
+ return '#';
+ }
+
/**
* May return fake owner (group), if flags are [1, (*)]
*
@@ -46,8 +51,11 @@ function getOwner(bool $honourFlags = true, bool $real = false): RowModel
return parent::getOwner($honourFlags, $real);
}
- function canBeDeletedBy(User $user): bool
+ function canBeDeletedBy(User $user = NULL): bool
{
+ if(!$user)
+ return false;
+
return $this->getOwner()->getId() == $user->getId() ||
$this->getTarget()->getOwner()->getId() == $user->getId() ||
$this->getTarget() instanceof Post && $this->getTarget()->getTargetWall() < 0 && (new Clubs)->get(abs($this->getTarget()->getTargetWall()))->canBeModifiedBy($user) ||
@@ -61,7 +69,7 @@ function toVkApiStruct(?User $user = NULL, bool $need_likes = false, bool $exten
$res->id = $this->getId();
$res->from_id = $this->getOwner()->getId();
$res->date = $this->getPublicationTime()->timestamp();
- $res->text = $this->getText();
+ $res->text = $this->getText(false);
$res->attachments = [];
$res->parents_stack = [];
@@ -74,8 +82,12 @@ function toVkApiStruct(?User $user = NULL, bool $need_likes = false, bool $exten
foreach($this->getChildren() as $attachment) {
if($attachment->isDeleted())
continue;
-
- $res->attachments[] = $attachment->toVkApiStruct();
+
+ if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
+ $res->attachments[] = $attachment->toVkApiStruct();
+ } else if($attachment instanceof \openvk\Web\Models\Entities\Video) {
+ $res->attachments[] = $attachment->toVkApiStruct($this->getUser());
+ }
}
if($need_likes) {
@@ -85,4 +97,82 @@ function toVkApiStruct(?User $user = NULL, bool $need_likes = false, bool $exten
}
return $res;
}
+
+ function getURL(): string
+ {
+ return "/wall" . $this->getTarget()->getPrettyId() . "#_comment" . $this->getId();
+ }
+
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ if($this->isDeleted() || $this->getTarget()->isDeleted()) {
+ return false;
+ }
+
+ return $this->getTarget()->canBeViewedBy($user);
+ }
+
+ function isFromPostAuthor($target = NULL)
+ {
+ if(!$target)
+ $target = $this->getTarget();
+
+ $target_owner = $target->getOwner();
+ $comment_owner = $this->getOwner();
+
+ if($target_owner->getRealId() === $comment_owner->getRealId())
+ return true;
+
+ # TODO: make it work with signer_id
+
+ return false;
+ }
+
+ function toNotifApiStruct()
+ {
+ $res = (object)[];
+
+ $res->id = $this->getId();
+ $res->owner_id = $this->getOwner()->getId();
+ $res->date = $this->getPublicationTime()->timestamp();
+ $res->text = $this->getText(false);
+ $res->post = NULL; # todo
+
+ return $res;
+ }
+
+ function canBeEditedBy(?User $user = NULL): bool
+ {
+ if(!$user)
+ return false;
+
+ return $user->getId() == $this->getOwner(false)->getId();
+ }
+
+ function getTargetURL(): string
+ {
+ $target = $this->getTarget();
+ $target_name = 'wall';
+
+ if(!$target) {
+ return '/404';
+ }
+
+ switch(get_class($target)) {
+ case 'openvk\Web\Models\Entities\Note':
+ $target_name = 'note';
+ break;
+ case 'openvk\Web\Models\Entities\Photo':
+ $target_name = 'photo';
+ break;
+ case 'openvk\Web\Models\Entities\Video':
+ $target_name = 'video';
+ break;
+ case 'openvk\Web\Models\Entities\Topic':
+ $target_name = 'topic';
+ break;
+ }
+
+ return $target_name . $target->getPrettyId();
+ }
}
diff --git a/Web/Models/Entities/Correspondence.php b/Web/Models/Entities/Correspondence.php
index e4b7d96eb..a972425e5 100644
--- a/Web/Models/Entities/Correspondence.php
+++ b/Web/Models/Entities/Correspondence.php
@@ -131,7 +131,7 @@ function getMessages(int $capBehavior = 1, ?int $cap = NULL, ?int $limit = NULL,
*/
function getPreviewMessage(): ?Message
{
- $messages = $this->getMessages(1, NULL, 1);
+ $messages = $this->getMessages(1, NULL, 1, 0);
return $messages[0] ?? NULL;
}
diff --git a/Web/Models/Entities/IP.php b/Web/Models/Entities/IP.php
index ecea92cad..0d9b8fd0f 100644
--- a/Web/Models/Entities/IP.php
+++ b/Web/Models/Entities/IP.php
@@ -92,7 +92,7 @@ function rateLimit(int $actionComplexity = 1): int
$this->stateChanges("rate_limit_counter", $aCounter);
$this->stateChanges("rate_limit_violation_counter_start", $vCounterSessionStart);
$this->stateChanges("rate_limit_violation_counter", $vCounter);
- $this->save();
+ $this->save(false);
}
}
@@ -105,11 +105,11 @@ function setIp(string $ip): void
$this->stateChanges("ip", $ip);
}
- function save(): void
+ function save(?bool $log = false): void
{
if(is_null($this->getRecord()))
$this->stateChanges("first_seen", time());
- parent::save();
+ parent::save($log);
}
}
diff --git a/Web/Models/Entities/Media.php b/Web/Models/Entities/Media.php
index 9377f3e8e..648d3564e 100644
--- a/Web/Models/Entities/Media.php
+++ b/Web/Models/Entities/Media.php
@@ -121,14 +121,14 @@ function setFile(array $file): void
$this->stateChanges("hash", $hash);
}
- function save(): void
+ function save(?bool $log = false): void
{
if(!is_null($this->processingPlaceholder) && is_null($this->getRecord())) {
$this->stateChanges("processed", 0);
$this->stateChanges("last_checked", time());
}
- parent::save();
+ parent::save($log);
}
function delete(bool $softly = true): void
diff --git a/Web/Models/Entities/MediaCollection.php b/Web/Models/Entities/MediaCollection.php
index 05f3835c1..1f0619886 100644
--- a/Web/Models/Entities/MediaCollection.php
+++ b/Web/Models/Entities/MediaCollection.php
@@ -17,7 +17,17 @@ abstract class MediaCollection extends RowModel
protected $specialNames = [];
- private $relations;
+ protected $relations;
+
+ /**
+ * Maximum amount of items Collection can have
+ */
+ const MAX_ITEMS = INF;
+
+ /**
+ * Maximum amount of Collections with same "owner" allowed
+ */
+ const MAX_COUNT = INF;
function __construct(?ActiveRow $ar = NULL)
{
@@ -70,18 +80,29 @@ function getDescription(): ?string
}
abstract function getCoverURL(): ?string;
-
- function fetch(int $page = 1, ?int $perPage = NULL): \Traversable
+
+ function fetchClassic(int $offset = 0, ?int $limit = NULL): \Traversable
{
- $related = $this->getRecord()->related("$this->relTableName.collection")->page($page, $perPage ?? OPENVK_DEFAULT_PER_PAGE)->order("media ASC");
+ $related = $this->getRecord()->related("$this->relTableName.collection")
+ ->limit($limit ?? OPENVK_DEFAULT_PER_PAGE, $offset)
+ ->order("media ASC");
+
foreach($related as $rel) {
$media = $rel->ref($this->entityTableName, "media");
if(!$media)
continue;
-
+
yield new $this->entityClassName($media);
}
}
+
+ function fetch(int $page = 1, ?int $perPage = NULL): \Traversable
+ {
+ $page = max(1, $page);
+ $perPage ??= OPENVK_DEFAULT_PER_PAGE;
+
+ return $this->fetchClassic($perPage * ($page - 1), $perPage);
+ }
function size(): int
{
@@ -110,7 +131,7 @@ function isCreatedBySystem(): bool
{
return $this->getRecord()->special_type !== 0;
}
-
+
function add(RowModel $entity): bool
{
$this->entitySuitable($entity);
@@ -118,6 +139,10 @@ function add(RowModel $entity): bool
if(!$this->allowDuplicates)
if($this->has($entity))
return false;
+
+ if(self::MAX_ITEMS != INF)
+ if(sizeof($this->relations->where("collection", $this->getId())) > self::MAX_ITEMS)
+ throw new \OutOfBoundsException("Collection is full");
$this->relations->insert([
"collection" => $this->getId(),
@@ -127,14 +152,14 @@ function add(RowModel $entity): bool
return true;
}
- function remove(RowModel $entity): void
+ function remove(RowModel $entity): bool
{
$this->entitySuitable($entity);
- $this->relations->where([
+ return $this->relations->where([
"collection" => $this->getId(),
"media" => $entity->getId(),
- ])->delete();
+ ])->delete() > 0;
}
function has(RowModel $entity): bool
@@ -148,6 +173,33 @@ function has(RowModel $entity): bool
return !is_null($rel);
}
-
+
+ function save(?bool $log = false): void
+ {
+ $thisTable = DatabaseConnection::i()->getContext()->table($this->tableName);
+ if(self::MAX_COUNT != INF)
+ if(isset($this->changes["owner"]))
+ if(sizeof($thisTable->where("owner", $this->changes["owner"])) > self::MAX_COUNT)
+ throw new \OutOfBoundsException("Maximum amount of collections");
+
+ if(is_null($this->getRecord()))
+ if(!isset($this->changes["created"]))
+ $this->stateChanges("created", time());
+ else
+ $this->stateChanges("edited", time());
+
+ parent::save($log);
+ }
+
+ function delete(bool $softly = true): void
+ {
+ if(!$softly) {
+ $this->relations->where("collection", $this->getId())
+ ->delete();
+ }
+
+ parent::delete($softly);
+ }
+
use Traits\TOwnable;
}
diff --git a/Web/Models/Entities/Message.php b/Web/Models/Entities/Message.php
index 97f3cf69b..29e6578e5 100644
--- a/Web/Models/Entities/Message.php
+++ b/Web/Models/Entities/Message.php
@@ -66,7 +66,7 @@ function getSendTimeHumanized(): string
$dateTime = new DateTime($this->getRecord()->created);
if($dateTime->format("%d.%m.%y") == ovk_strftime_safe("%d.%m.%y", time())) {
- return $dateTime->format("%T %p");
+ return $dateTime->format("%T");
} else {
return $dateTime->format("%d.%m.%y");
}
@@ -123,7 +123,11 @@ function simplify(): array
],
];
} else {
- throw new \Exception("Unknown attachment type: " . get_class($attachment));
+ $attachments[] = [
+ "type" => "unknown"
+ ];
+
+ # throw new \Exception("Unknown attachment type: " . get_class($attachment));
}
}
diff --git a/Web/Models/Entities/NoSpamLog.php b/Web/Models/Entities/NoSpamLog.php
new file mode 100644
index 000000000..48d723c90
--- /dev/null
+++ b/Web/Models/Entities/NoSpamLog.php
@@ -0,0 +1,71 @@
+getRecord()->id;
+ }
+
+ function getUser(): ?User
+ {
+ return (new Users)->get($this->getRecord()->user);
+ }
+
+ function getModel(): string
+ {
+ return $this->getRecord()->model;
+ }
+
+ function getRegex(): ?string
+ {
+ return $this->getRecord()->regex;
+ }
+
+ function getRequest(): ?string
+ {
+ return $this->getRecord()->request;
+ }
+
+ function getCount(): int
+ {
+ return $this->getRecord()->count;
+ }
+
+ function getTime(): DateTime
+ {
+ return new DateTime($this->getRecord()->time);
+ }
+
+ function getItems(): ?array
+ {
+ return explode(",", $this->getRecord()->items);
+ }
+
+ function getTypeRaw(): int
+ {
+ return $this->getRecord()->ban_type;
+ }
+
+ function getType(): string
+ {
+ switch ($this->getTypeRaw()) {
+ case 1: return "О";
+ case 2: return "Б";
+ case 3: return "ОБ";
+ default: return (string) $this->getTypeRaw();
+ }
+ }
+
+ function isRollbacked(): bool
+ {
+ return !is_null($this->getRecord()->rollback);
+ }
+}
diff --git a/Web/Models/Entities/Note.php b/Web/Models/Entities/Note.php
index d259c2a50..33ac6b040 100644
--- a/Web/Models/Entities/Note.php
+++ b/Web/Models/Entities/Note.php
@@ -118,19 +118,29 @@ function getSource(): string
{
return $this->getRecord()->source;
}
+
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ if($this->isDeleted() || $this->getOwner()->isDeleted()) {
+ return false;
+ }
+
+ return $this->getOwner()->getPrivacyPermission('notes.read', $user) && $this->getOwner()->canBeViewedBy($user);
+ }
function toVkApiStruct(): object
{
$res = (object) [];
- $res->id = $this->getId();
+ $res->type = "note";
+ $res->id = $this->getVirtualId();
$res->owner_id = $this->getOwner()->getId();
$res->title = $this->getName();
$res->text = $this->getText();
$res->date = $this->getPublicationTime()->timestamp();
$res->comments = $this->getCommentsCount();
$res->read_comments = $this->getCommentsCount();
- $res->view_url = "/note".$this->getOwner()->getId()."_".$this->getId();
+ $res->view_url = "/note".$this->getOwner()->getId()."_".$this->getVirtualId();
$res->privacy_view = 1;
$res->can_comment = 1;
$res->text_wiki = "r";
diff --git a/Web/Models/Entities/Notifications/NewSuggestedPostsNotification.php b/Web/Models/Entities/Notifications/NewSuggestedPostsNotification.php
new file mode 100644
index 000000000..e1795b08a
--- /dev/null
+++ b/Web/Models/Entities/Notifications/NewSuggestedPostsNotification.php
@@ -0,0 +1,13 @@
+encodeType($this->originModel);
+ $target_m = $this->encodeType($this->targetModel);
+
+ $info = [
+ "type" => "",
+ "parent" => NULL,
+ "feedback" => NULL,
+ ];
+
+ switch($this->getActionCode()) {
+ case 0:
+ $info["type"] = "like_post";
+ $info["parent"] = $this->getModel(0)->toNotifApiStruct();
+ $info["feedback"] = $this->getModel(1)->toVkApiStruct();
+ break;
+ case 1:
+ $info["type"] = "copy_post";
+ $info["parent"] = $this->getModel(0)->toNotifApiStruct();
+ $info["feedback"] = NULL; # todo
+ break;
+ case 2:
+ switch($origin_m) {
+ case 19:
+ $info["type"] = "comment_video";
+ $info["parent"] = $this->getModel(0)->toNotifApiStruct();
+ $info["feedback"] = NULL; # айди коммента не сохраняется в бд( ну пиздец блять
+ break;
+ case 13:
+ $info["type"] = "comment_photo";
+ $info["parent"] = $this->getModel(0)->toNotifApiStruct();
+ $info["feedback"] = NULL;
+ break;
+ # unstandart (vk forgor about notes)
+ case 10:
+ $info["type"] = "comment_note";
+ $info["parent"] = $this->getModel(0)->toVkApiStruct();
+ $info["feedback"] = NULL;
+ break;
+ case 14:
+ $info["type"] = "comment_post";
+ $info["parent"] = $this->getModel(0)->toNotifApiStruct();
+ $info["feedback"] = NULL;
+ break;
+ # unused (users don't have topics bruh)
+ case 21:
+ $info["type"] = "comment_topic";
+ $info["parent"] = $this->getModel(0)->toVkApiStruct(0, 90);
+ break;
+ default:
+ $info["type"] = "comment_unknown";
+ break;
+ }
+
+ break;
+ case 3:
+ $info["type"] = "wall";
+ $info["feedback"] = $this->getModel(0)->toNotifApiStruct();
+ break;
+ case 4:
+ switch($target_m) {
+ case 14:
+ $info["type"] = "mention";
+ $info["feedback"] = $this->getModel(1)->toNotifApiStruct();
+ break;
+ case 19:
+ $info["type"] = "mention_comment_video";
+ $info["parent"] = $this->getModel(1)->toNotifApiStruct();
+ break;
+ case 13:
+ $info["type"] = "mention_comment_photo";
+ $info["parent"] = $this->getModel(1)->toNotifApiStruct();
+ break;
+ # unstandart
+ case 10:
+ $info["type"] = "mention_comment_note";
+ $info["parent"] = $this->getModel(1)->toVkApiStruct();
+ break;
+ case 21:
+ $info["type"] = "mention_comments";
+ break;
+ default:
+ $info["type"] = "mention_comment_unknown";
+ break;
+ }
+ break;
+ case 5:
+ $info["type"] = "make_you_admin";
+ $info["parent"] = $this->getModel(0)->toVkApiStruct($this->getModel(1));
+ break;
+ # Нужно доделать после мержа #935
+ case 6:
+ $info["type"] = "wall_publish";
+ break;
+ # В вк не было такого уведомления, так что unstandart
+ case 7:
+ $info["type"] = "new_posts_in_club";
+ break;
+ # В вк при передаче подарков приходит сообщение, а не уведомление, так что unstandart
+ case 9601:
+ $info["type"] = "sent_gift";
+ $info["parent"] = $this->getModel(1)->toVkApiStruct($this->getModel(1));
+ break;
+ case 9602:
+ $info["type"] = "voices_transfer";
+ $info["parent"] = $this->getModel(1)->toVkApiStruct($this->getModel(1));
+ break;
+ case 9603:
+ $info["type"] = "up_rating";
+ $info["parent"] = $this->getModel(1)->toVkApiStruct($this->getModel(1));
+ $info["parent"]->count = $this->getData();
+ break;
+ default:
+ $info["type"] = NULL;
+ break;
+ }
+
+ return $info;
+ }
+
+ function toVkApiStruct()
+ {
+ $res = (object)[];
+
+ $info = $this->getVkApiInfo();
+ $res->type = $info["type"];
+ $res->date = $this->getDateTime()->timestamp();
+ $res->parent = $info["parent"];
+ $res->feedback = $info["feedback"];
+ $res->reply = NULL; # Ответы на комментарии не реализованы
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Notifications/PostAcceptedNotification.php b/Web/Models/Entities/Notifications/PostAcceptedNotification.php
new file mode 100644
index 000000000..bb99d34e7
--- /dev/null
+++ b/Web/Models/Entities/Notifications/PostAcceptedNotification.php
@@ -0,0 +1,13 @@
+stateChanges("key", base64_encode(openssl_random_pseudo_bytes(46)));
$this->stateChanges("timestamp", time());
- parent::save();
+ parent::save($log);
}
}
diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php
index 29526daaf..90c532b27 100644
--- a/Web/Models/Entities/Photo.php
+++ b/Web/Models/Entities/Photo.php
@@ -114,7 +114,7 @@ protected function saveFile(string $filename, string $hash): bool
return true;
}
- function crop(real $left, real $top, real $width, real $height): void
+ function crop(float $left, float $top, float $width, float $height): void
{
if(isset($this->changes["hash"]))
$hash = $this->changes["hash"];
@@ -300,7 +300,7 @@ function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object
{
$res = (object) [];
- $res->id = $res->pid = $this->getId();
+ $res->id = $res->pid = $this->getVirtualId();
$res->owner_id = $res->user_id = $this->getOwner()->getId();
$res->aid = $res->album_id = NULL;
$res->width = $this->getDimensions()[0];
@@ -308,7 +308,7 @@ function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object
$res->date = $res->created = $this->getPublicationTime()->timestamp();
if($photo_sizes) {
- $res->sizes = $this->getVkApiSizes();
+ $res->sizes = array_values($this->getVkApiSizes());
$res->src_small = $res->photo_75 = $this->getURLBySizeId("miniscule");
$res->src = $res->photo_130 = $this->getURLBySizeId("tiny");
$res->src_big = $res->photo_604 = $this->getURLBySizeId("normal");
@@ -328,6 +328,19 @@ function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object
return $res;
}
+
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ if($this->isDeleted() || $this->getOwner()->isDeleted()) {
+ return false;
+ }
+
+ if(!is_null($this->getAlbum())) {
+ return $this->getAlbum()->canBeViewedBy($user);
+ } else {
+ return $this->getOwner()->canBeViewedBy($user);
+ }
+ }
static function fastMake(int $owner, string $description = "", array $file, ?Album $album = NULL, bool $anon = false): Photo
{
@@ -347,4 +360,20 @@ static function fastMake(int $owner, string $description = "", array $file, ?Alb
return $photo;
}
+
+ function toNotifApiStruct()
+ {
+ $res = (object)[];
+
+ $res->id = $this->getVirtualId();
+ $res->owner_id = $this->getOwner()->getId();
+ $res->aid = 0;
+ $res->src = $this->getURLBySizeId("tiny");
+ $res->src_big = $this->getURLBySizeId("normal");
+ $res->src_small = $this->getURLBySizeId("miniscule");
+ $res->text = $this->getDescription();
+ $res->created = $this->getPublicationTime()->timestamp();
+
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Playlist.php b/Web/Models/Entities/Playlist.php
new file mode 100644
index 000000000..ac36b4f34
--- /dev/null
+++ b/Web/Models/Entities/Playlist.php
@@ -0,0 +1,282 @@
+importTable = DatabaseConnection::i()->getContext()->table("playlist_imports");
+ }
+
+ function getCoverURL(string $size = "normal"): ?string
+ {
+ $photo = (new Photos)->get((int) $this->getRecord()->cover_photo_id);
+ return is_null($photo) ? "/assets/packages/static/openvk/img/song.jpg" : $photo->getURLBySizeId($size);
+ }
+
+ function getLength(): int
+ {
+ return $this->getRecord()->length;
+ }
+
+ function fetchClassic(int $offset = 0, ?int $limit = NULL): \Traversable
+ {
+ $related = $this->getRecord()->related("$this->relTableName.collection")
+ ->limit($limit ?? OPENVK_DEFAULT_PER_PAGE, $offset)
+ ->order("index ASC");
+
+ foreach($related as $rel) {
+ $media = $rel->ref($this->entityTableName, "media");
+ if(!$media)
+ continue;
+
+ yield new $this->entityClassName($media);
+ }
+ }
+
+ function getAudios(int $offset = 0, ?int $limit = NULL, ?int $shuffleSeed = NULL): \Traversable
+ {
+ if(!$shuffleSeed) {
+ foreach ($this->fetchClassic($offset, $limit) as $e)
+ yield $e; # No, I can't return, it will break with []
+
+ return;
+ }
+
+ $ids = [];
+ foreach($this->relations->select("media AS i")->where("collection", $this->getId()) as $rel)
+ $ids[] = $rel->i;
+
+ $ids = knuth_shuffle($ids, $shuffleSeed);
+ $ids = array_slice($ids, $offset, $limit ?? OPENVK_DEFAULT_PER_PAGE);
+ foreach($ids as $id)
+ yield (new Audios)->get($id);
+ }
+
+ function add(RowModel $audio): bool
+ {
+ if($res = parent::add($audio)) {
+ $this->stateChanges("length", $this->getRecord()->length + $audio->getLength());
+ $this->save();
+ }
+
+ return $res;
+ }
+
+ function remove(RowModel $audio): bool
+ {
+ if($res = parent::remove($audio)) {
+ $this->stateChanges("length", $this->getRecord()->length - $audio->getLength());
+ $this->save();
+ }
+
+ return $res;
+ }
+
+ function isBookmarkedBy(RowModel $entity): bool
+ {
+ $id = $entity->getId();
+ if($entity instanceof Club)
+ $id *= -1;
+
+ return !is_null($this->importTable->where([
+ "entity" => $id,
+ "playlist" => $this->getId(),
+ ])->fetch());
+ }
+
+ function bookmark(RowModel $entity): bool
+ {
+ if($this->isBookmarkedBy($entity))
+ return false;
+
+ $id = $entity->getId();
+ if($entity instanceof Club)
+ $id *= -1;
+
+ if($this->importTable->where("entity", $id)->count() > self::MAX_COUNT)
+ throw new \OutOfBoundsException("Maximum amount of playlists");
+
+ $this->importTable->insert([
+ "entity" => $id,
+ "playlist" => $this->getId(),
+ ]);
+
+ return true;
+ }
+
+ function unbookmark(RowModel $entity): bool
+ {
+ $id = $entity->getId();
+ if($entity instanceof Club)
+ $id *= -1;
+
+ $count = $this->importTable->where([
+ "entity" => $id,
+ "playlist" => $this->getId(),
+ ])->delete();
+
+ return $count > 0;
+ }
+
+ function getDescription(): ?string
+ {
+ return $this->getRecord()->description;
+ }
+
+ function getDescriptionHTML(): ?string
+ {
+ return htmlspecialchars($this->getRecord()->description, ENT_DISALLOWED | ENT_XHTML);
+ }
+
+ function getListens()
+ {
+ return $this->getRecord()->listens;
+ }
+
+ function toVkApiStruct(?User $user = NULL): object
+ {
+ $oid = $this->getOwner()->getId();
+ if($this->getOwner() instanceof Club)
+ $oid *= -1;
+
+ return (object) [
+ "id" => $this->getId(),
+ "owner_id" => $oid,
+ "title" => $this->getName(),
+ "description" => $this->getDescription(),
+ "size" => $this->size(),
+ "length" => $this->getLength(),
+ "created" => $this->getCreationTime()->timestamp(),
+ "modified" => $this->getEditTime() ? $this->getEditTime()->timestamp() : NULL,
+ "accessible" => $this->canBeViewedBy($user),
+ "editable" => $this->canBeModifiedBy($user),
+ "bookmarked" => $this->isBookmarkedBy($user),
+ "listens" => $this->getListens(),
+ "cover_url" => $this->getCoverURL(),
+ "searchable" => !$this->isUnlisted(),
+ ];
+ }
+
+ function setLength(): void
+ {
+ throw new \LogicException("Can't set length of playlist manually");
+ }
+
+ function resetLength(): bool
+ {
+ $this->stateChanges("length", 0);
+
+ return true;
+ }
+
+ function delete(bool $softly = true): void
+ {
+ $ctx = DatabaseConnection::i()->getContext();
+ $ctx->table("playlist_imports")->where("playlist", $this->getId())
+ ->delete();
+
+ parent::delete($softly);
+ }
+
+ function hasAudio(Audio $audio): bool
+ {
+ $ctx = DatabaseConnection::i()->getContext();
+ return !is_null($ctx->table("playlist_relations")->where([
+ "collection" => $this->getId(),
+ "media" => $audio->getId()
+ ])->fetch());
+ }
+
+ function getCoverPhotoId(): ?int
+ {
+ return $this->getRecord()->cover_photo_id;
+ }
+
+ function getCoverPhoto(): ?Photo
+ {
+ return (new Photos)->get((int) $this->getRecord()->cover_photo_id);
+ }
+
+ function canBeModifiedBy(User $user): bool
+ {
+ if(!$user)
+ return false;
+
+ if($this->getOwner() instanceof User)
+ return $user->getId() == $this->getOwner()->getId();
+ else
+ return $this->getOwner()->canBeModifiedBy($user);
+ }
+
+ function getLengthInMinutes(): int
+ {
+ return (int)round($this->getLength() / 60, PHP_ROUND_HALF_DOWN);
+ }
+
+ function fastMakeCover(int $owner, array $file)
+ {
+ $cover = new Photo;
+ $cover->setOwner($owner);
+ $cover->setDescription("Playlist cover image");
+ $cover->setFile($file);
+ $cover->setCreated(time());
+ $cover->save();
+
+ $this->setCover_photo_id($cover->getId());
+
+ return $cover;
+ }
+
+ function getURL(): string
+ {
+ return "/playlist" . $this->getOwner()->getRealId() . "_" . $this->getId();
+ }
+
+ function incrementListens()
+ {
+ $this->stateChanges("listens", ($this->getListens() + 1));
+ }
+
+ function getMetaDescription(): string
+ {
+ $length = $this->getLengthInMinutes();
+
+ $props = [];
+ $props[] = tr("audios_count", $this->size());
+ $props[] = "" . tr("listens_count", $this->getListens()) . "";
+ if($length > 0) $props[] = tr("minutes_count", $length);
+ $props[] = tr("created_playlist") . " " . $this->getPublicationTime();
+ # if($this->getEditTime()) $props[] = tr("updated_playlist") . " " . $this->getEditTime();
+
+ return implode(" • ", $props);
+ }
+
+ function isUnlisted(): bool
+ {
+ return (bool)$this->getRecord()->unlisted;
+ }
+}
diff --git a/Web/Models/Entities/Poll.php b/Web/Models/Entities/Poll.php
index 6f2885b1f..60a39bc5c 100644
--- a/Web/Models/Entities/Poll.php
+++ b/Web/Models/Entities/Poll.php
@@ -4,7 +4,7 @@
use openvk\Web\Util\DateTime;
use \UnexpectedValueException;
use Nette\InvalidStateException;
-use openvk\Web\Models\Repositories\Users;
+use openvk\Web\Models\Repositories\{Users, Posts};
use Chandler\Database\DatabaseConnection;
use openvk\Web\Models\Exceptions\PollLockedException;
use openvk\Web\Models\Exceptions\AlreadyVotedException;
@@ -165,7 +165,7 @@ function hasVoted(User $user): bool
function canVote(User $user): bool
{
- return !$this->hasEnded() && !$this->hasVoted($user);
+ return !$this->hasEnded() && !$this->hasVoted($user) && !is_null($this->getAttachedPost()) && $this->getAttachedPost()->getSuggestionType() == 0;
}
function vote(User $user, array $optionIds): void
@@ -278,13 +278,24 @@ static function import(User $owner, string $xml): Poll
return $poll;
}
+
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ # waiting for #935 :(
+ /*if(!is_null($this->getAttachedPost())) {
+ return $this->getAttachedPost()->canBeViewedBy($user);
+ } else {*/
+ return true;
+ #}
+
+ }
- function save(): void
+ function save(?bool $log = false): void
{
if(empty($this->choicesToPersist))
throw new InvalidStateException;
- parent::save();
+ parent::save($log);
foreach($this->choicesToPersist as $option) {
DatabaseConnection::i()->getContext()->table("poll_options")->insert([
"poll" => $this->getId(),
@@ -292,4 +303,17 @@ function save(): void
]);
}
}
+
+ function getAttachedPost()
+ {
+ $post = DatabaseConnection::i()->getContext()->table("attachments")
+ ->where(
+ ["attachable_type" => static::class,
+ "attachable_id" => $this->getId()])->fetch();
+
+ if(!is_null($post->target_id))
+ return (new Posts)->get($post->target_id);
+ else
+ return NULL;
+ }
}
diff --git a/Web/Models/Entities/Post.php b/Web/Models/Entities/Post.php
index 429419018..30c6eac3d 100644
--- a/Web/Models/Entities/Post.php
+++ b/Web/Models/Entities/Post.php
@@ -78,6 +78,45 @@ function isPinned(): bool
{
return (bool) $this->getRecord()->pinned;
}
+
+ function hasSource(): bool
+ {
+ return $this->getRecord()->source != NULL;
+ }
+
+ function getSource(bool $format = false)
+ {
+ $orig_source = $this->getRecord()->source;
+ if(!str_contains($orig_source, "https://") && !str_contains($orig_source, "http://"))
+ $orig_source = "https://" . $orig_source;
+
+ if(!$format)
+ return $orig_source;
+
+ return $this->formatLinks($orig_source);
+ }
+
+ function setSource(string $source)
+ {
+ $result = check_copyright_link($source);
+
+ $this->stateChanges("source", $source);
+ }
+
+ function resetSource()
+ {
+ $this->stateChanges("source", NULL);
+ }
+
+ function getVkApiCopyright(): object
+ {
+ return (object)[
+ 'id' => 0,
+ 'link' => $this->getSource(false),
+ 'name' => $this->getSource(false),
+ 'type' => 'link',
+ ];
+ }
function isAd(): bool
{
@@ -133,6 +172,10 @@ function getPlatform(bool $forAPI = false): ?string
case 'openvk_legacy_ios':
return 'iphone';
break;
+
+ case 'windows_phone':
+ return 'wphone';
+ break;
case 'vika_touch': // кика хохотач ахахахаххахахахахах
case 'vk4me':
@@ -175,6 +218,31 @@ function getPlatformDetails(): array
"img" => NULL
];
}
+
+ function getPostSourceInfo(): array
+ {
+ $post_source = ["type" => "vk"];
+ if($this->getPlatform(true) !== NULL) {
+ $post_source = [
+ "type" => "api",
+ "platform" => $this->getPlatform(true)
+ ];
+ }
+
+ if($this->isUpdateAvatarMessage())
+ $post_source['data'] = 'profile_photo';
+
+ return $post_source;
+ }
+
+ function getVkApiType(): string
+ {
+ $type = 'post';
+ if($this->getSuggestionType() != 0)
+ $type = 'suggest';
+
+ return $type;
+ }
function pin(): void
{
@@ -197,16 +265,25 @@ function unpin(): void
$this->save();
}
- function canBePinnedBy(User $user): bool
+ function canBePinnedBy(User $user = NULL): bool
{
+ if(!$user)
+ return false;
+
if($this->getTargetWall() < 0)
return (new Clubs)->get(abs($this->getTargetWall()))->canBeModifiedBy($user);
return $this->getTargetWall() === $user->getId();
}
- function canBeDeletedBy(User $user): bool
+ function canBeDeletedBy(User $user = NULL): bool
{
+ if(!$user)
+ return false;
+
+ if($this->getTargetWall() < 0 && !$this->getWallOwner()->canBeModifiedBy($user) && $this->getWallOwner()->getWallType() != 1 && $this->getSuggestionType() == 0)
+ return false;
+
return $this->getOwnerPost() === $user->getId() || $this->canBePinnedBy($user);
}
@@ -224,7 +301,7 @@ function toggleLike(User $user): bool
{
$liked = parent::toggleLike($user);
- if($this->getOwner(false)->getId() !== $user->getId() && !($this->getOwner() instanceof Club) && !$this instanceof Comment)
+ if(!$user->isPrivateLikes() && $this->getOwner(false)->getId() !== $user->getId() && !($this->getOwner() instanceof Club) && !$this instanceof Comment)
(new LikeNotification($this->getOwner(false), $this, $user))->emit();
foreach($this->getChildren() as $attachment)
@@ -245,6 +322,139 @@ function deletePost(): void
$this->unwire();
$this->save();
}
+
+ function canBeViewedBy(?User $user = NULL): bool
+ {
+ if($this->isDeleted()) {
+ return false;
+ }
+
+ return $this->getWallOwner()->canBeViewedBy($user);
+ }
+
+ function getSuggestionType()
+ {
+ return $this->getRecord()->suggested;
+ }
+
+ function getPageURL(): string
+ {
+ return "/wall".$this->getPrettyId();
+ }
+
+ function toNotifApiStruct()
+ {
+ $res = (object)[];
+
+ $res->id = $this->getVirtualId();
+ $res->to_id = $this->getOwner() instanceof Club ? $this->getOwner()->getId() * -1 : $this->getOwner()->getId();
+ $res->from_id = $res->to_id;
+ $res->date = $this->getPublicationTime()->timestamp();
+ $res->text = $this->getText(false);
+ $res->attachments = []; # todo
+
+ $res->copy_owner_id = NULL; # todo
+ $res->copy_post_id = NULL; # todo
+
+ return $res;
+ }
+
+ function canBeEditedBy(?User $user = NULL): bool
+ {
+ if(!$user)
+ return false;
+
+ if($this->isDeactivationMessage() || $this->isUpdateAvatarMessage())
+ return false;
+
+ if($this->getTargetWall() > 0)
+ return $this->getPublicationTime()->timestamp() + WEEK > time() && $user->getId() == $this->getOwner(false)->getId();
+ else {
+ if($this->isPostedOnBehalfOfGroup())
+ return $this->getWallOwner()->canBeModifiedBy($user);
+ else
+ return $user->getId() == $this->getOwner(false)->getId();
+ }
+
+ return $user->getId() == $this->getOwner(false)->getId();
+ }
+
+ function toRss(): \Bhaktaraz\RSSGenerator\Item
+ {
+ $domain = ovk_scheme(true).$_SERVER["HTTP_HOST"];
+ $description = $this->getText(false);
+ $title = str_replace("\n", "", ovk_proc_strtr($description, 79));
+ $description_html = $description;
+ $url = $domain."/wall".$this->getPrettyId();
+
+ if($this->isUpdateAvatarMessage())
+ $title = tr('upd_in_general');
+ if($this->isDeactivationMessage())
+ $title = tr('post_deact_in_general');
+
+ $author = $this->getOwner();
+ $target_wall = $this->getWallOwner();
+ $author_name = escape_html($author->getCanonicalName());
+ if($this->isExplicit())
+ $title = 'NSFW: ' . $title;
+
+ foreach($this->getChildren() as $child) {
+ if($child instanceof Photo) {
+ $child_page = $domain.$child->getPageURL();
+ $child_url = $child->getURL();
+ $description_html .= "
- {tr("banned_1", htmlentities($thisUser->getCanonicalName()))|noescape}
- {tr("banned_2", htmlentities($thisUser->getBanReason()))|noescape}
+ {var $ban = $thisUser->getBanReason("banned")}
+ {if is_string($ban)}
+ {tr("banned_1", htmlentities($thisUser->getCanonicalName()))|noescape}
+ {tr("banned_2", htmlentities($thisUser->getBanReason()))|noescape}
+ {else}
+ {tr("banned_1", htmlentities($thisUser->getCanonicalName()))|noescape}
+
+