diff --git a/README_RU.md b/README_RU.md
index 2b06d593..cc4f672f 100644
--- a/README_RU.md
+++ b/README_RU.md
@@ -2,11 +2,11 @@
_[English](README.md)_
-**OpenVK** - это попытка создать простую CMS, которая ~~косплеит~~ имитирует старый ВКонтакте. На данный момент представленный здесь исходный код проекта пока не является стабильным.
+**OpenVK** — это попытка создать простую CMS, которая ~~косплеит~~ имитирует старый ВКонтакте. На данный момент, представленный здесь исходный код проекта пока не является стабильным.
ВКонтакте принадлежит Павлу Дурову и VK Group.
-Честно говоря, мы даже не знаем, работает ли она вообще. Однако, эта версия поддерживается, и мы будем рады принять ваши сообщения об ошибках [в нашем баг-трекере](https://github.com/openvk/openvk/projects/1). Вы также можете отправлять их через [вкладку "Помощь"](https://openvk.su/support?act=new) (для этого вам понадобится учетная запись OVK).
+Честно говоря, мы даже не знаем, работает ли она вообще. Однако, эта версия поддерживается, и мы будем рады принять ваши сообщения об ошибках [в нашем баг-трекере](https://github.com/openvk/openvk/projects/1). Вы также можете отправлять их через [вкладку "Помощь"](https://openvk.su/support?act=new) (для этого вам понадобится учетная запись OpenVK).
## Когда выйдет релизная версия?
@@ -16,19 +16,15 @@ _[English](README.md)_
## Инстанции
-* **[openvk.su](https://openvk.su/)**
-* **[openvk.uk](https://openvk.uk)** - официальное зеркало openvk.su (
diff --git a/ServiceAPI/Apps.php b/ServiceAPI/Apps.php
index 521b117e..6504c23e 100644
--- a/ServiceAPI/Apps.php
+++ b/ServiceAPI/Apps.php
@@ -54,6 +54,11 @@ class Apps implements Handler
$reject("No application with this id found");
return;
}
+
+ if($amount < 0) {
+ $reject(552, "Payment amount is invalid");
+ return;
+ }
$coinsLeft = $this->user->getCoins() - $amount;
if($coinsLeft < 0) {
diff --git a/ServiceAPI/Groups.php b/ServiceAPI/Groups.php
new file mode 100644
index 00000000..9eed0e8d
--- /dev/null
+++ b/ServiceAPI/Groups.php
@@ -0,0 +1,39 @@
+user = $user;
+ $this->groups = new Clubs;
+ }
+
+ function getWriteableClubs(callable $resolve, callable $reject)
+ {
+ $clubs = [];
+ $wclubs = $this->groups->getWriteableClubs($this->user->getId());
+ $count = $this->groups->getWriteableClubsCount($this->user->getId());
+
+ if(!$count) {
+ $reject("You don't have any groups with write access");
+
+ return;
+ }
+
+ foreach($wclubs as $club) {
+ $clubs[] = [
+ "name" => $club->getName(),
+ "id" => $club->getId(),
+ "avatar" => $club->getAvatarUrl() # если в овк когда-нибудь появится крутой список с аватарками, то можно использовать это поле
+ ];
+ }
+
+ $resolve($clubs);
+ }
+}
diff --git a/ServiceAPI/Mentions.php b/ServiceAPI/Mentions.php
new file mode 100644
index 00000000..33c1fc01
--- /dev/null
+++ b/ServiceAPI/Mentions.php
@@ -0,0 +1,50 @@
+user = $user;
+ }
+
+ function resolve(int $id, callable $resolve, callable $reject): void
+ {
+ if($id > 0) {
+ $user = (new Users)->get($id);
+ if(!$user) {
+ $reject("Not found");
+ return;
+ }
+
+ $resolve([
+ "url" => $user->getURL(),
+ "name" => $user->getFullName(),
+ "ava" => $user->getAvatarURL("miniscule"),
+ "about" => $user->getStatus() ?? "",
+ "online" => ($user->isFemale() ? tr("was_online_f") : tr("was_online_m")) . " " . $user->getOnline(),
+ "verif" => $user->isVerified(),
+ ]);
+ return;
+ }
+
+ $club = (new Clubs)->get(abs($id));
+ if(!$club) {
+ $reject("Not found");
+ return;
+ }
+
+ $resolve([
+ "url" => $club->getURL(),
+ "name" => $club->getName(),
+ "ava" => $club->getAvatarURL("miniscule"),
+ "about" => $club->getDescription() ?? "",
+ "online" => tr("participants", $club->getFollowersCount()),
+ "verif" => $club->isVerified(),
+ ]);
+ }
+}
diff --git a/ServiceAPI/Notes.php b/ServiceAPI/Notes.php
new file mode 100644
index 00000000..456cfaee
--- /dev/null
+++ b/ServiceAPI/Notes.php
@@ -0,0 +1,41 @@
+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");
+
+ $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/Polls.php b/ServiceAPI/Polls.php
new file mode 100644
index 00000000..9d3e2e7f
--- /dev/null
+++ b/ServiceAPI/Polls.php
@@ -0,0 +1,70 @@
+user = $user;
+ $this->polls = new PollRepo;
+ }
+
+ private function getPollHtml(int $poll): string
+ {
+ return Router::i()->execute("/poll$poll", "SAPI");
+ }
+
+ function vote(int $pollId, string $options, callable $resolve, callable $reject): void
+ {
+ $poll = $this->polls->get($pollId);
+ if(!$poll) {
+ $reject("Poll not found");
+ return;
+ }
+
+ try {
+ $options = explode(",", $options);
+ $poll->vote($this->user, $options);
+ } catch(AlreadyVotedException $ex) {
+ $reject("Poll state changed: user has already voted.");
+ return;
+ } catch(PollLockedException $ex) {
+ $reject("Poll state changed: poll has ended.");
+ return;
+ } catch(InvalidOptionException $ex) {
+ $reject("Foreign options passed.");
+ return;
+ } catch(UnexpectedValueException $ex) {
+ $reject("Too much options passed.");
+ return;
+ }
+
+ $resolve(["html" => $this->getPollHtml($pollId)]);
+ }
+
+ function unvote(int $pollId, callable $resolve, callable $reject): void
+ {
+ $poll = $this->polls->get($pollId);
+ if(!$poll) {
+ $reject("Poll not found");
+ return;
+ }
+
+ try {
+ $poll->revokeVote($this->user);
+ } catch(PollLockedException $ex) {
+ $reject("Votes can't be revoked from this poll.");
+ return;
+ }
+
+ $resolve(["html" => $this->getPollHtml($pollId)]);
+ }
+}
\ No newline at end of file
diff --git a/ServiceAPI/Search.php b/ServiceAPI/Search.php
new file mode 100644
index 00000000..46def4f4
--- /dev/null
+++ b/ServiceAPI/Search.php
@@ -0,0 +1,76 @@
+user = $user;
+ $this->users = new Users;
+ $this->clubs = new Clubs;
+ $this->videos = new Videos;
+ }
+
+ function fastSearch(string $query, string $type = "users", callable $resolve, callable $reject)
+ {
+ if($query == "" || strlen($query) < 3)
+ $reject(12, "No input or input < 3");
+
+ $repo;
+ $sort;
+
+ switch($type) {
+ default:
+ case "users":
+ $repo = (new Users);
+ $sort = "rating DESC";
+
+ break;
+ case "groups":
+ $repo = (new Clubs);
+ $sort = "id ASC";
+
+ break;
+ case "videos":
+ $repo = (new Videos);
+ $sort = "created ASC";
+
+ break;
+ }
+
+ $res = $repo->find($query, ["doNotSearchMe" => $this->user->getId()], $sort);
+
+ $results = array_slice(iterator_to_array($res), 0, 5);
+
+ $count = sizeof($results);
+
+ $arr = [
+ "count" => $count,
+ "items" => []
+ ];
+
+ if(sizeof($results) < 1) {
+ $reject(2, "No results");
+ }
+
+ foreach($results as $res) {
+ $arr["items"][] = [
+ "id" => $res->getId(),
+ "name" => $type == "users" ? $res->getCanonicalName() : $res->getName(),
+ "avatar" => $type != "videos" ? $res->getAvatarUrl() : $res->getThumbnailURL(),
+ "url" => $type != "videos" ? $res->getUrl() : "/video".$res->getPrettyId(),
+ "description" => ovk_proc_strtr($res->getDescription() ?? "...", 40)
+ ];
+ }
+
+ $resolve($arr);
+ }
+}
diff --git a/ServiceAPI/Wall.php b/ServiceAPI/Wall.php
index 628ceb22..5677f7ba 100644
--- a/ServiceAPI/Wall.php
+++ b/ServiceAPI/Wall.php
@@ -2,17 +2,19 @@
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};
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;
}
function getPost(int $id, callable $resolve, callable $reject): void
@@ -71,4 +73,26 @@ class Wall implements Handler
$resolve($post->getId());
}
+
+ function getMyNotes(callable $resolve, callable $reject)
+ {
+ $count = $this->notes->getUserNotesCount($this->user);
+ $myNotes = $this->notes->getUserNotes($this->user, 1, $count);
+
+ $arr = [
+ "count" => $count,
+ "closed" => $this->user->getPrivacySetting("notes.read"),
+ "items" => [],
+ ];
+
+ foreach($myNotes as $note) {
+ $arr["items"][] = [
+ "id" => $note->getId(),
+ "name" => ovk_proc_strtr($note->getName(), 30),
+ #"preview" => $note->getPreview()
+ ];
+ }
+
+ $resolve($arr);
+ }
}
diff --git a/VKAPI/Handlers/Account.php b/VKAPI/Handlers/Account.php
index 6f4ad0e6..a20c42be 100644
--- a/VKAPI/Handlers/Account.php
+++ b/VKAPI/Handlers/Account.php
@@ -1,5 +1,6 @@
$this->getUser()->getLastName(),
"home_town" => $this->getUser()->getHometown(),
"status" => $this->getUser()->getStatus(),
- "bdate" => $this->getUser()->getBirthday()->format('%e.%m.%Y'),
+ "bdate" => is_null($this->getUser()->getBirthday()) ? '01.01.1970' : $this->getUser()->getBirthday()->format('%e.%m.%Y'),
"bdate_visibility" => $this->getUser()->getBirthdayPrivacy(),
"phone" => "+420 ** *** 228", # TODO
"relation" => $this->getUser()->getMaritalStatus(),
@@ -44,13 +45,12 @@ final class Account extends VKAPIRequestHandler
{
$this->requireUser();
- $this->getUser()->setOnline(time());
- $this->getUser()->save();
+ $this->getUser()->updOnline($this->getPlatform());
return 1;
}
- function setOffline(): object
+ function setOffline(): int
{
$this->requireUser();
@@ -66,6 +66,8 @@ final class Account extends VKAPIRequestHandler
function getCounters(string $filter = ""): object
{
+ $this->requireUser();
+
return (object) [
"friends" => $this->getUser()->getFollowersCount(),
"notifications" => $this->getUser()->getNotificationsCount(),
@@ -74,4 +76,79 @@ final class Account extends VKAPIRequestHandler
# TODO: Filter
}
+
+ function saveProfileInfo(string $first_name = "", string $last_name = "", string $screen_name = "", int $sex = -1, int $relation = -1, string $bdate = "", int $bdate_visibility = -1, string $home_town = "", string $status = ""): object
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $user = $this->getUser();
+
+ $output = [
+ "changed" => 0,
+ ];
+
+ if(!empty($first_name) || !empty($last_name)) {
+ $output["name_request"] = [
+ "id" => random_int(1, 2048), # For compatibility with original VK API
+ "status" => "success",
+ "first_name" => !empty($first_name) ? $first_name : $user->getFirstName(),
+ "last_name" => !empty($last_name) ? $last_name : $user->getLastName(),
+ ];
+
+ try {
+ if(!empty($first_name))
+ $user->setFirst_name($first_name);
+ if(!empty($last_name))
+ $user->setLast_Name($last_name);
+ } catch (InvalidUserNameException $e) {
+ $output["name_request"]["status"] = "declined";
+ return (object) $output;
+ }
+ }
+
+ if(!empty($screen_name))
+ if (!$user->setShortCode($screen_name))
+ $this->fail(1260, "Invalid screen name");
+
+ # For compatibility with original VK API
+ if($sex > 0)
+ $user->setSex($sex == 1 ? 1 : 0);
+
+ if($relation > -1)
+ $user->setMarital_Status($relation);
+
+ if(!empty($bdate)) {
+ $birthday = strtotime($bdate);
+ if (!is_int($birthday))
+ $this->fail(100, "invalid value of bdate.");
+
+ $user->setBirthday($birthday);
+ }
+
+ # For compatibility with original VK API
+ switch($bdate_visibility) {
+ case 0:
+ $this->fail(946, "Hiding date of birth is not implemented.");
+ break;
+ case 1:
+ $user->setBirthday_privacy(0);
+ break;
+ case 2:
+ $user->setBirthday_privacy(1);
+ }
+
+ if(!empty($home_town))
+ $user->setHometown($home_town);
+
+ if(!empty($status))
+ $user->setStatus($status);
+
+ if($sex > 0 || $relation > -1 || $bdate_visibility > 1 || !empty("$first_name$last_name$screen_name$bdate$home_town$status")) {
+ $output["changed"] = 1;
+ $user->save();
+ }
+
+ return (object) $output;
+ }
}
diff --git a/VKAPI/Handlers/Board.php b/VKAPI/Handlers/Board.php
new file mode 100644
index 00000000..5a4b87ef
--- /dev/null
+++ b/VKAPI/Handlers/Board.php
@@ -0,0 +1,431 @@
+requireUser();
+ $this->willExecuteWriteAction();
+
+ $club = (new ClubsRepo)->get($group_id);
+
+ if(!$club) {
+ $this->fail(403, "Invalid club");
+ }
+
+ if(!$club->canBeModifiedBy($this->getUser()) && !$club->isEveryoneCanCreateTopics()) {
+ $this->fail(403, "Access to club denied");
+ }
+
+ $flags = 0;
+
+ if($from_group == true && $club->canBeModifiedBy($this->getUser()))
+ $flags |= 0b10000000;
+
+ $topic = new Topic;
+ $topic->setGroup($club->getId());
+ $topic->setOwner($this->getUser()->getId());
+ $topic->setTitle(ovk_proc_strtr($title, 127));
+ $topic->setCreated(time());
+ $topic->setFlags($flags);
+ $topic->save();
+
+ if(!empty($text)) {
+ $comment = new Comment;
+ $comment->setOwner($this->getUser()->getId());
+ $comment->setModel(get_class($topic));
+ $comment->setTarget($topic->getId());
+ $comment->setContent($text);
+ $comment->setCreated(time());
+ $comment->setFlags($flags);
+ $comment->save();
+
+ if(!empty($attachments)) {
+ $attachmentsArr = explode(",", $attachments);
+ # блин а мне это везде копировать типа
+
+ if(sizeof($attachmentsArr) > 10)
+ $this->fail(50, "Error: too many attachments");
+
+ foreach($attachmentsArr as $attac) {
+ $attachmentType = NULL;
+
+ if(str_contains($attac, "photo"))
+ $attachmentType = "photo";
+ elseif(str_contains($attac, "video"))
+ $attachmentType = "video";
+ else
+ $this->fail(205, "Unknown attachment type");
+
+ $attachment = str_replace($attachmentType, "", $attac);
+
+ $attachmentOwner = (int)explode("_", $attachment)[0];
+ $attachmentId = (int)end(explode("_", $attachment));
+
+ $attacc = NULL;
+
+ if($attachmentType == "photo") {
+ $attacc = (new PhotosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Photo does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this photo");
+
+ $comment->attach($attacc);
+ } elseif($attachmentType == "video") {
+ $attacc = (new VideosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Video does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this video");
+
+ $comment->attach($attacc);
+ }
+
+ }
+
+ }
+
+ }
+
+ return $topic->getId();
+ }
+
+ function closeTopic(int $group_id, int $topic_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ if(!$topic->isClosed()) {
+ $topic->setClosed(1);
+ $topic->save();
+ }
+
+ return 1;
+ }
+
+ function createComment(int $group_id, int $topic_id, string $message = "", string $attachments = "", bool $from_group = true)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if(empty($message) && empty($attachments)) {
+ $this->fail(100, "Required parameter 'message' missing.");
+ }
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || $topic->isDeleted() || $topic->isClosed()) {
+ $this->fail(100, "Topic is deleted, closed or invalid.");
+ }
+
+ $flags = 0;
+
+ if($from_group != 0 && !is_null($topic->getClub()) && $topic->getClub()->canBeModifiedBy($this->user))
+ $flags |= 0b10000000;
+
+ if(strlen($message) > 300) {
+ $this->fail(20, "Comment is too long.");
+ }
+
+ $comment = new Comment;
+ $comment->setOwner($this->getUser()->getId());
+ $comment->setModel(get_class($topic));
+ $comment->setTarget($topic->getId());
+ $comment->setContent($message);
+ $comment->setCreated(time());
+ $comment->setFlags($flags);
+ $comment->save();
+
+ if(!empty($attachments)) {
+ $attachmentsArr = explode(",", $attachments);
+
+ if(sizeof($attachmentsArr) > 10)
+ $this->fail(50, "Error: too many attachments");
+
+ foreach($attachmentsArr as $attac) {
+ $attachmentType = NULL;
+
+ if(str_contains($attac, "photo"))
+ $attachmentType = "photo";
+ elseif(str_contains($attac, "video"))
+ $attachmentType = "video";
+ else
+ $this->fail(205, "Unknown attachment type");
+
+ $attachment = str_replace($attachmentType, "", $attac);
+
+ $attachmentOwner = (int)explode("_", $attachment)[0];
+ $attachmentId = (int)end(explode("_", $attachment));
+
+ $attacc = NULL;
+
+ if($attachmentType == "photo") {
+ $attacc = (new PhotosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Photo does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this photo");
+
+ $comment->attach($attacc);
+ } elseif($attachmentType == "video") {
+ $attacc = (new VideosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Video does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this video");
+
+ $comment->attach($attacc);
+ }
+ }
+ }
+
+ return $comment->getId();
+ }
+
+ function deleteComment(int $comment_id, int $group_id = 0, int $topic_id = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $comment = (new CommentsRepo)->get($comment_id);
+
+ if($comment->isDeleted() || !$comment || !$comment->canBeDeletedBy($this->getUser()))
+ $this->fail(403, "Access to comment denied");
+
+ $comment->delete();
+
+ return 1;
+ }
+
+ function deleteTopic(int $group_id, int $topic_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ $topic->deleteTopic();
+
+ return 1;
+ }
+
+ function editComment(int $comment_id, int $group_id = 0, int $topic_id = 0, string $message, string $attachments)
+ {
+ /*
+ $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 editTopic(int $group_id, int $topic_id, string $title)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || $topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ $topic->setTitle(ovk_proc_strtr($title, 127));
+
+ $topic->save();
+
+ return 1;
+ }
+
+ function fixTopic(int $group_id, int $topic_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ $topic->setPinned(1);
+
+ $topic->save();
+
+ return 1;
+ }
+
+ function getComments(int $group_id, int $topic_id, bool $need_likes = false, int $start_comment_id = 0, int $offset = 0, int $count = 40, bool $extended = false, string $sort = "asc")
+ {
+ # start_comment_id ne robit
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || $topic->isDeleted()) {
+ $this->fail(5, "Invalid topic");
+ }
+
+ $arr = [
+ "items" => []
+ ];
+
+ $comms = array_slice(iterator_to_array($topic->getComments(1, $count + $offset)), $offset);
+ foreach($comms as $comm) {
+ $arr["items"][] = $this->getApiBoardComment($comm, $need_likes);
+
+ if($extended) {
+ if($comm->getOwner() instanceof \openvk\Web\Models\Entities\User) {
+ $arr["profiles"][] = $comm->getOwner()->toVkApiStruct();
+ }
+
+ if($comm->getOwner() instanceof \openvk\Web\Models\Entities\Club) {
+ $arr["groups"][] = $comm->getOwner()->toVkApiStruct();
+ }
+ }
+ }
+
+ return $arr;
+ }
+
+ function getTopics(int $group_id, string $topic_ids = "", int $order = 1, int $offset = 0, int $count = 40, bool $extended = false, int $preview = 0, int $preview_length = 90)
+ {
+ # 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["profiles"] = [];
+
+ if(empty($topic_ids)) {
+ foreach($topics as $topic) {
+ if($topic->isDeleted()) continue;
+ $arr["items"][] = $topic->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
+ }
+ } else {
+ $topics = explode(',', $topic_ids);
+
+ foreach($topics as $topic) {
+ $id = explode("_", $topic);
+ $topicy = (new TopicsRepo)->getTopicById((int)$id[0], (int)$id[1]);
+
+ if($topicy && !$topicy->isDeleted()) {
+ $arr["items"][] = $topicy->toVkApiStruct($preview, $preview_length > 1 ? $preview_length : 90);
+ }
+ }
+ }
+
+ return $arr;
+ }
+
+ function openTopic(int $group_id, int $topic_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || !$topic->isDeleted() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ if($topic->isClosed()) {
+ $topic->setClosed(0);
+ $topic->save();
+ }
+
+ return 1;
+ }
+
+ function restoreComment(int $group_id, int $topic_id, int $comment_id)
+ {
+ $this->fail(501, "Not implemented");
+ }
+
+ function unfixTopic(int $group_id, int $topic_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $topic = (new TopicsRepo)->getTopicById($group_id, $topic_id);
+
+ if(!$topic || !$topic->getClub() || !$topic->getClub()->canBeModifiedBy($this->getUser())) {
+ return 0;
+ }
+
+ if($topic->isPinned()) {
+ $topic->setClosed(0);
+ $topic->save();
+ }
+
+ $topic->setPinned(0);
+
+ $topic->save();
+
+ return 1;
+ }
+
+ private function getApiBoardComment(?Comment $comment, bool $need_likes = false)
+ {
+ $res = (object) [];
+
+ $res->id = $comment->getId();
+ $res->from_id = $comment->getOwner()->getId();
+ $res->date = $comment->getPublicationTime()->timestamp();
+ $res->text = $comment->getText(false);
+ $res->attachments = [];
+ $res->likes = [];
+ if($need_likes) {
+ $res->likes = [
+ "count" => $comment->getLikesCount(),
+ "user_likes" => (int) $comment->hasLikeFrom($this->getUser()),
+ "can_like" => 1 # а чё типо не может ахахаххахах
+ ];
+ }
+
+ foreach($comment->getChildren() as $attachment) {
+ if($attachment->isDeleted())
+ continue;
+
+ $res->attachments[] = $attachment->toVkApiStruct();
+ }
+
+ return $res;
+ }
+}
\ No newline at end of file
diff --git a/VKAPI/Handlers/Friends.php b/VKAPI/Handlers/Friends.php
index ca9b7573..f7873520 100644
--- a/VKAPI/Handlers/Friends.php
+++ b/VKAPI/Handlers/Friends.php
@@ -66,6 +66,7 @@ final class Friends extends VKAPIRequestHandler
function add(string $user_id): int
{
$this->requireUser();
+ $this->willExecuteWriteAction();
$users = new UsersRepo;
$user = $users->get(intval($user_id));
@@ -96,6 +97,7 @@ final class Friends extends VKAPIRequestHandler
function delete(string $user_id): int
{
$this->requireUser();
+ $this->willExecuteWriteAction();
$users = new UsersRepo;
@@ -107,7 +109,7 @@ final class Friends extends VKAPIRequestHandler
return 1;
default:
- fail(15, "Access denied: No friend or friend request found.");
+ $this->fail(15, "Access denied: No friend or friend request found.");
}
}
@@ -133,15 +135,18 @@ final class Friends extends VKAPIRequestHandler
return $response;
}
- function getRequests(string $fields = "", int $offset = 0, int $count = 100): object
+ function getRequests(string $fields = "", 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.");
+
$this->requireUser();
$i = 0;
$offset++;
$followers = [];
- foreach($this->getUser()->getFollowers() as $follower) {
+ foreach($this->getUser()->getFollowers($offset, $count) as $follower) {
$followers[$i] = $follower->getId();
$i++;
}
@@ -149,8 +154,7 @@ final class Friends extends VKAPIRequestHandler
$response = $followers;
$usersApi = new Users($this->getUser());
- if(!is_null($fields))
- $response = $usersApi->get(implode(',', $followers), $fields, 0, $count); # FIXME
+ $response = $usersApi->get(implode(',', $followers), $fields, 0, $count);
foreach($response as $user)
$user->user_id = $user->id;
diff --git a/VKAPI/Handlers/Gifts.php b/VKAPI/Handlers/Gifts.php
new file mode 100644
index 00000000..2702924d
--- /dev/null
+++ b/VKAPI/Handlers/Gifts.php
@@ -0,0 +1,174 @@
+requireUser();
+
+ $i = 0;
+
+ $i += $offset;
+
+ $user = (new UsersRepo)->get($user_id);
+
+ if(!$user || $user->isDeleted())
+ $this->fail(177, "Invalid user");
+
+ $gift_item = [];
+
+ $userGifts = array_slice(iterator_to_array($user->getGifts(1, $count, false)), $offset);
+
+ if(sizeof($userGifts) < 0) {
+ return NULL;
+ }
+
+ foreach($userGifts as $gift) {
+ if($i < $count) {
+ $gift_item[] = [
+ "id" => $i,
+ "from_id" => $gift->anon == true ? 0 : $gift->sender->getId(),
+ "message" => $gift->caption == NULL ? "" : $gift->caption,
+ "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)
+ ],
+ "privacy" => 0
+ ];
+ }
+ $i+=1;
+ }
+
+ return $gift_item;
+ }
+
+ function send(int $user_ids, int $gift_id, string $message = "", int $privacy = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $user = (new UsersRepo)->get((int) $user_ids);
+
+ if(!OPENVK_ROOT_CONF['openvk']['preferences']['commerce'])
+ $this->fail(105, "Commerce is disabled on this instance");
+
+ if(!$user || $user->isDeleted())
+ $this->fail(177, "Invalid user");
+
+ $gift = (new GiftsRepo)->get($gift_id);
+
+ if(!$gift)
+ $this->fail(165, "Invalid gift");
+
+ $price = $gift->getPrice();
+ $coinsLeft = $this->getUser()->getCoins() - $price;
+
+ if(!$gift->canUse($this->getUser()))
+ return (object)
+ [
+ "success" => 0,
+ "user_ids" => $user_ids,
+ "error" => "You don't have any more of these gifts."
+ ];
+
+ if($coinsLeft < 0)
+ return (object)
+ [
+ "success" => 0,
+ "user_ids" => $user_ids,
+ "error" => "You don't have enough voices."
+ ];
+
+ $user->gift($this->getUser(), $gift, $message);
+ $gift->used();
+
+ $this->getUser()->setCoins($coinsLeft);
+ $this->getUser()->save();
+
+ $notification = new GiftNotification($user, $this->getUser(), $gift, $message);
+ $notification->emit();
+
+ return (object)
+ [
+ "success" => 1,
+ "user_ids" => $user_ids,
+ "withdraw_votes" => $price
+ ];
+ }
+
+ function delete()
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $this->fail(501, "Not implemented");
+ }
+
+ # этих методов не было в ВК, но я их добавил чтобы можно было отобразить список подарков
+ function getCategories(bool $extended = false, int $page = 1)
+ {
+ $cats = (new GiftsRepo)->getCategories($page);
+ $categ = [];
+ $i = 0;
+
+ if(!OPENVK_ROOT_CONF['openvk']['preferences']['commerce'])
+ $this->fail(105, "Commerce is disabled on this instance");
+
+ foreach($cats as $cat) {
+ $categ[$i] = [
+ "name" => $cat->getName(),
+ "description" => $cat->getDescription(),
+ "id" => $cat->getId(),
+ "thumbnail" => $cat->getThumbnailURL(),
+ ];
+
+ if($extended == true) {
+ $categ[$i]["localizations"] = [];
+ foreach(getLanguages() as $lang) {
+ $code = $lang["code"];
+ $categ[$i]["localizations"][$code] =
+ [
+ "name" => $cat->getName($code),
+ "desc" => $cat->getDescription($code),
+ ];
+ }
+ }
+ $i++;
+ }
+
+ return $categ;
+ }
+
+ function getGiftsInCategory(int $id, int $page = 1)
+ {
+ $this->requireUser();
+
+ if(!OPENVK_ROOT_CONF['openvk']['preferences']['commerce'])
+ $this->fail(105, "Commerce is disabled on this instance");
+
+ if(!(new GiftsRepo)->getCat($id))
+ $this->fail(177, "Category not found");
+
+ $giftz = ((new GiftsRepo)->getCat($id))->getGifts($page);
+ $gifts = [];
+
+ foreach($giftz as $gift) {
+ $gifts[] = [
+ "name" => $gift->getName(),
+ "image" => $gift->getImage(2),
+ "usages_left" => (int)$gift->getUsagesLeft($this->getUser()),
+ "price" => $gift->getPrice(), # голосов
+ "is_free" => $gift->isFree()
+ ];
+ }
+
+ return $gifts;
+ }
+}
diff --git a/VKAPI/Handlers/Groups.php b/VKAPI/Handlers/Groups.php
index 59b19fa4..3123a43f 100644
--- a/VKAPI/Handlers/Groups.php
+++ b/VKAPI/Handlers/Groups.php
@@ -2,6 +2,7 @@
namespace openvk\VKAPI\Handlers;
use openvk\Web\Models\Repositories\Clubs as ClubsRepo;
use openvk\Web\Models\Repositories\Users as UsersRepo;
+use openvk\Web\Models\Entities\Club;
final class Groups extends VKAPIRequestHandler
{
@@ -10,7 +11,7 @@ final class Groups extends VKAPIRequestHandler
$this->requireUser();
if($user_id == 0) {
- foreach($this->getUser()->getClubs($offset+1) as $club)
+ foreach($this->getUser()->getClubs($offset, false, $count, true) as $club)
$clbs[] = $club;
$clbsCount = $this->getUser()->getClubCount();
} else {
@@ -20,7 +21,7 @@ final class Groups extends VKAPIRequestHandler
if(is_null($user))
$this->fail(15, "Access denied");
- foreach($user->getClubs($offset+1) as $club)
+ foreach($user->getClubs($offset, false, $count, true) as $club)
$clbs[] = $club;
$clbsCount = $user->getClubCount();
@@ -33,17 +34,9 @@ final class Groups extends VKAPIRequestHandler
$ic = $count;
if(!empty($clbs)) {
- $clbs = array_slice($clbs, $offset * $count);
-
for($i=0; $i < $ic; $i++) {
$usr = $clbs[$i];
- if(is_null($usr)) {
- $rClubs[$i] = (object)[
- "id" => $clbs[$i],
- "name" => "DELETED",
- "deactivated" => "deleted"
- ];
- } else if($clbs[$i] == NULL) {
+ if(is_null($usr)) {
} else {
$rClubs[$i] = (object) [
@@ -102,23 +95,32 @@ final class Groups extends VKAPIRequestHandler
];
}
- function getById(string $group_ids = "", string $group_id = "", string $fields = ""): ?array
+ function getById(string $group_ids = "", string $group_id = "", string $fields = "", int $offset = 0, int $count = 500): ?array
{
+ /* Both offset and count SHOULD be used only in OpenVK code,
+ not in your app or script, since it's not oficially documented by VK */
+
$clubs = new ClubsRepo;
- if($group_ids == NULL && $group_id != NULL)
+ if(empty($group_ids) && !empty($group_id))
$group_ids = $group_id;
- if($group_ids == NULL && $group_id == NULL)
+ if(empty($group_ids) && empty($group_id))
$this->fail(100, "One of the parameters specified was missing or invalid: group_ids is undefined");
$clbs = explode(',', $group_ids);
- $response;
+ $response = array();
$ic = sizeof($clbs);
+ if(sizeof($clbs) > $count)
+ $ic = $count;
+
+ $clbs = array_slice($clbs, $offset * $count);
+
+
for($i=0; $i < $ic; $i++) {
- if($i > 500)
+ if($i > 500 || $clbs[$i] == 0)
break;
if($clbs[$i] < 0)
@@ -142,6 +144,7 @@ final class Groups extends VKAPIRequestHandler
"screen_name" => $clb->getShortCode() ?? "club".$clb->getId(),
"is_closed" => false,
"type" => "group",
+ "is_member" => !is_null($this->getUser()) ? (int) $clb->getSubscriptionStatus($this->getUser()) : 0,
"can_access_closed" => true,
];
@@ -183,7 +186,7 @@ final class Groups extends VKAPIRequestHandler
$response[$i]->site = $clb->getWebsite();
break;
case "description":
- $response[$i]->desctiption = $clb->getDescription();
+ $response[$i]->description = $clb->getDescription();
break;
case "contacts":
$contacts;
@@ -204,10 +207,6 @@ final class Groups extends VKAPIRequestHandler
else
$response[$i]->can_post = $clb->canPost();
break;
- case "is_member":
- if(!is_null($this->getUser()))
- $response[$i]->is_member = (int) $clb->getSubscriptionStatus($this->getUser());
- break;
}
}
}
@@ -215,4 +214,322 @@ final class Groups extends VKAPIRequestHandler
return $response;
}
+
+ function search(string $q, int $offset = 0, int $count = 100)
+ {
+ $clubs = new ClubsRepo;
+
+ $array = [];
+ $find = $clubs->find($q);
+
+ foreach ($find as $group)
+ $array[] = $group->getId();
+
+ 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
+ */
+ ];
+ }
+
+ function join(int $group_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $club = (new ClubsRepo)->get($group_id);
+
+ $isMember = !is_null($this->getUser()) ? (int) $club->getSubscriptionStatus($this->getUser()) : 0;
+
+ if($isMember == 0)
+ $club->toggleSubscription($this->getUser());
+
+ return 1;
+ }
+
+ function leave(int $group_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $club = (new ClubsRepo)->get($group_id);
+
+ $isMember = !is_null($this->getUser()) ? (int) $club->getSubscriptionStatus($this->getUser()) : 0;
+
+ if($isMember == 1)
+ $club->toggleSubscription($this->getUser());
+
+ return 1;
+ }
+
+ function create(string $title, string $description = "", string $type = "group", int $public_category = 1, int $public_subcategory = 1, int $subtype = 1)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $club = new Club;
+
+ $club->setName($title);
+ $club->setAbout($description);
+ $club->setOwner($this->getUser()->getId());
+ $club->save();
+
+ $club->toggleSubscription($this->getUser());
+
+ return $this->getById((string)$club->getId());
+ }
+
+ function edit(
+ int $group_id,
+ string $title = NULL,
+ string $description = NULL,
+ string $screen_name = NULL,
+ string $website = NULL,
+ int $wall = NULL,
+ int $topics = NULL,
+ int $adminlist = NULL,
+ int $topicsAboveWall = NULL,
+ int $hideFromGlobalFeed = NULL)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $club = (new ClubsRepo)->get($group_id);
+
+ if(!$club) $this->fail(203, "Club not found");
+ 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;
+
+ $club->save();
+
+ return 1;
+ }
+
+ function getMembers(string $group_id, string $sort = "id_asc", int $offset = 0, int $count = 100, string $fields = "", string $filter = "any")
+ {
+ # bdate,can_post,can_see_all_posts,can_see_audio,can_write_private_message,city,common_count,connections,contacts,country,domain,education,has_mobile,last_seen,lists,online,online_mobile,photo_100,photo_200,photo_200_orig,photo_400_orig,photo_50,photo_max,photo_max_orig,relation,relatives,schools,sex,site,status,universities
+ $club = (new ClubsRepo)->get((int) $group_id);
+ if(!$club)
+ $this->fail(125, "Invalid group id");
+
+ $sorter = "follower ASC";
+
+ switch($sort) {
+ default:
+ case "time_asc":
+ case "id_asc":
+ $sorter = "follower ASC";
+ break;
+ case "time_desc":
+ case "id_desc":
+ $sorter = "follower DESC";
+ break;
+ }
+
+ $members = array_slice(iterator_to_array($club->getFollowers(1, $count, $sorter)), $offset);
+ $arr = (object) [
+ "count" => count($members),
+ "items" => array()];
+
+ $filds = explode(",", $fields);
+
+ $i = 0;
+ foreach($members as $member) {
+ if($i > $count) {
+ break;
+ }
+
+ $arr->items[] = (object) [
+ "id" => $member->getId(),
+ "first_name" => $member->getFirstName(),
+ "last_name" => $member->getLastName(),
+ ];
+
+ foreach($filds as $fild) {
+ switch($fild) {
+ case "bdate":
+ $arr->items[$i]->bdate = $member->getBirthday()->format('%e.%m.%Y');
+ break;
+ case "can_post":
+ $arr->items[$i]->can_post = $club->canBeModifiedBy($member);
+ break;
+ case "can_see_all_posts":
+ $arr->items[$i]->can_see_all_posts = 1;
+ break;
+ case "can_see_audio":
+ $arr->items[$i]->can_see_audio = 0;
+ break;
+ case "can_write_private_message":
+ $arr->items[$i]->can_write_private_message = 0;
+ break;
+ case "common_count":
+ $arr->items[$i]->common_count = 420;
+ break;
+ case "connections":
+ $arr->items[$i]->connections = 1;
+ break;
+ case "contacts":
+ $arr->items[$i]->contacts = $member->getContactEmail();
+ break;
+ case "country":
+ $arr->items[$i]->country = 1;
+ break;
+ case "domain":
+ $arr->items[$i]->domain = "";
+ break;
+ case "education":
+ $arr->items[$i]->education = "";
+ break;
+ case "has_mobile":
+ $arr->items[$i]->has_mobile = false;
+ break;
+ case "last_seen":
+ $arr->items[$i]->last_seen = $member->getOnline()->timestamp();
+ break;
+ case "lists":
+ $arr->items[$i]->lists = "";
+ break;
+ case "online":
+ $arr->items[$i]->online = $member->isOnline();
+ break;
+ case "online_mobile":
+ $arr->items[$i]->online_mobile = $member->getOnlinePlatform() == "android" || $member->getOnlinePlatform() == "iphone" || $member->getOnlinePlatform() == "mobile";
+ break;
+ case "photo_100":
+ $arr->items[$i]->photo_100 = $member->getAvatarURL("tiny");
+ break;
+ case "photo_200":
+ $arr->items[$i]->photo_200 = $member->getAvatarURL("normal");
+ break;
+ case "photo_200_orig":
+ $arr->items[$i]->photo_200_orig = $member->getAvatarURL("normal");
+ break;
+ case "photo_400_orig":
+ $arr->items[$i]->photo_400_orig = $member->getAvatarURL("normal");
+ break;
+ case "photo_max":
+ $arr->items[$i]->photo_max = $member->getAvatarURL("original");
+ break;
+ case "photo_max_orig":
+ $arr->items[$i]->photo_max_orig = $member->getAvatarURL();
+ break;
+ case "relation":
+ $arr->items[$i]->relation = $member->getMaritalStatus();
+ break;
+ case "relatives":
+ $arr->items[$i]->relatives = 0;
+ break;
+ case "schools":
+ $arr->items[$i]->schools = 0;
+ break;
+ case "sex":
+ $arr->items[$i]->sex = $member->isFemale() ? 1 : 2;
+ break;
+ case "site":
+ $arr->items[$i]->site = $member->getWebsite();
+ break;
+ case "status":
+ $arr->items[$i]->status = $member->getStatus();
+ break;
+ case "universities":
+ $arr->items[$i]->universities = 0;
+ break;
+ }
+ }
+ $i++;
+ }
+ return $arr;
+ }
+
+ function getSettings(string $group_id)
+ {
+ $this->requireUser();
+ $club = (new ClubsRepo)->get((int)$group_id);
+
+ if(!$club || !$club->canBeModifiedBy($this->getUser()))
+ $this->fail(15, "You can't get settings of this group.");
+
+ $arr = (object) [
+ "title" => $club->getName(),
+ "description" => $club->getDescription() != NULL ? $club->getDescription() : "",
+ "address" => $club->getShortcode(),
+ "wall" => $club->canPost() == true ? 1 : 0,
+ "photos" => 1,
+ "video" => 0,
+ "audio" => 0,
+ "docs" => 0,
+ "topics" => $club->isEveryoneCanCreateTopics() == true ? 1 : 0,
+ "wiki" => 0,
+ "messages" => 0,
+ "obscene_filter" => 0,
+ "obscene_stopwords" => 0,
+ "obscene_words" => "",
+ "access" => 1,
+ "subject" => 1,
+ "subject_list" => [
+ 0 => "в",
+ 1 => "опенвк",
+ 2 => "нет",
+ 3 => "категорий",
+ 4 => "групп",
+ ],
+ "rss" => "/club".$club->getId()."/rss",
+ "website" => $club->getWebsite(),
+ "age_limits" => 0,
+ "market" => [],
+ ];
+
+ return $arr;
+ }
+
+ function isMember(string $group_id, int $user_id, string $user_ids = "", bool $extended = false)
+ {
+ $this->requireUser();
+ $id = $user_id != NULL ? $user_id : explode(",", $user_ids);
+
+ if($group_id < 0)
+ $this->fail(228, "Remove the minus from group_id");
+
+ $club = (new ClubsRepo)->get((int)$group_id);
+ $usver = (new UsersRepo)->get((int)$id);
+
+ if(!$club || $group_id == 0)
+ $this->fail(203, "Invalid club");
+
+ if(!$usver || $usver->isDeleted() || $user_id == 0)
+ $this->fail(30, "Invalid user");
+
+ if($extended == false) {
+ return $club->getSubscriptionStatus($usver) ? 1 : 0;
+ } else {
+ return (object)
+ [
+ "member" => $club->getSubscriptionStatus($usver) ? 1 : 0,
+ "request" => 0,
+ "invitation" => 0,
+ "can_invite" => 0,
+ "can_recall" => 0
+ ];
+ }
+ }
+
+ function remove(int $group_id, int $user_id)
+ {
+ $this->requireUser();
+
+ $this->fail(501, "Not implemented");
+ }
}
diff --git a/VKAPI/Handlers/Likes.php b/VKAPI/Handlers/Likes.php
index 38a76893..9501b433 100644
--- a/VKAPI/Handlers/Likes.php
+++ b/VKAPI/Handlers/Likes.php
@@ -8,6 +8,7 @@ final class Likes extends VKAPIRequestHandler
function add(string $type, int $owner_id, int $item_id): object
{
$this->requireUser();
+ $this->willExecuteWriteAction();
switch($type) {
case "post":
@@ -28,6 +29,7 @@ final class Likes extends VKAPIRequestHandler
function delete(string $type, int $owner_id, int $item_id): object
{
$this->requireUser();
+ $this->willExecuteWriteAction();
switch($type) {
case "post":
@@ -52,11 +54,7 @@ final class Likes extends VKAPIRequestHandler
case "post":
$user = (new UsersRepo)->get($user_id);
if (is_null($user))
- return (object) [
- "liked" => 0,
- "copied" => 0,
- "sex" => 0
- ];
+ $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))
diff --git a/VKAPI/Handlers/Messages.php b/VKAPI/Handlers/Messages.php
index c1a85a0a..bc9035f5 100644
--- a/VKAPI/Handlers/Messages.php
+++ b/VKAPI/Handlers/Messages.php
@@ -65,10 +65,16 @@ final class Messages extends VKAPIRequestHandler
];
}
- 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)
+ 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)
{
$this->requireUser();
-
+ $this->willExecuteWriteAction();
+
+ if($forGodSakePleaseDoNotReportAboutMyOnlineActivity == 0)
+ {
+ $this->getUser()->updOnline($this->getPlatform());
+ }
+
if($chat_id !== -1)
$this->fail(946, "Chats are not implemented");
else if($sticker_id !== -1)
@@ -117,6 +123,7 @@ final class Messages extends VKAPIRequestHandler
function delete(string $message_ids, int $spam = 0, int $delete_for_all = 0): object
{
$this->requireUser();
+ $this->willExecuteWriteAction();
$msgs = new MSGRepo;
$ids = preg_split("%, ?%", $message_ids);
@@ -136,6 +143,7 @@ final class Messages extends VKAPIRequestHandler
function restore(int $message_id): int
{
$this->requireUser();
+ $this->willExecuteWriteAction();
$msg = (new MSGRepo)->get($message_id);
if(!$msg)
@@ -247,32 +255,34 @@ final class Messages extends VKAPIRequestHandler
$user = (new USRRepo)->get((int) $peer);
- $dialogue = new Correspondence($this->getUser(), $user);
- $iterator = $dialogue->getMessages(Correspondence::CAP_BEHAVIOUR_START_MESSAGE_ID, 0, 1, 0, false);
- $msg = $iterator[0]->unwrap(); // шоб удобнее было
- $output['items'][] = [
- "peer" => [
- "id" => $user->getId(),
- "type" => "user",
- "local_id" => $user->getId()
- ],
- "last_message_id" => $msg->id,
- "in_read" => $msg->id,
- "out_read" => $msg->id,
- "sort_id" => [
- "major_id" => 0,
- "minor_id" => $msg->id, // КОНЕЧНО ЖЕ
- ],
- "last_conversation_message_id" => $user->getId(),
- "in_read_cmid" => $user->getId(),
- "out_read_cmid" => $user->getId(),
- "is_marked_unread" => $iterator[0]->isUnread(),
- "important" => false, // целестора когда релиз
- "can_write" => [
- "allowed" => ($user->getId() === $this->getUser()->getId() || $user->getPrivacyPermission('messages.write', $this->getUser()) === true)
- ]
- ];
- $userslist[] = $user->getId();
+ if($user) {
+ $dialogue = new Correspondence($this->getUser(), $user);
+ $iterator = $dialogue->getMessages(Correspondence::CAP_BEHAVIOUR_START_MESSAGE_ID, 0, 1, 0, false);
+ $msg = $iterator[0]->unwrap(); // шоб удобнее было
+ $output['items'][] = [
+ "peer" => [
+ "id" => $user->getId(),
+ "type" => "user",
+ "local_id" => $user->getId()
+ ],
+ "last_message_id" => $msg->id,
+ "in_read" => $msg->id,
+ "out_read" => $msg->id,
+ "sort_id" => [
+ "major_id" => 0,
+ "minor_id" => $msg->id, // КОНЕЧНО ЖЕ
+ ],
+ "last_conversation_message_id" => $user->getId(),
+ "in_read_cmid" => $user->getId(),
+ "out_read_cmid" => $user->getId(),
+ "is_marked_unread" => $iterator[0]->isUnread(),
+ "important" => false, // целестора когда релиз
+ "can_write" => [
+ "allowed" => ($user->getId() === $this->getUser()->getId() || $user->getPrivacyPermission('messages.write', $this->getUser()) === true)
+ ]
+ ];
+ $userslist[] = $user->getId();
+ }
}
if($extended == 1) {
diff --git a/VKAPI/Handlers/Newsfeed.php b/VKAPI/Handlers/Newsfeed.php
index 06474220..d9992430 100644
--- a/VKAPI/Handlers/Newsfeed.php
+++ b/VKAPI/Handlers/Newsfeed.php
@@ -2,13 +2,19 @@
namespace openvk\VKAPI\Handlers;
use Chandler\Database\DatabaseConnection;
use openvk\Web\Models\Repositories\Posts as PostsRepo;
+use openvk\Web\Models\Entities\User;
use openvk\VKAPI\Handlers\Wall;
final class Newsfeed extends VKAPIRequestHandler
{
- function get(string $fields = "", int $start_from = 0, int $offset = 0, int $count = 30, int $extended = 0)
+ function get(string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0, int $forGodSakePleaseDoNotReportAboutMyOnlineActivity = 0)
{
$this->requireUser();
+
+ if($forGodSakePleaseDoNotReportAboutMyOnlineActivity == 0)
+ {
+ $this->getUser()->updOnline($this->getPlatform());
+ }
$id = $this->getUser()->getId();
$subs = DatabaseConnection::i()
@@ -26,7 +32,9 @@ final class Newsfeed extends VKAPIRequestHandler
->select("id")
->where("wall IN (?)", $ids)
->where("deleted", 0)
- ->where("id < (?)", empty($start_from) ? time()+1 : $start_from)
+ ->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)
->order("created DESC");
$rposts = [];
@@ -35,6 +43,34 @@ final class Newsfeed extends VKAPIRequestHandler
$response = (new Wall)->getById(implode(',', $rposts), $extended, $fields, $this->getUser());
$response->next_from = end(end($posts->page((int) ($offset + 1), $count))); // ну и костыли пиздец конечно)
+
+ 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)
+ {
+ $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";
+
+ if($this->getUser()->getNsfwTolerance() === User::NSFW_INTOLERANT)
+ $queryBase .= " AND `nsfw` = 0";
+
+ $start_from = empty($start_from) ? PHP_INT_MAX : $start_from;
+ $start_time = empty($start_time) ? 0 : $start_time;
+ $end_time = empty($end_time) ? PHP_INT_MAX : $end_time;
+ $posts = DatabaseConnection::i()->getConnection()->query("SELECT `posts`.`id` " . $queryBase . " AND `posts`.`id` <= " . $start_from . " AND " . $start_time . " <= `posts`.`created` AND `posts`.`created` <= " . $end_time . " ORDER BY `created` DESC LIMIT " . $count . " OFFSET " . $offset);
+
+ $rposts = [];
+ $ids = [];
+ foreach($posts as $post) {
+ $rposts[] = (new PostsRepo)->get($post->id)->getPrettyId();
+ $ids[] = $post->id;
+ }
+
+ $response = (new Wall)->getById(implode(',', $rposts), $extended, $fields, $this->getUser());
+ $response->next_from = end($ids);
+
return $response;
}
}
diff --git a/VKAPI/Handlers/Notes.php b/VKAPI/Handlers/Notes.php
new file mode 100644
index 00000000..ce26baae
--- /dev/null
+++ b/VKAPI/Handlers/Notes.php
@@ -0,0 +1,283 @@
+requireUser();
+ $this->willExecuteWriteAction();
+
+ $note = new Note;
+ $note->setOwner($this->getUser()->getId());
+ $note->setCreated(time());
+ $note->setName($title);
+ $note->setSource($text);
+ $note->setEdited(time());
+ $note->save();
+
+ return $note->getVirtualId();
+ }
+
+ function createComment(string $note_id, int $owner_id, string $message, int $reply_to = 0, string $attachments = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+ $note = (new NotesRepo)->getNoteById((int)$owner_id, (int)$note_id);
+
+ if(!$note)
+ $this->fail(180, "Note not found");
+
+ if($note->isDeleted())
+ $this->fail(189, "Note is deleted");
+
+ if($note->getOwner()->isDeleted())
+ $this->fail(403, "Owner is deleted");
+
+ 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.");
+
+ $comment = new Comment;
+ $comment->setOwner($this->getUser()->getId());
+ $comment->setModel(get_class($note));
+ $comment->setTarget($note->getId());
+ $comment->setContent($message);
+ $comment->setCreated(time());
+ $comment->save();
+
+ if(!empty($attachments)) {
+ $attachmentsArr = explode(",", $attachments);
+
+ if(sizeof($attachmentsArr) > 10)
+ $this->fail(50, "Error: too many attachments");
+
+ foreach($attachmentsArr as $attac) {
+ $attachmentType = NULL;
+
+ if(str_contains($attac, "photo"))
+ $attachmentType = "photo";
+ elseif(str_contains($attac, "video"))
+ $attachmentType = "video";
+ else
+ $this->fail(205, "Unknown attachment type");
+
+ $attachment = str_replace($attachmentType, "", $attac);
+
+ $attachmentOwner = (int)explode("_", $attachment)[0];
+ $attachmentId = (int)end(explode("_", $attachment));
+
+ $attacc = NULL;
+
+ if($attachmentType == "photo") {
+ $attacc = (new PhotosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Photo does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this photo");
+
+ $comment->attach($attacc);
+ } elseif($attachmentType == "video") {
+ $attacc = (new VideosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Video does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this video");
+
+ $comment->attach($attacc);
+ }
+ }
+ }
+
+ return $comment->getId();
+ }
+
+ function delete(string $note_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $note = (new NotesRepo)->get((int)$note_id);
+
+ if(!$note)
+ $this->fail(180, "Note not found");
+
+ if(!$note->canBeModifiedBy($this->getUser()))
+ $this->fail(15, "Access to note denied");
+
+ $note->delete();
+
+ 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();
+ $this->willExecuteWriteAction();
+
+ $note = (new NotesRepo)->getNoteById($this->getUser()->getId(), (int)$note_id);
+
+ if(!$note)
+ $this->fail(180, "Note not found");
+
+ if($note->isDeleted())
+ $this->fail(189, "Note is deleted");
+
+ if(!$note->canBeModifiedBy($this->getUser()))
+ $this->fail(403, "No access");
+
+ !empty($title) ? $note->setName($title) : NULL;
+ !empty($text) ? $note->setSource($text) : NULL;
+
+ $note->setCached_Content(NULL);
+ $note->setEdited(time());
+ $note->save();
+
+ 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();
+ $user = (new UsersRepo)->get($user_id);
+
+ if(!$user || $user->isDeleted())
+ $this->fail(15, "Invalid user");
+
+ if(!$user->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(43, "Access denied: this user chose to hide his notes");
+
+ if(empty($note_ids)) {
+ $notes = array_slice(iterator_to_array((new NotesRepo)->getUserNotes($user, 1, $count + $offset, $sort == 0 ? "ASC" : "DESC")), $offset);
+ $nodez = (object) [
+ "count" => (new NotesRepo)->getUserNotesCount((new UsersRepo)->get($user_id)),
+ "notes" => []
+ ];
+
+ foreach($notes as $note) {
+ if($note->isDeleted()) continue;
+
+ $nodez->notes[] = $note->toVkApiStruct();
+ }
+ } else {
+ $notes = explode(',', $note_ids);
+
+ foreach($notes as $note)
+ {
+ $id = explode("_", $note);
+
+ $items = [];
+
+ $note = (new NotesRepo)->getNoteById((int)$id[0], (int)$id[1]);
+ if($note) {
+ $nodez->notes[] = $note->toVkApiStruct();
+ }
+ }
+ }
+
+ return $nodez;
+ }
+
+ function getById(int $note_id, int $owner_id, bool $need_wiki = false)
+ {
+ $this->requireUser();
+
+ $note = (new NotesRepo)->getNoteById($owner_id, $note_id);
+
+ if(!$note)
+ $this->fail(180, "Note not found");
+
+ 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");
+
+ return $note->toVkApiStruct();
+ }
+
+ function getComments(int $note_id, int $owner_id, int $sort = 1, int $offset = 0, int $count = 100)
+ {
+ $this->requireUser();
+
+ $note = (new NotesRepo)->getNoteById($owner_id, $note_id);
+
+ if(!$note)
+ $this->fail(180, "Note not found");
+
+ if($note->isDeleted())
+ $this->fail(189, "Note is deleted");
+
+ if(!$note->getOwner())
+ $this->fail(177, "Owner does not exists");
+
+ if(!$note->getOwner()->getPrivacyPermission('notes.read', $this->getUser()))
+ $this->fail(14, "No access");
+
+ $arr = (object) [
+ "count" => $note->getCommentsCount(),
+ "comments" => []];
+ $comments = array_slice(iterator_to_array($note->getComments(1, $count + $offset)), $offset);
+
+ foreach($comments as $comment) {
+ $arr->comments[] = $comment->toVkApiStruct($this->getUser(), false, false, $note);
+ }
+
+ return $arr;
+ }
+
+ function getFriendsNotes(int $offset = 0, int $count = 0)
+ {
+ $this->fail(501, "Not implemented");
+ }
+
+ function restoreComment(int $comment_id = 0, int $owner_id = 0)
+ {
+ $this->fail(501, "Not implemented");
+ }
+}
diff --git a/VKAPI/Handlers/Photos.php b/VKAPI/Handlers/Photos.php
index 9a02dd8c..e3e9abac 100644
--- a/VKAPI/Handlers/Photos.php
+++ b/VKAPI/Handlers/Photos.php
@@ -3,9 +3,12 @@ namespace openvk\VKAPI\Handlers;
use Nette\InvalidStateException;
use Nette\Utils\ImageException;
-use openvk\Web\Models\Entities\Photo;
+use openvk\Web\Models\Entities\{Photo, Album, Comment};
use openvk\Web\Models\Repositories\Albums;
+use openvk\Web\Models\Repositories\Photos as PhotosRepo;
use openvk\Web\Models\Repositories\Clubs;
+use openvk\Web\Models\Repositories\Users as UsersRepo;
+use openvk\Web\Models\Repositories\Comments as CommentsRepo;
final class Photos extends VKAPIRequestHandler
{
@@ -58,7 +61,7 @@ final class Photos extends VKAPIRequestHandler
}
return (object) [
- "upload_url" => $this->getPhotoUploadUrl("photo", isset($club) ? 0 : $club->getId()),
+ "upload_url" => $this->getPhotoUploadUrl("photo", !isset($club) ? 0 : $club->getId()),
];
}
@@ -227,4 +230,504 @@ final class Photos extends VKAPIRequestHandler
"items" => $images,
];
}
+
+ function createAlbum(string $title, int $group_id = 0, string $description = "", int $privacy = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if($group_id != 0) {
+ $club = (new Clubs)->get((int) $group_id);
+
+ if(!$club || !$club->canBeModifiedBy($this->getUser())) {
+ $this->fail(20, "Invalid club");
+ }
+ }
+
+ $album = new Album;
+ $album->setOwner(isset($club) ? $club->getId() * -1 : $this->getUser()->getId());
+ $album->setName($title);
+ $album->setDescription($description);
+ $album->setCreated(time());
+ $album->save();
+
+ return $album->toVkApiStruct($this->getUser());
+ }
+
+ function editAlbum(int $album_id, int $owner_id, string $title, string $description = "", int $privacy = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Albums)->getAlbumByOwnerAndId($owner_id, $album_id);
+
+ if(!$album || $album->isDeleted()) {
+ $this->fail(2, "Invalid album");
+ }
+
+ if(empty($title)) {
+ $this->fail(25, "Title is empty");
+ }
+
+ if($album->isCreatedBySystem()) {
+ $this->fail(40, "You can't change system album");
+ }
+
+ if(!$album->canBeModifiedBy($this->getUser())) {
+ $this->fail(2, "Access to album denied");
+ }
+
+ $album->setName($title);
+ $album->setDescription($description);
+
+ $album->save();
+
+ return $album->toVkApiStruct($this->getUser());
+ }
+
+ 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 = [];
+
+ if(empty($album_ids)) {
+ if($owner_id > 0) {
+ $user = (new UsersRepo)->get($owner_id);
+
+ $res = [
+ "count" => (new Albums)->getUserAlbumsCount($user),
+ "items" => []
+ ];
+
+ if(!$user || $user->isDeleted())
+ $this->fail(2, "Invalid user");
+
+
+ if(!$user->getPrivacyPermission('photos.read', $this->getUser()))
+ $this->fail(21, "This user chose to hide his albums.");
+
+ $albums = array_slice(iterator_to_array((new Albums)->getUserAlbums($user, 1, $count + $offset)), $offset);
+
+ foreach($albums as $album) {
+ if(!$need_system && $album->isCreatedBySystem()) continue;
+ $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
+ }
+ }
+
+ else {
+ $club = (new Clubs)->get($owner_id * -1);
+
+ $res = [
+ "count" => (new Albums)->getClubAlbumsCount($club),
+ "items" => []
+ ];
+
+ if(!$club)
+ $this->fail(2, "Invalid club");
+
+ $albums = array_slice(iterator_to_array((new Albums)->getClubAlbums($club, 1, $count + $offset)), $offset);
+
+ foreach($albums as $album) {
+ if(!$need_system && $album->isCreatedBySystem()) continue;
+ $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
+ }
+ }
+
+ } else {
+ $albums = explode(',', $album_ids);
+
+ $res = [
+ "count" => sizeof($albums),
+ "items" => []
+ ];
+
+ foreach($albums as $album)
+ {
+ $id = explode("_", $album);
+
+ $album = (new Albums)->getAlbumByOwnerAndId((int)$id[0], (int)$id[1]);
+ if($album && !$album->isDeleted()) {
+ if(!$need_system && $album->isCreatedBySystem()) continue;
+ $res["items"][] = $album->toVkApiStruct($this->getUser(), $need_covers, $photo_sizes);
+ }
+ }
+ }
+
+ return $res;
+ }
+
+ 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) {
+ $this->fail(21, "Select user_id or group_id");
+ }
+
+ if($user_id > 0) {
+
+ $us = (new UsersRepo)->get($user_id);
+ if(!$us || $us->isDeleted()) {
+ $this->fail(21, "Invalid user");
+ }
+
+ 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)
+ {
+ $cl = (new Clubs)->get($group_id);
+ if(!$cl) {
+ $this->fail(21, "Invalid club");
+ }
+
+ return (new Albums)->getClubAlbumsCount($cl);
+ }
+ }
+
+ function getById(string $photos, bool $extended = false, bool $photo_sizes = false)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $phts = explode(",", $photos);
+ $res = [];
+
+ foreach($phts as $phota) {
+ $ph = explode("_", $phota);
+ $photo = (new PhotosRepo)->getByOwnerAndVID((int)$ph[0], (int)$ph[1]);
+
+ 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.");
+ }
+
+ $res[] = $photo->toVkApiStruct($photo_sizes, $extended);
+ }
+
+ return $res;
+ }
+
+ 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()) {
+ $this->fail(21, "Invalid album");
+ }
+
+ $photos = array_slice(iterator_to_array($album->getPhotos(1, $count + $offset)), $offset);
+ $res["count"] = sizeof($photos);
+
+ foreach($photos as $photo) {
+ if(!$photo || $photo->isDeleted()) continue;
+ $res["items"][] = $photo->toVkApiStruct($photo_sizes, $extended);
+ }
+
+ } else {
+ $photos = explode(',', $photo_ids);
+
+ $res = [
+ "count" => sizeof($photos),
+ "items" => []
+ ];
+
+ foreach($photos as $photo)
+ {
+ $id = explode("_", $photo);
+
+ $phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]);
+ if($phot && !$phot->isDeleted()) {
+ $res["items"][] = $phot->toVkApiStruct($photo_sizes, $extended);
+ }
+ }
+ }
+
+ return $res;
+ }
+
+ function deleteAlbum(int $album_id, int $group_id = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $album = (new Albums)->get($album_id);
+
+ if(!$album || $album->canBeModifiedBy($this->getUser())) {
+ $this->fail(21, "Invalid album");
+ }
+
+ if($album->isDeleted()) {
+ $this->fail(22, "Album already deleted");
+ }
+
+ $album->delete();
+
+ return 1;
+ }
+
+ function edit(int $owner_id, int $photo_id, string $caption = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
+
+ if(!$photo) {
+ $this->fail(21, "Invalid photo");
+ }
+
+ if($photo->isDeleted()) {
+ $this->fail(21, "Photo is deleted");
+ }
+
+ if(!empty($caption)) {
+ $photo->setDescription($caption);
+ $photo->save();
+ }
+
+ return 1;
+ }
+
+ function delete(int $owner_id, int $photo_id, string $photos = "")
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if(empty($photos)) {
+ $photo = (new PhotosRepo)->getByOwnerAndVID($owner_id, $photo_id);
+
+ if($this->getUser()->getId() !== $photo->getOwner()->getId()) {
+ $this->fail(21, "You can't delete another's photo");
+ }
+
+ if(!$photo) {
+ $this->fail(21, "Invalid photo");
+ }
+
+ if($photo->isDeleted()) {
+ $this->fail(21, "Photo already deleted");
+ }
+
+ $photo->delete();
+ } else {
+ $photozs = explode(',', $photos);
+
+ foreach($photozs as $photo)
+ {
+ $id = explode("_", $photo);
+
+ $phot = (new PhotosRepo)->getByOwnerAndVID((int)$id[0], (int)$id[1]);
+
+ if($this->getUser()->getId() !== $phot->getOwner()->getId()) {
+ $this->fail(21, "You can't delete another's photo");
+ }
+
+ if(!$phot) {
+ $this->fail(21, "Invalid photo");
+ }
+
+ if($phot->isDeleted()) {
+ $this->fail(21, "Photo already deleted");
+ }
+
+ $phot->delete();
+ }
+ }
+
+ return 1;
+ }
+
+ function getAllComments(int $owner_id, int $album_id, bool $need_likes = false, int $offset = 0, int $count = 100)
+ {
+ $this->fail(501, "Not implemented");
+ }
+
+ function deleteComment(int $comment_id, int $owner_id = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $comment = (new CommentsRepo)->get($comment_id);
+ 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");
+ }
+
+ $comment->delete();
+
+ return 1;
+ }
+
+ function createComment(int $owner_id, int $photo_id, string $message = "", string $attachments = "", bool $from_group = false)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ 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)
+ $this->fail(180, "Photo not found");
+ if($photo->isDeleted())
+ $this->fail(189, "Photo is deleted");
+
+ $comment = new Comment;
+ $comment->setOwner($this->getUser()->getId());
+ $comment->setModel(get_class($photo));
+ $comment->setTarget($photo->getId());
+ $comment->setContent($message);
+ $comment->setCreated(time());
+ $comment->save();
+
+ if(!empty($attachments)) {
+ $attachmentsArr = explode(",", $attachments);
+
+ if(sizeof($attachmentsArr) > 10)
+ $this->fail(50, "Error: too many attachments");
+
+ foreach($attachmentsArr as $attac) {
+ $attachmentType = NULL;
+
+ if(str_contains($attac, "photo"))
+ $attachmentType = "photo";
+ elseif(str_contains($attac, "video"))
+ $attachmentType = "video";
+ else
+ $this->fail(205, "Unknown attachment type");
+
+ $attachment = str_replace($attachmentType, "", $attac);
+
+ $attachmentOwner = (int)explode("_", $attachment)[0];
+ $attachmentId = (int)end(explode("_", $attachment));
+
+ $attacc = NULL;
+
+ if($attachmentType == "photo") {
+ $attacc = (new PhotosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Photo does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this photo");
+
+ $comment->attach($attacc);
+ } elseif($attachmentType == "video") {
+ $attacc = (new VideosRepo)->getByOwnerAndVID($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Video does not exists");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this video");
+
+ $comment->attach($attacc);
+ }
+ }
+ }
+
+ return $comment->getId();
+ }
+
+ 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) {
+ $this->fail(4, "This method doesn't works with clubs");
+ }
+
+ $user = (new UsersRepo)->get($owner_id);
+
+ if(!$user) {
+ $this->fail(4, "Invalid user");
+ }
+
+ 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 = [];
+
+ foreach($photos as $photo) {
+ if(!$photo || $photo->isDeleted()) continue;
+ $res["items"][] = $photo->toVkApiStruct($photo_sizes, $extended);
+ }
+
+ return $res;
+ }
+
+ 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) {
+ $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");
+ }
+
+ $res = [
+ "count" => sizeof($comms),
+ "items" => []
+ ];
+
+ foreach($comms as $comment) {
+ $res["items"][] = $comment->toVkApiStruct($this->getUser(), $need_likes, $extended);
+ if($extended) {
+ if($comment->getOwner() instanceof \openvk\Web\Models\Entities\User) {
+ $res["profiles"][] = $comment->getOwner()->toVkApiStruct();
+ }
+ }
+ }
+
+ return $res;
+ }
}
\ No newline at end of file
diff --git a/VKAPI/Handlers/Polls.php b/VKAPI/Handlers/Polls.php
new file mode 100755
index 00000000..be947a44
--- /dev/null
+++ b/VKAPI/Handlers/Polls.php
@@ -0,0 +1,107 @@
+get($poll_id);
+
+ if (!$poll)
+ $this->fail(100, "One of the parameters specified was missing or invalid: poll_id is incorrect");
+
+ $users = array();
+ $answers = array();
+ foreach($poll->getResults()->options as $answer) {
+ $answers[] = (object)[
+ "id" => $answer->id,
+ "rate" => $answer->pct,
+ "text" => $answer->name,
+ "votes" => $answer->votes
+ ];
+ }
+
+ $userVote = array();
+ foreach($poll->getUserVote($this->getUser()) as $vote)
+ $userVote[] = $vote[0];
+
+ $response = [
+ "multiple" => $poll->isMultipleChoice(),
+ "end_date" => $poll->endsAt() == NULL ? 0 : $poll->endsAt()->timestamp(),
+ "closed" => $poll->hasEnded(),
+ "is_board" => false,
+ "can_edit" => false,
+ "can_vote" => $poll->canVote($this->getUser()),
+ "can_report" => false,
+ "can_share" => true,
+ "created" => 0,
+ "id" => $poll->getId(),
+ "owner_id" => $poll->getOwner()->getId(),
+ "question" => $poll->getTitle(),
+ "votes" => $poll->getVoterCount(),
+ "disable_unvote" => $poll->isRevotable(),
+ "anonymous" => $poll->isAnonymous(),
+ "answer_ids" => $userVote,
+ "answers" => $answers,
+ "author_id" => $poll->getOwner()->getId(),
+ ];
+
+ if ($extended) {
+ $response["profiles"] = (new Users)->get(strval($poll->getOwner()->getId()), $fields, 0, 1);
+ /* Currently there is only one person that can be shown trough "Extended" param.
+ * As "friends" param will be implemented, "profiles" will show more users
+ */
+ }
+
+ return (object) $response;
+ }
+
+ function addVote(int $poll_id, string $answers_ids)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $poll = (new PollsRepo)->get($poll_id);
+
+ if(!$poll)
+ $this->fail(251, "Invalid poll id");
+
+ try {
+ $poll->vote($this->getUser(), explode(",", $answers_ids));
+ return 1;
+ } catch(AlreadyVotedException $ex) {
+ return 0;
+ } catch(PollLockedException $ex) {
+ return 0;
+ } catch(InvalidOptionException $ex) {
+ $this->fail(8, "бдсм вибратор купить в киеве");
+ }
+ }
+
+ function deleteVote(int $poll_id)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ $poll = (new PollsRepo)->get($poll_id);
+
+ if(!$poll)
+ $this->fail(251, "Invalid poll id");
+
+ try {
+ $poll->revokeVote($this->getUser());
+ return 1;
+ } catch(PollLockedException $ex) {
+ $this->fail(15, "Access denied: Poll is locked or isn't revotable");
+ } catch(InvalidOptionException $ex) {
+ $this->fail(8, "how.to. ook.bacon.in.microwova.");
+ }
+ }
+}
diff --git a/VKAPI/Handlers/Status.php b/VKAPI/Handlers/Status.php
new file mode 100644
index 00000000..843f42bd
--- /dev/null
+++ b/VKAPI/Handlers/Status.php
@@ -0,0 +1,35 @@
+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();
+ }
+ }
+
+ function set(string $text, int $group_id = 0)
+ {
+ $this->requireUser();
+ $this->willExecuteWriteAction();
+
+ if($group_id > 0) {
+ $this->fail(501, "Group statuses are not implemented");
+ } else {
+ $this->getUser()->setStatus($text);
+ $this->getUser()->save();
+
+ return 1;
+ }
+ }
+}
diff --git a/VKAPI/Handlers/Users.php b/VKAPI/Handlers/Users.php
index 6185a250..a4298787 100644
--- a/VKAPI/Handlers/Users.php
+++ b/VKAPI/Handlers/Users.php
@@ -32,7 +32,15 @@ final class Users extends VKAPIRequestHandler
"first_name" => "DELETED",
"last_name" => "",
"deactivated" => "deleted"
- ];
+ ];
+ } else if($usr->isBanned()) {
+ $response[$i] = (object)[
+ "id" => $usr->getId(),
+ "first_name" => $usr->getFirstName(),
+ "last_name" => $usr->getLastName(),
+ "deactivated" => "banned",
+ "ban_reason" => $usr->getBanReason()
+ ];
} else if($usrs[$i] == NULL) {
} else {
@@ -108,11 +116,31 @@ final class Users extends VKAPIRequestHandler
}
break;
case "last_seen":
- if ($usr->onlineStatus() == 0)
+ if ($usr->onlineStatus() == 0) {
+ $platform = $usr->getOnlinePlatform(true);
+ switch ($platform) {
+ case 'iphone':
+ $platform = 2;
+ break;
+
+ case 'android':
+ $platform = 4;
+ break;
+
+ case NULL:
+ $platform = 7;
+ break;
+
+ default:
+ $platform = 1;
+ break;
+ }
+
$response[$i]->last_seen = (object) [
- "platform" => 1,
+ "platform" => $platform,
"time" => $usr->getOnline()->timestamp()
];
+ }
case "music":
$response[$i]->music = $usr->getFavoriteMusic();
break;
@@ -130,7 +158,10 @@ final class Users extends VKAPIRequestHandler
break;
case "interests":
$response[$i]->interests = $usr->getInterests();
- break;
+ break;
+ case "rating":
+ $response[$i]->rating = $usr->getRating();
+ break;
}
}
@@ -168,19 +199,94 @@ final class Users extends VKAPIRequestHandler
];
}
- function search(string $q, string $fields = "", int $offset = 0, int $count = 100)
+ function search(string $q,
+ string $fields = "",
+ int $offset = 0,
+ int $count = 100,
+ string $city = "",
+ string $hometown = "",
+ int $sex = 2,
+ int $status = 0, # это про marital status
+ bool $online = false,
+ # дальше идут параметры которых нету в vkapi но есть на сайте
+ string $profileStatus = "", # а это уже нормальный статус
+ int $sort = 0,
+ int $before = 0,
+ int $politViews = 0,
+ int $after = 0,
+ string $interests = "",
+ string $fav_music = "",
+ string $fav_films = "",
+ string $fav_shows = "",
+ string $fav_books = "",
+ string $fav_quotes = ""
+ )
{
$users = new UsersRepo;
+ $sortg = "id ASC";
+
+ $nfilds = $fields;
+
+ switch($sort) {
+ case 0:
+ $sortg = "id DESC";
+ break;
+ case 1:
+ $sortg = "id ASC";
+ break;
+ case 2:
+ $sortg = "first_name DESC";
+ break;
+ case 3:
+ $sortg = "first_name ASC";
+ break;
+ case 4:
+ $sortg = "rating DESC";
+
+ if(!str_contains($nfilds, "rating")) {
+ $nfilds .= "rating";
+ }
+
+ break;
+ case 5:
+ $sortg = "rating DESC";
+
+ if(!str_contains($nfilds, "rating")) {
+ $nfilds .= "rating";
+ }
+
+ break;
+ }
+
$array = [];
- $find = $users->find($q);
+
+ $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,
+ ];
+
+ $find = $users->find($q, $parameters, $sortg);
foreach ($find as $user)
$array[] = $user->getId();
return (object) [
"count" => $find->size(),
- "items" => $this->get(implode(',', $array), $fields, $offset, $count)
+ "items" => $this->get(implode(',', $array), $nfilds, $offset, $count)
];
}
}
diff --git a/VKAPI/Handlers/Utils.php b/VKAPI/Handlers/Utils.php
index 7144a39a..5350a64f 100644
--- a/VKAPI/Handlers/Utils.php
+++ b/VKAPI/Handlers/Utils.php
@@ -1,5 +1,6 @@
getMatchingRoute("/$screen_name")[0]->presenter !== "UnknownTextRouteStrategy") {
+ if(substr($screen_name, 0, strlen("id")) === "id") {
+ return (object) [
+ "object_id" => (int) substr($screen_name, strlen("id")),
+ "type" => "user"
+ ];
+ } else if(substr($screen_name, 0, strlen("club")) === "club") {
+ return (object) [
+ "object_id" => (int) substr($screen_name, strlen("club")),
+ "type" => "group"
+ ];
+ }
+ } else {
+ $user = (new Users)->getByShortURL($screen_name);
+ if($user) {
+ return (object) [
+ "object_id" => $user->getId(),
+ "type" => "user"
+ ];
+ }
+
+ $club = (new Clubs)->getByShortURL($screen_name);
+ if($club) {
+ return (object) [
+ "object_id" => $club->getId(),
+ "type" => "group"
+ ];
+ }
+
+ return (object) [];
+ }
+ }
}
diff --git a/VKAPI/Handlers/VKAPIRequestHandler.php b/VKAPI/Handlers/VKAPIRequestHandler.php
index 79cfb41b..d2fcfc74 100644
--- a/VKAPI/Handlers/VKAPIRequestHandler.php
+++ b/VKAPI/Handlers/VKAPIRequestHandler.php
@@ -1,15 +1,19 @@
user = $user;
+ $this->user = $user;
+ $this->platform = $platform;
}
protected function fail(int $code, string $message): void
@@ -22,6 +26,11 @@ abstract class VKAPIRequestHandler
return $this->user;
}
+ protected function getPlatform(): ?string
+ {
+ return $this->platform;
+ }
+
protected function userAuthorized(): bool
{
return !is_null($this->getUser());
@@ -32,4 +41,19 @@ abstract class VKAPIRequestHandler
if(!$this->userAuthorized())
$this->fail(5, "User authorization failed: no access_token passed.");
}
+
+ protected function willExecuteWriteAction(): void
+ {
+ $ip = (new IPs)->get(CONNECTING_IP);
+ $res = $ip->rateLimit();
+
+ if(!($res === IP::RL_RESET || $res === IP::RL_CANEXEC)) {
+ if($res === IP::RL_BANNED && OPENVK_ROOT_CONF["openvk"]["preferences"]["security"]["rateLimits"]["autoban"]) {
+ $this->user->ban("User account has been suspended for breaking API terms of service", false);
+ $this->fail(18, "User account has been suspended due to repeated violation of API rate limits.");
+ }
+
+ $this->fail(29, "You have been rate limited.");
+ }
+ }
}
diff --git a/VKAPI/Handlers/Video.php b/VKAPI/Handlers/Video.php
new file mode 100755
index 00000000..740ccd54
--- /dev/null
+++ b/VKAPI/Handlers/Video.php
@@ -0,0 +1,57 @@
+requireUser();
+
+ if ($videos) {
+ $vids = explode(',', $videos);
+
+ foreach($vids as $vid)
+ {
+ $id = explode("_", $vid);
+
+ $items = [];
+
+ $video = (new VideosRepo)->getByOwnerAndVID(intval($id[0]), intval($id[1]));
+ if($video) {
+ $items[] = $video->getApiStructure();
+ }
+ }
+
+ return (object) [
+ "count" => count($items),
+ "items" => $items
+ ];
+ } else {
+ if ($owner_id > 0)
+ $user = (new UsersRepo)->get($owner_id);
+ else
+ $this->fail(1, "Not implemented");
+
+ $videos = (new VideosRepo)->getByUser($user, $offset + 1, $count);
+ $videosCount = (new VideosRepo)->getUserVideosCount($user);
+
+ $items = [];
+ foreach ($videos as $video) {
+ $items[] = $video->getApiStructure();
+ }
+
+ return (object) [
+ "count" => $videosCount,
+ "items" => $items
+ ];
+ }
+ }
+}
diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php
index c669cd02..d52dfce1 100644
--- a/VKAPI/Handlers/Wall.php
+++ b/VKAPI/Handlers/Wall.php
@@ -9,11 +9,19 @@ use openvk\Web\Models\Entities\Post;
use openvk\Web\Models\Repositories\Posts as PostsRepo;
use openvk\Web\Models\Entities\Comment;
use openvk\Web\Models\Repositories\Comments as CommentsRepo;
+use openvk\Web\Models\Entities\Photo;
+use openvk\Web\Models\Repositories\Photos as PhotosRepo;
+use openvk\Web\Models\Entities\Video;
+use openvk\Web\Models\Repositories\Videos as VideosRepo;
+use openvk\Web\Models\Entities\Note;
+use openvk\Web\Models\Repositories\Notes as NotesRepo;
final class Wall extends VKAPIRequestHandler
{
function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 30, int $extended = 0): object
{
+ $this->requireUser();
+
$posts = new PostsRepo;
$items = [];
@@ -21,10 +29,17 @@ final class Wall extends VKAPIRequestHandler
$groups = [];
$cnt = $posts->getPostCountOnUserWall($owner_id);
- $wallOnwer = (new UsersRepo)->get($owner_id);
+ if ($owner_id > 0)
+ $wallOnwer = (new UsersRepo)->get($owner_id);
+ else
+ $wallOnwer = (new ClubsRepo)->get($owner_id * -1);
- if(!$wallOnwer || $wallOnwer->isDeleted() || $wallOnwer->isDeleted())
- $this->fail(18, "User was deleted or banned");
+ if ($owner_id > 0)
+ if(!$wallOnwer || $wallOnwer->isDeleted())
+ $this->fail(18, "User was deleted or banned");
+ 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) {
$from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId();
@@ -35,21 +50,43 @@ final class Wall extends VKAPIRequestHandler
if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
if($attachment->isDeleted())
continue;
-
+
$attachments[] = $this->getApiPhoto($attachment);
+ } 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();
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ $attachments[] = $attachment->toVkApiStruct();
} else if ($attachment instanceof \openvk\Web\Models\Entities\Post) {
$repostAttachments = [];
foreach($attachment->getChildren() as $repostAttachment) {
if($repostAttachment instanceof \openvk\Web\Models\Entities\Photo) {
- if($attachment->isDeleted())
+ if($repostAttachment->isDeleted())
continue;
-
+
$repostAttachments[] = $this->getApiPhoto($repostAttachment);
/* Рекурсии, сука! Заказывали? */
}
}
+ if ($attachment->isPostedOnBehalfOfGroup())
+ $groups[] = $attachment->getOwner()->getId();
+ 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(),
@@ -58,13 +95,22 @@ final class Wall extends VKAPIRequestHandler
"post_type" => "post",
"text" => $attachment->getText(false),
"attachments" => $repostAttachments,
- "post_source" => [
- "type" => "vk"
- ],
+ "post_source" => $post_source,
];
}
}
+ $post_source = [];
+
+ if($post->getPlatform(true) === NULL) {
+ $post_source = (object)["type" => "vk"];
+ } else {
+ $post_source = (object)[
+ "type" => "api",
+ "platform" => $post->getPlatform(true)
+ ];
+ }
+
$items[] = (object)[
"id" => $post->getVirtualId(),
"from_id" => $from_id,
@@ -79,8 +125,9 @@ final class Wall extends VKAPIRequestHandler
"can_archive" => false, # TODO MAYBE
"is_archived" => false,
"is_pinned" => $post->isPinned(),
+ "is_explicit" => $post->isExplicit(),
"attachments" => $attachments,
- "post_source" => (object)["type" => "vk"],
+ "post_source" => $post_source,
"comments" => (object)[
"count" => $post->getCommentsCount(),
"can_post" => 1
@@ -96,7 +143,7 @@ final class Wall extends VKAPIRequestHandler
"user_reposted" => 0
]
];
-
+
if ($from_id > 0)
$profiles[] = $from_id;
else
@@ -124,7 +171,8 @@ final class Wall extends VKAPIRequestHandler
"screen_name" => $user->getShortCode(),
"photo_50" => $user->getAvatarUrl(),
"photo_100" => $user->getAvatarUrl(),
- "online" => $user->isOnline()
+ "online" => $user->isOnline(),
+ "verified" => $user->isVerified()
];
}
@@ -139,6 +187,7 @@ final class Wall extends VKAPIRequestHandler
"photo_50" => $group->getAvatarUrl(),
"photo_100" => $group->getAvatarUrl(),
"photo_200" => $group->getAvatarUrl(),
+ "verified" => $group->isVerified()
];
}
@@ -171,13 +220,19 @@ final class Wall extends VKAPIRequestHandler
foreach($psts as $pst) {
$id = explode("_", $pst);
$post = (new PostsRepo)->getPostById(intval($id[0]), intval($id[1]));
- if($post) {
+ if($post && !$post->isDeleted()) {
$from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId();
$attachments = [];
$repost = []; // чел высрал семь сигарет 😳 помянем 🕯
foreach($post->getChildren() as $attachment) {
if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
$attachments[] = $this->getApiPhoto($attachment);
+ } 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();
+ } else if ($attachment instanceof \openvk\Web\Models\Entities\Note) {
+ $attachments[] = $attachment->toVkApiStruct();
} else if ($attachment instanceof \openvk\Web\Models\Entities\Post) {
$repostAttachments = [];
@@ -185,11 +240,27 @@ final class Wall extends VKAPIRequestHandler
if($repostAttachment instanceof \openvk\Web\Models\Entities\Photo) {
if($attachment->isDeleted())
continue;
-
+
$repostAttachments[] = $this->getApiPhoto($repostAttachment);
/* Рекурсии, сука! Заказывали? */
}
- }
+ }
+
+ if ($attachment->isPostedOnBehalfOfGroup())
+ $groups[] = $attachment->getOwner()->getId();
+ 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(),
@@ -199,13 +270,22 @@ final class Wall extends VKAPIRequestHandler
"post_type" => "post",
"text" => $attachment->getText(false),
"attachments" => $repostAttachments,
- "post_source" => [
- "type" => "vk"
- ],
+ "post_source" => $post_source,
];
}
}
+ $post_source = [];
+
+ if($post->getPlatform(true) === NULL) {
+ $post_source = (object)["type" => "vk"];
+ } else {
+ $post_source = (object)[
+ "type" => "api",
+ "platform" => $post->getPlatform(true)
+ ];
+ }
+
$items[] = (object)[
"id" => $post->getVirtualId(),
"from_id" => $from_id,
@@ -220,7 +300,8 @@ final class Wall extends VKAPIRequestHandler
"can_archive" => false, # TODO MAYBE
"is_archived" => false,
"is_pinned" => $post->isPinned(),
- "post_source" => (object)["type" => "vk"],
+ "is_explicit" => $post->isExplicit(),
+ "post_source" => $post_source,
"attachments" => $attachments,
"comments" => (object)[
"count" => $post->getCommentsCount(),
@@ -237,7 +318,7 @@ final class Wall extends VKAPIRequestHandler
"user_reposted" => 0
]
];
-
+
if ($from_id > 0)
$profiles[] = $from_id;
else
@@ -267,7 +348,8 @@ final class Wall extends VKAPIRequestHandler
"screen_name" => $user->getShortCode(),
"photo_50" => $user->getAvatarUrl(),
"photo_100" => $user->getAvatarUrl(),
- "online" => $user->isOnline()
+ "online" => $user->isOnline(),
+ "verified" => $user->isVerified()
];
}
@@ -282,6 +364,7 @@ final class Wall extends VKAPIRequestHandler
"photo_50" => $group->getAvatarUrl(),
"photo_100" => $group->getAvatarUrl(),
"photo_200" => $group->getAvatarUrl(),
+ "verified" => $group->isVerified()
];
}
@@ -296,12 +379,13 @@ final class Wall extends VKAPIRequestHandler
];
}
- function post(string $owner_id, string $message = "", int $from_group = 0, int $signed = 0): object
+ function post(string $owner_id, string $message = "", int $from_group = 0, int $signed = 0, string $attachments = ""): object
{
$this->requireUser();
+ $this->willExecuteWriteAction();
$owner_id = intval($owner_id);
-
+
$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)
@@ -312,7 +396,7 @@ final class Wall extends VKAPIRequestHandler
else
$canPost = $wallOwner->canPost();
else
- $canPost = false;
+ $canPost = false;
if($canPost == false) $this->fail(15, "Access denied");
@@ -333,27 +417,7 @@ final class Wall extends VKAPIRequestHandler
if($signed == 1)
$flags |= 0b01000000;
- # TODO: Compatible implementation of this
- try {
- $photo = NULL;
- $video = NULL;
- if($_FILES["photo"]["error"] === UPLOAD_ERR_OK) {
- $album = NULL;
- if(!$anon && $owner_id > 0 && $owner_id === $this->getUser()->getId())
- $album = (new AlbumsRepo)->getUserWallAlbum($wallOwner);
-
- $photo = Photo::fastMake($this->getUser()->getId(), $message, $_FILES["photo"], $album, $anon);
- }
-
- if($_FILES["video"]["error"] === UPLOAD_ERR_OK)
- $video = Video::fastMake($this->getUser()->getId(), $message, $_FILES["video"], $anon);
- } catch(\DomainException $ex) {
- $this->fail(-156, "The media file is corrupted");
- } catch(ISE $ex) {
- $this->fail(-156, "The media file is corrupted or too large ");
- }
-
- if(empty($message) && !$photo && !$video)
+ if(empty($message) && empty($attachments))
$this->fail(100, "Required parameter 'message' missing.");
try {
@@ -363,16 +427,69 @@ final class Wall extends VKAPIRequestHandler
$post->setCreated(time());
$post->setContent($message);
$post->setFlags($flags);
+ $post->setApi_Source_Name($this->getPlatform());
$post->save();
} catch(\LogicException $ex) {
$this->fail(100, "One of the parameters specified was missing or invalid");
}
- if(!is_null($photo))
- $post->attach($photo);
+ if(!empty($attachments)) {
+ $attachmentsArr = explode(",", $attachments);
+ # Аттачи такого вида: [тип][id владельца]_[id вложения]
+ # Пример: photo1_1
- if(!is_null($video))
- $post->attach($video);
+ 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";
+ elseif(str_contains($attac, "note"))
+ $attachmentType = "note";
+ 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);
+ } elseif($attachmentType == "note") {
+ $attacc = (new NotesRepo)->getNoteById($attachmentOwner, $attachmentId);
+ if(!$attacc || $attacc->isDeleted())
+ $this->fail(100, "Note does not exist");
+ if($attacc->getOwner()->getId() != $this->getUser()->getId())
+ $this->fail(43, "You do not have access to this note");
+
+ if($attacc->getOwner()->getPrivacySetting("notes.read") < 1)
+ $this->fail(11, "You can't attach note to post, because your notes list is closed. Change it in privacy settings in web-version.");
+
+ $post->attach($attacc);
+ }
+ }
+ }
if($wall > 0 && $wall !== $this->user->identity->getId())
(new WallPostNotification($wallOwner, $post, $this->user->identity))->emit();
@@ -380,8 +497,9 @@ final class Wall extends VKAPIRequestHandler
return (object)["post_id" => $post->getVirtualId()];
}
- function repost(string $object, string $message = "") {
+ function repost(string $object, string $message = "", int $group_id = 0) {
$this->requireUser();
+ $this->willExecuteWriteAction();
$postArray;
if(preg_match('/wall((?:-?)[0-9]+)_([0-9]+)/', $object, $postArray) == 0)
@@ -392,13 +510,27 @@ final class Wall extends VKAPIRequestHandler
$nPost = new Post;
$nPost->setOwner($this->user->getId());
- $nPost->setWall($this->user->getId());
+
+ if($group_id > 0) {
+ $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);
+ } else {
+ $nPost->setWall($this->user->getId());
+ }
+
$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->identity))->emit();
+ (new RepostNotification($post->getOwner(false), $post, $this->user))->emit();
return (object) [
"success" => 1, // 👍
@@ -408,6 +540,7 @@ final class Wall extends VKAPIRequestHandler
];
}
+
function getComments(int $owner_id, int $post_id, bool $need_likes = true, int $offset = 0, int $count = 10, string $fields = "sex,screen_name,photo_50,photo_100,online_info,online", string $sort = "asc", bool $extended = false) {
$this->requireUser();
@@ -415,19 +548,35 @@ final class Wall extends VKAPIRequestHandler
if(!$post || $post->isDeleted()) $this->fail(100, "One of the parameters specified was missing or invalid");
$comments = (new CommentsRepo)->getCommentsByTarget($post, $offset+1, $count, $sort == "desc" ? "DESC" : "ASC");
-
+
$items = [];
$profiles = [];
foreach($comments as $comment) {
+ $owner = $comment->getOwner();
+ $oid = $owner->getId();
+ if($owner instanceof Club)
+ $oid *= -1;
+
+ $attachments = [];
+
+ 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();
+ }
+ }
+
$item = [
"id" => $comment->getId(),
- "from_id" => $comment->getOwner()->getId(),
+ "from_id" => $oid,
"date" => $comment->getPublicationTime()->timestamp(),
"text" => $comment->getText(false),
"post_id" => $post->getVirtualId(),
"owner_id" => $post->isPostedOnBehalfOfGroup() ? $post->getOwner()->getId() * -1 : $post->getOwner()->getId(),
"parents_stack" => [],
+ "attachments" => $attachments,
"thread" => [
"count" => 0,
"items" => [],
@@ -444,10 +593,13 @@ final class Wall extends VKAPIRequestHandler
"user_likes" => (int) $comment->hasLikeFrom($this->getUser()),
"can_publish" => 1
];
-
+
$items[] = $item;
if($extended == true)
$profiles[] = $comment->getOwner()->getId();
+
+ $attachments = null;
+ // Reset $attachments to not duplicate prikols
}
$response = [
@@ -470,10 +622,18 @@ final class Wall extends VKAPIRequestHandler
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); # один хуй айди всех комментов общий
+
$profiles = [];
+ $attachments = [];
+
+ foreach($comment->getChildren() as $attachment) {
+ if($attachment instanceof \openvk\Web\Models\Entities\Photo) {
+ $attachments[] = $this->getApiPhoto($attachment);
+ }
+ }
+
$item = [
"id" => $comment->getId(),
"from_id" => $comment->getOwner()->getId(),
@@ -482,6 +642,7 @@ final class Wall extends VKAPIRequestHandler
"post_id" => $comment->getTarget()->getVirtualId(),
"owner_id" => $comment->getTarget()->isPostedOnBehalfOfGroup() ? $comment->getTarget()->getOwner()->getId() * -1 : $comment->getTarget()->getOwner()->getId(),
"parents_stack" => [],
+ "attachments" => $attachments,
"likes" => [
"can_like" => 1,
"count" => $comment->getLikesCount(),
@@ -496,7 +657,7 @@ final class Wall extends VKAPIRequestHandler
"groups_can_post" => false,
]
];
-
+
if($extended == true)
$profiles[] = $comment->getOwner()->getId();
@@ -512,20 +673,29 @@ final class Wall extends VKAPIRequestHandler
$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) {
+ 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, "One of the parameters specified was missing or invalid");
+ if(!$post || $post->isDeleted()) $this->fail(100, "Invalid post");
if($post->getTargetWall() < 0)
$club = (new ClubsRepo)->get(abs($post->getTargetWall()));
-
+
+ if(empty($message) && empty($attachments)) {
+ $this->fail(100, "Required parameter 'message' missing.");
+ }
+
$flags = 0;
if($from_group != 0 && !is_null($club) && $club->canBeModifiedBy($this->user))
$flags |= 0b10000000;
-
+
try {
$comment = new Comment;
$comment->setOwner($this->user->getId());
@@ -538,11 +708,54 @@ final class Wall extends VKAPIRequestHandler
} catch (\LengthException $ex) {
$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);
+ }
+ }
+ }
+
if($post->getOwner()->getId() !== $this->user->getId())
if(($owner = $post->getOwner()) instanceof User)
(new CommentNotification($owner, $comment, $post, $this->user))->emit();
-
+
return (object) [
"comment_id" => $comment->getId(),
"parents_stack" => []
@@ -551,14 +764,15 @@ final class Wall extends VKAPIRequestHandler
function deleteComment(int $comment_id) {
$this->requireUser();
+ $this->willExecuteWriteAction();
$comment = (new CommentsRepo)->get($comment_id);
if(!$comment) $this->fail(100, "One of the parameters specified was missing or invalid");;
if(!$comment->canBeDeletedBy($this->user))
$this->fail(7, "Access denied");
-
+
$comment->delete();
-
+
return 1;
}
@@ -570,10 +784,50 @@ final class Wall extends VKAPIRequestHandler
"date" => $attachment->getPublicationTime()->timestamp(),
"id" => $attachment->getVirtualId(),
"owner_id" => $attachment->getOwner()->getId(),
- "sizes" => array_values($attachment->getVkApiSizes()),
+ "sizes" => !is_null($attachment->getVkApiSizes()) ? array_values($attachment->getVkApiSizes()) : NULL,
"text" => "",
"has_tags" => false
]
];
}
+
+ private function getApiPoll($attachment, $user) {
+ $answers = array();
+ foreach($attachment->getResults()->options as $answer) {
+ $answers[] = (object)[
+ "id" => $answer->id,
+ "rate" => $answer->pct,
+ "text" => $answer->name,
+ "votes" => $answer->votes
+ ];
+ }
+
+ $userVote = array();
+ foreach($attachment->getUserVote($user) as $vote)
+ $userVote[] = $vote[0];
+
+ return [
+ "type" => "poll",
+ "poll" => [
+ "multiple" => $attachment->isMultipleChoice(),
+ "end_date" => $attachment->endsAt() == NULL ? 0 : $attachment->endsAt()->timestamp(),
+ "closed" => $attachment->hasEnded(),
+ "is_board" => false,
+ "can_edit" => false,
+ "can_vote" => $attachment->canVote($user),
+ "can_report" => false,
+ "can_share" => true,
+ "created" => 0,
+ "id" => $attachment->getId(),
+ "owner_id" => $attachment->getOwner()->getId(),
+ "question" => $attachment->getTitle(),
+ "votes" => $attachment->getVoterCount(),
+ "disable_unvote" => $attachment->isRevotable(),
+ "anonymous" => $attachment->isAnonymous(),
+ "answer_ids" => $userVote,
+ "answers" => $answers,
+ "author_id" => $attachment->getOwner()->getId(),
+ ]
+ ];
+ }
}
diff --git a/VKAPI/README.md b/VKAPI/README.md
index b3c85918..75918afc 100644
--- a/VKAPI/README.md
+++ b/VKAPI/README.md
@@ -1,10 +1,12 @@
# VK API Compatability layer for OpenVK
-This directory contains VK api handlers, structures and relared
+This directory contains VK API handlers, structures and relared
exceptions. It is still a work-in-progress functionality.
-**Note**: requests to api are routed through
+**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/)
+
## Implementing API methods
VK API methods have names like this: `example.test`. To implement a
diff --git a/Web/Events/NewMessageEvent.php b/Web/Events/NewMessageEvent.php
index 49d102b3..3b828e90 100644
--- a/Web/Events/NewMessageEvent.php
+++ b/Web/Events/NewMessageEvent.php
@@ -27,14 +27,23 @@ class NewMessageEvent implements ILPEmitable
if($peer === $userId)
$peer = $msg->getRecipient()->getId();
+ /*
+ * Source:
+ * https://github.com/danyadev/longpoll-doc
+ */
+
return [
4, # event type
+ $msg->getId(), # messageId
256, # checked for spam flag
$peer, # TODO calculate peer correctly
$msg->getSendTime()->timestamp(), # creation time in unix
$msg->getText(), # text (formatted)
+ [], # empty additional info
[], # empty attachments
$msg->getId() << 2, # id as random_id
+ $peer, # conversation id
+ 0 # not edited yet
];
}
}
diff --git a/Web/Models/Entities/APIToken.php b/Web/Models/Entities/APIToken.php
index 7257c6a8..f5744ec3 100644
--- a/Web/Models/Entities/APIToken.php
+++ b/Web/Models/Entities/APIToken.php
@@ -22,6 +22,11 @@ class APIToken extends RowModel
{
return $this->getId() . "-" . chunk_split($this->getSecret(), 8, "-") . "jill";
}
+
+ function getPlatform(): ?string
+ {
+ return $this->getRecord()->platform;
+ }
function isRevoked(): bool
{
diff --git a/Web/Models/Entities/Album.php b/Web/Models/Entities/Album.php
index b20f0388..150cc625 100644
--- a/Web/Models/Entities/Album.php
+++ b/Web/Models/Entities/Album.php
@@ -66,4 +66,31 @@ class Album extends MediaCollection
{
return $this->has($photo);
}
+
+ function toVkApiStruct(?User $user = NULL, bool $need_covers = false, bool $photo_sizes = false): object
+ {
+ $res = (object) [];
+
+ $res->id = $this->getPrettyId();
+ $res->thumb_id = !is_null($this->getCoverPhoto()) ? $this->getCoverPhoto()->getPrettyId() : 0;
+ $res->owner_id = $this->getOwner()->getId();
+ $res->title = $this->getName();
+ $res->description = $this->getDescription();
+ $res->created = $this->getCreationTime()->timestamp();
+ $res->updated = $this->getEditTime() ? $this->getEditTime()->timestamp() : NULL;
+ $res->size = $this->size();
+ $res->privacy_comment = 1;
+ $res->upload_by_admins_only = 1;
+ $res->comments_disabled = 0;
+ $res->can_upload = $this->canBeModifiedBy($user); # thisUser недоступен в entities
+ if($need_covers) {
+ $res->thumb_src = $this->getCoverURL();
+
+ if($photo_sizes) {
+ $res->sizes = !is_null($this->getCoverPhoto()) ? $this->getCoverPhoto()->getVkApiSizes() : NULL;
+ }
+ }
+
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Alias.php b/Web/Models/Entities/Alias.php
new file mode 100644
index 00000000..99f7baae
--- /dev/null
+++ b/Web/Models/Entities/Alias.php
@@ -0,0 +1,34 @@
+getRecord()->owner_id;
+ }
+
+ function getType(): string
+ {
+ if ($this->getOwnerId() < 0)
+ return "club";
+
+ return "user";
+ }
+
+ function getUser(): ?User
+ {
+ return (new Users)->get($this->getOwnerId());
+ }
+
+ function getClub(): ?Club
+ {
+ return (new Clubs)->get($this->getOwnerId() * -1);
+ }
+}
diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php
index a5a3027b..15c458a9 100644
--- a/Web/Models/Entities/Club.php
+++ b/Web/Models/Entities/Club.php
@@ -160,7 +160,7 @@ class Club extends RowModel
function canPost(): bool
{
- return (bool) $this->getRecord()->wall;
+ return (bool) $this->getRecord()->wall;
}
@@ -262,12 +262,12 @@ class Club extends RowModel
return $subbed && ($this->getOpennesStatus() === static::CLOSED ? $this->isSubscriptionAccepted($user) : true);
}
- function getFollowersQuery(): GroupedSelection
+ function getFollowersQuery(string $sort = "follower ASC"): GroupedSelection
{
$query = $this->getRecord()->related("subscriptions.target");
if($this->getOpennesStatus() === static::OPEN) {
- $query = $query->where("model", "openvk\\Web\\Models\\Entities\\Club");
+ $query = $query->where("model", "openvk\\Web\\Models\\Entities\\Club")->order($sort);
} else {
return false;
}
@@ -280,9 +280,9 @@ class Club extends RowModel
return sizeof($this->getFollowersQuery());
}
- function getFollowers(int $page = 1): \Traversable
+ function getFollowers(int $page = 1, int $perPage = 6, string $sort = "follower ASC"): \Traversable
{
- $rels = $this->getFollowersQuery()->page($page, 6);
+ $rels = $this->getFollowersQuery($sort)->page($page, $perPage);
foreach($rels as $rel) {
$rel = (new Users)->get($rel->follower);
@@ -360,5 +360,35 @@ class Club extends RowModel
return $this->getRecord()->alert;
}
+ function toVkApiStruct(?User $user = NULL): object
+ {
+ $res = [];
+
+ $res->id = $this->getId();
+ $res->name = $this->getName();
+ $res->screen_name = $this->getShortCode();
+ $res->is_closed = 0;
+ $res->deactivated = NULL;
+ $res->is_admin = $this->canBeModifiedBy($user);
+
+ if($this->canBeModifiedBy($user)) {
+ $res->admin_level = 3;
+ }
+
+ $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;
+ }
+
+ use Traits\TBackDrops;
use Traits\TSubscribable;
}
diff --git a/Web/Models/Entities/Comment.php b/Web/Models/Entities/Comment.php
index 9115ad3e..7c6222e4 100644
--- a/Web/Models/Entities/Comment.php
+++ b/Web/Models/Entities/Comment.php
@@ -2,6 +2,7 @@
namespace openvk\Web\Models\Entities;
use openvk\Web\Models\Repositories\Clubs;
use openvk\Web\Models\RowModel;
+use openvk\Web\Models\Entities\{Note};
class Comment extends Post
{
@@ -52,4 +53,36 @@ class Comment extends Post
$this->getTarget() instanceof Post && $this->getTarget()->getTargetWall() < 0 && (new Clubs)->get(abs($this->getTarget()->getTargetWall()))->canBeModifiedBy($user) ||
$this->getTarget() instanceof Topic && $this->getTarget()->canBeModifiedBy($user);
}
+
+ function toVkApiStruct(?User $user = NULL, bool $need_likes = false, bool $extended = false, ?Note $note = NULL): object
+ {
+ $res = (object) [];
+
+ $res->id = $this->getId();
+ $res->from_id = $this->getOwner()->getId();
+ $res->date = $this->getPublicationTime()->timestamp();
+ $res->text = $this->getText(false);
+ $res->attachments = [];
+ $res->parents_stack = [];
+
+ if(!is_null($note)) {
+ $res->uid = $this->getOwner()->getId();
+ $res->nid = $note->getId();
+ $res->oid = $note->getOwner()->getId();
+ }
+
+ foreach($this->getChildren() as $attachment) {
+ if($attachment->isDeleted())
+ continue;
+
+ $res->attachments[] = $attachment->toVkApiStruct();
+ }
+
+ if($need_likes) {
+ $res->count = $this->getLikesCount();
+ $res->user_likes = (int)$this->hasLikeFrom($user);
+ $res->can_like = 1;
+ }
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Note.php b/Web/Models/Entities/Note.php
index a536602a..37d9ac29 100644
--- a/Web/Models/Entities/Note.php
+++ b/Web/Models/Entities/Note.php
@@ -118,4 +118,24 @@ class Note extends Postable
{
return $this->getRecord()->source;
}
+
+ function toVkApiStruct(): object
+ {
+ $res = (object) [];
+
+ $res->type = "note";
+ $res->id = $this->getId();
+ $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->privacy_view = 1;
+ $res->can_comment = 1;
+ $res->text_wiki = "r";
+
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Notifications/CommentNotification.php b/Web/Models/Entities/Notifications/CommentNotification.php
index 68af586b..95fd13cd 100644
--- a/Web/Models/Entities/Notifications/CommentNotification.php
+++ b/Web/Models/Entities/Notifications/CommentNotification.php
@@ -8,6 +8,6 @@ final class CommentNotification extends Notification
function __construct(User $recipient, Comment $comment, $postable, User $commenter)
{
- parent::__construct($recipient, $postable, $commenter, time(), ovk_proc_strtr($comment->getText(), 10));
+ parent::__construct($recipient, $postable, $commenter, time(), ovk_proc_strtr(strip_tags($comment->getText()), 400));
}
}
diff --git a/Web/Models/Entities/Notifications/MentionNotification.php b/Web/Models/Entities/Notifications/MentionNotification.php
index 4c744733..25680f57 100644
--- a/Web/Models/Entities/Notifications/MentionNotification.php
+++ b/Web/Models/Entities/Notifications/MentionNotification.php
@@ -1,13 +1,14 @@
actionCode;
diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php
index 628589db..c1825b3a 100644
--- a/Web/Models/Entities/Photo.php
+++ b/Web/Models/Entities/Photo.php
@@ -1,6 +1,8 @@
getWidth() / $image->getHeight()) > ($px / $py)) {
- # For some weird reason using resize with EXACT flag causes system to consume an unholy amount of RAM
- $image->crop(0, 0, "100%", (int) ceil(($px * $image->getWidth()) / $py));
+ if(($image->getImageWidth() / $image->getImageHeight()) > ($px / $py)) {
+ $height = (int) ceil(($px * $image->getImageWidth()) / $py);
+ $image->cropImage($image->getImageWidth(), $height, 0, 0);
$res[0] = true;
}
}
-
+
if(isset($size["maxSize"])) {
$maxSize = (int) $size["maxSize"];
- $image->resize($maxSize, $maxSize, Image::SHRINK_ONLY | Image::FIT);
+ $sizes = Image::calculateSize($image->getImageWidth(), $image->getImageHeight(), $maxSize, $maxSize, Image::SHRINK_ONLY | Image::FIT);
+ $image->resizeImage($sizes[0], $sizes[1], \Imagick::FILTER_HERMITE, 1);
} else if(isset($size["maxResolution"])) {
$resolution = explode("x", (string) $size["maxResolution"]);
- $image->resize((int) $resolution[0], (int) $resolution[1], Image::SHRINK_ONLY | Image::FIT);
+ $sizes = Image::calculateSize(
+ $image->getImageWidth(), $image->getImageHeight(), (int) $resolution[0], (int) $resolution[1], Image::SHRINK_ONLY | Image::FIT
+ );
+ $image->resizeImage($sizes[0], $sizes[1], \Imagick::FILTER_HERMITE, 1);
} else {
throw new \RuntimeException("Malformed size description: " . (string) $size["id"]);
}
-
- $res[1] = $image->getWidth();
- $res[2] = $image->getHeight();
+
+ $res[1] = $image->getImageWidth();
+ $res[2] = $image->getImageHeight();
if($res[1] <= 300 || $res[2] <= 300)
- $image->save("$outputDir/" . (string) $size["id"] . ".gif");
+ $image->writeImage("$outputDir/$size[id].gif");
else
- $image->save("$outputDir/" . (string) $size["id"] . ".jpeg");
-
- imagedestroy($image->getImageResource());
+ $image->writeImage("$outputDir/$size[id].jpeg");
+
+ $res[3] = true;
+ $image->destroy();
unset($image);
-
+
return $res;
}
- private function saveImageResizedCopies(string $filename, string $hash): void
+ private function saveImageResizedCopies(?\Imagick $image, string $filename, string $hash): void
{
+ if(!$image) {
+ $image = new \Imagick;
+ $image->readImage($filename);
+ }
+
$dir = dirname($this->pathFromHash($hash));
$dir = "$dir/$hash" . "_cropped";
if(!is_dir($dir)) {
@@ -67,8 +83,13 @@ class Photo extends Media
throw new \RuntimeException("Could not load photosizes.xml!");
$sizesMeta = [];
- foreach($sizes->Size as $size)
- $sizesMeta[(string) $size["id"]] = $this->resizeImage($filename, $dir, $size);
+ if(OPENVK_ROOT_CONF["openvk"]["preferences"]["photos"]["photoSaving"] === "quick") {
+ foreach($sizes->Size as $size)
+ $sizesMeta[(string)$size["id"]] = [false, false, false, false];
+ } else {
+ foreach($sizes->Size as $size)
+ $sizesMeta[(string)$size["id"]] = $this->resizeImage(clone $image, $dir, $size);
+ }
$sizesMeta = MessagePack::pack($sizesMeta);
$this->stateChanges("sizes", $sizesMeta);
@@ -76,13 +97,19 @@ class Photo extends Media
protected function saveFile(string $filename, string $hash): bool
{
- $image = Image::fromFile($filename);
- if(($image->height >= ($image->width * Photo::ALLOWED_SIDE_MULTIPLIER)) || ($image->width >= ($image->height * Photo::ALLOWED_SIDE_MULTIPLIER)))
+ $image = new \Imagick;
+ $image->readImage($filename);
+ $h = $image->getImageHeight();
+ $w = $image->getImageWidth();
+ if(($h >= ($w * Photo::ALLOWED_SIDE_MULTIPLIER)) || ($w >= ($h * Photo::ALLOWED_SIDE_MULTIPLIER)))
throw new ISE("Invalid layout: image is too wide/short");
-
- $image->resize(8192, 4320, Image::SHRINK_ONLY | Image::FIT);
- $image->save($this->pathFromHash($hash), 92, Image::JPEG);
- $this->saveImageResizedCopies($filename, $hash);
+
+ $sizes = Image::calculateSize(
+ $image->getImageWidth(), $image->getImageHeight(), 8192, 4320, Image::SHRINK_ONLY | Image::FIT
+ );
+ $image->resizeImage($sizes[0], $sizes[1], \Imagick::FILTER_HERMITE, 1);
+ $image->writeImage($this->pathFromHash($hash));
+ $this->saveImageResizedCopies($image, $filename, $hash);
return true;
}
@@ -114,8 +141,8 @@ class Photo extends Media
$sizes = $this->getRecord()->sizes;
if(!$sizes || $forceUpdate) {
if($forceUpdate || $upgrade || OPENVK_ROOT_CONF["openvk"]["preferences"]["photos"]["upgradeStructure"]) {
- $hash = $this->getRecord()->hash;
- $this->saveImageResizedCopies($this->pathFromHash($hash), $hash);
+ $hash = $this->getRecord()->hash;
+ $this->saveImageResizedCopies(NULL, $this->pathFromHash($hash), $hash);
$this->save();
return $this->getSizes();
@@ -127,6 +154,16 @@ class Photo extends Media
$res = [];
$sizes = MessagePack::unpack($sizes);
foreach($sizes as $id => $meta) {
+ if(isset($meta[3]) && !$meta[3]) {
+ $res[$id] = (object) [
+ "url" => ovk_scheme(true) . $_SERVER["HTTP_HOST"] . "/photos/thumbnails/" . $this->getId() . "_$id.jpeg",
+ "width" => NULL,
+ "height" => NULL,
+ "crop" => NULL
+ ];
+ continue;
+ }
+
$url = $this->getURL();
$url = str_replace(".$this->fileExtension", "_cropped/$id.", $url);
$url .= ($meta[1] <= 300 || $meta[2] <= 300) ? "gif" : "jpeg";
@@ -149,6 +186,47 @@ class Photo extends Media
return $res;
}
+
+ function forceSize(string $sizeName): bool
+ {
+ $hash = $this->getRecord()->hash;
+ $sizes = MessagePack::unpack($this->getRecord()->sizes);
+ $size = $sizes[$sizeName] ?? false;
+ if(!$size)
+ return $size;
+
+ if(!isset($size[3]) || $size[3] === true)
+ return true;
+
+ $path = $this->pathFromHash($hash);
+ $dir = dirname($this->pathFromHash($hash));
+ $dir = "$dir/$hash" . "_cropped";
+ if(!is_dir($dir)) {
+ @unlink($dir);
+ mkdir($dir);
+ }
+
+ $sizeMetas = simplexml_load_file(OPENVK_ROOT . "/data/photosizes.xml");
+ if(!$sizeMetas)
+ throw new \RuntimeException("Could not load photosizes.xml!");
+
+ $sizeInfo = NULL;
+ foreach($sizeMetas->Size as $size)
+ if($size["id"] == $sizeName)
+ $sizeInfo = $size;
+
+ if(!$sizeInfo)
+ return false;
+
+ $pic = new \Imagick;
+ $pic->readImage($path);
+ $sizes[$sizeName] = $this->resizeImage($pic, $dir, $sizeInfo);
+
+ $this->stateChanges("sizes", MessagePack::pack($sizes));
+ $this->save();
+
+ return $sizes[$sizeName][3];
+ }
function getVkApiSizes(): ?array
{
@@ -205,30 +283,48 @@ class Photo extends Media
return [$x, $y];
}
+ function getPageURL(): string
+ {
+ if($this->isAnonymous())
+ return "/photos/" . base_convert((string) $this->getId(), 10, 32);
+
+ return "/photo" . $this->getPrettyId();
+ }
+
function getAlbum(): ?Album
{
return (new Albums)->getAlbumByPhotoId($this);
}
- function toVkApiStruct(): object
+ function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object
{
$res = (object) [];
- $res->id = $res->pid = $this->getId();
- $res->owner_id = $res->user_id = $this->getOwner()->getId()->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];
$res->height = $this->getDimensions()[1];
$res->date = $res->created = $this->getPublicationTime()->timestamp();
- $res->sizes = $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");
- $res->src_xbig = $res->photo_807 = $this->getURLBySizeId("large");
- $res->src_xxbig = $res->photo_1280 = $this->getURLBySizeId("larger");
- $res->src_xxxbig = $res->photo_2560 = $this->getURLBySizeId("original");
- $res->src_original = $res->url = $this->getURLBySizeId("UPLOADED_MAXRES");
+ if($photo_sizes) {
+ $res->sizes = $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");
+ $res->src_xbig = $res->photo_807 = $this->getURLBySizeId("large");
+ $res->src_xxbig = $res->photo_1280 = $this->getURLBySizeId("larger");
+ $res->src_xxxbig = $res->photo_2560 = $this->getURLBySizeId("original");
+ $res->src_original = $res->url = $this->getURLBySizeId("UPLOADED_MAXRES");
+ }
+
+ if($extended) {
+ $res->likes = $this->getLikesCount(); # их нету но пусть будут
+ $res->comments = $this->getCommentsCount();
+ $res->tags = 0;
+ $res->can_comment = 1;
+ $res->can_repost = 0;
+ }
return $res;
}
diff --git a/Web/Models/Entities/Poll.php b/Web/Models/Entities/Poll.php
new file mode 100644
index 00000000..6f2885b1
--- /dev/null
+++ b/Web/Models/Entities/Poll.php
@@ -0,0 +1,295 @@
+getRecord()->title;
+ }
+
+ function getMetaDescription(): string
+ {
+ $props = [];
+ $props[] = tr($this->isAnonymous() ? "poll_anon" : "poll_public");
+ if($this->isMultipleChoice()) $props[] = tr("poll_multi");
+ if(!$this->isRevotable()) $props[] = tr("poll_lock");
+ if(!is_null($this->endsAt())) $props[] = tr("poll_until", $this->endsAt());
+
+ return implode(" • ", $props);
+ }
+
+ function getOwner(): User
+ {
+ return (new Users)->get($this->getRecord()->owner);
+ }
+
+ function getOptions(): array
+ {
+ $options = $this->getRecord()->related("poll_options.poll");
+ $res = [];
+ foreach($options as $opt)
+ $res[$opt->id] = $opt->name;
+
+ return $res;
+ }
+
+ function getUserVote(User $user): ?array
+ {
+ $ctx = DatabaseConnection::i()->getContext();
+ $votedOpts = $ctx->table("poll_votes")
+ ->where(["user" => $user->getId(), "poll" => $this->getId()]);
+
+ if($votedOpts->count() == 0)
+ return NULL;
+
+ $res = [];
+ foreach($votedOpts as $votedOpt) {
+ $option = $ctx->table("poll_options")->get($votedOpt->option);
+ $res[] = [$option->id, $option->name];
+ }
+
+ return $res;
+ }
+
+ function getVoters(int $optionId, int $page = 1, ?int $perPage = NULL): array
+ {
+ $res = [];
+ $ctx = DatabaseConnection::i()->getContext();
+ $perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE;
+ $voters = $ctx->table("poll_votes")->where(["poll" => $this->getId(), "option" => $optionId]);
+ foreach($voters->page($page, $perPage) as $vote)
+ $res[] = (new Users)->get($vote->user);
+
+ return $res;
+ }
+
+ function getVoterCount(?int $optionId = NULL): int
+ {
+ $votes = DatabaseConnection::i()->getContext()->table("poll_votes");
+ if(!$optionId)
+ return $votes->select("COUNT(DISTINCT user) AS c")->where("poll", $this->getId())->fetch()->c;
+
+ return $votes->where(["poll" => $this->getId(), "option" => $optionId])->count();
+ }
+
+ function getResults(?User $user = NULL): object
+ {
+ $ctx = DatabaseConnection::i()->getContext();
+ $voted = NULL;
+ if(!is_null($user))
+ $voted = $this->getUserVote($user);
+
+ $result = (object) [];
+ $result->totalVotes = $this->getVoterCount();
+
+ $unsOptions = [];
+ foreach($this->getOptions() as $id => $title) {
+ $option = (object) [];
+ $option->id = $id;
+ $option->name = $title;
+
+ $option->votes = $this->getVoterCount($id);
+ $option->pct = $result->totalVotes == 0 ? 0 : min(100, floor(($option->votes / $result->totalVotes) * 100));
+ $option->voters = $this->getVoters($id, 1, 10);
+ if(!$user || !$voted)
+ $option->voted = NULL;
+ else
+ $option->voted = in_array([$id, $title], $voted);
+
+ $unsOptions[$id] = $option;
+ }
+
+ $optionsC = sizeof($unsOptions);
+ $sOptions = $unsOptions;
+ usort($sOptions, function($a, $b) { return $a->votes <=> $b->votes; });
+ for($i = 0; $i < $optionsC; $i++)
+ $unsOptions[$id]->rate = $optionsC - $i - 1;
+
+ $result->options = array_values($unsOptions);
+
+ return $result;
+ }
+
+ function isAnonymous(): bool
+ {
+ return (bool) $this->getRecord()->is_anonymous;
+ }
+
+ function isMultipleChoice(): bool
+ {
+ return (bool) $this->getRecord()->allows_multiple;
+ }
+
+ function isRevotable(): bool
+ {
+ return (bool) $this->getRecord()->can_revote;
+ }
+
+ function endsAt(): ?DateTime
+ {
+ if(!$this->getRecord()->until)
+ return NULL;
+
+ return new DateTime($this->getRecord()->until);
+ }
+
+ function hasEnded(): bool
+ {
+ if($this->getRecord()->ended)
+ return true;
+
+ if(!is_null($this->getRecord()->until))
+ return time() >= $this->getRecord()->until;
+
+ return false;
+ }
+
+ function hasVoted(User $user): bool
+ {
+ return !is_null($this->getUserVote($user));
+ }
+
+ function canVote(User $user): bool
+ {
+ return !$this->hasEnded() && !$this->hasVoted($user);
+ }
+
+ function vote(User $user, array $optionIds): void
+ {
+ if($this->hasEnded())
+ throw new PollLockedException;
+
+ if($this->hasVoted($user))
+ throw new AlreadyVotedException;
+
+ $optionIds = array_map(function($x) { return (int) $x; }, array_unique($optionIds));
+ $validOpts = array_keys($this->getOptions());
+ if(empty($optionIds) || (sizeof($optionIds) > 1 && !$this->isMultipleChoice()))
+ throw new UnexpectedValueException;
+
+ if(sizeof(array_diff($optionIds, $validOpts)) > 0)
+ throw new InvalidOptionException;
+
+ foreach($optionIds as $opt) {
+ DatabaseConnection::i()->getContext()->table("poll_votes")->insert([
+ "user" => $user->getId(),
+ "poll" => $this->getId(),
+ "option" => $opt,
+ ]);
+ }
+ }
+
+ function revokeVote(User $user): void
+ {
+ if(!$this->isRevotable())
+ throw new PollLockedException;
+
+ $this->getRecord()->related("poll_votes.poll")
+ ->where("user", $user->getId())->delete();
+ }
+
+ function setOwner(User $owner): void
+ {
+ $this->stateChanges("owner", $owner->getId());
+ }
+
+ function setEndDate(int $timestamp): void
+ {
+ if(!is_null($this->getRecord()))
+ throw new PollLockedException;
+
+ $this->stateChanges("until", $timestamp);
+ }
+
+ function setEnded(): void
+ {
+ $this->stateChanges("ended", 1);
+ }
+
+ function setOptions(array $options): void
+ {
+ if(!is_null($this->getRecord()))
+ throw new PollLockedException;
+
+ if(sizeof($options) > ovkGetQuirk("polls.max-opts"))
+ throw new TooMuchOptionsException;
+
+ $this->choicesToPersist = $options;
+ }
+
+ function setRevotability(bool $canReVote): void
+ {
+ if(!is_null($this->getRecord()))
+ throw new PollLockedException;
+
+ $this->stateChanges("can_revote", $canReVote);
+ }
+
+ function setAnonymity(bool $anonymous): void
+ {
+ $this->stateChanges("is_anonymous", $anonymous);
+ }
+
+ function setMultipleChoice(bool $mc): void
+ {
+ $this->stateChanges("allows_multiple", $mc);
+ }
+
+ function importXML(User $owner, string $xml): void
+ {
+ $xml = simplexml_load_string($xml);
+ $this->setOwner($owner);
+ $this->setTitle($xml["title"] ?? "Untitled");
+ $this->setMultipleChoice(($xml["multiple"] ?? "no") == "yes");
+ $this->setAnonymity(($xml["anonymous"] ?? "no") == "yes");
+ $this->setRevotability(($xml["locked"] ?? "no") == "no");
+ if(ctype_digit((string) ($xml["duration"] ?? "")))
+ $this->setEndDate(time() + ((86400 * (int) $xml["duration"])));
+
+ $options = [];
+ foreach($xml->options->option as $opt)
+ $options[] = (string) $opt;
+
+ if(empty($options))
+ throw new UnexpectedValueException;
+
+ $this->setOptions($options);
+ }
+
+ static function import(User $owner, string $xml): Poll
+ {
+ $poll = new Poll;
+ $poll->importXML($owner, $xml);
+ $poll->save();
+
+ return $poll;
+ }
+
+ function save(): void
+ {
+ if(empty($this->choicesToPersist))
+ throw new InvalidStateException;
+
+ parent::save();
+ foreach($this->choicesToPersist as $option) {
+ DatabaseConnection::i()->getContext()->table("poll_options")->insert([
+ "poll" => $this->getId(),
+ "name" => $option,
+ ]);
+ }
+ }
+}
diff --git a/Web/Models/Entities/Post.php b/Web/Models/Entities/Post.php
index 4afb4baa..42941901 100644
--- a/Web/Models/Entities/Post.php
+++ b/Web/Models/Entities/Post.php
@@ -1,7 +1,7 @@
getRecord()->wall;
}
+
+ function getWallOwner()
+ {
+ $w = $this->getRecord()->wall;
+ if($w < 0)
+ return (new Clubs)->get(abs($w));
+
+ return (new Users)->get($w);
+ }
function getRepostCount(): int
{
@@ -87,9 +96,14 @@ class Post extends Postable
function isDeactivationMessage(): bool
{
- return ($this->getRecord()->flags & 0b00100000) > 0;
+ return (($this->getRecord()->flags & 0b00100000) > 0) && ($this->getRecord()->owner > 0);
}
+ function isUpdateAvatarMessage(): bool
+ {
+ return (($this->getRecord()->flags & 0b00010000) > 0) && ($this->getRecord()->owner > 0);
+ }
+
function isExplicit(): bool
{
return (bool) $this->getRecord()->nsfw;
@@ -104,6 +118,63 @@ class Post extends Postable
{
return $this->getOwner(false)->getId();
}
+
+ function getPlatform(bool $forAPI = false): ?string
+ {
+ $platform = $this->getRecord()->api_source_name;
+ if($forAPI) {
+ switch ($platform) {
+ case 'openvk_refresh_android':
+ case 'openvk_legacy_android':
+ return 'android';
+ break;
+
+ case 'openvk_ios':
+ case 'openvk_legacy_ios':
+ return 'iphone';
+ break;
+
+ case 'vika_touch': // кика хохотач ахахахаххахахахахах
+ case 'vk4me':
+ return 'mobile';
+ break;
+
+ case NULL:
+ return NULL;
+ break;
+
+ default:
+ return 'api';
+ break;
+ }
+ } else {
+ return $platform;
+ }
+ }
+
+ function getPlatformDetails(): array
+ {
+ $clients = simplexml_load_file(OPENVK_ROOT . "/data/clients.xml");
+
+ foreach($clients as $client) {
+ if($client['tag'] == $this->getPlatform()) {
+ return [
+ "tag" => $client['tag'],
+ "name" => $client['name'],
+ "url" => $client['url'],
+ "img" => $client['img']
+ ];
+ break;
+ }
+ }
+
+ return [
+ "tag" => $this->getPlatform(),
+ "name" => NULL,
+ "url" => NULL,
+ "img" => NULL
+ ];
+ }
function pin(): void
{
diff --git a/Web/Models/Entities/SupportAgent.php b/Web/Models/Entities/SupportAgent.php
new file mode 100644
index 00000000..2f7fc21b
--- /dev/null
+++ b/Web/Models/Entities/SupportAgent.php
@@ -0,0 +1,39 @@
+getRecord()->agent;
+ }
+
+ function getName(): ?string
+ {
+ return $this->getRecord()->name;
+ }
+
+ function getCanonicalName(): string
+ {
+ return $this->getName();
+ }
+
+ function getAvatarURL(): ?string
+ {
+ return $this->getRecord()->icon;
+ }
+
+ function isShowNumber(): int
+ {
+ return $this->getRecord()->numerate;
+ }
+
+ function getRealName(): string
+ {
+ return (new Users)->get($this->getAgentId())->getCanonicalName();
+ }
+}
\ No newline at end of file
diff --git a/Web/Models/Entities/TicketComment.php b/Web/Models/Entities/TicketComment.php
index a9fb684a..2f1a5e8f 100644
--- a/Web/Models/Entities/TicketComment.php
+++ b/Web/Models/Entities/TicketComment.php
@@ -42,7 +42,7 @@ class TicketComment extends RowModel
$alias = $this->getSupportAlias();
if(!$alias)
- return OPENVK_ROOT_CONF["openvk"]["preferences"]["support"]["supportName"] . " №" . $this->getAgentNumber();
+ return tr("helpdesk_agent") . " #" . $this->getAgentNumber();
$name = $alias->getName();
if($alias->shouldAppendNumber())
diff --git a/Web/Models/Entities/Topic.php b/Web/Models/Entities/Topic.php
index 89b3cb39..d4257816 100644
--- a/Web/Models/Entities/Topic.php
+++ b/Web/Models/Entities/Topic.php
@@ -68,6 +68,12 @@ class Topic extends Postable
return isset($array[0]) ? $array[0] : NULL;
}
+ function getFirstComment(): ?Comment
+ {
+ $array = iterator_to_array($this->getComments(1));
+ return $array[0] ?? NULL;
+ }
+
function getUpdateTime(): DateTime
{
$lastComment = $this->getLastComment();
@@ -83,4 +89,40 @@ class Topic extends Postable
$this->unwire();
$this->save();
}
+
+ function toVkApiStruct(int $preview = 0, int $preview_length = 90): object
+ {
+ $res = (object)[];
+
+ $res->id = $this->getId();
+ $res->title = $this->getTitle();
+ $res->created = $this->getPublicationTime()->timestamp();
+
+ if($this->getOwner() instanceof User) {
+ $res->created_by = $this->getOwner()->getId();
+ } else {
+ $res->created_by = $this->getOwner()->getId() * -1;
+ }
+
+ $res->updated = $this->getUpdateTime()->timestamp();
+
+ if($this->getLastComment()) {
+ if($this->getLastComment()->getOwner() instanceof User) {
+ $res->updated_by = $this->getLastComment()->getOwner()->getId();
+ } else {
+ $res->updated_by = $this->getLastComment()->getOwner()->getId() * -1;
+ }
+ }
+
+ $res->is_closed = (int)$this->isClosed();
+ $res->is_fixed = (int)$this->isPinned();
+ $res->comments = $this->getCommentsCount();
+
+ if($preview == 1) {
+ $res->first_comment = $this->getFirstComment() ? ovk_proc_strtr($this->getFirstComment()->getText(false), $preview_length) : NULL;
+ $res->last_comment = $this->getLastComment() ? ovk_proc_strtr($this->getLastComment()->getText(false), $preview_length) : NULL;
+ }
+
+ return $res;
+ }
}
diff --git a/Web/Models/Entities/Traits/TBackDrops.php b/Web/Models/Entities/Traits/TBackDrops.php
new file mode 100644
index 00000000..cab67138
--- /dev/null
+++ b/Web/Models/Entities/Traits/TBackDrops.php
@@ -0,0 +1,44 @@
+getRecord()->backdrop_1;
+ $photo2 = $this->getRecord()->backdrop_2;
+ if(is_null($photo1) && is_null($photo2))
+ return NULL;
+
+ $photo1obj = $photo2obj = NULL;
+ if(!is_null($photo1))
+ $photo1obj = (new Photos)->get($photo1);
+ if(!is_null($photo2))
+ $photo2obj = (new Photos)->get($photo2);
+
+ if(is_null($photo1obj) && is_null($photo2obj))
+ return NULL;
+
+ return [
+ is_null($photo1obj) ? "" : $photo1obj->getURL(),
+ is_null($photo2obj) ? "" : $photo2obj->getURL(),
+ ];
+ }
+
+ function setBackDropPictures(?Photo $first, ?Photo $second): void
+ {
+ if(!is_null($first))
+ $this->stateChanges("backdrop_1", $first->getId());
+
+ if(!is_null($second))
+ $this->stateChanges("backdrop_2", $second->getId());
+ }
+
+ function unsetBackDropPictures(): void
+ {
+ $this->stateChanges("backdrop_1", NULL);
+ $this->stateChanges("backdrop_2", NULL);
+ }
+}
\ No newline at end of file
diff --git a/Web/Models/Entities/Traits/TRichText.php b/Web/Models/Entities/Traits/TRichText.php
index f2229250..dc78a034 100644
--- a/Web/Models/Entities/Traits/TRichText.php
+++ b/Web/Models/Entities/Traits/TRichText.php
@@ -1,5 +1,6 @@
isAd() ? "sponsored" : "ugc";
return "$link" . htmlentities($matches[4]);
@@ -48,7 +49,63 @@ trait TRichText
private function removeZalgo(string $text): string
{
- return preg_replace("%[\x{0300}-\x{036F}]{3,}%Xu", "�", $text);
+ return preg_replace("%\p{M}{3,}%Xu", "", $text);
+ }
+
+ function resolveMentions(array $skipUsers = []): \Traversable
+ {
+ $contentColumn = property_exists($this, "overrideContentColumn") ? $this->overrideContentColumn : "content";
+ $text = $this->getRecord()->{$contentColumn};
+ $text = preg_replace("%@([A-Za-z0-9]++) \(((?:[\p{L&}\p{Lo} 0-9]\p{Mn}?)++)\)%Xu", "[$1|$2]", $text);
+ $text = preg_replace("%([\n\r\s]|^)(@([A-Za-z0-9]++))%Xu", "$1[$3|@$3]", $text);
+
+ $resolvedUsers = $skipUsers;
+ $resolvedClubs = [];
+ preg_match_all("%\[([A-Za-z0-9]++)\|((?:[\p{L&}\p{Lo} 0-9@]\p{Mn}?)++)\]%Xu", $text, $links, PREG_PATTERN_ORDER);
+ foreach($links[1] as $link) {
+ if(preg_match("%^id([0-9]++)$%", $link, $match)) {
+ $uid = (int) $match[1];
+ if(in_array($uid, $resolvedUsers))
+ continue;
+
+ $resolvedUsers[] = $uid;
+ $maybeUser = (new Users)->get($uid);
+ if($maybeUser)
+ yield $maybeUser;
+ } else if(preg_match("%^(?:club|public|event)([0-9]++)$%", $link, $match)) {
+ $cid = (int) $match[1];
+ if(in_array($cid, $resolvedClubs))
+ continue;
+
+ $resolvedClubs[] = $cid;
+ $maybeClub = (new Clubs)->get($cid);
+ if($maybeClub)
+ yield $maybeClub;
+ } else {
+ $maybeUser = (new Users)->getByShortURL($link);
+ if($maybeUser) {
+ $uid = $maybeUser->getId();
+ if(in_array($uid, $resolvedUsers))
+ continue;
+ else
+ $resolvedUsers[] = $uid;
+
+ yield $maybeUser;
+ continue;
+ }
+
+ $maybeClub = (new Clubs)->getByShortURL($link);
+ if($maybeClub) {
+ $cid = $maybeClub->getId();
+ if(in_array($cid, $resolvedClubs))
+ continue;
+ else
+ $resolvedClubs[] = $cid;
+
+ yield $maybeClub;
+ }
+ }
+ }
}
function getText(bool $html = true): string
@@ -59,7 +116,6 @@ trait TRichText
$proc = iconv_strlen($this->getRecord()->{$contentColumn}) <= OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["postSizes"]["processingLimit"];
if($html) {
if($proc) {
- $rel = $this->isAd() ? "sponsored" : "ugc";
$text = $this->formatLinks($text);
$text = preg_replace("%@([A-Za-z0-9]++) \(((?:[\p{L&}\p{Lo} 0-9]\p{Mn}?)++)\)%Xu", "[$1|$2]", $text);
$text = preg_replace("%([\n\r\s]|^)(@([A-Za-z0-9]++))%Xu", "$1[$3|@$3]", $text);
diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
index e75cfcdf..0145dd8e 100644
--- a/Web/Models/Entities/User.php
+++ b/Web/Models/Entities/User.php
@@ -5,7 +5,7 @@ use openvk\Web\Themes\{Themepack, Themepacks};
use openvk\Web\Util\DateTime;
use openvk\Web\Models\RowModel;
use openvk\Web\Models\Entities\{Photo, Message, Correspondence, Gift};
-use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Gifts, Notifications};
+use openvk\Web\Models\Repositories\{Photos, Users, Clubs, Albums, Gifts, Notifications};
use openvk\Web\Models\Exceptions\InvalidUserNameException;
use Nette\Database\Table\ActiveRow;
use Chandler\Database\DatabaseConnection;
@@ -148,8 +148,9 @@ class User extends RowModel
function getFirstName(bool $pristine = false): string
{
$name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->first_name, MB_CASE_TITLE));
- if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine)
- return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE);
+ $tsn = tr("__transNames");
+ if(( $tsn !== "@__transNames" && !empty($tsn) ) && !$pristine)
+ return mb_convert_case(transliterator_transliterate($tsn, $name), MB_CASE_TITLE);
else
return $name;
}
@@ -157,8 +158,9 @@ class User extends RowModel
function getLastName(bool $pristine = false): string
{
$name = ($this->isDeleted() && !$this->isDeactivated() ? "DELETED" : mb_convert_case($this->getRecord()->last_name, MB_CASE_TITLE));
- if((($ts = tr("__transNames")) !== "@__transNames") && !$pristine)
- return mb_convert_case(transliterator_transliterate($ts, $name), MB_CASE_TITLE);
+ $tsn = tr("__transNames");
+ if(( $tsn !== "@__transNames" && !empty($tsn) ) && !$pristine)
+ return mb_convert_case(transliterator_transliterate($tsn, $name), MB_CASE_TITLE);
else
return $name;
}
@@ -535,12 +537,15 @@ class User extends RowModel
return sizeof(DatabaseConnection::i()->getContext()->table("messages")->where(["recipient_id" => $this->getId(), "unread" => 1]));
}
- function getClubs(int $page = 1, bool $admin = false): \Traversable
+ function getClubs(int $page = 1, bool $admin = false, int $count = OPENVK_DEFAULT_PER_PAGE, bool $offset = false): \Traversable
{
+ if(!$offset)
+ $page = ($page - 1) * $count;
+
if($admin) {
$id = $this->getId();
$query = "SELECT `id` FROM `groups` WHERE `owner` = ? UNION SELECT `club` as `id` FROM `group_coadmins` WHERE `user` = ?";
- $query .= " LIMIT " . OPENVK_DEFAULT_PER_PAGE . " OFFSET " . ($page - 1) * OPENVK_DEFAULT_PER_PAGE;
+ $query .= " LIMIT " . $count . " OFFSET " . $page;
$sel = DatabaseConnection::i()->getConnection()->query($query, $id, $id);
foreach($sel as $target) {
@@ -550,7 +555,7 @@ class User extends RowModel
yield $target;
}
} else {
- $sel = $this->getRecord()->related("subscriptions.follower")->page($page, OPENVK_DEFAULT_PER_PAGE);
+ $sel = $this->getRecord()->related("subscriptions.follower")->limit($count, $page);
foreach($sel->where("model", "openvk\\Web\\Models\\Entities\\Club") as $target) {
$target = (new Clubs)->get($target->target);
if(!$target) continue;
@@ -746,6 +751,63 @@ class User extends RowModel
return time() - $this->getRecord()->online <= 300;
}
+ function getOnlinePlatform(bool $forAPI = false): ?string
+ {
+ $platform = $this->getRecord()->client_name;
+ if($forAPI) {
+ switch ($platform) {
+ case 'openvk_refresh_android':
+ case 'openvk_legacy_android':
+ return 'android';
+ break;
+
+ case 'openvk_ios':
+ case 'openvk_legacy_ios':
+ return 'iphone';
+ break;
+
+ case 'vika_touch': // кика хохотач ахахахаххахахахахах
+ case 'vk4me':
+ return 'mobile';
+ break;
+
+ case NULL:
+ return NULL;
+ break;
+
+ default:
+ return 'api';
+ break;
+ }
+ } else {
+ return $platform;
+ }
+ }
+
+ function getOnlinePlatformDetails(): array
+ {
+ $clients = simplexml_load_file(OPENVK_ROOT . "/data/clients.xml");
+
+ foreach($clients as $client) {
+ if($client['tag'] == $this->getOnlinePlatform()) {
+ return [
+ "tag" => $client['tag'],
+ "name" => $client['name'],
+ "url" => $client['url'],
+ "img" => $client['img']
+ ];
+ break;
+ }
+ }
+
+ return [
+ "tag" => $this->getOnlinePlatform(),
+ "name" => NULL,
+ "url" => NULL,
+ "img" => NULL
+ ];
+ }
+
function prefersNotToSeeRating(): bool
{
return !((bool) $this->getRecord()->show_rating);
@@ -908,6 +970,10 @@ class User extends RowModel
$pClub = DatabaseConnection::i()->getContext()->table("groups")->where("shortcode", $code)->fetch();
if(!is_null($pClub))
return false;
+
+ $pAlias = DatabaseConnection::i()->getContext()->table("aliases")->where("shortcode", $code)->fetch();
+ if(!is_null($pAlias))
+ return false;
}
$this->stateChanges("shortcode", $code);
@@ -943,6 +1009,15 @@ class User extends RowModel
return true;
}
+ function updOnline(string $platform): bool
+ {
+ $this->setOnline(time());
+ $this->setClient_name($platform);
+ $this->save();
+
+ return true;
+ }
+
function changeEmail(string $email): void
{
DatabaseConnection::i()->getContext()->table("ChandlerUsers")
@@ -1049,6 +1124,24 @@ class User extends RowModel
return true;
}
+
+ function toVkApiStruct(): object
+ {
+ $res = (object) [];
+
+ $res->id = $this->getId();
+ $res->first_name = $this->getFirstName();
+ $res->last_name = $this->getLastName();
+ $res->deactivated = $this->isDeactivated();
+ $res->photo_50 = $this->getAvatarURL();
+ $res->photo_100 = $this->getAvatarURL("tiny");
+ $res->photo_200 = $this->getAvatarURL("normal");
+ $res->photo_id = !is_null($this->getAvatarPhoto()) ? $this->getAvatarPhoto()->getPrettyId() : NULL;
+ # TODO: Perenesti syuda vsyo ostalnoyie
+
+ return $res;
+ }
- use Traits\TSubscribable;
+ use Traits\TBackDrops;
+ use Traits\TSubscribable;
}
diff --git a/Web/Models/Entities/Video.php b/Web/Models/Entities/Video.php
index b45072b9..cef48e27 100644
--- a/Web/Models/Entities/Video.php
+++ b/Web/Models/Entities/Video.php
@@ -13,7 +13,7 @@ class Video extends Media
const TYPE_EMBED = 1;
protected $tableName = "videos";
- protected $fileExtension = "ogv";
+ protected $fileExtension = "mp4";
protected $processingPlaceholder = "video/rendering";
@@ -30,7 +30,7 @@ class Video extends Media
throw new \DomainException("$filename does not contain any video streams");
$durations = [];
- preg_match('%duration=([0-9\.]++)%', $streams, $durations);
+ preg_match_all('%duration=([0-9\.]++)%', $streams, $durations);
if(sizeof($durations[1]) === 0)
throw new \DomainException("$filename does not contain any meaningful video streams");
@@ -104,7 +104,7 @@ class Video extends Media
if(!$this->isProcessed())
return "/assets/packages/static/openvk/video/rendering.apng";
- return preg_replace("%\.[A-z]++$%", ".gif", $this->getURL());
+ return preg_replace("%\.[A-z0-9]++$%", ".gif", $this->getURL());
} else {
return $this->getVideoDriver()->getThumbnailURL();
}
@@ -114,7 +114,64 @@ class Video extends Media
{
return $this->getRecord()->owner;
}
+
+ function getApiStructure(): object
+ {
+ $fromYoutube = $this->getType() == Video::TYPE_EMBED;
+ return (object)[
+ "type" => "video",
+ "video" => [
+ "can_comment" => 1,
+ "can_like" => 0, // we don't h-have wikes in videos
+ "can_repost" => 0,
+ "can_subscribe" => 1,
+ "can_add_to_faves" => 0,
+ "can_add" => 0,
+ "comments" => $this->getCommentsCount(),
+ "date" => $this->getPublicationTime()->timestamp(),
+ "description" => $this->getDescription(),
+ "duration" => 0, // я хуй знает как получить длину видео
+ "image" => [
+ [
+ "url" => $this->getThumbnailURL(),
+ "width" => 320,
+ "height" => 240,
+ "with_padding" => 1
+ ]
+ ],
+ "width" => 640,
+ "height" => 480,
+ "id" => $this->getVirtualId(),
+ "owner_id" => $this->getOwner()->getId(),
+ "user_id" => $this->getOwner()->getId(),
+ "title" => $this->getName(),
+ "is_favorite" => false,
+ "player" => !$fromYoutube ? $this->getURL() : $this->getVideoDriver()->getURL(),
+ "files" => !$fromYoutube ? [
+ "mp4_480" => $this->getURL()
+ ] : NULL,
+ "platform" => $fromYoutube ? "youtube" : NULL,
+ "added" => 0,
+ "repeat" => 0,
+ "type" => "video",
+ "views" => 0,
+ "likes" => [
+ "count" => 0,
+ "user_likes" => 0
+ ],
+ "reposts" => [
+ "count" => 0,
+ "user_reposted" => 0
+ ]
+ ]
+ ];
+ }
+ function toVkApiStruct(): object
+ {
+ return $this->getApiStructure();
+ }
+
function setLink(string $link): string
{
if(preg_match(file_get_contents(__DIR__ . "/../VideoDrivers/regex/youtube.txt"), $link, $matches)) {
@@ -145,11 +202,14 @@ class Video extends Media
$this->save();
}
- static function fastMake(int $owner, string $description = "", array $file, bool $unlisted = true, bool $anon = false): Video
+ static function fastMake(int $owner, string $name = "Unnamed Video.ogv", string $description = "", array $file, bool $unlisted = true, bool $anon = false): Video
{
+ if(OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
+ exit(VIDEOS_FRIENDLY_ERROR);
+
$video = new Video;
$video->setOwner($owner);
- $video->setName("Unnamed Video.ogv");
+ $video->setName(ovk_proc_strtr($name, 61));
$video->setDescription(ovk_proc_strtr($description, 300));
$video->setAnonymous($anon);
$video->setCreated(time());
diff --git a/Web/Models/Exceptions/AlreadyVotedException.php b/Web/Models/Exceptions/AlreadyVotedException.php
new file mode 100644
index 00000000..08363b9a
--- /dev/null
+++ b/Web/Models/Exceptions/AlreadyVotedException.php
@@ -0,0 +1,7 @@
+collection ? $this->get($dbalbum->collection) : null;
}
+
+ function getAlbumByOwnerAndId(int $owner, int $id)
+ {
+ $album = $this->albums->where([
+ "owner" => $owner,
+ "id" => $id
+ ])->fetch();
+
+ return new Album($album);
+ }
}
diff --git a/Web/Models/Repositories/Aliases.php b/Web/Models/Repositories/Aliases.php
new file mode 100644
index 00000000..e74532a1
--- /dev/null
+++ b/Web/Models/Repositories/Aliases.php
@@ -0,0 +1,35 @@
+context = DB::i()->getContext();
+ $this->aliases = $this->context->table("aliases");
+ }
+
+ private function toAlias(?ActiveRow $ar): ?Alias
+ {
+ return is_null($ar) ? NULL : new Alias($ar);
+ }
+
+ function get(int $id): ?Alias
+ {
+ return $this->toAlias($this->aliases->get($id));
+ }
+
+ function getByShortcode(string $shortcode): ?Alias
+ {
+ return $this->toAlias($this->aliases->where("shortcode", $shortcode)->fetch());
+ }
+}
diff --git a/Web/Models/Repositories/Applications.php b/Web/Models/Repositories/Applications.php
index 3aa6e5be..0687856e 100644
--- a/Web/Models/Repositories/Applications.php
+++ b/Web/Models/Repositories/Applications.php
@@ -66,4 +66,12 @@ class Applications
{
return sizeof($this->appRels->where("user", $user->getId()));
}
+
+ function find(string $query, array $pars = [], string $sort = "id"): Util\EntityStream
+ {
+ $query = "%$query%";
+ $result = $this->apps->where("CONCAT_WS(' ', name, description) LIKE ?", $query)->where("enabled", 1);
+
+ return new Util\EntityStream("Application", $result->order("$sort"));
+ }
}
\ No newline at end of file
diff --git a/Web/Models/Repositories/ChandlerGroups.php b/Web/Models/Repositories/ChandlerGroups.php
new file mode 100644
index 00000000..45af2a62
--- /dev/null
+++ b/Web/Models/Repositories/ChandlerGroups.php
@@ -0,0 +1,48 @@
+context = DB::i()->getContext();
+ $this->groups = $this->context->table("ChandlerGroups");
+ $this->members = $this->context->table("ChandlerACLRelations");
+ $this->perms = $this->context->table("ChandlerACLGroupsPermissions");
+ }
+
+ function get(string $UUID): ?ActiveRow
+ {
+ return $this->groups->where("id", $UUID)->fetch();
+ }
+
+ function getList(): \Traversable
+ {
+ foreach($this->groups as $group) yield $group;
+ }
+
+ function getMembersById(string $UUID): \Traversable
+ {
+ foreach($this->members->where("group", $UUID) as $member)
+ yield (new Users)->getByChandlerUser(
+ new ChandlerUser($this->context->table("ChandlerUsers")->where("id", $member->user)->fetch())
+ );
+ }
+
+ function getUsersMemberships(string $UUID): \Traversable
+ {
+ foreach($this->members->where("user", $UUID) as $member) yield $member;
+ }
+
+ function getPermissionsById(string $UUID): \Traversable
+ {
+ foreach($this->perms->where("group", $UUID) as $perm) yield $perm;
+ }
+}
diff --git a/Web/Models/Repositories/ChandlerUsers.php b/Web/Models/Repositories/ChandlerUsers.php
new file mode 100644
index 00000000..a827afac
--- /dev/null
+++ b/Web/Models/Repositories/ChandlerUsers.php
@@ -0,0 +1,39 @@
+context = DB::i()->getContext();
+ $this->users = $this->context->table("ChandlerUsers");
+ }
+
+ private function toUser(?ActiveRow $ar): ?ChandlerUser
+ {
+ return is_null($ar) ? NULL : (new User($ar))->getChandlerUser();
+ }
+
+ function get(int $id): ?ChandlerUser
+ {
+ return (new Users)->get($id)->getChandlerUser();
+ }
+
+ function getById(string $UUID): ?ChandlerUser
+ {
+ return new ChandlerUser($this->users->where("id", $UUID)->fetch());
+ }
+
+ function getList(int $page = 1): \Traversable
+ {
+ foreach($this->users as $user)
+ yield new ChandlerUser($user);
+ }
+}
diff --git a/Web/Models/Repositories/Clubs.php b/Web/Models/Repositories/Clubs.php
index b7b59251..04bb30ab 100644
--- a/Web/Models/Repositories/Clubs.php
+++ b/Web/Models/Repositories/Clubs.php
@@ -1,6 +1,7 @@
context = DatabaseConnection::i()->getContext();
- $this->clubs = $this->context->table("groups");
+ $this->context = DatabaseConnection::i()->getContext();
+ $this->clubs = $this->context->table("groups");
+ $this->coadmins = $this->context->table("group_coadmins");
}
private function toClub(?ActiveRow $ar): ?Club
@@ -22,7 +25,17 @@ class Clubs
function getByShortURL(string $url): ?Club
{
- return $this->toClub($this->clubs->where("shortcode", $url)->fetch());
+ $shortcode = $this->toClub($this->clubs->where("shortcode", $url)->fetch());
+
+ if ($shortcode)
+ return $shortcode;
+
+ $alias = (new Aliases)->getByShortcode($url);
+
+ if (!$alias) return NULL;
+ if ($alias->getType() !== "club") return NULL;
+
+ return $alias->getClub();
}
function get(int $id): ?Club
@@ -30,12 +43,12 @@ class Clubs
return $this->toClub($this->clubs->get($id));
}
- function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable
+ function find(string $query, array $pars = [], string $sort = "id DESC", int $page = 1, ?int $perPage = NULL): \Traversable
{
$query = "%$query%";
$result = $this->clubs->where("name LIKE ? OR about LIKE ?", $query, $query);
- return new Util\EntityStream("Club", $result);
+ return new Util\EntityStream("Club", $result->order($sort));
}
function getCount(): int
@@ -45,6 +58,9 @@ class Clubs
function getPopularClubs(): \Traversable
{
+ // TODO rewrite
+
+ /*
$query = "SELECT ROW_NUMBER() OVER (ORDER BY `subscriptions` DESC) as `place`, `target` as `id`, COUNT(`follower`) as `subscriptions` FROM `subscriptions` WHERE `model` = \"openvk\\\Web\\\Models\\\Entities\\\Club\" GROUP BY `target` ORDER BY `subscriptions` DESC, `id` LIMIT 30;";
$entries = DatabaseConnection::i()->getConnection()->query($query);
@@ -54,7 +70,28 @@ class Clubs
"club" => $this->get($entry["id"]),
"subscriptions" => $entry["subscriptions"],
];
+ */
}
-
+
+ function getWriteableClubs(int $id): \Traversable
+ {
+ $result = $this->clubs->where("owner", $id);
+ $coadmins = $this->coadmins->where("user", $id);
+
+ foreach($result as $entry) {
+ yield new Club($entry);
+ }
+
+ foreach($coadmins as $coadmin) {
+ $cl = new Manager($coadmin);
+ yield $cl->getClub();
+ }
+ }
+
+ function getWriteableClubsCount(int $id): int
+ {
+ return sizeof($this->clubs->where("owner", $id)) + sizeof($this->coadmins->where("user", $id));
+ }
+
use \Nette\SmartObject;
}
diff --git a/Web/Models/Repositories/Comments.php b/Web/Models/Repositories/Comments.php
index 4774cf35..f4b8e5ac 100644
--- a/Web/Models/Repositories/Comments.php
+++ b/Web/Models/Repositories/Comments.php
@@ -59,4 +59,35 @@ class Comments
"deleted" => false,
]));
}
+
+ function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream
+ {
+ $query = "%$query%";
+
+ $notNullParams = [];
+
+ foreach($pars as $paramName => $paramValue)
+ if($paramName != "before" && $paramName != "after")
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
+ else
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
+
+ $result = $this->comments->where("content LIKE ?", $query)->where("deleted", 0);
+ $nnparamsCount = sizeof($notNullParams);
+
+ if($nnparamsCount > 0) {
+ foreach($notNullParams as $paramName => $paramValue) {
+ switch($paramName) {
+ case "before":
+ $result->where("created < ?", $paramValue);
+ break;
+ case "after":
+ $result->where("created > ?", $paramValue);
+ break;
+ }
+ }
+ }
+
+ return new Util\EntityStream("Comment", $result->order("$sort"));
+ }
}
diff --git a/Web/Models/Repositories/Notes.php b/Web/Models/Repositories/Notes.php
index 7d95f975..0473070a 100644
--- a/Web/Models/Repositories/Notes.php
+++ b/Web/Models/Repositories/Notes.php
@@ -26,10 +26,10 @@ class Notes
return $this->toNote($this->notes->get($id));
}
- function getUserNotes(User $user, int $page = 1, ?int $perPage = NULL): \Traversable
+ function getUserNotes(User $user, int $page = 1, ?int $perPage = NULL, string $sort = "DESC"): \Traversable
{
$perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE;
- foreach($this->notes->where("owner", $user->getId())->where("deleted", 0)->order("created DESC")->page($page, $perPage) as $album)
+ foreach($this->notes->where("owner", $user->getId())->where("deleted", 0)->order("created $sort")->page($page, $perPage) as $album)
yield new Note($album);
}
diff --git a/Web/Models/Repositories/Photos.php b/Web/Models/Repositories/Photos.php
index 4ff8a1b9..88c7e804 100644
--- a/Web/Models/Repositories/Photos.php
+++ b/Web/Models/Repositories/Photos.php
@@ -1,6 +1,6 @@
photos->where([
+ "owner" => $user->getId()
+ ]);
+
+ foreach($photos as $photo) {
+ yield new Photo($photo);
+ }
+ }
}
diff --git a/Web/Models/Repositories/Polls.php b/Web/Models/Repositories/Polls.php
new file mode 100644
index 00000000..c2ba720b
--- /dev/null
+++ b/Web/Models/Repositories/Polls.php
@@ -0,0 +1,23 @@
+polls = DatabaseConnection::i()->getContext()->table("polls");
+ }
+
+ function get(int $id): ?Poll
+ {
+ $poll = $this->polls->get($id);
+ if(!$poll)
+ return NULL;
+
+ return new Poll($poll);
+ }
+}
\ No newline at end of file
diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php
index 7aadc0bb..c354f152 100644
--- a/Web/Models/Repositories/Posts.php
+++ b/Web/Models/Repositories/Posts.php
@@ -99,7 +99,39 @@ class Posts
return NULL;
}
-
+
+ function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream
+ {
+ $query = "%$query%";
+
+ $notNullParams = [];
+
+ foreach($pars as $paramName => $paramValue)
+ if($paramName != "before" && $paramName != "after")
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
+ else
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
+
+ $result = $this->posts->where("content LIKE ?", $query)->where("deleted", 0);
+ $nnparamsCount = sizeof($notNullParams);
+
+ if($nnparamsCount > 0) {
+ foreach($notNullParams as $paramName => $paramValue) {
+ switch($paramName) {
+ case "before":
+ $result->where("created < ?", $paramValue);
+ break;
+ case "after":
+ $result->where("created > ?", $paramValue);
+ break;
+ }
+ }
+ }
+
+
+ return new Util\EntityStream("Post", $result->order("$sort"));
+ }
+
function getPostCountOnUserWall(int $user): int
{
return sizeof($this->posts->where(["wall" => $user, "deleted" => 0]));
diff --git a/Web/Models/Repositories/SupportAgents.php b/Web/Models/Repositories/SupportAgents.php
new file mode 100644
index 00000000..7b3a1e7e
--- /dev/null
+++ b/Web/Models/Repositories/SupportAgents.php
@@ -0,0 +1,32 @@
+context = DatabaseConnection::i()->getContext();
+ $this->agents = $this->context->table("support_names");
+ }
+
+ private function toAgent(?ActiveRow $ar)
+ {
+ return is_null($ar) ? NULL : new SupportAgent($ar);
+ }
+
+ function get(int $id): ?SupportAgent
+ {
+ return $this->toAgent($this->agents->where("agent", $id)->fetch());
+ }
+
+ function isExists(int $id): bool
+ {
+ return !is_null($this->get($id));
+ }
+}
\ No newline at end of file
diff --git a/Web/Models/Repositories/TicketComments.php b/Web/Models/Repositories/TicketComments.php
index 9277218f..ee05bb55 100644
--- a/Web/Models/Repositories/TicketComments.php
+++ b/Web/Models/Repositories/TicketComments.php
@@ -27,6 +27,13 @@ class TicketComments
else
return NULL;
}
+
+ function getCountByAgent(int $agent_id, int $mark = NULL): int
+ {
+ $filter = ['user_id' => $agent_id, 'user_type' => 1];
+ $mark && $filter['mark'] = $mark;
+ return sizeof($this->comments->where($filter));
+ }
use \Nette\SmartObject;
}
diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php
index 9cd7d001..6c165aa3 100644
--- a/Web/Models/Repositories/Users.php
+++ b/Web/Models/Repositories/Users.php
@@ -1,6 +1,7 @@
context = DatabaseConnection::i()->getContext();
$this->users = $this->context->table("profiles");
+ $this->aliases = $this->context->table("aliases");
}
private function toUser(?ActiveRow $ar): ?User
@@ -28,7 +31,17 @@ class Users
function getByShortURL(string $url): ?User
{
- return $this->toUser($this->users->where("shortcode", $url)->fetch());
+ $shortcode = $this->toUser($this->users->where("shortcode", $url)->fetch());
+
+ if ($shortcode)
+ return $shortcode;
+
+ $alias = (new Aliases)->getByShortcode($url);
+
+ if (!$alias) return NULL;
+ if ($alias->getType() !== "user") return NULL;
+
+ return $alias->getUser();
}
function getByChandlerUser(ChandlerUser $user): ?User
@@ -36,12 +49,91 @@ class Users
return $this->toUser($this->users->where("user", $user->getId())->fetch());
}
- function find(string $query): Util\EntityStream
+ function find(string $query, array $pars = [], string $sort = "id DESC"): Util\EntityStream
{
$query = "%$query%";
$result = $this->users->where("CONCAT_WS(' ', first_name, last_name, pseudo, shortcode) LIKE ?", $query)->where("deleted", 0);
- return new Util\EntityStream("User", $result);
+ $notNullParams = [];
+ $nnparamsCount = 0;
+
+ foreach($pars as $paramName => $paramValue)
+ if($paramName != "before" && $paramName != "after" && $paramName != "gender" && $paramName != "maritalstatus" && $paramName != "politViews" && $paramName != "doNotSearchMe")
+ $paramValue != NULL ? $notNullParams += ["$paramName" => "%$paramValue%"] : NULL;
+ else
+ $paramValue != NULL ? $notNullParams += ["$paramName" => "$paramValue"] : NULL;
+
+ $nnparamsCount = sizeof($notNullParams);
+
+ if($nnparamsCount > 0) {
+ foreach($notNullParams as $paramName => $paramValue) {
+ switch($paramName) {
+ case "hometown":
+ $result->where("hometown LIKE ?", $paramValue);
+ break;
+ case "city":
+ $result->where("city LIKE ?", $paramValue);
+ break;
+ case "maritalstatus":
+ $result->where("marital_status ?", $paramValue);
+ break;
+ case "status":
+ $result->where("status LIKE ?", $paramValue);
+ break;
+ case "politViews":
+ $result->where("polit_views ?", $paramValue);
+ break;
+ case "email":
+ $result->where("email_contact LIKE ?", $paramValue);
+ break;
+ case "telegram":
+ $result->where("telegram LIKE ?", $paramValue);
+ break;
+ case "site":
+ $result->where("telegram LIKE ?", $paramValue);
+ break;
+ case "address":
+ $result->where("address LIKE ?", $paramValue);
+ break;
+ case "is_online":
+ $result->where("online >= ?", time() - 900);
+ break;
+ case "interests":
+ $result->where("interests LIKE ?", $paramValue);
+ break;
+ case "fav_mus":
+ $result->where("fav_music LIKE ?", $paramValue);
+ break;
+ case "fav_films":
+ $result->where("fav_films LIKE ?", $paramValue);
+ break;
+ case "fav_shows":
+ $result->where("fav_shows LIKE ?", $paramValue);
+ break;
+ case "fav_books":
+ $result->where("fav_books LIKE ?", $paramValue);
+ break;
+ case "fav_quote":
+ $result->where("fav_quote LIKE ?", $paramValue);
+ break;
+ case "before":
+ $result->where("UNIX_TIMESTAMP(since) < ?", $paramValue);
+ break;
+ case "after":
+ $result->where("UNIX_TIMESTAMP(since) > ?", $paramValue);
+ break;
+ case "gender":
+ $result->where("sex ?", $paramValue);
+ break;
+ case "doNotSearchMe":
+ $result->where("id !=", $paramValue);
+ break;
+ }
+ }
+ }
+
+
+ return new Util\EntityStream("User", $result->order($sort));
}
function getStatistics(): object
diff --git a/Web/Models/Repositories/Videos.php b/Web/Models/Repositories/Videos.php
index 5701b44e..63273349 100644
--- a/Web/Models/Repositories/Videos.php
+++ b/Web/Models/Repositories/Videos.php
@@ -45,4 +45,36 @@ class Videos
{
return sizeof($this->videos->where("owner", $user->getId())->where(["deleted" => 0, "unlisted" => 0]));
}
+
+ function find(string $query = "", array $pars = [], string $sort = "id"): Util\EntityStream
+ {
+ $query = "%$query%";
+
+ $notNullParams = [];
+
+ foreach($pars as $paramName => $paramValue)
+ if($paramName != "before" && $paramName != "after")
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "%$paramValue%"] : NULL;
+ else
+ $paramValue != NULL ? $notNullParams+=["$paramName" => "$paramValue"] : NULL;
+
+ $result = $this->videos->where("CONCAT_WS(' ', name, description) LIKE ?", $query)->where("deleted", 0);
+ $nnparamsCount = sizeof($notNullParams);
+
+ if($nnparamsCount > 0) {
+ foreach($notNullParams as $paramName => $paramValue) {
+ switch($paramName) {
+ case "before":
+ $result->where("created < ?", $paramValue);
+ break;
+ case "after":
+ $result->where("created > ?", $paramValue);
+ break;
+ }
+ }
+ }
+
+
+ return new Util\EntityStream("Video", $result->order("$sort"));
+ }
}
diff --git a/Web/Models/VideoDrivers/VideoDriver.php b/Web/Models/VideoDrivers/VideoDriver.php
index 141e738b..ca9fb74b 100644
--- a/Web/Models/VideoDrivers/VideoDriver.php
+++ b/Web/Models/VideoDrivers/VideoDriver.php
@@ -14,5 +14,5 @@ abstract class VideoDriver
abstract function getURL(): string;
- abstract function getEmbed(): string;
+ abstract function getEmbed(string $w = "600", string $h = "340"): string;
}
diff --git a/Web/Models/VideoDrivers/YouTubeVideoDriver.php b/Web/Models/VideoDrivers/YouTubeVideoDriver.php
index f517d7fd..1b9940e6 100644
--- a/Web/Models/VideoDrivers/YouTubeVideoDriver.php
+++ b/Web/Models/VideoDrivers/YouTubeVideoDriver.php
@@ -13,13 +13,13 @@ final class YouTubeVideoDriver extends VideoDriver
return "https://youtu.be/$this->id";
}
- function getEmbed(): string
+ function getEmbed(string $w = "600", string $h = "340"): string
{
return <<template->usersStats = (new Users)->getStatistics();
$this->template->clubsCount = (new Clubs)->getCount();
$this->template->postsCount = (new Posts)->getCount();
- $this->template->popularClubs = iterator_to_array((new Clubs)->getPopularClubs());
+ $this->template->popularClubs = [];
$this->template->admins = iterator_to_array((new Users)->getInstanceAdmins());
}
@@ -76,6 +79,9 @@ final class AboutPresenter extends OpenVKPresenter
$this->assertNoCSRF();
setLanguage($_GET['lg']);
}
+
+ if(!is_null($_GET['jReturnTo']))
+ $this->redirect(rawurldecode($_GET['jReturnTo']));
}
function renderExportJSLanguage($lg = NULL): void
@@ -135,6 +141,6 @@ final class AboutPresenter extends OpenVKPresenter
function renderDev(): void
{
- $this->redirect("https://docs.openvk.su/");
+ $this->redirect("https://docs.openvk.uk/");
}
}
diff --git a/Web/Presenters/AdminPresenter.php b/Web/Presenters/AdminPresenter.php
index ceda6f6b..ff21612b 100644
--- a/Web/Presenters/AdminPresenter.php
+++ b/Web/Presenters/AdminPresenter.php
@@ -1,7 +1,7 @@
users = $users;
$this->clubs = $clubs;
$this->vouchers = $vouchers;
$this->gifts = $gifts;
$this->bannedLinks = $bannedLinks;
+ $this->chandlerGroups = $chandlerGroups;
parent::__construct();
}
@@ -62,7 +64,9 @@ final class AdminPresenter extends OpenVKPresenter
$this->notFound();
$this->template->user = $user;
-
+ $this->template->c_groups_list = (new ChandlerGroups)->getList();
+ $this->template->c_memberships = $this->chandlerGroups->getUsersMemberships($user->getChandlerGUID());
+
if($_SERVER["REQUEST_METHOD"] !== "POST")
return;
@@ -78,8 +82,16 @@ final class AdminPresenter extends OpenVKPresenter
$user->changeEmail($this->postParam("email"));
if($user->onlineStatus() != $this->postParam("online")) $user->setOnline(intval($this->postParam("online")));
$user->setVerified(empty($this->postParam("verify") ? 0 : 1));
+ if($this->postParam("add-to-group")) {
+ $query = "INSERT INTO `ChandlerACLRelations` (`user`, `group`) VALUES ('" . $user->getChandlerGUID() . "', '" . $this->postParam("add-to-group") . "')";
+ DatabaseConnection::i()->getConnection()->query($query);
+ }
+ if($this->postParam("password")) {
+ $user->getChandlerUser()->updatePassword($this->postParam("password"));
+ }
$user->save();
+
break;
}
}
@@ -447,4 +459,95 @@ final class AdminPresenter extends OpenVKPresenter
$this->redirect("/admin/bannedLinks");
}
+
+ function renderChandlerGroups(): void
+ {
+ $this->template->groups = (new ChandlerGroups)->getList();
+
+ if($_SERVER["REQUEST_METHOD"] !== "POST")
+ return;
+
+ $req = "INSERT INTO `ChandlerGroups` (`name`) VALUES ('" . $this->postParam("name") . "')";
+ DatabaseConnection::i()->getConnection()->query($req);
+ }
+
+ function renderChandlerGroup(string $UUID): void
+ {
+ $DB = DatabaseConnection::i()->getConnection();
+
+ if(is_null($DB->query("SELECT * FROM `ChandlerGroups` WHERE `id` = '$UUID'")->fetch()))
+ $this->flashFail("err", tr("error"), tr("c_group_not_found"));
+
+ $this->template->group = (new ChandlerGroups)->get($UUID);
+ $this->template->mode = in_array(
+ $this->queryParam("act"),
+ [
+ "main",
+ "members",
+ "permissions",
+ "removeMember",
+ "removePermission",
+ "delete"
+ ]) ? $this->queryParam("act") : "main";
+ $this->template->members = (new ChandlerGroups)->getMembersById($UUID);
+ $this->template->perms = (new ChandlerGroups)->getPermissionsById($UUID);
+
+ if($this->template->mode == "removeMember") {
+ $where = "`user` = '" . $this->queryParam("uid") . "' AND `group` = '$UUID'";
+
+ if(is_null($DB->query("SELECT * FROM `ChandlerACLRelations` WHERE " . $where)->fetch()))
+ $this->flashFail("err", tr("error"), tr("c_user_is_not_in_group"));
+
+ $DB->query("DELETE FROM `ChandlerACLRelations` WHERE " . $where);
+ $this->flashFail("succ", tr("changes_saved"), tr("c_user_removed_from_group"));
+ } elseif($this->template->mode == "removePermission") {
+ $where = "`model` = '" . trim(addslashes($this->queryParam("model"))) . "' AND `permission` = '". $this->queryParam("perm") ."' AND `group` = '$UUID'";
+
+ if(is_null($DB->query("SELECT * FROM `ChandlerACLGroupsPermissions WHERE $where`")))
+ $this->flashFail("err", tr("error"), tr("c_permission_not_found"));
+
+ $DB->query("DELETE FROM `ChandlerACLGroupsPermissions` WHERE $where");
+ $this->flashFail("succ", tr("changes_saved"), tr("c_permission_removed_from_group"));
+ } elseif($this->template->mode == "delete") {
+ $DB->query("DELETE FROM `ChandlerGroups` WHERE `id` = '$UUID'");
+ $DB->query("DELETE FROM `ChandlerACLGroupsPermissions` WHERE `group` = '$UUID'");
+ $DB->query("DELETE FROM `ChandlerACLRelations` WHERE `group` = '$UUID'");
+
+ $this->flashFail("succ", tr("changes_saved"), tr("c_group_removed"));
+ }
+
+ if ($_SERVER["REQUEST_METHOD"] !== "POST") return;
+
+ $req = "";
+
+ if($this->template->mode == "main")
+ if($this->postParam("delete"))
+ $req = "DELETE FROM `ChandlerGroups` WHERE `id`='$UUID'";
+ else
+ $req = "UPDATE `ChandlerGroups` SET `name`='". $this->postParam('name') ."' , `color`='". $this->postParam("color") ."' WHERE `id`='$UUID'";
+
+ if($this->template->mode == "members")
+ if($this->postParam("uid"))
+ if(!is_null($DB->query("SELECT * FROM `ChandlerACLRelations` WHERE `user` = '" . $this->postParam("uid") . "'")))
+ $this->flashFail("err", tr("error"), tr("c_user_is_already_in_group"));
+
+ $req = "INSERT INTO `ChandlerACLRelations` (`user`, `group`, `priority`) VALUES ('". $this->postParam("uid") ."', '$UUID', 32)";
+
+ if($this->template->mode == "permissions")
+ $req = "INSERT INTO `ChandlerACLGroupsPermissions` (`group`, `model`, `permission`, `context`) VALUES ('$UUID', '". trim(addslashes($this->postParam("model"))) ."', '". $this->postParam("permission") ."', 0)";
+
+ $DB->query($req);
+ $this->flashFail("succ", tr("changes_saved"));
+ }
+
+ function renderChandlerUser(string $UUID): void
+ {
+ if(!$UUID) $this->notFound();
+
+ $c_user = (new ChandlerUsers())->getById($UUID);
+ $user = $this->users->getByChandlerUser($c_user);
+ if(!$user) $this->notFound();
+
+ $this->redirect("/admin/users/id" . $user->getId());
+ }
}
diff --git a/Web/Presenters/AppsPresenter.php b/Web/Presenters/AppsPresenter.php
index 02fb8922..8dcfb8a4 100644
--- a/Web/Presenters/AppsPresenter.php
+++ b/Web/Presenters/AppsPresenter.php
@@ -6,7 +6,7 @@ use openvk\Web\Models\Repositories\Applications;
final class AppsPresenter extends OpenVKPresenter
{
private $apps;
-
+ protected $presenterName = "apps";
function __construct(Applications $apps)
{
$this->apps = $apps;
diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php
index f934f7fe..2f178900 100644
--- a/Web/Presenters/AuthPresenter.php
+++ b/Web/Presenters/AuthPresenter.php
@@ -80,10 +80,17 @@ final class AuthPresenter extends OpenVKPresenter
if(!Validator::i()->emailValid($this->postParam("email")))
$this->flashFail("err", tr("invalid_email_address"), tr("invalid_email_address_comment"));
-
+
+ if(OPENVK_ROOT_CONF['openvk']['preferences']['security']['forceStrongPassword'])
+ if(!Validator::i()->passwordStrong($this->postParam("password")))
+ $this->flashFail("err", tr("error"), tr("error_weak_password"));
+
if (strtotime($this->postParam("birthday")) > time())
$this->flashFail("err", tr("invalid_birth_date"), tr("invalid_birth_date_comment"));
+ if (!$this->postParam("confirmation"))
+ $this->flashFail("err", tr("error"), tr("checkbox_in_registration_unchecked"));
+
try {
$user = new User;
$user->setFirst_Name($this->postParam("first_name"));
@@ -200,6 +207,9 @@ final class AuthPresenter extends OpenVKPresenter
function renderFinishRestoringPassword(): void
{
+ if(OPENVK_ROOT_CONF['openvk']['preferences']['security']['disablePasswordRestoring'])
+ $this->notFound();
+
$request = $this->restores->getByToken(str_replace(" ", "+", $this->queryParam("key")));
if(!$request || !$request->isStillValid()) {
$this->flash("err", tr("token_manipulation_error"), tr("token_manipulation_error_comment"));
@@ -234,6 +244,9 @@ final class AuthPresenter extends OpenVKPresenter
function renderRestore(): void
{
+ if(OPENVK_ROOT_CONF['openvk']['preferences']['security']['disablePasswordRestoring'])
+ $this->notFound();
+
if(!is_null($this->user))
$this->redirect($this->user->identity->getURL());
diff --git a/Web/Presenters/CommentPresenter.php b/Web/Presenters/CommentPresenter.php
index cbdac84e..dad79ac4 100644
--- a/Web/Presenters/CommentPresenter.php
+++ b/Web/Presenters/CommentPresenter.php
@@ -1,11 +1,12 @@
"openvk\\Web\\Models\\Repositories\\Posts",
"photos" => "openvk\\Web\\Models\\Repositories\\Photos",
@@ -46,6 +47,9 @@ final class CommentPresenter extends OpenVKPresenter
$club = (new Clubs)->get(abs($entity->getTargetWall()));
else if($entity instanceof Topic)
$club = $entity->getClub();
+
+ if($_FILES["_vid_attachment"] && OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
+ $this->flashFail("err", tr("error"), "Video uploads are disabled by the system administrator.");
$flags = 0;
if($this->postParam("as_group") === "on" && !is_null($club) && $club->canBeModifiedBy($this->user->identity))
@@ -73,7 +77,7 @@ final class CommentPresenter extends OpenVKPresenter
}
if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
- $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"]);
+ $video = Video::fastMake($this->user->id, $_FILES["_vid_attachment"]["name"], $this->postParam("text"), $_FILES["_vid_attachment"]);
}
} catch(ISE $ex) {
$this->flashFail("err", "Не удалось опубликовать комментарий", "Файл медиаконтента повреждён или слишком велик.");
@@ -104,6 +108,15 @@ final class CommentPresenter extends OpenVKPresenter
if($entity->getOwner()->getId() !== $this->user->identity->getId())
if(($owner = $entity->getOwner()) instanceof User)
(new CommentNotification($owner, $comment, $entity, $this->user->identity))->emit();
+
+ $excludeMentions = [$this->user->identity->getId()];
+ if(($owner = $entity->getOwner()) instanceof User)
+ $excludeMentions[] = $owner->getId();
+
+ $mentions = iterator_to_array($comment->resolveMentions($excludeMentions));
+ foreach($mentions as $mentionee)
+ if($mentionee instanceof User)
+ (new MentionNotification($mentionee, $entity, $comment->getOwner(), strip_tags($comment->getText())))->emit();
$this->flashFail("succ", "Комментарий добавлен", "Ваш комментарий появится на странице.");
}
diff --git a/Web/Presenters/GiftsPresenter.php b/Web/Presenters/GiftsPresenter.php
index b99e5ba9..8f59bdcb 100644
--- a/Web/Presenters/GiftsPresenter.php
+++ b/Web/Presenters/GiftsPresenter.php
@@ -7,6 +7,7 @@ final class GiftsPresenter extends OpenVKPresenter
{
private $gifts;
private $users;
+ protected $presenterName = "gifts";
function __construct(Gifts $gifts, Users $users)
{
diff --git a/Web/Presenters/GroupPresenter.php b/Web/Presenters/GroupPresenter.php
index a83386db..4f671df3 100644
--- a/Web/Presenters/GroupPresenter.php
+++ b/Web/Presenters/GroupPresenter.php
@@ -1,6 +1,7 @@
clubs = $clubs;
@@ -190,7 +192,7 @@ final class GroupPresenter extends OpenVKPresenter
$this->willExecuteWriteAction();
$club = $this->clubs->get($id);
- if(!$club->canBeModifiedBy($this->user->identity))
+ if(!$club || !$club->canBeModifiedBy($this->user->identity))
$this->notFound();
else
$this->template->club = $club;
@@ -249,6 +251,88 @@ final class GroupPresenter extends OpenVKPresenter
}
}
+ function renderSetAvatar(int $id)
+ {
+ $photo = new Photo;
+ $club = $this->clubs->get($id);
+ if($_SERVER["REQUEST_METHOD"] === "POST" && $_FILES["ava"]["error"] === UPLOAD_ERR_OK) {
+ try {
+ $anon = OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"];
+ if($anon && $this->user->id === $club->getOwner()->getId())
+ $anon = $club->isOwnerHidden();
+ else if($anon)
+ $anon = $club->getManager($this->user->identity)->isHidden();
+ $photo->setOwner($this->user->id);
+ $photo->setDescription("Club image");
+ $photo->setFile($_FILES["ava"]);
+ $photo->setCreated(time());
+ $photo->setAnonymous($anon);
+ $photo->save();
+
+ (new Albums)->getClubAvatarAlbum($club)->addPhoto($photo);
+
+ $flags = 0;
+ $flags |= 0b00010000;
+ $flags |= 0b10000000;
+
+ $post = new Post;
+ $post->setOwner($this->user->id);
+ $post->setWall($club->getId()*-1);
+ $post->setCreated(time());
+ $post->setContent("");
+ $post->setFlags($flags);
+ $post->save();
+ $post->attach($photo);
+
+ } catch(ISE $ex) {
+ $name = $album->getName();
+ $this->flashFail("err", "Неизвестная ошибка", "Не удалось сохранить фотографию.");
+ }
+ }
+ $this->returnJson([
+ "url" => $photo->getURL(),
+ "id" => $photo->getPrettyId()
+ ]);
+ }
+ function renderEditBackdrop(int $id): void
+ {
+ $this->assertUserLoggedIn();
+ $this->willExecuteWriteAction();
+
+ $club = $this->clubs->get($id);
+ if(!$club || !$club->canBeModifiedBy($this->user->identity))
+ $this->notFound();
+ else
+ $this->template->club = $club;
+
+ if($_SERVER["REQUEST_METHOD"] !== "POST")
+ return;
+
+ if($this->postParam("subact") === "remove") {
+ $club->unsetBackDropPictures();
+ $club->save();
+ $this->flashFail("succ", tr("backdrop_succ_rem"), tr("backdrop_succ_desc")); # will exit
+ }
+
+ $pic1 = $pic2 = NULL;
+ try {
+ if($_FILES["backdrop1"]["error"] !== UPLOAD_ERR_NO_FILE)
+ $pic1 = Photo::fastMake($this->user->id, "Profile backdrop (system)", $_FILES["backdrop1"]);
+
+ if($_FILES["backdrop2"]["error"] !== UPLOAD_ERR_NO_FILE)
+ $pic2 = Photo::fastMake($this->user->id, "Profile backdrop (system)", $_FILES["backdrop2"]);
+ } catch(InvalidStateException $e) {
+ $this->flashFail("err", tr("backdrop_error_title"), tr("backdrop_error_no_media"));
+ }
+
+ if($pic1 == $pic2 && is_null($pic1))
+ $this->flashFail("err", tr("backdrop_error_title"), tr("backdrop_error_no_media"));
+
+ $club->setBackDropPictures($pic1, $pic2);
+ $club->save();
+ $this->flashFail("succ", tr("backdrop_succ"), tr("backdrop_succ_desc"));
+ }
+
function renderStatistics(int $id): void
{
$this->assertUserLoggedIn();
diff --git a/Web/Presenters/MaintenancePresenter.php b/Web/Presenters/MaintenancePresenter.php
new file mode 100644
index 00000000..d4a5a6ef
--- /dev/null
+++ b/Web/Presenters/MaintenancePresenter.php
@@ -0,0 +1,35 @@
+flashFail("err", tr("error"), tr("forbidden"));
+
+ $this->template->name = [
+ "photos" => tr("my_photos"),
+ "videos" => tr("my_videos"),
+ "messenger" => tr("my_messages"),
+ "user" => tr("users"),
+ "group" => tr("my_groups"),
+ "comment" => tr("comments"),
+ "gifts" => tr("gifts"),
+ "apps" => tr("apps"),
+ "notes" => tr("my_notes"),
+ "notification" => tr("my_feedback"),
+ "support" => tr("menu_support"),
+ "topics" => tr("topics")
+ ][$name] ?? $name;
+ }
+
+ function renderAll(): void
+ {
+
+ }
+}
diff --git a/Web/Presenters/MessengerPresenter.php b/Web/Presenters/MessengerPresenter.php
index cea440ba..d5ffb988 100644
--- a/Web/Presenters/MessengerPresenter.php
+++ b/Web/Presenters/MessengerPresenter.php
@@ -9,11 +9,13 @@ final class MessengerPresenter extends OpenVKPresenter
{
private $messages;
private $signaler;
-
+ protected $presenterName = "messenger";
+
function __construct(Messages $messages)
{
$this->messages = $messages;
$this->signaler = SignalManager::i();
+
parent::__construct();
}
@@ -30,7 +32,7 @@ final class MessengerPresenter extends OpenVKPresenter
function renderIndex(): void
{
$this->assertUserLoggedIn();
-
+
if(isset($_GET["sel"]))
$this->pass("openvk!Messenger->app", $_GET["sel"]);
@@ -55,6 +57,11 @@ final class MessengerPresenter extends OpenVKPresenter
$correspondent = $this->getCorrespondent($sel);
if(!$correspondent)
$this->notFound();
+
+ if(!$this->user->identity->getPrivacyPermission('messages.write', $correspondent))
+ {
+ $this->flash("err", tr("warning"), tr("user_may_not_reply"));
+ }
$this->template->selId = $sel;
$this->template->correspondent = $correspondent;
@@ -93,6 +100,13 @@ final class MessengerPresenter extends OpenVKPresenter
}
$legacy = $this->queryParam("version") < 3;
+
+ $time = intval($this->queryParam("wait"));
+
+ if($time > 60)
+ $time = 60;
+ elseif($time == 0)
+ $time = 25; // default
$this->signaler->listen(function($event, $eId) use ($id) {
exit(json_encode([
@@ -101,7 +115,7 @@ final class MessengerPresenter extends OpenVKPresenter
$event->getVKAPISummary($id),
],
]));
- }, $id);
+ }, $id, $time);
}
function renderApiGetMessages(int $sel, int $lastMsg): void
diff --git a/Web/Presenters/NotesPresenter.php b/Web/Presenters/NotesPresenter.php
index 363d814c..50437ad7 100644
--- a/Web/Presenters/NotesPresenter.php
+++ b/Web/Presenters/NotesPresenter.php
@@ -6,7 +6,8 @@ use openvk\Web\Models\Entities\Note;
final class NotesPresenter extends OpenVKPresenter
{
private $notes;
-
+ protected $presenterName = "notes";
+
function __construct(Notes $notes)
{
$this->notes = $notes;
diff --git a/Web/Presenters/NotificationPresenter.php b/Web/Presenters/NotificationPresenter.php
index d12f27f0..3bd7a321 100644
--- a/Web/Presenters/NotificationPresenter.php
+++ b/Web/Presenters/NotificationPresenter.php
@@ -3,6 +3,8 @@ namespace openvk\Web\Presenters;
final class NotificationPresenter extends OpenVKPresenter
{
+ protected $presenterName = "notification";
+
function renderFeed(): void
{
$this->assertUserLoggedIn();
diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php
index 2a19fa03..710713e5 100755
--- a/Web/Presenters/OpenVKPresenter.php
+++ b/Web/Presenters/OpenVKPresenter.php
@@ -17,7 +17,8 @@ abstract class OpenVKPresenter extends SimplePresenter
protected $deactivationTolerant = false;
protected $errorTemplate = "@error";
protected $user = NULL;
-
+ protected $presenterName;
+
private function calculateQueryString(array $data): string
{
$rawUrl = "tcp+stratum://fakeurl.net$_SERVER[REQUEST_URI]"; #HTTP_HOST can be tainted
@@ -196,12 +197,13 @@ abstract class OpenVKPresenter extends SimplePresenter
function onStartup(): void
{
$user = Authenticator::i()->getUser();
-
+
$this->template->isXmas = intval(date('d')) >= 1 && date('m') == 12 || intval(date('d')) <= 15 && date('m') == 1 ? true : false;
$this->template->isTimezoned = Session::i()->get("_timezoneOffset");
-
+
$userValidated = 0;
$cacheTime = OPENVK_ROOT_CONF["openvk"]["preferences"]["nginxCacheTime"] ?? 0;
+
if(!is_null($user)) {
$this->user = (object) [];
$this->user->raw = $user;
@@ -226,7 +228,7 @@ abstract class OpenVKPresenter extends SimplePresenter
}
exit;
}
-
+
if($this->user->identity->isBanned() && !$this->banTolerant) {
header("HTTP/1.1 403 Forbidden");
$this->getTemplatingEngine()->render(__DIR__ . "/templates/@banned.xml", [
@@ -247,23 +249,34 @@ abstract class OpenVKPresenter extends SimplePresenter
]);
exit;
}
-
+
$userValidated = 1;
$cacheTime = 0; # Force no cache
if($this->user->identity->onlineStatus() == 0 && !($this->user->identity->isDeleted() || $this->user->identity->isBanned())) {
$this->user->identity->setOnline(time());
+ $this->user->identity->setClient_name(NULL);
$this->user->identity->save();
}
-
+
$this->template->ticketAnsweredCount = (new Tickets)->getTicketsCountByUserId($this->user->id, 1);
if($user->can("write")->model("openvk\Web\Models\Entities\TicketReply")->whichBelongsTo(0))
$this->template->helpdeskTicketNotAnsweredCount = (new Tickets)->getTicketCount(0);
}
-
+
header("X-OpenVK-User-Validated: $userValidated");
header("X-Accel-Expires: $cacheTime");
setlocale(LC_TIME, ...(explode(";", tr("__locale"))));
-
+
+ if (!OPENVK_ROOT_CONF["openvk"]["preferences"]["maintenanceMode"]["all"]) {
+ if (OPENVK_ROOT_CONF["openvk"]["preferences"]["maintenanceMode"][$this->presenterName]) {
+ $this->pass("openvk!Maintenance->section", $this->presenterName);
+ }
+ } else {
+ if ($this->presenterName != "maintenance") {
+ $this->redirect("/maintenances/");
+ }
+ }
+
parent::onStartup();
}
@@ -272,10 +285,14 @@ abstract class OpenVKPresenter extends SimplePresenter
parent::onBeforeRender();
$whichbrowser = new WhichBrowser\Parser(getallheaders());
+ $featurephonetheme = OPENVK_ROOT_CONF["openvk"]["preferences"]["defaultFeaturePhoneTheme"];
$mobiletheme = OPENVK_ROOT_CONF["openvk"]["preferences"]["defaultMobileTheme"];
- if($mobiletheme && $whichbrowser->isType('mobile') && Session::i()->get("_tempTheme") == NULL)
+
+ if($featurephonetheme && $this->isOldThing($whichbrowser) && Session::i()->get("_tempTheme") == NULL) {
+ $this->setSessionTheme($featurephonetheme);
+ } elseif($mobiletheme && $whichbrowser->isType('mobile') && Session::i()->get("_tempTheme") == NULL)
$this->setSessionTheme($mobiletheme);
-
+
$theme = NULL;
if(Session::i()->get("_tempTheme")) {
$theme = Themepacks::i()[Session::i()->get("_tempTheme", "ovk")];
@@ -306,4 +323,33 @@ abstract class OpenVKPresenter extends SimplePresenter
header("Content-Length: $size");
exit($payload);
}
+
+ protected function isOldThing($whichbrowser) {
+ if($whichbrowser->isOs('Series60') ||
+ $whichbrowser->isOs('Series40') ||
+ $whichbrowser->isOs('Series80') ||
+ $whichbrowser->isOs('Windows CE') ||
+ $whichbrowser->isOs('Windows Mobile') ||
+ $whichbrowser->isOs('Nokia Asha Platform') ||
+ $whichbrowser->isOs('UIQ') ||
+ $whichbrowser->isEngine('NetFront') || // PSP and other japanese portable systems
+ $whichbrowser->isOs('Android') ||
+ $whichbrowser->isOs('iOS') ||
+ $whichbrowser->isBrowser('Internet Explorer', '<=', '8')) {
+ // yeah, it's old, but ios and android are?
+ if($whichbrowser->isOs('iOS') && $whichbrowser->isOs('iOS', '<=', '9'))
+ return true;
+ elseif($whichbrowser->isOs('iOS') && $whichbrowser->isOs('iOS', '>', '9'))
+ return false;
+
+ if($whichbrowser->isOs('Android') && $whichbrowser->isOs('Android', '<=', '5'))
+ return true;
+ elseif($whichbrowser->isOs('Android') && $whichbrowser->isOs('Android', '>', '5'))
+ return false;
+
+ return true;
+ } else {
+ return false;
+ }
+ }
}
diff --git a/Web/Presenters/PhotosPresenter.php b/Web/Presenters/PhotosPresenter.php
index eacf76d4..02d6ae46 100644
--- a/Web/Presenters/PhotosPresenter.php
+++ b/Web/Presenters/PhotosPresenter.php
@@ -9,7 +9,8 @@ final class PhotosPresenter extends OpenVKPresenter
private $users;
private $photos;
private $albums;
-
+ protected $presenterName = "photos";
+
function __construct(Photos $photos, Albums $albums, Users $users)
{
$this->users = $users;
@@ -184,6 +185,18 @@ final class PhotosPresenter extends OpenVKPresenter
$this->renderPhoto($photo->getOwner(true)->getId(), $photo->getVirtualId());
}
+ function renderThumbnail($id, $size): void
+ {
+ $photo = $this->photos->get($id);
+ if(!$photo || $photo->isDeleted())
+ $this->notFound();
+
+ if(!$photo->forceSize($size))
+ chandler_http_panic(588, "Gone", "This thumbnail cannot be generated due to server misconfiguration");
+
+ $this->redirect($photo->getURLBySizeId($size), 8);
+ }
+
function renderEditPhoto(int $ownerId, int $photoId): void
{
$this->assertUserLoggedIn();
diff --git a/Web/Presenters/PollPresenter.php b/Web/Presenters/PollPresenter.php
new file mode 100644
index 00000000..9c75e3bf
--- /dev/null
+++ b/Web/Presenters/PollPresenter.php
@@ -0,0 +1,75 @@
+polls = $polls;
+
+ parent::__construct();
+ }
+
+ function renderView(int $id): void
+ {
+ $poll = $this->polls->get($id);
+ if(!$poll)
+ $this->notFound();
+
+ $this->template->id = $poll->getId();
+ $this->template->title = $poll->getTitle();
+ $this->template->isAnon = $poll->isAnonymous();
+ $this->template->multiple = $poll->isMultipleChoice();
+ $this->template->unlocked = $poll->isRevotable();
+ $this->template->until = $poll->endsAt();
+ $this->template->votes = $poll->getVoterCount();
+ $this->template->meta = $poll->getMetaDescription();
+ $this->template->ended = $ended = $poll->hasEnded();
+ if((is_null($this->user) || $poll->canVote($this->user->identity)) && !$ended) {
+ $this->template->options = $poll->getOptions();
+
+ $this->template->_template = "Poll/Poll.xml";
+ return;
+ }
+
+ if(is_null($this->user)) {
+ $this->template->voted = false;
+ $this->template->results = $poll->getResults();
+ } else {
+ $this->template->voted = $poll->hasVoted($this->user->identity);
+ $this->template->results = $poll->getResults($this->user->identity);
+ }
+
+ $this->template->_template = "Poll/PollResults.xml";
+ }
+
+ function renderVoters(int $pollId): void
+ {
+ $poll = $this->polls->get($pollId);
+ if(!$poll)
+ $this->notFound();
+
+ if($poll->isAnonymous())
+ $this->flashFail("err", tr("forbidden"), tr("poll_err_anonymous"));
+
+ $options = $poll->getOptions();
+ $option = (int) base_convert($this->queryParam("option"), 32, 10);
+ if(!in_array($option, array_keys($options)))
+ $this->notFound();
+
+ $page = (int) ($this->queryParam("p") ?? 1);
+ $voters = $poll->getVoters($option, $page);
+
+ $this->template->pollId = $pollId;
+ $this->template->options = $options;
+ $this->template->option = [$option, $options[$option]];
+ $this->template->tabs = $options;
+ $this->template->iterator = $voters;
+ $this->template->count = $poll->getVoterCount($option);
+ $this->template->page = $page;
+ }
+}
\ No newline at end of file
diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php
index 2171297c..fadf9954 100644
--- a/Web/Presenters/SearchPresenter.php
+++ b/Web/Presenters/SearchPresenter.php
@@ -1,18 +1,28 @@
users = $users;
- $this->clubs = $clubs;
+ $this->users = $users;
+ $this->clubs = $clubs;
+ $this->posts = new Posts;
+ $this->comments = new Comments;
+ $this->videos = new Videos;
+ $this->apps = new Applications;
+ $this->notes = new Notes;
parent::__construct();
}
@@ -21,6 +31,8 @@ final class SearchPresenter extends OpenVKPresenter
{
$query = $this->queryParam("query") ?? "";
$type = $this->queryParam("type") ?? "users";
+ $sorter = $this->queryParam("sort") ?? "id";
+ $invert = $this->queryParam("invert") == 1 ? "ASC" : "DESC";
$page = (int) ($this->queryParam("p") ?? 1);
$this->willExecuteWriteAction();
@@ -28,11 +40,58 @@ final class SearchPresenter extends OpenVKPresenter
$this->assertUserLoggedIn();
# https://youtu.be/pSAWM5YuXx8
-
- $repos = [ "groups" => "clubs", "users" => "users" ];
+
+ $repos = [
+ "groups" => "clubs",
+ "users" => "users",
+ "posts" => "posts",
+ "comments" => "comments",
+ "videos" => "videos",
+ "audios" => "posts",
+ "apps" => "apps",
+ "notes" => "notes"
+ ];
+
+ switch($sorter) {
+ default:
+ case "id":
+ $sort = "id " . $invert;
+ break;
+ case "name":
+ $sort = "first_name " . $invert;
+ break;
+ case "rating":
+ $sort = "rating " . $invert;
+ break;
+ }
+
+ $parameters = [
+ "type" => $this->queryParam("type"),
+ "city" => $this->queryParam("city") != "" ? $this->queryParam("city") : NULL,
+ "maritalstatus" => $this->queryParam("maritalstatus") != 0 ? $this->queryParam("maritalstatus") : NULL,
+ "with_photo" => $this->queryParam("with_photo"),
+ "status" => $this->queryParam("status") != "" ? $this->queryParam("status") : NULL,
+ "politViews" => $this->queryParam("politViews") != 0 ? $this->queryParam("politViews") : NULL,
+ "email" => $this->queryParam("email"),
+ "telegram" => $this->queryParam("telegram"),
+ "site" => $this->queryParam("site") != "" ? "https://".$this->queryParam("site") : NULL,
+ "address" => $this->queryParam("address"),
+ "is_online" => $this->queryParam("is_online") == 1 ? 1 : NULL,
+ "interests" => $this->queryParam("interests") != "" ? $this->queryParam("interests") : NULL,
+ "fav_mus" => $this->queryParam("fav_mus") != "" ? $this->queryParam("fav_mus") : NULL,
+ "fav_films" => $this->queryParam("fav_films") != "" ? $this->queryParam("fav_films") : NULL,
+ "fav_shows" => $this->queryParam("fav_shows") != "" ? $this->queryParam("fav_shows") : NULL,
+ "fav_books" => $this->queryParam("fav_books") != "" ? $this->queryParam("fav_books") : NULL,
+ "fav_quote" => $this->queryParam("fav_quote") != "" ? $this->queryParam("fav_quote") : NULL,
+ "hometown" => $this->queryParam("hometown") != "" ? $this->queryParam("hometown") : NULL,
+ "before" => $this->queryParam("datebefore") != "" ? strtotime($this->queryParam("datebefore")) : NULL,
+ "after" => $this->queryParam("dateafter") != "" ? strtotime($this->queryParam("dateafter")) : NULL,
+ "gender" => $this->queryParam("gender") != "" && $this->queryParam("gender") != 2 ? $this->queryParam("gender") : NULL
+ ];
+
$repo = $repos[$type] or $this->throwError(400, "Bad Request", "Invalid search entity $type.");
- $results = $this->{$repo}->find($query);
+ $results = $this->{$repo}->find($query, $parameters, $sort);
$iterator = $results->page($page);
$count = $results->size();
diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php
index 22f09201..c4d729ea 100644
--- a/Web/Presenters/SupportPresenter.php
+++ b/Web/Presenters/SupportPresenter.php
@@ -1,7 +1,7 @@
notFound();
} else {
if($ticket->getUserId() !== $this->user->id && $this->hasPermission('openvk\Web\Models\Entities\TicketReply', 'write', 0))
- $this->redirect("/support/tickets");
+ $_redirect = "/support/tickets";
else
- $this->redirect("/support");
+ $_redirect = "/support?act=list";
$ticket->delete();
+ $this->redirect($_redirect);
}
}
}
@@ -340,4 +342,58 @@ final class SupportPresenter extends OpenVKPresenter
$user->save();
$this->returnJson([ "success" => true ]);
}
+
+ function renderAgent(int $id): void
+ {
+ $this->assertPermission("openvk\Web\Models\Entities\TicketReply", "write", 0);
+
+ $support_names = new SupportAgents;
+
+ if(!$support_names->isExists($id))
+ $this->template->mode = "edit";
+
+ $this->template->agent_id = $id;
+ $this->template->mode = in_array($this->queryParam("act"), ["info", "edit"]) ? $this->queryParam("act") : "info";
+ $this->template->agent = $support_names->get($id) ?? NULL;
+ $this->template->counters = [
+ "all" => (new TicketComments)->getCountByAgent($id),
+ "good" => (new TicketComments)->getCountByAgent($id, 1),
+ "bad" => (new TicketComments)->getCountByAgent($id, 2)
+ ];
+
+ if($id != $this->user->identity->getId())
+ if ($support_names->isExists($id))
+ $this->template->mode = "info";
+ else
+ $this->redirect("/support/agent" . $this->user->identity->getId());
+ }
+
+ function renderEditAgent(int $id): void
+ {
+ $this->assertPermission("openvk\Web\Models\Entities\TicketReply", "write", 0);
+ $this->assertNoCSRF();
+
+ $support_names = new SupportAgents;
+ $agent = $support_names->get($id);
+
+ if($agent)
+ if($agent->getAgentId() != $this->user->identity->getId()) $this->flashFail("err", tr("error"), tr("forbidden"));
+
+ if ($support_names->isExists($id)) {
+ $agent = $support_names->get($id);
+ $agent->setName($this->postParam("name") ?? tr("helpdesk_agent"));
+ $agent->setNumerate((int) $this->postParam("number") ?? NULL);
+ $agent->setIcon($this->postParam("avatar"));
+ $agent->save();
+ $this->flashFail("succ", "Успех", "Профиль отредактирован.");
+ } else {
+ $agent = new SupportAgent;
+ $agent->setAgent($this->user->identity->getId());
+ $agent->setName($this->postParam("name") ?? tr("helpdesk_agent"));
+ $agent->setNumerate((int) $this->postParam("number") ?? NULL);
+ $agent->setIcon($this->postParam("avatar"));
+ $agent->save();
+ $this->flashFail("succ", "Успех", "Профиль создан. Теперь пользователи видят Ваши псевдоним и аватарку вместо стандартных аватарки и номера.");
+ }
+ }
}
diff --git a/Web/Presenters/TopicsPresenter.php b/Web/Presenters/TopicsPresenter.php
index 6dd1ec6c..e7b08ac3 100644
--- a/Web/Presenters/TopicsPresenter.php
+++ b/Web/Presenters/TopicsPresenter.php
@@ -7,7 +7,8 @@ final class TopicsPresenter extends OpenVKPresenter
{
private $topics;
private $clubs;
-
+ protected $presenterName = "topics";
+
function __construct(Topics $topics, Clubs $clubs)
{
$this->topics = $topics;
@@ -83,6 +84,9 @@ final class TopicsPresenter extends OpenVKPresenter
if($this->postParam("as_group") === "on" && $club->canBeModifiedBy($this->user->identity))
$flags |= 0b10000000;
+ if($_FILES["_vid_attachment"] && OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
+ $this->flashFail("err", tr("error"), "Video uploads are disabled by the system administrator.");
+
$topic = new Topic;
$topic->setGroup($club->getId());
$topic->setOwner($this->user->id);
@@ -104,7 +108,7 @@ final class TopicsPresenter extends OpenVKPresenter
}
if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
- $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"]);
+ $video = Video::fastMake($this->user->id, $_FILES["_vid_attachment"]["name"], $this->postParam("text"), $_FILES["_vid_attachment"]);
}
} catch(ISE $ex) {
$this->flash("err", "Не удалось опубликовать комментарий", "Файл медиаконтента повреждён или слишком велик.");
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index bfda79e8..9cfa3654 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -1,5 +1,6 @@
users = $users;
-
+
parent::__construct();
}
@@ -28,7 +30,7 @@ final class UserPresenter extends OpenVKPresenter
{
$user = $this->users->get($id);
if(!$user || $user->isDeleted()) {
- if($user->isDeactivated()) {
+ if(!is_null($user) && $user->isDeactivated()) {
$this->template->_template = "User/deactivated.xml";
$this->template->user = $user;
@@ -37,6 +39,7 @@ final class UserPresenter extends OpenVKPresenter
}
} else {
$this->template->albums = (new Albums)->getUserAlbums($user);
+ $this->template->avatarAlbum = (new Albums)->getUserAvatarAlbum($user);
$this->template->albumsCount = (new Albums)->getUserAlbumsCount($user);
$this->template->videos = (new Videos)->getByUser($user, 1, 2);
$this->template->videosCount = (new Videos)->getUserVideosCount($user);
@@ -207,6 +210,30 @@ final class UserPresenter extends OpenVKPresenter
$user->setFav_Books(empty($this->postParam("fav_books")) ? NULL : ovk_proc_strtr($this->postParam("fav_books"), 300));
$user->setFav_Quote(empty($this->postParam("fav_quote")) ? NULL : ovk_proc_strtr($this->postParam("fav_quote"), 300));
$user->setAbout(empty($this->postParam("about")) ? NULL : ovk_proc_strtr($this->postParam("about"), 300));
+ } elseif($_GET["act"] === "backdrop") {
+ if($this->postParam("subact") === "remove") {
+ $user->unsetBackDropPictures();
+ $user->save();
+ $this->flashFail("succ", tr("backdrop_succ_rem"), tr("backdrop_succ_desc")); # will exit
+ }
+
+ $pic1 = $pic2 = NULL;
+ try {
+ if($_FILES["backdrop1"]["error"] !== UPLOAD_ERR_NO_FILE)
+ $pic1 = Photo::fastMake($user->getId(), "Profile backdrop (system)", $_FILES["backdrop1"]);
+
+ if($_FILES["backdrop2"]["error"] !== UPLOAD_ERR_NO_FILE)
+ $pic2 = Photo::fastMake($user->getId(), "Profile backdrop (system)", $_FILES["backdrop2"]);
+ } catch(InvalidStateException $e) {
+ $this->flashFail("err", tr("backdrop_error_title"), tr("backdrop_error_no_media"));
+ }
+
+ if($pic1 == $pic2 && is_null($pic1))
+ $this->flashFail("err", tr("backdrop_error_title"), tr("backdrop_error_no_media"));
+
+ $user->setBackDropPictures($pic1, $pic2);
+ $user->save();
+ $this->flashFail("succ", tr("backdrop_succ"), tr("backdrop_succ_desc"));
} elseif($_GET['act'] === "status") {
if(mb_strlen($this->postParam("status")) > 255) {
$statusLength = (string) mb_strlen($this->postParam("status"));
@@ -234,7 +261,7 @@ final class UserPresenter extends OpenVKPresenter
}
$this->template->mode = in_array($this->queryParam("act"), [
- "main", "contacts", "interests", "avatar"
+ "main", "contacts", "interests", "avatar", "backdrop"
]) ? $this->queryParam("act")
: "main";
@@ -275,7 +302,7 @@ final class UserPresenter extends OpenVKPresenter
$this->redirect($user->getURL());
}
- function renderSetAvatar(): void
+ function renderSetAvatar()
{
$this->assertUserLoggedIn();
$this->willExecuteWriteAction();
@@ -295,8 +322,26 @@ final class UserPresenter extends OpenVKPresenter
$album->addPhoto($photo);
$album->setEdited(time());
$album->save();
-
- $this->flashFail("succ", tr("photo_saved"), tr("photo_saved_comment"));
+
+ $flags = 0;
+ $flags |= 0b00010000;
+
+ $post = new Post;
+ $post->setOwner($this->user->id);
+ $post->setWall($this->user->id);
+ $post->setCreated(time());
+ $post->setContent("");
+ $post->setFlags($flags);
+ $post->save();
+ $post->attach($photo);
+ if($this->postParam("ava", true) == (int)1) {
+ $this->returnJson([
+ "url" => $photo->getURL(),
+ "id" => $photo->getPrettyId()
+ ]);
+ } else {
+ $this->flashFail("succ", tr("photo_saved"), tr("photo_saved_comment"));
+ }
}
function renderSettings(): void
diff --git a/Web/Presenters/VKAPIPresenter.php b/Web/Presenters/VKAPIPresenter.php
index a26a25b9..431379c5 100644
--- a/Web/Presenters/VKAPIPresenter.php
+++ b/Web/Presenters/VKAPIPresenter.php
@@ -6,6 +6,7 @@ use openvk\VKAPI\Exceptions\APIErrorException;
use openvk\Web\Models\Entities\{User, APIToken};
use openvk\Web\Models\Repositories\{Users, APITokens};
use lfkeitel\phptotp\{Base32, Totp};
+use WhichBrowser;
final class VKAPIPresenter extends OpenVKPresenter
{
@@ -98,20 +99,21 @@ final class VKAPIPresenter extends OpenVKPresenter
function renderPhotoUpload(string $signature): void
{
- $secret = CHANDLER_ROOT_CONF["security"]["secret"];
- $computedSignature = hash_hmac("sha3-224", $_SERVER["QUERY_STRING"], $secret);
+ $secret = CHANDLER_ROOT_CONF["security"]["secret"];
+ $queryString = rawurldecode($_SERVER["QUERY_STRING"]);
+ $computedSignature = hash_hmac("sha3-224", $queryString, $secret);
if(!(strlen($signature) == 56 && sodium_memcmp($signature, $computedSignature) == 0)) {
header("HTTP/1.1 422 Unprocessable Entity");
exit("Try harder <3");
}
- $data = unpack("vDOMAIN/Z10FIELD/vMF/vMP/PTIME/PUSER/PGROUP", base64_decode($_SERVER["QUERY_STRING"]));
+ $data = unpack("vDOMAIN/Z10FIELD/vMF/vMP/PTIME/PUSER/PGROUP", base64_decode($queryString));
if((time() - $data["TIME"]) > 600) {
header("HTTP/1.1 422 Unprocessable Entity");
exit("Expired");
}
- $folder = __DIR__ . "../../tmp/api-storage/photos";
+ $folder = __DIR__ . "/../../tmp/api-storage/photos";
$maxSize = OPENVK_ROOT_CONF["openvk"]["preferences"]["uploads"]["api"]["maxFileSize"];
$maxFiles = OPENVK_ROOT_CONF["openvk"]["preferences"]["uploads"]["api"]["maxFilesPerDomain"];
$usrFiles = sizeof(glob("$folder/$data[USER]_*.oct"));
@@ -195,19 +197,24 @@ final class VKAPIPresenter extends OpenVKPresenter
$identity = NULL;
} else {
$token = (new APITokens)->getByCode($this->requestParam("access_token"));
- if(!$token)
+ if(!$token) {
$identity = NULL;
- else
+ } else {
$identity = $token->getUser();
+ $platform = $token->getPlatform();
+ }
}
}
+ if(!is_null($identity) && $identity->isBanned())
+ $this->fail(18, "User account is deactivated", $object, $method);
+
$object = ucfirst(strtolower($object));
$handlerClass = "openvk\\VKAPI\\Handlers\\$object";
if(!class_exists($handlerClass))
$this->badMethod($object, $method);
- $handler = new $handlerClass($identity);
+ $handler = new $handlerClass($identity, $platform);
if(!is_callable([$handler, $method]))
$this->badMethod($object, $method);
@@ -274,8 +281,11 @@ final class VKAPIPresenter extends OpenVKPresenter
$this->fail(28, "Invalid 2FA code", "internal", "acquireToken");
}
+ $platform = $this->requestParam("client_name");
+
$token = new APIToken;
$token->setUser($user);
+ $token->setPlatform($platform ?? (new WhichBrowser\Parser(getallheaders()))->toString());
$token->save();
$payload = json_encode([
diff --git a/Web/Presenters/VideosPresenter.php b/Web/Presenters/VideosPresenter.php
index e7b24344..4e4d484a 100644
--- a/Web/Presenters/VideosPresenter.php
+++ b/Web/Presenters/VideosPresenter.php
@@ -8,7 +8,8 @@ final class VideosPresenter extends OpenVKPresenter
{
private $videos;
private $users;
-
+ protected $presenterName = "videos";
+
function __construct(Videos $videos, Users $users)
{
$this->videos = $videos;
@@ -55,6 +56,9 @@ final class VideosPresenter extends OpenVKPresenter
{
$this->assertUserLoggedIn();
$this->willExecuteWriteAction();
+
+ if(OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
+ $this->flashFail("err", tr("error"), "Video uploads are disabled by the system administrator.");
if($_SERVER["REQUEST_METHOD"] === "POST") {
if(!empty($this->postParam("name"))) {
diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
index 55c90518..727101ff 100644
--- a/Web/Presenters/WallPresenter.php
+++ b/Web/Presenters/WallPresenter.php
@@ -1,8 +1,9 @@
get(abs($user));
if(is_null($this->user)) {
$canPost = false;
@@ -65,7 +63,10 @@ final class WallPresenter extends OpenVKPresenter
}
if ($embedded == true) $this->template->_template = "components/wall.xml";
- $this->template->oObj = $owner;
+ $this->template->oObj = $owner;
+ if($user < 0)
+ $this->template->club = $owner;
+
$this->template->owner = $user;
$this->template->canPost = $canPost;
$this->template->count = $this->posts->getPostCountOnUserWall($user);
@@ -88,9 +89,6 @@ final class WallPresenter extends OpenVKPresenter
function renderRSS(int $user): void
{
- if(false)
- exit(tr("forbidden") . ": " . (string) random_int(0, 255));
-
$owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user));
if(is_null($this->user)) {
$canPost = false;
@@ -231,6 +229,9 @@ final class WallPresenter extends OpenVKPresenter
if(!$canPost)
$this->flashFail("err", tr("not_enough_permissions"), tr("not_enough_permissions_comment"));
+ if($_FILES["_vid_attachment"] && OPENVK_ROOT_CONF['openvk']['preferences']['videos']['disableUploading'])
+ $this->flashFail("err", tr("error"), "Video uploads are disabled by the system administrator.");
+
$anon = OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"];
if($wallOwner instanceof Club && $this->postParam("as_group") === "on" && $this->postParam("force_sign") !== "on" && $anon) {
$manager = $wallOwner->getManager($this->user->identity);
@@ -259,16 +260,40 @@ final class WallPresenter extends OpenVKPresenter
$photo = Photo::fastMake($this->user->id, $this->postParam("text"), $_FILES["_pic_attachment"], $album, $anon);
}
- if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK) {
- $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"], $anon);
- }
+ if($_FILES["_vid_attachment"]["error"] === UPLOAD_ERR_OK)
+ $video = Video::fastMake($this->user->id, $_FILES["_vid_attachment"]["name"], $this->postParam("text"), $_FILES["_vid_attachment"], $anon);
} catch(\DomainException $ex) {
$this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted"));
} catch(ISE $ex) {
$this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large"));
}
- if(empty($this->postParam("text")) && !$photo && !$video)
+ try {
+ $poll = NULL;
+ $xml = $this->postParam("poll");
+ if (!is_null($xml) && $xml != "none")
+ $poll = Poll::import($this->user->identity, $xml);
+ } catch(TooMuchOptionsException $e) {
+ $this->flashFail("err", tr("failed_to_publish_post"), tr("poll_err_to_much_options"));
+ } catch(\UnexpectedValueException $e) {
+ $this->flashFail("err", tr("failed_to_publish_post"), "Poll format invalid");
+ }
+
+ $note = NULL;
+
+ if(!is_null($this->postParam("note")) && $this->postParam("note") != "none") {
+ $note = (new Notes)->get((int)$this->postParam("note"));
+
+ if(!$note || $note->isDeleted() || $note->getOwner()->getId() != $this->user->id) {
+ $this->flashFail("err", tr("error"), tr("error_attaching_note"));
+ }
+
+ if($note->getOwner()->getPrivacySetting("notes.read") < 1) {
+ $this->flashFail("err", " ");
+ }
+ }
+
+ if(empty($this->postParam("text")) && !$photo && !$video && !$poll && !$note)
$this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_empty_or_too_big"));
try {
@@ -291,9 +316,24 @@ final class WallPresenter extends OpenVKPresenter
if(!is_null($video))
$post->attach($video);
+ if(!is_null($poll))
+ $post->attach($poll);
+
+ if(!is_null($note))
+ $post->attach($note);
+
if($wall > 0 && $wall !== $this->user->identity->getId())
(new WallPostNotification($wallOwner, $post, $this->user->identity))->emit();
+ $excludeMentions = [$this->user->identity->getId()];
+ if($wall > 0)
+ $excludeMentions[] = $wall;
+
+ $mentions = iterator_to_array($post->resolveMentions($excludeMentions));
+ foreach($mentions as $mentionee)
+ if($mentionee instanceof User)
+ (new MentionNotification($mentionee, $post, $post->getOwner(), strip_tags($post->getText())))->emit();
+
$this->redirect($wallOwner->getURL());
}
@@ -343,21 +383,52 @@ final class WallPresenter extends OpenVKPresenter
$this->assertNoCSRF();
$post = $this->posts->getPostById($wall, $post_id);
- if(!$post || $post->isDeleted()) $this->notFound();
+
+ if(!$post || $post->isDeleted())
+ $this->notFound();
+ $where = $this->postParam("type") ?? "wall";
+ $groupId = NULL;
+ $flags = 0;
+
+ if($where == "group")
+ $groupId = $this->postParam("groupId");
+
if(!is_null($this->user)) {
$nPost = new Post;
- $nPost->setOwner($this->user->id);
- $nPost->setWall($this->user->id);
+
+ if($where == "wall") {
+ $nPost->setOwner($this->user->id);
+ $nPost->setWall($this->user->id);
+ } elseif($where == "group") {
+ $nPost->setOwner($this->user->id);
+ $club = (new Clubs)->get((int)$groupId);
+
+ if(!$club || !$club->canBeModifiedBy($this->user->identity))
+ $this->notFound();
+
+ if($this->postParam("asGroup") == 1)
+ $flags |= 0b10000000;
+
+ if($this->postParam("signed") == 1)
+ $flags |= 0b01000000;
+
+ $nPost->setWall($groupId * -1);
+ }
+
$nPost->setContent($this->postParam("text"));
+ $nPost->setFlags($flags);
$nPost->save();
+
$nPost->attach($post);
if($post->getOwner(false)->getId() !== $this->user->identity->getId() && !($post->getOwner() instanceof Club))
(new RepostNotification($post->getOwner(false), $post, $this->user->identity))->emit();
};
-
- $this->returnJson(["wall_owner" => $this->user->identity->getId()]);
+
+ $this->returnJson([
+ "wall_owner" => $where == "wall" ? $this->user->identity->getId() : $groupId * -1
+ ]);
}
function renderDelete(int $wall, int $post_id): void
diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index 2c8c9e63..047050ad 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -17,62 +17,19 @@
{script "js/l10n.js"}
{script "js/openvk.cls.js"}
+ {css "js/node_modules/tippy.js/dist/backdrop.css"}
+ {css "js/node_modules/tippy.js/dist/border.css"}
+ {css "js/node_modules/tippy.js/dist/svg-arrow.css"}
+ {css "js/node_modules/tippy.js/themes/light.css"}
+ {script "js/node_modules/@popperjs/core/dist/umd/popper.min.js"}
+ {script "js/node_modules/tippy.js/dist/tippy-bundle.umd.min.js"}
+ {script "js/node_modules/handlebars/dist/handlebars.min.js"}
+
{if $isTimezoned == NULL}
{script "js/timezone.js"}
{/if}
- {ifset $thisUser}
- {if $thisUser->getNsfwTolerance() < 2}
- {css "css/nsfw-posts.css"}
- {/if}
-
- {if $theme !== NULL}
- {if $theme->inheritDefault()}
- {css "css/style.css"}
- {css "css/dialog.css"}
- {css "css/notifications.css"}
-
- {if $isXmas}
- {css "css/xmas.css"}
- {/if}
- {/if}
-
-
-
- {if $isXmas}
-
- {/if}
- {else}
- {css "css/style.css"}
- {css "css/dialog.css"}
- {css "css/notifications.css"}
-
- {if $isXmas}
- {css "css/xmas.css"}
- {/if}
- {/if}
-
- {if $thisUser->getStyleAvatar() == 1}
- {css "css/avatar.1.css"}
- {/if}
-
- {if $thisUser->getStyleAvatar() == 2}
- {css "css/avatar.2.css"}
- {/if}
-
- {if $thisUser->hasMicroblogEnabled() == 1}
- {css "css/microblog.css"}
- {/if}
- {else}
- {css "css/style.css"}
- {css "css/dialog.css"}
- {css "css/nsfw-posts.css"}
- {css "css/notifications.css"}
-
- {if $isXmas}
- {css "css/xmas.css"}
- {/if}
- {/ifset}
+ {include "_includeCSS.xml"}
{ifset headIncludes}
{include headIncludes}
@@ -92,6 +49,34 @@
+
+ {_close}
+
+
+
+
+
+ {_aw_legacy_ui}
+
+
+
+
+
+
+
+
+ {if isset($backdrops) && !is_null($backdrops)}
+
+
+
+ {/if}
+
⬆ {_to_top}
@@ -107,28 +92,66 @@
{_header_log_out}
{else}
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+ {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")}
+
+
+ {if !$atSearch}
+
+
+
+
+
+
+
+ {else}
+
+
+ {/if}
{/if}
{else}
@@ -182,7 +205,7 @@
{var $menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')}
{_admin}
- Helpdesk
+ {_helpdesk}
{if $helpdeskTicketNotAnsweredCount > 0}
({$helpdeskTicketNotAnsweredCount})
{/if}
@@ -210,7 +233,7 @@