Compare commits

..

2 commits

Author SHA1 Message Date
mrilyew
b9687b1fb2 fix(api): do not go online on every call 2024-11-19 16:39:05 +03:00
mrilyew
4046c992f9 feat(news): add rss param for newsfeed.getGlobal 2024-11-19 16:31:17 +03:00
5 changed files with 104 additions and 11 deletions

View file

@ -48,7 +48,7 @@ final class Newsfeed extends VKAPIRequestHandler
return $response;
}
function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0)
function getGlobal(string $fields = "", int $start_from = 0, int $start_time = 0, int $end_time = 0, int $offset = 0, int $count = 30, int $extended = 0, int $rss = 0)
{
$this->requireUser();
@ -74,6 +74,25 @@ final class Newsfeed extends VKAPIRequestHandler
$rposts = [];
$ids = [];
if($rss == 1) {
$channel = new \Bhaktaraz\RSSGenerator\Channel();
$channel->title("Global Feed — " . OPENVK_ROOT_CONF['openvk']['appearance']['name'])
->description('OVK Global feed')
->url(ovk_scheme(true) . $_SERVER["HTTP_HOST"] . "/feed/all");
foreach($posts as $item) {
$post = (new PostsRepo)->get($item->id);
if(!$post || $post->isDeleted()) {
continue;
}
$output = $post->toRss();
$output->appendTo($channel);
}
return $channel;
}
foreach($posts as $post) {
$rposts[] = (new PostsRepo)->get($post->id)->getPrettyId();
$ids[] = $post->id;

View file

@ -20,7 +20,7 @@ use openvk\Web\Models\Repositories\Audios as AudiosRepo;
final class Wall extends VKAPIRequestHandler
{
function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 30, int $extended = 0, string $filter = "all"): object
function get(int $owner_id, string $domain = "", int $offset = 0, int $count = 30, int $extended = 0, string $filter = "all", int $rss = 0): object
{
$this->requireUser();
@ -86,6 +86,8 @@ final class Wall extends VKAPIRequestHandler
break;
}
$iteratorv = iterator_to_array($iteratorv);
foreach($iteratorv as $post) {
$from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId();
@ -217,6 +219,20 @@ final class Wall extends VKAPIRequestHandler
$attachments = NULL; # free attachments so it will not clone everythingg
}
if($rss == 1) {
$channel = new \Bhaktaraz\RSSGenerator\Channel();
$channel->title($wallOnwer->getCanonicalName() . "" . OPENVK_ROOT_CONF['openvk']['appearance']['name'])
->description('Wall of ' . $wallOnwer->getCanonicalName())
->url(ovk_scheme(true) . $_SERVER["HTTP_HOST"] . "/wall" . $wallOnwer->getRealId());
foreach($iteratorv as $item) {
$output = $item->toRss();
$output->appendTo($channel);
}
return $channel;
}
if($extended == 1) {
$profiles = array_unique($profiles);
$groups = array_unique($groups);

View file

@ -374,5 +374,46 @@ class Post extends Postable
return $user->getId() == $this->getOwner(false)->getId();
}
function toRss(): \Bhaktaraz\RSSGenerator\Item
{
$domain = ovk_scheme(true).$_SERVER["HTTP_HOST"];
$description = $this->getText(false);
$description_html = $description;
$url = $domain."/wall".$this->getPrettyId();
$author = $this->getOwner();
$author_name = htmlspecialchars($author->getCanonicalName(), ENT_DISALLOWED | ENT_XHTML);
if($this->isExplicit())
$description_html .= "<br /><b>".tr('contains_nsfw').".</b><br />";
foreach($this->getChildren() as $child) {
if($child instanceof Photo) {
$child_page = $domain.$child->getPageURL();
$child_url = $child->getURLBySizeId('large');
$description_html .= "<br /><a href='$child_page'><img src='$child_url'></a>";
} elseif($child instanceof Video) {
$child_page = $domain.'/video'.$child->getPrettyId();
$description_html .= "<br /><a href='$child_page'>Video</a>";
} elseif($child instanceof Audio) {
$description_html .= "<br />Audio";
}
}
$description_html .= "<br />".tr('author').": <img width='15px' src='".$author->getAvatarURL()."'><a href='".$author->getURL()."'>" . $author_name . "</a>";
if($this->hasSource()) {
$description_html .= "<br />".tr('source').": ".htmlspecialchars($this->getSource(), ENT_DISALLOWED | ENT_XHTML);
}
$item = new \Bhaktaraz\RSSGenerator\Item();
$item->title(str_replace("\n", "", ovk_proc_strtr($description, 79)))
->url($url)
->guid($url)
->creator($author_name)
->pubDate($this->getPublicationTime()->timestamp())
->content(str_replace("\n", "<br />", $description_html));
return $item;
}
use Traits\TRichText;
}

View file

@ -256,7 +256,7 @@ abstract class OpenVKPresenter extends SimplePresenter
$userValidated = 1;
$cacheTime = 0; # Force no cache
if($this->user->identity->onlineStatus() == 0 && !($this->user->identity->isDeleted() || $this->user->identity->isBanned())) {
if(!property_exists($this, 'silent') && $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(false);

View file

@ -10,6 +10,7 @@ use WhichBrowser;
final class VKAPIPresenter extends OpenVKPresenter
{
protected $silent = true;
private function logRequest(string $object, string $method): void
{
$date = date(DATE_COOKIE);
@ -222,9 +223,13 @@ final class VKAPIPresenter extends OpenVKPresenter
if(!is_callable([$handler, $method]))
$this->badMethod($object, $method);
$has_rss = false;
$route = new \ReflectionMethod($handler, $method);
$params = [];
foreach($route->getParameters() as $parameter) {
if($parameter->getName() == 'rss')
$has_rss = true;
$val = $this->requestParam($parameter->getName());
if(is_null($val)) {
if($parameter->allowsNull())
@ -260,6 +265,16 @@ final class VKAPIPresenter extends OpenVKPresenter
$this->fail($ex->getCode(), $ex->getMessage(), $object, $method);
}
$result = NULL;
if($this->queryParam("rss") == '1' && $has_rss) {
$feed = new \Bhaktaraz\RSSGenerator\Feed();
$res->appendTo($feed);
$result = strval($feed);
header("Content-Type: application/rss+xml;charset=UTF-8");
} else {
$result = json_encode([
"response" => $res,
]);
@ -267,8 +282,10 @@ final class VKAPIPresenter extends OpenVKPresenter
if($callback) {
$result = $callback . '(' . $result . ')';
header('Content-Type: application/javascript');
} else
} else {
header("Content-Type: application/json");
}
}
$size = strlen($result);
header("Content-Length: $size");