-{$views} views
+
{$views} views
Hashtags: {$hastags_str}
EOD;
$this->items[] = $item;
@@ -87,10 +92,25 @@ public function getName()
private function processUsername()
{
- if (substr($this->getInput('username'), 0, 1) !== '@') {
- return '@' . $this->getInput('username');
+ $username = trim($this->getInput('username'));
+ if (preg_match('#^https?://www\.tiktok\.com/@(.*)$#', $username, $m)) {
+ return '@' . $m[1];
+ }
+ if (substr($username, 0, 1) !== '@') {
+ return '@' . $username;
}
+ return $username;
+ }
- return $this->getInput('username');
+ public function detectParameters($url)
+ {
+ if (preg_match('/tiktok\.com\/(@[\w]+)/', $url, $matches) > 0) {
+ return [
+ 'context' => 'By user',
+ 'username' => $matches[1]
+ ];
+ }
+
+ return null;
}
}
diff --git a/bridges/TldrTechBridge.php b/bridges/TldrTechBridge.php
index ba7ebf6e87c..7d8febe1c40 100644
--- a/bridges/TldrTechBridge.php
+++ b/bridges/TldrTechBridge.php
@@ -23,7 +23,9 @@ class TldrTechBridge extends BridgeAbstract
'values' => [
'Tech' => 'tech',
'Crypto' => 'crypto',
- 'AI' => 'ai'
+ 'AI' => 'ai',
+ 'Web Dev' => 'engineering',
+ 'Founders' => 'founders'
],
'defaultValue' => 'tech'
]
diff --git a/bridges/TraktBridge.php b/bridges/TraktBridge.php
new file mode 100644
index 00000000000..7aa90dfd81b
--- /dev/null
+++ b/bridges/TraktBridge.php
@@ -0,0 +1,70 @@
+ [
+ 'name' => 'username',
+ 'required' => true
+ ],
+ 'hide_shows' => [
+ 'name' => 'Hide shows',
+ 'type' => 'checkbox',
+ 'title' => 'Hide shows',
+ ],
+
+ ],
+ ];
+
+ public function detectParameters($url)
+ {
+ if (preg_match('/trakt\.tv\/users\/(.*?)\//', $url, $matches) > 0) {
+ return [
+ 'username' => $matches[1]
+ ];
+ }
+ return null;
+ }
+
+ public function collectData()
+ {
+ $username = $this->getInput('username');
+ $dom = getSimpleHTMLDOMCached(self::URI . '/users/' . $username . '/history');
+ $this->feedName = $dom->find('#avatar-wrapper h1 a', 0)->plaintext;
+ $this->iconURL = $dom->find('img.avatar', 0)->{'src'};
+
+ foreach ($dom->find('#history-items .posters', 0)->find('div.grid-item') as $div) {
+ if ($this->getInput('hide_shows') && $div->{'data-type'} != 'movie') {
+ continue;
+ }
+ $item = [];
+ $item['author'] = $this->feedName;
+ $item['title'] = $div->find('img.real', 0)->{'title'};
+ $item['timestamp'] = $div->find('.format-date', 0)->plaintext;
+ $item['content'] = '->{'data-original'} . ')
';
+ $item['uri'] = self::URI . $div->{'data-url'};
+ $this->items[] = $item;
+ }
+ }
+ public function getName()
+ {
+ if (empty($this->feedName)) {
+ return parent::getName();
+ } else {
+ return $this->feedName;
+ }
+ }
+ public function getIcon()
+ {
+ if (empty($this->iconURL)) {
+ return parent::getIcon();
+ } else {
+ return $this->iconURL;
+ }
+ }
+}
diff --git a/bridges/TwitchBridge.php b/bridges/TwitchBridge.php
index b8ff1c404a3..8976174afb8 100644
--- a/bridges/TwitchBridge.php
+++ b/bridges/TwitchBridge.php
@@ -223,10 +223,10 @@ private function apiRequest($query, $variables)
CURLOPT_POSTFIELDS => json_encode($request)
];
- Debug::log("Sending GraphQL query:\n" . $query);
- Debug::log("Sending GraphQL variables:\n" . json_encode($variables, JSON_PRETTY_PRINT));
+ Logger::debug("Sending GraphQL query:\n" . $query);
+ Logger::debug("Sending GraphQL variables:\n" . json_encode($variables, JSON_PRETTY_PRINT));
$response = json_decode(getContents('https://gql.twitch.tv/gql', $header, $opts));
- Debug::log("Got GraphQL response:\n" . json_encode($response, JSON_PRETTY_PRINT));
+ Logger::debug("Got GraphQL response:\n" . json_encode($response, JSON_PRETTY_PRINT));
if (isset($response->errors)) {
$messages = array_column($response->errors, 'message');
diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
index a467f61bded..1ba00c669f3 100644
--- a/bridges/TwitterBridge.php
+++ b/bridges/TwitterBridge.php
@@ -7,7 +7,7 @@ class TwitterBridge extends BridgeAbstract
const API_URI = 'https://api.twitter.com';
const GUEST_TOKEN_USES = 100;
const GUEST_TOKEN_EXPIRY = 10800; // 3hrs
- const CACHE_TIMEOUT = 300; // 5min
+ const CACHE_TIMEOUT = 60 * 15; // 15min
const DESCRIPTION = 'returns tweets';
const MAINTAINER = 'arnd-s';
const PARAMETERS = [
@@ -124,6 +124,7 @@ class TwitterBridge extends BridgeAbstract
private $apiKey = null;
private $guestToken = null;
private $authHeaders = [];
+ private ?string $feedIconUrl = null;
public function detectParameters($url)
{
@@ -209,6 +210,16 @@ public function getURI()
}
}
+ private function getFullText($id)
+ {
+ $url = sprintf(
+ 'https://cdn.syndication.twimg.com/tweet-result?id=%s&lang=en',
+ $id
+ );
+
+ return json_decode(getContents($url), false);
+ }
+
public function collectData()
{
// $data will contain an array of all found tweets (unfiltered)
@@ -219,18 +230,11 @@ public function collectData()
$tweets = [];
// Get authentication information
-
+ $cache = RssBridge::getCache();
+ $api = new TwitterClient($cache);
// Try to get all tweets
switch ($this->queriedContext) {
case 'By username':
- $cacheFactory = new CacheFactory();
- $cache = $cacheFactory->create();
-
- $cache->setScope('twitter');
- $cache->setKey(['cache']);
- $cache->purgeCache(60 * 60 * 3); // 3h
- $api = new TwitterClient($cache);
-
$screenName = $this->getInput('u');
$screenName = trim($screenName);
$screenName = ltrim($screenName, '@');
@@ -242,35 +246,45 @@ public function collectData()
case 'By keyword or hashtag':
// Does not work with the recent twitter changes
$params = [
- 'q' => urlencode($this->getInput('q')),
- 'tweet_mode' => 'extended',
- 'tweet_search_mode' => 'live',
+ 'q' => urlencode($this->getInput('q')),
+ 'tweet_mode' => 'extended',
+ 'tweet_search_mode' => 'live',
];
- $data = $this->makeApiCall('/1.1/search/tweets.json', $params)->statuses;
+ $tweets = $api->search($params)->statuses;
+ $data = (object) [
+ 'tweets' => $tweets
+ ];
break;
case 'By list':
// Does not work with the recent twitter changes
- $params = [
- 'slug' => strtolower($this->getInput('list')),
- 'owner_screen_name' => strtolower($this->getInput('user')),
- 'tweet_mode' => 'extended',
+ // $params = [
+ // 'slug' => strtolower($this->getInput('list')),
+ // 'owner_screen_name' => strtolower($this->getInput('user')),
+ // 'tweet_mode' => 'extended',
+ // ];
+ $query = [
+ 'screenName' => strtolower($this->getInput('user')),
+ 'listSlug' => strtolower($this->getInput('list'))
];
- $data = $this->makeApiCall('/1.1/lists/statuses.json', $params);
+ $data = $api->fetchListTweets($query, $this->queriedContext);
break;
case 'By list ID':
// Does not work with the recent twitter changes
- $params = [
- 'list_id' => $this->getInput('listid'),
- 'tweet_mode' => 'extended',
+ // $params = [
+ // 'list_id' => $this->getInput('listid'),
+ // 'tweet_mode' => 'extended',
+ // ];
+
+ $query = [
+ 'listId' => $this->getInput('listid')
];
- $data = $this->makeApiCall('/1.1/lists/statuses.json', $params);
+ $data = $api->fetchListTweets($query, $this->queriedContext);
break;
-
default:
returnServerError('Invalid query context !');
}
@@ -314,6 +328,11 @@ public function collectData()
}
}
+ if ($this->queriedContext === 'By username') {
+ $this->feedIconUrl = $data->user_info->legacy->profile_image_url_https ?? null;
+ }
+
+ $i = 0;
foreach ($tweets as $tweet) {
// Skip own Retweets...
if (isset($tweet->retweeted_status) && $tweet->retweeted_status->user->id_str === $tweet->user->id_str) {
@@ -325,14 +344,6 @@ public function collectData()
continue;
}
- switch ($this->queriedContext) {
- case 'By username':
- if ($this->getInput('norep') && isset($tweet->in_reply_to_status_id)) {
- continue 2;
- }
- break;
- }
-
$item = [];
$realtweet = $tweet;
@@ -341,11 +352,40 @@ public function collectData()
$realtweet = $tweet->retweeted_status;
}
- $item['username'] = $data->user_info->legacy->screen_name;
- $item['fullname'] = $data->user_info->legacy->name;
- $item['avatar'] = $data->user_info->legacy->profile_image_url_https;
+ if (isset($realtweet->truncated) && $realtweet->truncated) {
+ try {
+ $realtweet = $this->getFullText($realtweet->id_str);
+ } catch (HttpException $e) {
+ $realtweet = $tweet;
+ }
+ }
+
+ switch ($this->queriedContext) {
+ case 'By username':
+ if ($this->getInput('norep') && isset($tweet->in_reply_to_status_id)) {
+ continue 2;
+ }
+ $item['username'] = $data->user_info->legacy->screen_name;
+ $item['fullname'] = $data->user_info->legacy->name;
+ $item['avatar'] = $data->user_info->legacy->profile_image_url_https;
+ $item['id'] = $realtweet->id_str;
+ break;
+ case 'By list':
+ case 'By list ID':
+ $item['username'] = $data->userIds[$i]->legacy->screen_name;
+ $item['fullname'] = $data->userIds[$i]->legacy->name;
+ $item['avatar'] = $data->userIds[$i]->legacy->profile_image_url_https;
+ $item['id'] = $realtweet->conversation_id_str;
+ break;
+ case 'By keyword or hashtag':
+ $item['username'] = $realtweet->user->screen_name;
+ $item['fullname'] = $realtweet->user->name;
+ $item['avatar'] = $realtweet->user->profile_image_url_https;
+ $item['id'] = $realtweet->id_str;
+ break;
+ }
+
$item['timestamp'] = $realtweet->created_at;
- $item['id'] = $realtweet->id_str;
$item['uri'] = self::URI . $item['username'] . '/status/' . $item['id'];
$item['author'] = (isset($tweet->retweeted_status) ? 'RT: ' : '')
. $item['fullname']
@@ -353,7 +393,11 @@ public function collectData()
. $item['username'] . ')';
// Convert plain text URLs into HTML hyperlinks
- $fulltext = $realtweet->full_text;
+ if (isset($realtweet->full_text)) {
+ $fulltext = $realtweet->full_text;
+ } else {
+ $fulltext = $realtweet->text;
+ }
$cleanedTweet = $fulltext;
$foundUrls = false;
@@ -385,7 +429,7 @@ public function collectData()
if ($foundUrls === false) {
// fallback to regex'es
$reg_ex = '/(http|https|ftp|ftps)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/';
- if (preg_match($reg_ex, $realtweet->full_text, $url)) {
+ if (preg_match($reg_ex, $fulltext, $url)) {
$cleanedTweet = preg_replace(
$reg_ex,
"{$url[0]} ",
@@ -410,10 +454,17 @@ public function collectData()
EOD;
}
+ $medias = [];
+ if (isset($realtweet->extended_entities->media)) {
+ $medias = $realtweet->extended_entities->media;
+ } else if (isset($realtweet->mediaDetails)) {
+ $medias = $realtweet->mediaDetails;
+ }
+
// Get images
$media_html = '';
- if (isset($realtweet->extended_entities->media) && !$this->getInput('noimg')) {
- foreach ($realtweet->extended_entities->media as $media) {
+ if (!$this->getInput('noimg')) {
+ foreach ($medias as $media) {
switch ($media->type) {
case 'photo':
$image = $media->media_url_https . '?name=orig';
@@ -496,12 +547,18 @@ public function collectData()
EOD;
// put out
+ $i++;
$this->items[] = $item;
}
usort($this->items, ['TwitterBridge', 'compareTweetId']);
}
+ public function getIcon()
+ {
+ return $this->feedIconUrl ?? parent::getIcon();
+ }
+
private static function compareTweetId($tweet1, $tweet2)
{
return (intval($tweet1['id']) < intval($tweet2['id']) ? 1 : -1);
@@ -511,9 +568,7 @@ private static function compareTweetId($tweet1, $tweet2)
//This function takes 2 requests, and therefore is cached
private function getApiKey($forceNew = 0)
{
- $cacheFactory = new CacheFactory();
-
- $r_cache = $cacheFactory->create();
+ $r_cache = RssBridge::getCache();
$scope = 'TwitterBridge';
$r_cache->setScope($scope);
$r_cache->setKey(['refresh']);
@@ -529,7 +584,7 @@ private function getApiKey($forceNew = 0)
$cacheFactory = new CacheFactory();
- $cache = $cacheFactory->create();
+ $cache = RssBridge::getCache();
$cache->setScope($scope);
$cache->setKey(['api_key']);
$data = $cache->loadData();
@@ -564,9 +619,7 @@ private function getApiKey($forceNew = 0)
$apiKey = $data;
}
- $cacheFac2 = new CacheFactory();
-
- $gt_cache = $cacheFactory->create();
+ $gt_cache = RssBridge::getCache();
$gt_cache->setScope($scope);
$gt_cache->setKey(['guest_token']);
$guestTokenUses = $gt_cache->loadData();
diff --git a/bridges/UsesTechBridge.php b/bridges/UsesTechBridge.php
new file mode 100644
index 00000000000..653d83dc71f
--- /dev/null
+++ b/bridges/UsesTechBridge.php
@@ -0,0 +1,30 @@
+find('div[class=PersonInner]') as $index => $a) {
+ $item = []; // Create an empty item
+ $articlePath = $a->find('a[class=displayLink]', 0)->href;
+ $item['title'] = $a->find('img', 0)->getAttribute('alt');
+ $item['author'] = $a->find('img', 0)->getAttribute('alt');
+ $item['uri'] = $articlePath;
+ $item['content'] = $a->find('p', 0)->innertext;
+
+ $this->items[] = $item; // Add item to the list
+ if (count($this->items) >= self::MAX_ITEM) {
+ break;
+ }
+ }
+ }
+}
diff --git a/bridges/VideoCardzBridge.php b/bridges/VideoCardzBridge.php
new file mode 100644
index 00000000000..84796c203fa
--- /dev/null
+++ b/bridges/VideoCardzBridge.php
@@ -0,0 +1,76 @@
+ [
+ 'name' => 'News Feed',
+ 'type' => 'list',
+ 'title' => 'Feeds from VideoCardz.com',
+ 'values' => [
+ 'News' => 'sections/news',
+ 'Featured' => 'sections/featured',
+ 'Leaks' => 'sections/leaks',
+ 'Press Releases' => 'sections/press-releases',
+ 'Preview Roundup' => 'sections/review-roundup',
+ 'Rumour' => 'sections/rumor',
+ ]
+ ]
+ ]
+ ];
+
+ public function getIcon()
+ {
+ return 'https://videocardz.com/favicon-32x32.png?x66580';
+ }
+
+ public function getName()
+ {
+ return !is_null($this->getKey('feed')) ? self::NAME . ' | ' . $this->getKey('feed') : self::NAME;
+ }
+
+ public function getURI()
+ {
+ return self::URI . $this->getInput('feed');
+ }
+
+ public function collectData()
+ {
+ $url = sprintf('https://videocardz.com/%s', $this->getInput('feed'));
+ $dom = getSimpleHTMLDOM($url);
+ $dom = $dom->find('.subcategory-news', 0);
+ if (!$dom) {
+ throw new \Exception(sprintf('Unable to find css selector on `%s`', $url));
+ }
+ $dom = defaultLinkTo($dom, $this->getURI());
+
+ foreach ($dom->find('article') as $article) {
+ $title = preg_replace('/\(PR\) /i', '', $article->find('h2', 0)->plaintext);
+ //Get thumbnail
+ $image = $article->style;
+ $image = preg_replace('/background-image:url\(/i', '', $image);
+ $image = substr_replace($image, '', -3);
+ //Get date and time of publishing
+ $datetime = date_parse($article->find('.main-index-article-datetitle-date > a', 0)->plaintext);
+ $year = $datetime['year'];
+ $month = $datetime['month'];
+ $day = $datetime['day'];
+ $hour = $datetime['hour'];
+ $minute = $datetime['minute'];
+ $timestamp = mktime($hour, $minute, 0, $month, $day, $year);
+ $content = '
';
+ $this->items[] = [
+ 'title' => $title,
+ 'uri' => $article->find('p.main-index-article-datetitle-date > a', 0)->href,
+ 'content' => $content,
+ 'timestamp' => $timestamp,
+ ];
+ }
+ }
+}
diff --git a/bridges/VkBridge.php b/bridges/VkBridge.php
index 0b00fca7bf9..967734ef7bd 100644
--- a/bridges/VkBridge.php
+++ b/bridges/VkBridge.php
@@ -311,6 +311,44 @@ public function collectData()
$copy_quote->outertext = "
Reposted ($copy_quote_author):
$copy_quote_content";
}
+ foreach ($post->find('.SecondaryAttachment') as $sa) {
+ $sa_href = $sa->getAttribute('href');
+ if (!$sa_href) {
+ $sa_href = '';
+ }
+ $sa_task_click = $sa->getAttribute('data-task-click');
+
+ if (str_starts_with($sa_href, 'https://vk.com/doc')) {
+ // document
+ $doc_title = $sa->find('.SecondaryAttachment__childrenText', 0)->innertext;
+ $doc_size = $sa->find('.SecondaryAttachmentSubhead', 0)->innertext;
+ $doc_link = $sa_href;
+ $content_suffix .= "
Doc: $doc_title ($doc_size)";
+ $sa->outertext = '';
+ } else if (str_starts_with($sa_href, 'https://vk.com/@')) {
+ // article
+ $article_title = $sa->find('.SecondaryAttachment__childrenText', 0)->innertext;
+ $article_author = explode('Article · from ', $sa->find('.SecondaryAttachmentSubhead', 0)->innertext)[1];
+ $article_link = $sa_href;
+ $content_suffix .= "
Article: $article_title ($article_author)";
+ $sa->outertext = '';
+ } else if ($sa_task_click == 'SecondaryAttachment/playAudio') {
+ // audio
+ $audio_json = json_decode(html_entity_decode($sa->getAttribute('data-audio')));
+ $audio_link = $audio_json->url;
+ $audio_title = $sa->find('.SecondaryAttachment__childrenText', 0)->innertext;
+ $audio_author = $sa->find('.SecondaryAttachmentSubhead', 0)->innertext;
+ $content_suffix .= "
Audio: $audio_title ($audio_author)";
+ $sa->outertext = '';
+ } else if ($sa_task_click == 'SecondaryAttachment/playPlaylist') {
+ // playlist link
+ $playlist_title = $sa->find('.SecondaryAttachment__childrenText', 0)->innertext;
+ $playlist_link = $sa->find('.SecondaryAttachment__link', 0)->getAttribute('href');
+ $content_suffix .= "
Playlist: $playlist_title";
+ $sa->outertext = '';
+ }
+ }
+
$item = [];
$content = strip_tags(backgroundToImg($post->find('div.wall_text', 0)->innertext), '
![]()
');
$content .= $content_suffix;
@@ -410,7 +448,9 @@ private function getPhoto($a)
private function getTitle($content)
{
- preg_match('/^["\w\ \p{L}\(\)\?#«»-]+/mu', htmlspecialchars_decode($content), $result);
+ $content = explode('
', $content)[0];
+ $content = strip_tags($content);
+ preg_match('/^[:,"\w\ \p{L}\(\)\?#«»-]+/mu', htmlspecialchars_decode($content), $result);
if (count($result) == 0) {
return 'untitled';
}
@@ -450,18 +490,22 @@ private function getTime($post)
private function getContents()
{
- $header = ['Accept-language: en', 'Cookie: remixlang=3'];
+ $httpHeaders = [
+ 'Accept-language: en',
+ 'Cookie: remixlang=3',
+ ];
$redirects = 0;
$uri = $this->getURI();
while ($redirects < 2) {
- $response = getContents($uri, $header, [CURLOPT_FOLLOWLOCATION => false], true);
+ $response = getContents($uri, $httpHeaders, [CURLOPT_FOLLOWLOCATION => false], true);
if (in_array($response['code'], [200, 304])) {
return $response['content'];
}
- $uri = urljoin(self::URI, $response['header']['location'][0]);
+ $headers = $response['headers'];
+ $uri = urljoin(self::URI, $headers['location'][0]);
if (str_contains($uri, '/429.html')) {
returnServerError('VK responded "Too many requests"');
diff --git a/bridges/WYMTNewsBridge.php b/bridges/WYMTNewsBridge.php
new file mode 100644
index 00000000000..c19d6e25c72
--- /dev/null
+++ b/bridges/WYMTNewsBridge.php
@@ -0,0 +1,27 @@
+find('.card-body');
+
+ foreach ($articles as $article) {
+ $item = [];
+ $url = $article->find('.headline a', 0);
+ $item['uri'] = $url->href;
+ $item['title'] = trim($url->plaintext);
+ $item['author'] = $article->find('.author', 0)->plaintext;
+ $item['content'] = $article->find('.deck', 0)->plaintext;
+ $this->items[] = $item;
+ }
+ }
+}
diff --git a/bridges/YandexZenBridge.php b/bridges/YandexZenBridge.php
index 4232f2d0a6d..ee1ff506f6c 100644
--- a/bridges/YandexZenBridge.php
+++ b/bridges/YandexZenBridge.php
@@ -39,8 +39,13 @@ public function collectData()
$item['uri'] = $post->share_link;
$item['title'] = $post->title;
- $item['timestamp'] = date(DateTimeInterface::ATOM, $post->publication_date);
- $item['content'] = $post->text;
+
+ $publicationDateUnixTimestamp = $post->publication_date ?? null;
+ if ($publicationDateUnixTimestamp) {
+ $item['timestamp'] = date(DateTimeInterface::ATOM, $publicationDateUnixTimestamp);
+ }
+
+ $item['content'] = $post->text . "
";
$item['enclosures'] = [
$post->image,
];
diff --git a/bridges/YouTubeCommunityTabBridge.php b/bridges/YouTubeCommunityTabBridge.php
index c44e9557311..20822828b0d 100644
--- a/bridges/YouTubeCommunityTabBridge.php
+++ b/bridges/YouTubeCommunityTabBridge.php
@@ -78,21 +78,29 @@ public function collectData()
returnServerError('Channel does not have a community tab');
}
- foreach ($this->getCommunityPosts($json) as $post) {
+ $posts = $this->getCommunityPosts($json);
+ foreach ($posts as $key => $post) {
$this->itemTitle = '';
if (!isset($post->backstagePostThreadRenderer)) {
continue;
}
- $details = $post->backstagePostThreadRenderer->post->backstagePostRenderer;
+ if (isset($post->backstagePostThreadRenderer->post->backstagePostRenderer)) {
+ $details = $post->backstagePostThreadRenderer->post->backstagePostRenderer;
+ } elseif (isset($post->backstagePostThreadRenderer->post->sharedPostRenderer)) {
+ // todo: properly extract data from this shared post
+ $details = $post->backstagePostThreadRenderer->post->sharedPostRenderer;
+ } else {
+ continue;
+ }
$item = [];
$item['uri'] = self::URI . '/post/' . $details->postId;
- $item['author'] = $details->authorText->runs[0]->text;
- $item['content'] = '';
+ $item['author'] = $details->authorText->runs[0]->text ?? null;
+ $item['content'] = $item['uri'];
- if (isset($details->contentText)) {
+ if (isset($details->contentText->runs)) {
$text = $this->getText($details->contentText->runs);
$this->itemTitle = $this->ellipsisTitle($text);
@@ -102,14 +110,20 @@ public function collectData()
$item['content'] .= $this->getAttachments($details);
$item['title'] = $this->itemTitle;
+ $date = strtotime(str_replace(' (edited)', '', $details->publishedTimeText->runs[0]->text));
+ if (is_int($date)) {
+ // subtract an increasing multiple of 60 seconds to always preserve the original order
+ $item['timestamp'] = $date - $key * 60;
+ }
+
$this->items[] = $item;
}
}
public function getURI()
{
- if (!empty($this->feedUri)) {
- return $this->feedUri;
+ if (!empty($this->feedUrl)) {
+ return $this->feedUrl;
}
return parent::getURI();
diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 95f4f01791e..54a38d987cb 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -13,7 +13,6 @@ class YoutubeBridge extends BridgeAbstract
const URI = 'https://www.youtube.com/';
const CACHE_TIMEOUT = 10800; // 3h
const DESCRIPTION = 'Returns the 10 newest videos by username/channel/playlist or search';
- const MAINTAINER = 'em92';
const PARAMETERS = [
'By username' => [
@@ -234,7 +233,11 @@ private function ytGetSimpleHTMLDOM($url, $cached = false)
private function getJSONData($html)
{
$scriptRegex = '/var ytInitialData = (.*?);<\/script>/';
- preg_match($scriptRegex, $html, $matches) or returnServerError('Could not find ytInitialData');
+ $result = preg_match($scriptRegex, $html, $matches);
+ if (! $result) {
+ Logger::debug('Could not find ytInitialData');
+ return null;
+ }
return json_decode($matches[1]);
}
@@ -293,15 +296,17 @@ private function parseJSONListing($jsonData)
}
}
- if (preg_match('/([\d]{1,2})\:([\d]{1,2})\:([\d]{2})/', $durationText)) {
- $durationText = preg_replace('/([\d]{1,2})\:([\d]{1,2})\:([\d]{2})/', '$1:$2:$3', $durationText);
- } else {
- $durationText = preg_replace('/([\d]{1,2})\:([\d]{2})/', '00:$1:$2', $durationText);
- }
- sscanf($durationText, '%d:%d:%d', $hours, $minutes, $seconds);
- $duration = $hours * 3600 + $minutes * 60 + $seconds;
- if ($duration < $duration_min || $duration > $duration_max) {
- continue;
+ if (is_string($durationText)) {
+ if (preg_match('/([\d]{1,2})\:([\d]{1,2})\:([\d]{2})/', $durationText)) {
+ $durationText = preg_replace('/([\d]{1,2})\:([\d]{1,2})\:([\d]{2})/', '$1:$2:$3', $durationText);
+ } else {
+ $durationText = preg_replace('/([\d]{1,2})\:([\d]{2})/', '00:$1:$2', $durationText);
+ }
+ sscanf($durationText, '%d:%d:%d', $hours, $minutes, $seconds);
+ $duration = $hours * 3600 + $minutes * 60 + $seconds;
+ if ($duration < $duration_min || $duration > $duration_max) {
+ continue;
+ }
}
// $vid_list .= $vid . ',';
diff --git a/caches/FileCache.php b/caches/FileCache.php
index 8c99234da00..6e150cb495c 100644
--- a/caches/FileCache.php
+++ b/caches/FileCache.php
@@ -1,44 +1,66 @@
config = $config;
-
- if (!is_dir($this->config['path'])) {
- throw new \Exception('The cache path does not exists. You probably want: mkdir cache && chown www-data:www-data cache');
- }
- if (!is_writable($this->config['path'])) {
- throw new \Exception('The cache path is not writeable. You probably want: chown www-data:www-data cache');
+ $default = [
+ 'path' => null,
+ 'enable_purge' => true,
+ ];
+ $this->config = array_merge($default, $config);
+ if (!$this->config['path']) {
+ throw new \Exception('The FileCache needs a path value');
}
+ // Normalize with a single trailing slash
+ $this->config['path'] = rtrim($this->config['path'], '/') . '/';
}
- public function loadData()
+ public function getConfig()
{
- if (file_exists($this->getCacheFile())) {
- return unserialize(file_get_contents($this->getCacheFile()));
+ return $this->config;
+ }
+
+ public function loadData(int $timeout = 86400)
+ {
+ clearstatcache();
+ if (!file_exists($this->getCacheFile())) {
+ return null;
+ }
+ $modificationTime = filemtime($this->getCacheFile());
+ if (time() - $timeout < $modificationTime) {
+ $data = unserialize(file_get_contents($this->getCacheFile()));
+ if ($data === false) {
+ Logger::warning(sprintf('Failed to unserialize: %s', $this->getCacheFile()));
+ // Intentionally not throwing an exception
+ return null;
+ }
+ return $data;
}
+ // It's a good idea to delete the expired item here, but commented out atm
+ // unlink($this->getCacheFile());
return null;
}
- public function saveData($data)
+ public function saveData($data): void
{
- $writeStream = file_put_contents($this->getCacheFile(), serialize($data));
- if ($writeStream === false) {
- throw new \Exception('The cache path is not writeable. You probably want: chown www-data:www-data cache');
+ $bytes = file_put_contents($this->getCacheFile(), serialize($data), LOCK_EX);
+ if ($bytes === false) {
+ throw new \Exception(sprintf('Failed to write to: %s', $this->getCacheFile()));
}
- return $this;
}
- public function getTime()
+ public function getTime(): ?int
{
+ clearstatcache();
$cacheFile = $this->getCacheFile();
- clearstatcache(false, $cacheFile);
if (file_exists($cacheFile)) {
$time = filemtime($cacheFile);
if ($time !== false) {
@@ -50,7 +72,7 @@ public function getTime()
return null;
}
- public function purgeCache($seconds)
+ public function purgeCache(int $timeout = 86400): void
{
if (! $this->config['enable_purge']) {
return;
@@ -66,38 +88,32 @@ public function purgeCache($seconds)
);
foreach ($cacheIterator as $cacheFile) {
- if (in_array($cacheFile->getBasename(), ['.', '..', '.gitkeep'])) {
+ $basename = $cacheFile->getBasename();
+ $excluded = [
+ '.' => true,
+ '..' => true,
+ '.gitkeep' => true,
+ ];
+ if (isset($excluded[$basename])) {
continue;
} elseif ($cacheFile->isFile()) {
- if (filemtime($cacheFile->getPathname()) < time() - $seconds) {
+ $filepath = $cacheFile->getPathname();
+ if (filemtime($filepath) < time() - $timeout) {
// todo: sometimes this file doesn't exists
- unlink($cacheFile->getPathname());
+ unlink($filepath);
}
}
}
}
- public function setScope($scope)
+ public function setScope(string $scope): void
{
- if (!is_string($scope)) {
- throw new \Exception('The given scope is invalid!');
- }
-
$this->scope = $this->config['path'] . trim($scope, " \t\n\r\0\x0B\\\/") . '/';
-
- return $this;
}
- public function setKey($key)
+ public function setKey(array $key): void
{
- $key = json_encode($key);
-
- if (!is_string($key)) {
- throw new \Exception('The given key is invalid!');
- }
-
- $this->key = $key;
- return $this;
+ $this->key = json_encode($key);
}
private function getScope()
diff --git a/caches/MemcachedCache.php b/caches/MemcachedCache.php
index 85681e890a5..dcb572c7f7a 100644
--- a/caches/MemcachedCache.php
+++ b/caches/MemcachedCache.php
@@ -2,12 +2,10 @@
class MemcachedCache implements CacheInterface
{
- private $scope;
- private $key;
+ private string $scope;
+ private string $key;
private $conn;
private $expiration = 0;
- private $time = false;
- private $data = null;
public function __construct()
{
@@ -43,73 +41,62 @@ public function __construct()
$this->conn = $conn;
}
- public function loadData()
+ public function loadData(int $timeout = 86400)
{
- if ($this->data) {
- return $this->data;
- }
- $result = $this->conn->get($this->getCacheKey());
- if ($result === false) {
+ $value = $this->conn->get($this->getCacheKey());
+ if ($value === false) {
return null;
}
-
- $this->time = $result['time'];
- $this->data = $result['data'];
- return $result['data'];
+ if (time() - $timeout < $value['time']) {
+ return $value['data'];
+ }
+ return null;
}
- public function saveData($datas)
+ public function saveData($data): void
{
- $time = time();
- $object_to_save = [
- 'data' => $datas,
- 'time' => $time,
+ $value = [
+ 'data' => $data,
+ 'time' => time(),
];
- $result = $this->conn->set($this->getCacheKey(), $object_to_save, $this->expiration);
-
+ $result = $this->conn->set($this->getCacheKey(), $value, $this->expiration);
if ($result === false) {
- throw new \Exception('Cannot write the cache to memcached server');
+ Logger::warning('Failed to store an item in memcached', [
+ 'scope' => $this->scope,
+ 'key' => $this->key,
+ 'expiration' => $this->expiration,
+ 'code' => $this->conn->getLastErrorCode(),
+ 'message' => $this->conn->getLastErrorMessage(),
+ 'number' => $this->conn->getLastErrorErrno(),
+ ]);
+ // Intentionally not throwing an exception
}
-
- $this->time = $time;
-
- return $this;
}
- public function getTime()
+ public function getTime(): ?int
{
- if ($this->time === false) {
- $this->loadData();
+ $value = $this->conn->get($this->getCacheKey());
+ if ($value === false) {
+ return null;
}
- return $this->time;
+ return $value['time'];
}
- public function purgeCache($duration)
+ public function purgeCache(int $timeout = 86400): void
{
// Note: does not purges cache right now
// Just sets cache expiration and leave cache purging for memcached itself
- $this->expiration = $duration;
+ $this->expiration = $timeout;
}
- public function setScope($scope)
+ public function setScope(string $scope): void
{
$this->scope = $scope;
- return $this;
}
- public function setKey($key)
+ public function setKey(array $key): void
{
- if (!empty($key) && is_array($key)) {
- $key = array_map('strtolower', $key);
- }
- $key = json_encode($key);
-
- if (!is_string($key)) {
- throw new \Exception('The given key is invalid!');
- }
-
- $this->key = $key;
- return $this;
+ $this->key = json_encode($key);
}
private function getCacheKey()
diff --git a/caches/NullCache.php b/caches/NullCache.php
index 8e5c9e35804..fe43fe06472 100644
--- a/caches/NullCache.php
+++ b/caches/NullCache.php
@@ -4,27 +4,28 @@
class NullCache implements CacheInterface
{
- public function setScope($scope)
+ public function setScope(string $scope): void
{
}
- public function setKey($key)
+ public function setKey(array $key): void
{
}
- public function loadData()
+ public function loadData(int $timeout = 86400)
{
}
- public function saveData($data)
+ public function saveData($data): void
{
}
- public function getTime()
+ public function getTime(): ?int
{
+ return null;
}
- public function purgeCache($seconds)
+ public function purgeCache(int $timeout = 86400): void
{
}
}
diff --git a/caches/SQLiteCache.php b/caches/SQLiteCache.php
index 1e44519ba09..92235862664 100644
--- a/caches/SQLiteCache.php
+++ b/caches/SQLiteCache.php
@@ -1,128 +1,115 @@
- */
class SQLiteCache implements CacheInterface
{
- protected $scope;
- protected $key;
+ private \SQLite3 $db;
+ private string $scope;
+ private string $key;
+ private array $config;
- private $db = null;
-
- public function __construct()
+ public function __construct(array $config)
{
- if (!extension_loaded('sqlite3')) {
- throw new \Exception('"sqlite3" extension not loaded. Please check "php.ini"');
- }
-
- if (!is_writable(PATH_CACHE)) {
- throw new \Exception('The cache folder is not writable');
+ $default = [
+ 'file' => null,
+ 'timeout' => 5000,
+ 'enable_purge' => true,
+ ];
+ $config = array_merge($default, $config);
+ $this->config = $config;
+
+ if (!$config['file']) {
+ throw new \Exception('sqlite cache needs a file');
}
- $section = 'SQLiteCache';
- $file = Configuration::getConfig($section, 'file');
- if (!$file) {
- throw new \Exception(sprintf('Configuration for %s missing.', $section));
- }
-
- if (dirname($file) == '.') {
- $file = PATH_CACHE . $file;
- } elseif (!is_dir(dirname($file))) {
- throw new \Exception(sprintf('Invalid configuration for %s', $section));
- }
-
- if (!is_file($file)) {
- // The instantiation creates the file
- $this->db = new \SQLite3($file);
+ if (is_file($config['file'])) {
+ $this->db = new \SQLite3($config['file']);
$this->db->enableExceptions(true);
- $this->db->exec("CREATE TABLE storage ('key' BLOB PRIMARY KEY, 'value' BLOB, 'updated' INTEGER)");
} else {
- $this->db = new \SQLite3($file);
+ // Create the file and create sql schema
+ $this->db = new \SQLite3($config['file']);
$this->db->enableExceptions(true);
+ $this->db->exec("CREATE TABLE storage ('key' BLOB PRIMARY KEY, 'value' BLOB, 'updated' INTEGER)");
}
- $this->db->busyTimeout(5000);
+ $this->db->busyTimeout($config['timeout']);
}
- public function loadData()
+ public function loadData(int $timeout = 86400)
{
- $Qselect = $this->db->prepare('SELECT value FROM storage WHERE key = :key');
- $Qselect->bindValue(':key', $this->getCacheKey());
- $result = $Qselect->execute();
- if ($result instanceof \SQLite3Result) {
- $data = $result->fetchArray(\SQLITE3_ASSOC);
- if (isset($data['value'])) {
- return unserialize($data['value']);
+ $stmt = $this->db->prepare('SELECT value, updated FROM storage WHERE key = :key');
+ $stmt->bindValue(':key', $this->getCacheKey());
+ $result = $stmt->execute();
+ if (!$result) {
+ return null;
+ }
+ $row = $result->fetchArray(\SQLITE3_ASSOC);
+ if ($row === false) {
+ return null;
+ }
+ $value = $row['value'];
+ $modificationTime = $row['updated'];
+ if (time() - $timeout < $modificationTime) {
+ $data = unserialize($value);
+ if ($data === false) {
+ Logger::error(sprintf("Failed to unserialize: '%s'", mb_substr($value, 0, 100)));
+ return null;
}
+ return $data;
}
-
+ // It's a good idea to delete expired cache items.
+ // However I'm seeing lots of SQLITE_BUSY errors so commented out for now
+ // $stmt = $this->db->prepare('DELETE FROM storage WHERE key = :key');
+ // $stmt->bindValue(':key', $this->getCacheKey());
+ // $stmt->execute();
return null;
}
- public function saveData($data)
+ public function saveData($data): void
{
- $Qupdate = $this->db->prepare('INSERT OR REPLACE INTO storage (key, value, updated) VALUES (:key, :value, :updated)');
- $Qupdate->bindValue(':key', $this->getCacheKey());
- $Qupdate->bindValue(':value', serialize($data));
- $Qupdate->bindValue(':updated', time());
- $Qupdate->execute();
+ $blob = serialize($data);
- return $this;
+ $stmt = $this->db->prepare('INSERT OR REPLACE INTO storage (key, value, updated) VALUES (:key, :value, :updated)');
+ $stmt->bindValue(':key', $this->getCacheKey());
+ $stmt->bindValue(':value', $blob, \SQLITE3_BLOB);
+ $stmt->bindValue(':updated', time());
+ $stmt->execute();
}
- public function getTime()
+ public function getTime(): ?int
{
- $Qselect = $this->db->prepare('SELECT updated FROM storage WHERE key = :key');
- $Qselect->bindValue(':key', $this->getCacheKey());
- $result = $Qselect->execute();
- if ($result instanceof \SQLite3Result) {
- $data = $result->fetchArray(SQLITE3_ASSOC);
- if (isset($data['updated'])) {
- return $data['updated'];
+ $stmt = $this->db->prepare('SELECT updated FROM storage WHERE key = :key');
+ $stmt->bindValue(':key', $this->getCacheKey());
+ $result = $stmt->execute();
+ if ($result) {
+ $row = $result->fetchArray(\SQLITE3_ASSOC);
+ if ($row !== false) {
+ return $row['updated'];
}
}
-
return null;
}
- public function purgeCache($seconds)
+ public function purgeCache(int $timeout = 86400): void
{
- $Qdelete = $this->db->prepare('DELETE FROM storage WHERE updated < :expired');
- $Qdelete->bindValue(':expired', time() - $seconds);
- $Qdelete->execute();
+ if (!$this->config['enable_purge']) {
+ return;
+ }
+ $stmt = $this->db->prepare('DELETE FROM storage WHERE updated < :expired');
+ $stmt->bindValue(':expired', time() - $timeout);
+ $stmt->execute();
}
- public function setScope($scope)
+ public function setScope(string $scope): void
{
- if (is_null($scope) || !is_string($scope)) {
- throw new \Exception('The given scope is invalid!');
- }
-
$this->scope = $scope;
- return $this;
}
- public function setKey($key)
+ public function setKey(array $key): void
{
- if (!empty($key) && is_array($key)) {
- $key = array_map('strtolower', $key);
- }
- $key = json_encode($key);
-
- if (!is_string($key)) {
- throw new \Exception('The given key is invalid!');
- }
-
- $this->key = $key;
- return $this;
+ $this->key = json_encode($key);
}
private function getCacheKey()
{
- if (is_null($this->key)) {
- throw new \Exception('Call "setKey" first!');
- }
-
return hash('sha1', $this->scope . $this->key, true);
}
}
diff --git a/composer.lock b/composer.lock
index 426a59b496e..39e9cfc46ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,35 +4,35 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0d00dfa7c120bdd750ac0ac4a45f5452",
+ "content-hash": "24083060ddb8be9a95e75f6596e3bb83",
"packages": [],
"packages-dev": [
{
"name": "doctrine/instantiator",
- "version": "1.4.1",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
- "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^9",
+ "doctrine/coding-standard": "^9 || ^11",
"ext-pdo": "*",
"ext-phar": "*",
"phpbench/phpbench": "^0.16 || ^1",
"phpstan/phpstan": "^1.4",
"phpstan/phpstan-phpunit": "^1",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.22"
+ "vimeo/psalm": "^4.30 || ^5.4"
},
"type": "library",
"autoload": {
@@ -59,7 +59,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+ "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
},
"funding": [
{
@@ -75,20 +75,20 @@
"type": "tidelift"
}
],
- "time": "2022-03-03T08:28:38+00:00"
+ "time": "2022-12-30T00:15:36+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.0",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+ "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
- "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"shasum": ""
},
"require": {
@@ -126,7 +126,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
},
"funding": [
{
@@ -134,20 +134,20 @@
"type": "tidelift"
}
],
- "time": "2022-03-03T13:19:32+00:00"
+ "time": "2023-03-08T13:26:56+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.13.2",
+ "version": "v4.16.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+ "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
- "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+ "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
"shasum": ""
},
"require": {
@@ -188,9 +188,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
},
- "time": "2021-11-30T19:35:32+00:00"
+ "time": "2023-06-25T14:52:30+00:00"
},
{
"name": "phar-io/manifest",
@@ -303,252 +303,25 @@
},
"time": "2022-02-21T01:04:05+00:00"
},
- {
- "name": "phpdocumentor/reflection-common",
- "version": "2.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
- "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-2.x": "2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jaap van Otterdijk",
- "email": "opensource@ijaap.nl"
- }
- ],
- "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
- "homepage": "http://www.phpdoc.org",
- "keywords": [
- "FQSEN",
- "phpDocumentor",
- "phpdoc",
- "reflection",
- "static analysis"
- ],
- "support": {
- "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
- "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
- },
- "time": "2020-06-27T09:03:43+00:00"
- },
- {
- "name": "phpdocumentor/reflection-docblock",
- "version": "5.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
- "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
- "shasum": ""
- },
- "require": {
- "ext-filter": "*",
- "php": "^7.2 || ^8.0",
- "phpdocumentor/reflection-common": "^2.2",
- "phpdocumentor/type-resolver": "^1.3",
- "webmozart/assert": "^1.9.1"
- },
- "require-dev": {
- "mockery/mockery": "~1.3.2",
- "psalm/phar": "^4.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- },
- {
- "name": "Jaap van Otterdijk",
- "email": "account@ijaap.nl"
- }
- ],
- "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "support": {
- "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
- "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
- },
- "time": "2021-10-19T17:43:47+00:00"
- },
- {
- "name": "phpdocumentor/type-resolver",
- "version": "1.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "77a32518733312af16a44300404e945338981de3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
- "reference": "77a32518733312af16a44300404e945338981de3",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0",
- "phpdocumentor/reflection-common": "^2.0"
- },
- "require-dev": {
- "ext-tokenizer": "*",
- "psalm/phar": "^4.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
- "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "support": {
- "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
- },
- "time": "2022-03-15T21:29:03+00:00"
- },
- {
- "name": "phpspec/prophecy",
- "version": "v1.15.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpspec/prophecy.git",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.2",
- "php": "^7.2 || ~8.0, <8.2",
- "phpdocumentor/reflection-docblock": "^5.2",
- "sebastian/comparator": "^3.0 || ^4.0",
- "sebastian/recursion-context": "^3.0 || ^4.0"
- },
- "require-dev": {
- "phpspec/phpspec": "^6.0 || ^7.0",
- "phpunit/phpunit": "^8.0 || ^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Prophecy\\": "src/Prophecy"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
- },
- {
- "name": "Marcello Duarte",
- "email": "marcello.duarte@gmail.com"
- }
- ],
- "description": "Highly opinionated mocking framework for PHP 5.3+",
- "homepage": "https://github.com/phpspec/prophecy",
- "keywords": [
- "Double",
- "Dummy",
- "fake",
- "mock",
- "spy",
- "stub"
- ],
- "support": {
- "issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
- },
- "time": "2021-12-08T12:19:24+00:00"
- },
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.15",
+ "version": "9.2.26",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
- "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.13.0",
+ "nikic/php-parser": "^4.15",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -563,8 +336,8 @@
"phpunit/phpunit": "^9.3"
},
"suggest": {
- "ext-pcov": "*",
- "ext-xdebug": "*"
+ "ext-pcov": "PHP extension that provides line coverage",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"type": "library",
"extra": {
@@ -597,7 +370,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
},
"funding": [
{
@@ -605,7 +378,7 @@
"type": "github"
}
],
- "time": "2022-03-07T09:28:20+00:00"
+ "time": "2023-03-06T12:58:08+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -850,20 +623,20 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.20",
+ "version": "9.6.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
+ "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
- "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
+ "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.3.1",
+ "doctrine/instantiator": "^1.3.1 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
@@ -874,7 +647,6 @@
"phar-io/manifest": "^2.0.3",
"phar-io/version": "^3.0.2",
"php": ">=7.3",
- "phpspec/prophecy": "^1.12.1",
"phpunit/php-code-coverage": "^9.2.13",
"phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
@@ -882,23 +654,19 @@
"phpunit/php-timer": "^5.0.2",
"sebastian/cli-parser": "^1.0.1",
"sebastian/code-unit": "^1.0.6",
- "sebastian/comparator": "^4.0.5",
+ "sebastian/comparator": "^4.0.8",
"sebastian/diff": "^4.0.3",
"sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.3",
+ "sebastian/exporter": "^4.0.5",
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.0",
+ "sebastian/type": "^3.2",
"sebastian/version": "^3.0.2"
},
- "require-dev": {
- "ext-pdo": "*",
- "phpspec/prophecy-phpunit": "^2.0.1"
- },
"suggest": {
- "ext-soap": "*",
- "ext-xdebug": "*"
+ "ext-soap": "To be able to generate mocks based on WSDL files",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
},
"bin": [
"phpunit"
@@ -906,7 +674,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "9.5-dev"
+ "dev-master": "9.6-dev"
}
},
"autoload": {
@@ -937,7 +705,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
+ "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
},
"funding": [
{
@@ -947,9 +716,13 @@
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+ "type": "tidelift"
}
],
- "time": "2022-04-01T12:37:26+00:00"
+ "time": "2023-06-11T06:13:56+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -1120,16 +893,16 @@
},
{
"name": "sebastian/comparator",
- "version": "4.0.6",
+ "version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+ "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
- "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+ "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
"shasum": ""
},
"require": {
@@ -1182,7 +955,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
},
"funding": [
{
@@ -1190,7 +963,7 @@
"type": "github"
}
],
- "time": "2020-10-26T15:49:45+00:00"
+ "time": "2022-09-14T12:41:17+00:00"
},
{
"name": "sebastian/complexity",
@@ -1251,16 +1024,16 @@
},
{
"name": "sebastian/diff",
- "version": "4.0.4",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+ "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
- "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+ "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
"shasum": ""
},
"require": {
@@ -1305,7 +1078,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
},
"funding": [
{
@@ -1313,20 +1086,20 @@
"type": "github"
}
],
- "time": "2020-10-26T13:10:38+00:00"
+ "time": "2023-05-07T05:35:17+00:00"
},
{
"name": "sebastian/environment",
- "version": "5.1.4",
+ "version": "5.1.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+ "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
- "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+ "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
"shasum": ""
},
"require": {
@@ -1368,7 +1141,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
- "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+ "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
},
"funding": [
{
@@ -1376,20 +1149,20 @@
"type": "github"
}
],
- "time": "2022-04-03T09:37:03+00:00"
+ "time": "2023-02-03T06:03:51+00:00"
},
{
"name": "sebastian/exporter",
- "version": "4.0.4",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
- "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
"shasum": ""
},
"require": {
@@ -1445,7 +1218,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
},
"funding": [
{
@@ -1453,7 +1226,7 @@
"type": "github"
}
],
- "time": "2021-11-11T14:18:36+00:00"
+ "time": "2022-09-14T06:03:37+00:00"
},
{
"name": "sebastian/global-state",
@@ -1690,16 +1463,16 @@
},
{
"name": "sebastian/recursion-context",
- "version": "4.0.4",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+ "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
- "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+ "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
"shasum": ""
},
"require": {
@@ -1738,10 +1511,10 @@
}
],
"description": "Provides functionality to recursively process PHP variables",
- "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+ "homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
},
"funding": [
{
@@ -1749,7 +1522,7 @@
"type": "github"
}
],
- "time": "2020-10-26T13:17:30+00:00"
+ "time": "2023-02-03T06:07:39+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -1808,16 +1581,16 @@
},
{
"name": "sebastian/type",
- "version": "3.0.0",
+ "version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+ "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
- "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+ "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
"shasum": ""
},
"require": {
@@ -1829,7 +1602,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1852,7 +1625,7 @@
"homepage": "https://github.com/sebastianbergmann/type",
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
- "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+ "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
},
"funding": [
{
@@ -1860,7 +1633,7 @@
"type": "github"
}
],
- "time": "2022-03-15T09:54:48+00:00"
+ "time": "2023-02-03T06:13:03+00:00"
},
{
"name": "sebastian/version",
@@ -1917,16 +1690,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.6.2",
+ "version": "3.7.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+ "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
- "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+ "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
"shasum": ""
},
"require": {
@@ -1962,96 +1735,15 @@
"homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [
"phpcs",
- "standards"
+ "standards",
+ "static analysis"
],
"support": {
"issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
"source": "https://github.com/squizlabs/PHP_CodeSniffer",
"wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
},
- "time": "2021-12-12T21:44:58+00:00"
- },
- {
- "name": "symfony/polyfill-ctype",
- "version": "v1.25.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "30885182c981ab175d4d034db0f6f469898070ab"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
- "reference": "30885182c981ab175d4d034db0f6f469898070ab",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "provide": {
- "ext-ctype": "*"
- },
- "suggest": {
- "ext-ctype": "For best performance"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.23-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for ctype functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "ctype",
- "polyfill",
- "portable"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2021-10-20T20:35:02+00:00"
+ "time": "2023-02-22T23:07:41+00:00"
},
{
"name": "theseer/tokenizer",
@@ -2102,64 +1794,6 @@
}
],
"time": "2021-07-28T10:34:58+00:00"
- },
- {
- "name": "webmozart/assert",
- "version": "1.10.0",
- "source": {
- "type": "git",
- "url": "https://github.com/webmozarts/assert.git",
- "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
- "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0",
- "symfony/polyfill-ctype": "^1.8"
- },
- "conflict": {
- "phpstan/phpstan": "<0.12.20",
- "vimeo/psalm": "<4.6.1 || 4.6.2"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.5.13"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.10-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Webmozart\\Assert\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "Assertions to validate method input/output with nice error messages.",
- "keywords": [
- "assert",
- "check",
- "validate"
- ],
- "support": {
- "issues": "https://github.com/webmozarts/assert/issues",
- "source": "https://github.com/webmozarts/assert/tree/1.10.0"
- },
- "time": "2021-03-09T10:59:23+00:00"
}
],
"aliases": [],
@@ -2174,8 +1808,9 @@
"ext-openssl": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
- "ext-json": "*"
+ "ext-json": "*",
+ "ext-intl": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/config.default.ini.php b/config.default.ini.php
index 3a347036d60..d0c508f4481 100644
--- a/config.default.ini.php
+++ b/config.default.ini.php
@@ -6,6 +6,27 @@
[system]
+; Only these bridges are available for feed production
+; How to enable all bridges: enabled_bridges[] = *
+enabled_bridges[] = CssSelectorBridge
+enabled_bridges[] = FeedMerge
+enabled_bridges[] = FeedReducerBridge
+enabled_bridges[] = Filter
+enabled_bridges[] = GettrBridge
+enabled_bridges[] = MastodonBridge
+enabled_bridges[] = Reddit
+enabled_bridges[] = RumbleBridge
+enabled_bridges[] = SoundcloudBridge
+enabled_bridges[] = Telegram
+enabled_bridges[] = ThePirateBay
+enabled_bridges[] = TikTokBridge
+enabled_bridges[] = Twitch
+enabled_bridges[] = Twitter
+enabled_bridges[] = Vk
+enabled_bridges[] = XPathBridge
+enabled_bridges[] = Youtube
+enabled_bridges[] = YouTubeCommunityTabBridge
+
; Defines the timezone used by RSS-Bridge
; Find a list of supported timezones at
; https://www.php.net/manual/en/timezones.php
@@ -22,6 +43,9 @@
; debug_mode_whitelist[] = 127.0.0.1
; debug_mode_whitelist[] = 192.168.1.10
+; Whether to enable maintenance mode. If enabled, feed requests receive 503 Service Unavailable
+enable_maintenance_mode = false
+
[http]
timeout = 60
useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0"
@@ -110,7 +134,12 @@
enable_purge = true
[SQLiteCache]
+; Filepath of the sqlite db file
file = "cache.sqlite"
+; Whether to actually delete data when purging
+enable_purge = true
+; Busy wait in ms before timing out
+timeout = 5000
[MemcachedCache]
host = "localhost"
diff --git a/contrib/prepare_release/fetch_contributors.php b/contrib/prepare_release/fetch_contributors.php
index ad04458ad67..cfe2c5b29cb 100644
--- a/contrib/prepare_release/fetch_contributors.php
+++ b/contrib/prepare_release/fetch_contributors.php
@@ -14,7 +14,8 @@
'Content-Type' => 'application/json',
'User-Agent' => 'RSS-Bridge',
];
- $result = _http_request($url, ['headers' => $headers]);
+ $httpClient = new CurlHttpClient();
+ $result = $httpClient->request($url, ['headers' => $headers]);
foreach (json_decode($result['body']) as $contributor) {
$contributors[] = $contributor;
diff --git a/docs/03_For_Hosts/03_Docker_Installation.md b/docs/03_For_Hosts/03_Docker_Installation.md
index 12b75c482f9..d895e748bfb 100644
--- a/docs/03_For_Hosts/03_Docker_Installation.md
+++ b/docs/03_For_Hosts/03_Docker_Installation.md
@@ -45,5 +45,5 @@ services:
If you want to add a bridge that is not part of [`/bridges`](https://github.com/RSS-Bridge/rss-bridge/tree/master/bridges), you can map a folder to the `/config` folder of the `rss-bridge` container.
1. Create a folder in the location of your docker-compose.yml or your general docker working area (in this example it will be `/home/docker/rssbridge/config` ).
-2. Copy your [custom bridges](../05_Bridge_API/01_How_to_create_a_new_bridge.md) to the `/home/docker/rssbridge/config` folder. You can also add your custom [whitelist.txt](../03_For_Hosts/05_Whitelisting.md) file and your custom [config.ini.php](../03_For_Hosts/08_Custom_Configuration.md) to this folder.
+2. Copy your [custom bridges](../05_Bridge_API/01_How_to_create_a_new_bridge.md) to the `/home/docker/rssbridge/config` folder. Applies also to [config.ini.php](../03_For_Hosts/08_Custom_Configuration.md).
3. Map the folder to `/config` inside the container. To do that, replace the `` from the previous examples with `/home/docker/rssbridge/config`
\ No newline at end of file
diff --git a/docs/03_For_Hosts/04_Heroku_Installation.md b/docs/03_For_Hosts/04_Heroku_Installation.md
index ecda833d514..f79c2a969d4 100644
--- a/docs/03_For_Hosts/04_Heroku_Installation.md
+++ b/docs/03_For_Hosts/04_Heroku_Installation.md
@@ -14,7 +14,7 @@ You can simply press the button below to easily deploy RSS Bridge on Heroku and
-2. To customise what bridges can be used if need, create a `whitelist.txt` file in your fork and follow the instructions given [here](../03_For_Hosts/05_Whitelisting.md). You don’t need to do this if you’re fine with the default bridges.
+2. To customise what bridges can be used if need, see [here](../03_For_Hosts/05_Whitelisting.md). You don’t need to do this if you’re fine with the default bridges.
3. [Log in to Heroku](https://dashboard.heroku.com) and create a new app. The app name will be the URL of the RSS Bridge (appname.herokuapp.com)
diff --git a/docs/03_For_Hosts/05_Whitelisting.md b/docs/03_For_Hosts/05_Whitelisting.md
index 46e029edd1b..113c4e3d43b 100644
--- a/docs/03_For_Hosts/05_Whitelisting.md
+++ b/docs/03_For_Hosts/05_Whitelisting.md
@@ -1,38 +1,26 @@
-RSS-Bridge supports whitelists in order to limit the available bridges on your web server.
+Modify `config.ini.php` to limit available bridges.
-A default whitelist file (`whitelist.default.txt`) is shipped with RSS-Bridge. Please do not edit this file, as it gets replaced when upgrading RSS-Bridge!
+## Enable all bridges
-You should, however, use this file as template to create your own whitelist (or leave it as is, to keep the default bridges). In order to create your own whitelist perform following actions:
-
-* Copy the file `whitelist.default.txt` in the RSS-Bridge root folder
-* Rename the new file to `whitelist.txt`
-* Change the lines to satisfy your requirements
-
-RSS-Bridge will automatically detect the `whitelist.txt` and use it. If the file doesn't exist it will default to `whitelist.default.txt` automatically.
-
-# Specific whitelisting
+```
+enabled_bridges[] = *
+```
-In order to specifically whitelist bridges, open `whitelist.txt` and add one line for each bridge you want to show. Make sure you use normal [line-feeds](https://en.wikipedia.org/wiki/Newline "Line-feed") at the end of a line (LF not [CRLF](https://en.wikipedia.org/wiki/Carriage_return "Carriage-return line-feed")). The bridge name must match the filename of the bridge in the bridges folder (see [folder structure](../04_For_Developers/03_Folder_structure.md)). The name may or may not include the 'Bridge' part.
+## Enable some bridges
-**Examples**:
-```TEXT
-FacebookBridge
-WikipediaBridge
-TwitterBridge
+```
+enabled_bridges[] = TwitchBridge
+enabled_bridges[] = GettrBridge
```
-or
+## Enable all bridges (legacy shortcut)
-```TEXT
-Facebook
-Wikipedia
-Twitter
+```
+echo '*' > whitelist.txt
```
-# Global whitelisting
-
-In order to globally whitelist all bridges, open the `whitelist.txt` file, remove all contents and just write an asterisk `*` into the file (only this one character).
+## Enable some bridges (legacy shortcut)
-```TEXT
-*
-```
\ No newline at end of file
+```
+echo -e "TwitchBridge\nTwitterBridge" > whitelist.txt
+```
diff --git a/docs/07_Cache_API/01_How_to_create_a_new_cache.md b/docs/07_Cache_API/01_How_to_create_a_new_cache.md
index fe171718d91..cfc30308af3 100644
--- a/docs/07_Cache_API/01_How_to_create_a_new_cache.md
+++ b/docs/07_Cache_API/01_How_to_create_a_new_cache.md
@@ -1,24 +1,3 @@
Create a new file in the `caches/` folder (see [Folder structure](../04_For_Developers/03_Folder_structure.md)).
-The file must be named according to following specification:
-
-* It starts with the type
-* The file name must end with 'Cache'
-* The file type must be PHP, written in small letters (seriously!) ".php"
-
-**Examples:**
-
-Type | Filename
------|---------
-File | FileCache.php
-MySQL | MySQLCache.php
-
-The file must start with the PHP tags and end with an empty line. The closing tag `?>` is [omitted](http://php.net/basic-syntax.instruction-separation).
-
-Example:
-
-```PHP
-queriedContext;
}
+
$needle = $this->inputs[$this->queriedContext][$input]['value'];
foreach (static::PARAMETERS[$context][$input]['values'] as $first_level_key => $first_level_value) {
- if ($needle === (string)$first_level_value) {
+ if (!is_array($first_level_value) && $needle === (string)$first_level_value) {
return $first_level_key;
} elseif (is_array($first_level_value)) {
foreach ($first_level_value as $second_level_key => $second_level_value) {
@@ -408,39 +409,27 @@ public function detectParameters($url)
/**
* Loads a cached value for the specified key
*
- * @param string $key Key name
- * @param int $duration Cache duration (optional)
+ * @param int $timeout Cache duration (optional)
* @return mixed Cached value or null if the key doesn't exist or has expired
*/
- protected function loadCacheValue($key, $duration = null)
+ protected function loadCacheValue(string $key, int $timeout = 86400)
{
- $cacheFactory = new CacheFactory();
-
- $cache = $cacheFactory->create();
- // Create class name without the namespace part
- $scope = $this->getShortName();
- $cache->setScope($scope);
- $cache->setKey($key);
- if ($duration && $cache->getTime() < time() - $duration) {
- return null;
- }
- return $cache->loadData();
+ $cache = RssBridge::getCache();
+ $cache->setScope($this->getShortName());
+ $cache->setKey([$key]);
+ return $cache->loadData($timeout);
}
/**
* Stores a value to cache with the specified key
*
- * @param string $key Key name
* @param mixed $value Value to cache
*/
- protected function saveCacheValue($key, $value)
+ protected function saveCacheValue(string $key, $value)
{
- $cacheFactory = new CacheFactory();
-
- $cache = $cacheFactory->create();
- $scope = $this->getShortName();
- $cache->setScope($scope);
- $cache->setKey($key);
+ $cache = RssBridge::getCache();
+ $cache->setScope($this->getShortName());
+ $cache->setKey([$key]);
$cache->saveData($value);
}
diff --git a/lib/BridgeFactory.php b/lib/BridgeFactory.php
index 6bd832bf9ee..db2c394a2c8 100644
--- a/lib/BridgeFactory.php
+++ b/lib/BridgeFactory.php
@@ -2,101 +2,69 @@
final class BridgeFactory
{
- /** @var array> */
private $bridgeClassNames = [];
-
- /** @var array> */
- private $whitelist = [];
+ private $enabledBridges = [];
public function __construct()
{
- // create names
+ // Create all possible bridge class names from fs
foreach (scandir(__DIR__ . '/../bridges/') as $file) {
if (preg_match('/^([^.]+Bridge)\.php$/U', $file, $m)) {
$this->bridgeClassNames[] = $m[1];
}
}
- // create whitelist
- if (file_exists(WHITELIST)) {
- $contents = trim(file_get_contents(WHITELIST));
- } elseif (file_exists(WHITELIST_DEFAULT)) {
- $contents = trim(file_get_contents(WHITELIST_DEFAULT));
- } else {
- $contents = '';
+ $enabledBridges = Configuration::getConfig('system', 'enabled_bridges');
+ if ($enabledBridges === null) {
+ throw new \Exception('No bridges are enabled... wtf?');
}
-
- if ($contents === '*') {
- // Whitelist all bridges
- $this->whitelist = $this->getBridgeClassNames();
- } else {
- foreach (explode("\n", $contents) as $bridgeName) {
- $bridgeClassName = $this->sanitizeBridgeName($bridgeName);
- if ($bridgeClassName !== null) {
- $this->whitelist[] = $bridgeClassName;
- }
+ foreach ($enabledBridges as $enabledBridge) {
+ if ($enabledBridge === '*') {
+ $this->enabledBridges = $this->bridgeClassNames;
+ break;
}
+ $this->enabledBridges[] = $this->createBridgeClassName($enabledBridge);
}
}
- /**
- * @param class-string $name
- */
public function create(string $name): BridgeInterface
{
return new $name();
}
- /**
- * @return array>
- */
- public function getBridgeClassNames(): array
+ public function isEnabled(string $bridgeName): bool
{
- return $this->bridgeClassNames;
+ return in_array($bridgeName, $this->enabledBridges);
}
- /**
- * @param class-string|null $name
- */
- public function isWhitelisted(string $name): bool
+ public function createBridgeClassName(string $bridgeName): ?string
{
- return in_array($name, $this->whitelist);
- }
+ $name = self::normalizeBridgeName($bridgeName);
+ $namesLoweredCase = array_map('strtolower', $this->bridgeClassNames);
+ $nameLoweredCase = strtolower($name);
- /**
- * Tries to turn a potentially human produced bridge name into a class name.
- *
- * @param mixed $name
- * @return class-string|null
- */
- public function sanitizeBridgeName($name): ?string
- {
- if (!is_string($name)) {
- return null;
+ if (! in_array($nameLoweredCase, $namesLoweredCase)) {
+ throw new \Exception(sprintf('Bridge name invalid: %s', $bridgeName));
}
- // Trim trailing '.php' if exists
+ $index = array_search($nameLoweredCase, $namesLoweredCase);
+
+ return $this->bridgeClassNames[$index];
+ }
+
+ public static function normalizeBridgeName(string $name)
+ {
if (preg_match('/(.+)(?:\.php)/', $name, $matches)) {
$name = $matches[1];
}
-
- // Append 'Bridge' suffix if not present.
if (!preg_match('/(Bridge)$/i', $name)) {
$name = sprintf('%sBridge', $name);
}
+ return $name;
+ }
- // Improve performance for correctly written bridge names
- if (in_array($name, $this->getBridgeClassNames())) {
- $index = array_search($name, $this->getBridgeClassNames());
- return $this->getBridgeClassNames()[$index];
- }
-
- // The name is valid if a corresponding bridge file is found on disk
- if (in_array(strtolower($name), array_map('strtolower', $this->getBridgeClassNames()))) {
- $index = array_search(strtolower($name), array_map('strtolower', $this->getBridgeClassNames()));
- return $this->getBridgeClassNames()[$index];
- }
-
- return null;
+ public function getBridgeClassNames(): array
+ {
+ return $this->bridgeClassNames;
}
}
diff --git a/lib/CacheFactory.php b/lib/CacheFactory.php
index 4bf6342cf7d..78a0e83e488 100644
--- a/lib/CacheFactory.php
+++ b/lib/CacheFactory.php
@@ -38,13 +38,39 @@ public function create(string $name = null): CacheInterface
case NullCache::class:
return new NullCache();
case FileCache::class:
- return new FileCache([
- // Intentionally checking for "truthy" value
+ $fileCacheConfig = [
+ // Intentionally checking for truthy value because the historic default value is the empty string
'path' => Configuration::getConfig('FileCache', 'path') ?: PATH_CACHE,
'enable_purge' => Configuration::getConfig('FileCache', 'enable_purge'),
- ]);
+ ];
+ if (!is_dir($fileCacheConfig['path'])) {
+ throw new \Exception(sprintf('The FileCache path does not exists: %s', $fileCacheConfig['path']));
+ }
+ if (!is_writable($fileCacheConfig['path'])) {
+ throw new \Exception(sprintf('The FileCache path is not writable: %s', $fileCacheConfig['path']));
+ }
+ return new FileCache($fileCacheConfig);
case SQLiteCache::class:
- return new SQLiteCache();
+ if (!extension_loaded('sqlite3')) {
+ throw new \Exception('"sqlite3" extension not loaded. Please check "php.ini"');
+ }
+ if (!is_writable(PATH_CACHE)) {
+ throw new \Exception('The cache folder is not writable');
+ }
+ $file = Configuration::getConfig('SQLiteCache', 'file');
+ if (!$file) {
+ throw new \Exception(sprintf('Configuration for %s missing.', 'SQLiteCache'));
+ }
+ if (dirname($file) == '.') {
+ $file = PATH_CACHE . $file;
+ } elseif (!is_dir(dirname($file))) {
+ throw new \Exception(sprintf('Invalid configuration for %s', 'SQLiteCache'));
+ }
+ return new SQLiteCache([
+ 'file' => $file,
+ 'timeout' => Configuration::getConfig('SQLiteCache', 'timeout'),
+ 'enable_purge' => Configuration::getConfig('SQLiteCache', 'enable_purge'),
+ ]);
case MemcachedCache::class:
return new MemcachedCache();
default:
diff --git a/lib/CacheInterface.php b/lib/CacheInterface.php
index 1c3b89cadc1..85aa830f1f0 100644
--- a/lib/CacheInterface.php
+++ b/lib/CacheInterface.php
@@ -1,68 +1,16 @@
$envValue) {
$nameParts = explode('_', $envName);
if ($nameParts[0] === 'RSSBRIDGE') {
@@ -105,22 +124,30 @@ public static function loadConfiguration(array $customConfig = [], array $env =
// Invalid env name
continue;
}
+
+ // The variable is named $header but it's actually the section in config.ini.php
$header = $nameParts[1];
- $key = $nameParts[2];
+
+ // Recombine the key if it had multiple underscores
+ $key = implode('_', array_slice($nameParts, 2));
+ $key = strtolower($key);
+
+ // Handle this specifically because it's an array
+ if ($key === 'enabled_bridges') {
+ $envValue = explode(',', $envValue);
+ $envValue = array_map('trim', $envValue);
+ }
+
if ($envValue === 'true' || $envValue === 'false') {
$envValue = filter_var($envValue, FILTER_VALIDATE_BOOLEAN);
}
+
self::setConfig($header, $key, $envValue);
}
}
- if (file_exists(__DIR__ . '/../DEBUG')) {
- // The debug mode has been moved to config. Preserve existing installs which has this DEBUG file.
- self::setConfig('system', 'enable_debug_mode', true);
- $debug = trim(file_get_contents(__DIR__ . '/../DEBUG'));
- if ($debug) {
- self::setConfig('system', 'debug_mode_whitelist', explode("\n", str_replace("\r", '', $debug)));
- }
+ if (!is_array(self::getConfig('system', 'enabled_bridges'))) {
+ self::throwConfigError('system', 'enabled_bridges', 'Is not an array');
}
if (
@@ -193,9 +220,9 @@ public static function loadConfiguration(array $customConfig = [], array $env =
}
}
- public static function getConfig(string $section, string $key)
+ public static function getConfig(string $section, string $key, $default = null)
{
- return self::$config[strtolower($section)][strtolower($key)] ?? null;
+ return self::$config[strtolower($section)][strtolower($key)] ?? $default;
}
private static function setConfig(string $section, string $key, $value): void
diff --git a/lib/Debug.php b/lib/Debug.php
index f6a8d1052b4..48dbb31a9dd 100644
--- a/lib/Debug.php
+++ b/lib/Debug.php
@@ -7,7 +7,7 @@ class Debug
*/
public static function isEnabled(): bool
{
- $ip = $_SERVER['REMOTE_ADDR'];
+ $ip = $_SERVER['REMOTE_ADDR'] ?? 'x.y.z.1';
$enableDebugMode = Configuration::getConfig('system', 'enable_debug_mode');
$debugModeWhitelist = Configuration::getConfig('system', 'debug_mode_whitelist') ?: [];
if ($enableDebugMode && ($debugModeWhitelist === [] || in_array($ip, $debugModeWhitelist))) {
diff --git a/lib/Logger.php b/lib/Logger.php
index e15035fe503..5423f62c4d8 100644
--- a/lib/Logger.php
+++ b/lib/Logger.php
@@ -43,6 +43,7 @@ private static function log(string $level, string $message, array $context = [])
$context['url'] = get_current_url();
$context['trace'] = trace_to_call_points(trace_from_exception($e));
// Don't log these exceptions
+ // todo: this logic belongs in log handler
$ignoredExceptions = [
'You must specify a format',
'Format name invalid',
@@ -54,6 +55,10 @@ private static function log(string $level, string $message, array $context = [])
'Unable to find channel. The channel is non-existing or non-public',
// fb
'This group is not public! RSS-Bridge only supports public groups!',
+ 'You must be logged in to view this page',
+ 'Unable to get the page id. You should consider getting the ID by hand',
+ // tiktok 404
+ 'https://www.tiktok.com/@',
];
foreach ($ignoredExceptions as $ignoredException) {
if (str_starts_with($e->getMessage(), $ignoredException)) {
@@ -76,6 +81,6 @@ private static function log(string $level, string $message, array $context = [])
// Log to file
// todo: extract to log handler
- //file_put_contents('/tmp/rss-bridge.log', $text, FILE_APPEND);
+ // file_put_contents('/tmp/rss-bridge.log', $text, FILE_APPEND | LOCK_EX);
}
}
diff --git a/lib/RssBridge.php b/lib/RssBridge.php
index e6f1c9e4409..8969dc549af 100644
--- a/lib/RssBridge.php
+++ b/lib/RssBridge.php
@@ -2,6 +2,9 @@
final class RssBridge
{
+ private static HttpClient $httpClient;
+ private static CacheInterface $cache;
+
public function main(array $argv = [])
{
if ($argv) {
@@ -14,7 +17,7 @@ public function main(array $argv = [])
try {
$this->run($request);
} catch (\Throwable $e) {
- Logger::error('Exception in main', ['e' => $e]);
+ Logger::error(sprintf('Exception in RssBridge::main(): %s', create_sane_exception_message($e)), ['e' => $e]);
http_response_code(500);
print render(__DIR__ . '/../templates/error.html.php', ['e' => $e]);
}
@@ -52,7 +55,7 @@ private function run($request): void
$error = error_get_last();
if ($error) {
$message = sprintf(
- 'Fatal Error %s: %s in %s line %s',
+ '(shutdown) %s: %s in %s line %s',
$error['type'],
sanitize_root($error['message']),
sanitize_root($error['file']),
@@ -69,6 +72,11 @@ private function run($request): void
// Consider: ini_set('error_reporting', E_ALL & ~E_DEPRECATED);
date_default_timezone_set(Configuration::getConfig('system', 'timezone'));
+ $cacheFactory = new CacheFactory();
+
+ self::$httpClient = new CurlHttpClient();
+ self::$cache = $cacheFactory->create();
+
if (Configuration::getConfig('authentication', 'enable')) {
$authenticationMiddleware = new AuthenticationMiddleware();
$authenticationMiddleware();
@@ -98,4 +106,14 @@ private function run($request): void
$response->send();
}
}
+
+ public static function getHttpClient(): HttpClient
+ {
+ return self::$httpClient;
+ }
+
+ public static function getCache(): CacheInterface
+ {
+ return self::$cache;
+ }
}
diff --git a/lib/TwitterClient.php b/lib/TwitterClient.php
index fa8d765f837..0c6b95355eb 100644
--- a/lib/TwitterClient.php
+++ b/lib/TwitterClient.php
@@ -11,8 +11,95 @@ class TwitterClient
public function __construct(CacheInterface $cache)
{
$this->cache = $cache;
- $this->authorization = 'AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA';
- $this->data = $cache->loadData() ?? [];
+
+ $cache->setScope('twitter');
+ $cache->setKey(['cache']);
+ $cache->purgeCache(60 * 60 * 3);
+
+ $this->data = $this->cache->loadData() ?? [];
+ $this->authorization = 'AAAAAAAAAAAAAAAAAAAAAGHtAgAAAAAA%2Bx7ILXNILCqkSGIzy6faIHZ9s3Q%3DQy97w6SIrzE7lQwPJEYQBsArEE2fC25caFwRBvAGi456G09vGR';
+ }
+
+ private function extractTweetAndUsersFromGraphQL($timeline)
+ {
+ if (isset($timeline->data->user)) {
+ $result = $timeline->data->user->result;
+ $instructions = $result->timeline_v2->timeline->instructions;
+ } else {
+ $result = $timeline->data->list->timeline_response;
+ $instructions = $result->timeline->instructions;
+ }
+ if (isset($result->__typename) && $result->__typename === 'UserUnavailable') {
+ throw new \Exception('UserUnavailable');
+ }
+ $instructionTypes = [
+ 'TimelineAddEntries',
+ 'TimelineClearCache',
+ 'TimelinePinEntry', // unclear purpose, maybe pinned tweet?
+ ];
+ if (!isset($instructions[1]) && isset($timeline->data->user)) {
+ throw new \Exception('The account exists but has not tweeted yet?');
+ }
+
+ $entries = null;
+ foreach ($instructions as $instruction) {
+ $instructionType = '';
+ if (isset($instruction->type)) {
+ $instructionType = $instruction->type;
+ } else {
+ $instructionType = $instruction->__typename;
+ }
+
+ if ($instructionType === 'TimelineAddEntries') {
+ $entries = $instruction->entries;
+ break;
+ }
+ }
+ if (!$entries) {
+ throw new \Exception(sprintf('Unable to find time line tweets in: %s', implode(',', array_column($instructions, 'type'))));
+ }
+
+ $tweets = [];
+ $userIds = [];
+ foreach ($entries as $entry) {
+ $entryType = '';
+
+ if (isset($entry->content->entryType)) {
+ $entryType = $entry->content->entryType;
+ } else {
+ $entryType = $entry->content->__typename;
+ }
+
+ if ($entryType !== 'TimelineTimelineItem') {
+ continue;
+ }
+
+ if (isset($timeline->data->user)) {
+ if (!isset($entry->content->itemContent->tweet_results->result->legacy)) {
+ continue;
+ }
+ $tweets[] = $entry->content->itemContent->tweet_results->result->legacy;
+
+ $userIds[] = $entry->content->itemContent->tweet_results->result->core->user_results->result;
+ } else {
+ if (!isset($entry->content->content->tweetResult->result->legacy)) {
+ continue;
+ }
+ $tweets[] = $entry->content->content->tweetResult->result->legacy;
+
+ $userIds[] = $entry->content->content->tweetResult->result->core->user_result->result;
+ }
+ }
+
+ return (object) [
+ 'userIds' => $userIds,
+ 'tweets' => $tweets,
+ ];
+ }
+
+ private function extractTweetFromSearch($searchResult)
+ {
+ return $searchResult->statuses;
}
public function fetchUserTweets(string $screenName): \stdClass
@@ -22,7 +109,6 @@ public function fetchUserTweets(string $screenName): \stdClass
$userInfo = $this->fetchUserInfoByScreenName($screenName);
} catch (HttpException $e) {
if ($e->getCode() === 403) {
- Logger::info('The guest token has expired');
$this->data['guest_token'] = null;
$this->fetchGuestToken();
$userInfo = $this->fetchUserInfoByScreenName($screenName);
@@ -32,59 +118,79 @@ public function fetchUserTweets(string $screenName): \stdClass
}
try {
- $timeline = $this->fetchTimeline($userInfo->rest_id);
+ $timeline = $this->fetchTimelineUsingSearch($screenName);
} catch (HttpException $e) {
if ($e->getCode() === 403) {
- Logger::info('The guest token has expired');
$this->data['guest_token'] = null;
$this->fetchGuestToken();
- $timeline = $this->fetchTimeline($userInfo->rest_id);
+ $timeline = $this->fetchTimelineUsingSearch($screenName);
} else {
throw $e;
}
}
- $result = $timeline->data->user->result;
- if ($result->__typename === 'UserUnavailable') {
- throw new \Exception('UserUnavailable');
- }
- $instructionTypes = ['TimelineAddEntries', 'TimelineClearCache'];
- $instructions = $result->timeline_v2->timeline->instructions;
- if (!isset($instructions[1])) {
- throw new \Exception('The account exists but has not tweeted yet?');
- }
- $instruction = $instructions[1];
- if ($instruction->type !== 'TimelineAddEntries') {
- throw new \Exception(sprintf('Unexpected instruction type: %s', $instruction->type));
- }
- $tweets = [];
- foreach ($instruction->entries as $entry) {
- if ($entry->content->entryType !== 'TimelineTimelineItem') {
- continue;
- }
- if (!isset($entry->content->itemContent->tweet_results->result->legacy)) {
- continue;
- }
- $tweets[] = $entry->content->itemContent->tweet_results->result->legacy;
- }
+ $tweets = $this->extractTweetFromSearch($timeline);
+
return (object) [
'user_info' => $userInfo,
'tweets' => $tweets,
];
}
+ public function fetchListTweets($query, $operation = '')
+ {
+ $id = '';
+ $this->fetchGuestToken();
+ if ($operation == 'By list') {
+ try {
+ $listInfo = $this->fetchListInfoBySlug($query['screenName'], $query['listSlug']);
+ $id = $listInfo->id_str;
+ } catch (HttpException $e) {
+ if ($e->getCode() === 403) {
+ $this->data['guest_token'] = null;
+ $this->fetchGuestToken();
+ $listInfo = $this->fetchListInfoBySlug($query['screenName'], $query['listSlug']);
+ $id = $listInfo->id_str;
+ } else {
+ throw $e;
+ }
+ }
+ } elseif ($operation === 'By list ID') {
+ $id = $query['listId'];
+ } else {
+ throw new \Exception('Unknown operation to make list tweets');
+ }
+
+ try {
+ $timeline = $this->fetchListTimeline($id);
+ } catch (HttpException $e) {
+ if ($e->getCode() === 403) {
+ $this->data['guest_token'] = null;
+ $this->fetchGuestToken();
+ $timeline = $this->fetchListTimeline($id);
+ } else {
+ throw $e;
+ }
+ }
+
+ $data = $this->extractTweetAndUsersFromGraphQL($timeline);
+
+ return $data;
+ }
+
private function fetchGuestToken(): void
{
if (isset($this->data['guest_token'])) {
- Logger::info('Reusing cached guest token: ' . $this->data['guest_token']);
return;
}
$url = 'https://api.twitter.com/1.1/guest/activate.json';
$response = getContents($url, $this->createHttpHeaders(), [CURLOPT_POST => true]);
$guest_token = json_decode($response)->guest_token;
$this->data['guest_token'] = $guest_token;
+
+ $this->cache->setScope('twitter');
+ $this->cache->setKey(['cache']);
$this->cache->saveData($this->data);
- Logger::info("Fetch new guest token: $guest_token");
}
private function fetchUserInfoByScreenName(string $screenName)
@@ -100,13 +206,16 @@ private function fetchUserInfoByScreenName(string $screenName)
'https://twitter.com/i/api/graphql/hc-pka9A7gyS3xODIafnrQ/UserByScreenName?variables=%s',
urlencode(json_encode($variables))
);
- $response = json_decode(getContents($url, $this->createHttpHeaders()));
+ $response = Json::decode(getContents($url, $this->createHttpHeaders()), false);
if (isset($response->errors)) {
// Grab the first error message
throw new \Exception(sprintf('From twitter api: "%s"', $response->errors[0]->message));
}
$userInfo = $response->data->user;
$this->data[$screenName] = $userInfo;
+
+ $this->cache->setScope('twitter');
+ $this->cache->setKey(['cache']);
$this->cache->saveData($this->data);
return $userInfo;
}
@@ -150,7 +259,164 @@ private function fetchTimeline($userId)
urlencode(json_encode($variables)),
urlencode(json_encode($features))
);
- $response = json_decode(getContents($url, $this->createHttpHeaders()));
+ $response = Json::decode(getContents($url, $this->createHttpHeaders()), false);
+ return $response;
+ }
+
+ private function fetchTimelineUsingSearch($screenName)
+ {
+ $params = [
+ 'q' => 'from:' . $screenName,
+ 'modules' => 'status',
+ 'result_type' => 'recent'
+ ];
+ $response = $this->search($params);
+ return $response;
+ }
+
+ public function search($queryParam)
+ {
+ $url = sprintf(
+ 'https://api.twitter.com/1.1/search/tweets.json?%s',
+ http_build_query($queryParam)
+ );
+ $response = Json::decode(getContents($url, $this->createHttpHeaders()), false);
+ return $response;
+ }
+
+ private function fetchListInfoBySlug($screenName, $listSlug)
+ {
+ if (isset($this->data[$screenName . '-' . $listSlug])) {
+ return $this->data[$screenName . '-' . $listSlug];
+ }
+
+ $features = [
+ 'android_graphql_skip_api_media_color_palette' => false,
+ 'blue_business_profile_image_shape_enabled' => false,
+ 'creator_subscriptions_subscription_count_enabled' => false,
+ 'creator_subscriptions_tweet_preview_api_enabled' => true,
+ 'freedom_of_speech_not_reach_fetch_enabled' => false,
+ 'graphql_is_translatable_rweb_tweet_is_translatable_enabled' => false,
+ 'hidden_profile_likes_enabled' => false,
+ 'highlights_tweets_tab_ui_enabled' => false,
+ 'interactive_text_enabled' => false,
+ 'longform_notetweets_consumption_enabled' => true,
+ 'longform_notetweets_inline_media_enabled' => false,
+ 'longform_notetweets_richtext_consumption_enabled' => true,
+ 'longform_notetweets_rich_text_read_enabled' => false,
+ 'responsive_web_edit_tweet_api_enabled' => false,
+ 'responsive_web_enhance_cards_enabled' => false,
+ 'responsive_web_graphql_exclude_directive_enabled' => true,
+ 'responsive_web_graphql_skip_user_profile_image_extensions_enabled' => false,
+ 'responsive_web_graphql_timeline_navigation_enabled' => false,
+ 'responsive_web_media_download_video_enabled' => false,
+ 'responsive_web_text_conversations_enabled' => false,
+ 'responsive_web_twitter_article_tweet_consumption_enabled' => false,
+ 'responsive_web_twitter_blue_verified_badge_is_enabled' => true,
+ 'rweb_lists_timeline_redesign_enabled' => true,
+ 'spaces_2022_h2_clipping' => true,
+ 'spaces_2022_h2_spaces_communities' => true,
+ 'standardized_nudges_misinfo' => false,
+ 'subscriptions_verification_info_enabled' => true,
+ 'subscriptions_verification_info_reason_enabled' => true,
+ 'subscriptions_verification_info_verified_since_enabled' => true,
+ 'super_follow_badge_privacy_enabled' => false,
+ 'super_follow_exclusive_tweet_notifications_enabled' => false,
+ 'super_follow_tweet_api_enabled' => false,
+ 'super_follow_user_api_enabled' => false,
+ 'tweet_awards_web_tipping_enabled' => false,
+ 'tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled' => false,
+ 'tweetypie_unmention_optimization_enabled' => false,
+ 'unified_cards_ad_metadata_container_dynamic_card_content_query_enabled' => false,
+ 'verified_phone_label_enabled' => false,
+ 'vibe_api_enabled' => false,
+ 'view_counts_everywhere_api_enabled' => false
+ ];
+ $variables = [
+ 'screenName' => $screenName,
+ 'listSlug' => $listSlug
+ ];
+
+ $url = sprintf(
+ 'https://twitter.com/i/api/graphql/-kmqNvm5Y-cVrfvBy6docg/ListBySlug?variables=%s&features=%s',
+ urlencode(json_encode($variables)),
+ urlencode(json_encode($features))
+ );
+
+ $response = Json::decode(getContents($url, $this->createHttpHeaders()), false);
+ if (isset($response->errors)) {
+ // Grab the first error message
+ throw new \Exception(sprintf('From twitter api: "%s"', $response->errors[0]->message));
+ }
+ if (!isset($response->data->user_by_screen_name->list)) {
+ throw new \Exception(
+ sprintf('Unable to find list in twitter response for %s, %s', $screenName, $listSlug)
+ );
+ }
+ $listInfo = $response->data->user_by_screen_name->list;
+ $this->data[$screenName . '-' . $listSlug] = $listInfo;
+
+ $this->cache->setScope('twitter');
+ $this->cache->setKey(['cache']);
+ $this->cache->saveData($this->data);
+ return $listInfo;
+ }
+
+ private function fetchListTimeline($listId)
+ {
+ $features = [
+ 'android_graphql_skip_api_media_color_palette' => false,
+ 'blue_business_profile_image_shape_enabled' => false,
+ 'creator_subscriptions_subscription_count_enabled' => false,
+ 'creator_subscriptions_tweet_preview_api_enabled' => true,
+ 'freedom_of_speech_not_reach_fetch_enabled' => false,
+ 'graphql_is_translatable_rweb_tweet_is_translatable_enabled' => false,
+ 'hidden_profile_likes_enabled' => false,
+ 'highlights_tweets_tab_ui_enabled' => false,
+ 'interactive_text_enabled' => false,
+ 'longform_notetweets_consumption_enabled' => true,
+ 'longform_notetweets_inline_media_enabled' => false,
+ 'longform_notetweets_richtext_consumption_enabled' => true,
+ 'longform_notetweets_rich_text_read_enabled' => false,
+ 'responsive_web_edit_tweet_api_enabled' => false,
+ 'responsive_web_enhance_cards_enabled' => false,
+ 'responsive_web_graphql_exclude_directive_enabled' => true,
+ 'responsive_web_graphql_skip_user_profile_image_extensions_enabled' => false,
+ 'responsive_web_graphql_timeline_navigation_enabled' => false,
+ 'responsive_web_media_download_video_enabled' => false,
+ 'responsive_web_text_conversations_enabled' => false,
+ 'responsive_web_twitter_article_tweet_consumption_enabled' => false,
+ 'responsive_web_twitter_blue_verified_badge_is_enabled' => true,
+ 'rweb_lists_timeline_redesign_enabled' => true,
+ 'spaces_2022_h2_clipping' => true,
+ 'spaces_2022_h2_spaces_communities' => true,
+ 'standardized_nudges_misinfo' => false,
+ 'subscriptions_verification_info_enabled' => true,
+ 'subscriptions_verification_info_reason_enabled' => true,
+ 'subscriptions_verification_info_verified_since_enabled' => true,
+ 'super_follow_badge_privacy_enabled' => false,
+ 'super_follow_exclusive_tweet_notifications_enabled' => false,
+ 'super_follow_tweet_api_enabled' => false,
+ 'super_follow_user_api_enabled' => false,
+ 'tweet_awards_web_tipping_enabled' => false,
+ 'tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled' => false,
+ 'tweetypie_unmention_optimization_enabled' => false,
+ 'unified_cards_ad_metadata_container_dynamic_card_content_query_enabled' => false,
+ 'verified_phone_label_enabled' => false,
+ 'vibe_api_enabled' => false,
+ 'view_counts_everywhere_api_enabled' => false
+ ];
+ $variables = [
+ 'rest_id' => $listId,
+ 'count' => 20
+ ];
+
+ $url = sprintf(
+ 'https://twitter.com/i/api/graphql/BbGLL1ZfMibdFNWlk7a0Pw/ListTimeline?variables=%s&features=%s',
+ urlencode(json_encode($variables)),
+ urlencode(json_encode($features))
+ );
+ $response = Json::decode(getContents($url, $this->createHttpHeaders()), false);
return $response;
}
diff --git a/lib/XPathAbstract.php b/lib/XPathAbstract.php
index 27d6e1a1a05..059293228a4 100644
--- a/lib/XPathAbstract.php
+++ b/lib/XPathAbstract.php
@@ -388,7 +388,7 @@ public function collectData()
libxml_use_internal_errors(false);
// fix relative links
- defaultLinkTo($webPageHtml, $this->feedUri);
+ defaultLinkTo($webPageHtml, $webPageHtml->baseURI ?? $this->feedUri);
$xpath = new \DOMXPath($webPageHtml);
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 86182801a45..e05dd94a251 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -29,12 +29,6 @@
/** Path to the cache folder */
const PATH_CACHE = __DIR__ . '/../cache/';
-/** Path to the whitelist file */
-const WHITELIST = __DIR__ . '/../whitelist.txt';
-
-/** Path to the default whitelist file */
-const WHITELIST_DEFAULT = __DIR__ . '/../whitelist.default.txt';
-
/** URL to the RSS-Bridge repository */
const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/';
diff --git a/lib/contents.php b/lib/contents.php
index a1630e3ca19..5587a98e8b8 100644
--- a/lib/contents.php
+++ b/lib/contents.php
@@ -63,6 +63,11 @@ public function getBody()
return $this->body;
}
+ public function getCode()
+ {
+ return $this->code;
+ }
+
public function getHeaders()
{
return $this->headers;
@@ -99,12 +104,7 @@ function getContents(
array $curlOptions = [],
bool $returnFull = false
) {
- $cacheFactory = new CacheFactory();
-
- $cache = $cacheFactory->create();
- $cache->setScope('server');
- $cache->purgeCache(86400); // 24 hours (forced)
- $cache->setKey([$url]);
+ $httpClient = RssBridge::getHttpClient();
// Snagged from https://github.com/lwthiker/curl-impersonate/blob/main/firefox/curl_ff102
$defaultHttpHeaders = [
@@ -140,24 +140,23 @@ function getContents(
if (Configuration::getConfig('proxy', 'url') && !defined('NOPROXY')) {
$config['proxy'] = Configuration::getConfig('proxy', 'url');
}
- if (!Debug::isEnabled() && $cache->getTime()) {
+
+ $cache = RssBridge::getCache();
+ $cache->setScope('server');
+ $cache->setKey([$url]);
+
+ if (!Debug::isEnabled() && $cache->getTime() && $cache->loadData(86400 * 7)) {
$config['if_not_modified_since'] = $cache->getTime();
}
- $result = _http_request($url, $config);
- $response = [
- 'code' => $result['code'],
- 'status_lines' => $result['status_lines'],
- 'header' => $result['headers'],
- 'content' => $result['body'],
- ];
+ $response = $httpClient->request($url, $config);
- switch ($result['code']) {
+ switch ($response['code']) {
case 200:
case 201:
case 202:
- if (isset($result['headers']['cache-control'])) {
- $cachecontrol = $result['headers']['cache-control'];
+ if (isset($response['headers']['cache-control'])) {
+ $cachecontrol = $response['headers']['cache-control'];
$lastValue = array_pop($cachecontrol);
$directives = explode(',', $lastValue);
$directives = array_map('trim', $directives);
@@ -166,7 +165,7 @@ function getContents(
break;
}
}
- $cache->saveData($result['body']);
+ $cache->saveData($response['body']);
break;
case 301:
case 302:
@@ -175,16 +174,16 @@ function getContents(
break;
case 304:
// Not Modified
- $response['content'] = $cache->loadData();
+ $response['body'] = $cache->loadData(86400 * 7);
break;
default:
$exceptionMessage = sprintf(
'%s resulted in %s %s %s',
$url,
- $result['code'],
- Response::STATUS_CODES[$result['code']] ?? '',
+ $response['code'],
+ Response::STATUS_CODES[$response['code']] ?? '',
// If debug, include a part of the response body in the exception message
- Debug::isEnabled() ? mb_substr($result['body'], 0, 500) : '',
+ Debug::isEnabled() ? mb_substr($response['body'], 0, 500) : '',
);
// The following code must be extracted if it grows too much
@@ -195,134 +194,141 @@ function getContents(
'Security | Glassdoor',
];
foreach ($cloudflareTitles as $cloudflareTitle) {
- if (str_contains($result['body'], $cloudflareTitle)) {
- throw new CloudFlareException($exceptionMessage, $result['code']);
+ if (str_contains($response['body'], $cloudflareTitle)) {
+ throw new CloudFlareException($exceptionMessage, $response['code']);
}
}
-
- throw new HttpException($exceptionMessage, $result['code']);
+ throw new HttpException(trim($exceptionMessage), $response['code']);
}
if ($returnFull === true) {
+ // For legacy reasons, use content instead of body
+ $response['content'] = $response['body'];
+ unset($response['body']);
return $response;
}
- return $response['content'];
+ return $response['body'];
}
-/**
- * Fetch content from url
- *
- * @internal Private function used internally
- * @throws HttpException
- */
-function _http_request(string $url, array $config = []): array
+interface HttpClient
{
- $defaults = [
- 'useragent' => null,
- 'timeout' => 5,
- 'headers' => [],
- 'proxy' => null,
- 'curl_options' => [],
- 'if_not_modified_since' => null,
- 'retries' => 3,
- 'max_filesize' => null,
- ];
- $config = array_merge($defaults, $config);
-
- $ch = curl_init($url);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
- curl_setopt($ch, CURLOPT_HEADER, false);
- $httpHeaders = [];
- foreach ($config['headers'] as $name => $value) {
- $httpHeaders[] = sprintf('%s: %s', $name, $value);
- }
- curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeaders);
- if ($config['useragent']) {
- curl_setopt($ch, CURLOPT_USERAGENT, $config['useragent']);
- }
- curl_setopt($ch, CURLOPT_TIMEOUT, $config['timeout']);
- curl_setopt($ch, CURLOPT_ENCODING, '');
- curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-
- if ($config['max_filesize']) {
- // This option inspects the Content-Length header
- curl_setopt($ch, CURLOPT_MAXFILESIZE, $config['max_filesize']);
- curl_setopt($ch, CURLOPT_NOPROGRESS, false);
- // This progress function will monitor responses who omit the Content-Length header
- curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function ($ch, $downloadSize, $downloaded, $uploadSize, $uploaded) use ($config) {
- if ($downloaded > $config['max_filesize']) {
- // Return a non-zero value to abort the transfer
- return -1;
- }
- return 0;
- });
- }
-
- if ($config['proxy']) {
- curl_setopt($ch, CURLOPT_PROXY, $config['proxy']);
- }
- if (curl_setopt_array($ch, $config['curl_options']) === false) {
- throw new \Exception('Tried to set an illegal curl option');
- }
+ public function request(string $url, array $config = []): array;
+}
- if ($config['if_not_modified_since']) {
- curl_setopt($ch, CURLOPT_TIMEVALUE, $config['if_not_modified_since']);
- curl_setopt($ch, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
- }
+final class CurlHttpClient implements HttpClient
+{
+ public function request(string $url, array $config = []): array
+ {
+ $defaults = [
+ 'useragent' => null,
+ 'timeout' => 5,
+ 'headers' => [],
+ 'proxy' => null,
+ 'curl_options' => [],
+ 'if_not_modified_since' => null,
+ 'retries' => 3,
+ 'max_filesize' => null,
+ 'max_redirections' => 5,
+ ];
+ $config = array_merge($defaults, $config);
- $responseStatusLines = [];
- $responseHeaders = [];
- curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($ch, $rawHeader) use (&$responseHeaders, &$responseStatusLines) {
- $len = strlen($rawHeader);
- if ($rawHeader === "\r\n") {
- return $len;
+ $ch = curl_init($url);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_MAXREDIRS, $config['max_redirections']);
+ curl_setopt($ch, CURLOPT_HEADER, false);
+ $httpHeaders = [];
+ foreach ($config['headers'] as $name => $value) {
+ $httpHeaders[] = sprintf('%s: %s', $name, $value);
}
- if (preg_match('#^HTTP/(2|1.1|1.0)#', $rawHeader)) {
- $responseStatusLines[] = $rawHeader;
- return $len;
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeaders);
+ if ($config['useragent']) {
+ curl_setopt($ch, CURLOPT_USERAGENT, $config['useragent']);
}
- $header = explode(':', $rawHeader);
- if (count($header) === 1) {
- return $len;
+ curl_setopt($ch, CURLOPT_TIMEOUT, $config['timeout']);
+ curl_setopt($ch, CURLOPT_ENCODING, '');
+ curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+
+ if ($config['max_filesize']) {
+ // This option inspects the Content-Length header
+ curl_setopt($ch, CURLOPT_MAXFILESIZE, $config['max_filesize']);
+ curl_setopt($ch, CURLOPT_NOPROGRESS, false);
+ // This progress function will monitor responses who omit the Content-Length header
+ curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function ($ch, $downloadSize, $downloaded, $uploadSize, $uploaded) use ($config) {
+ if ($downloaded > $config['max_filesize']) {
+ // Return a non-zero value to abort the transfer
+ return -1;
+ }
+ return 0;
+ });
+ }
+
+ if ($config['proxy']) {
+ curl_setopt($ch, CURLOPT_PROXY, $config['proxy']);
}
- $name = mb_strtolower(trim($header[0]));
- $value = trim(implode(':', array_slice($header, 1)));
- if (!isset($responseHeaders[$name])) {
- $responseHeaders[$name] = [];
+ if (curl_setopt_array($ch, $config['curl_options']) === false) {
+ throw new \Exception('Tried to set an illegal curl option');
}
- $responseHeaders[$name][] = $value;
- return $len;
- });
- $attempts = 0;
- while (true) {
- $attempts++;
- $data = curl_exec($ch);
- if ($data !== false) {
- // The network call was successful, so break out of the loop
- break;
+ if ($config['if_not_modified_since']) {
+ curl_setopt($ch, CURLOPT_TIMEVALUE, $config['if_not_modified_since']);
+ curl_setopt($ch, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
}
- if ($attempts > $config['retries']) {
- // Finally give up
- throw new HttpException(sprintf(
- 'cURL error %s: %s (%s) for %s',
- curl_error($ch),
- curl_errno($ch),
- 'https://curl.haxx.se/libcurl/c/libcurl-errors.html',
- $url
- ));
+
+ $responseStatusLines = [];
+ $responseHeaders = [];
+ curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($ch, $rawHeader) use (&$responseHeaders, &$responseStatusLines) {
+ $len = strlen($rawHeader);
+ if ($rawHeader === "\r\n") {
+ return $len;
+ }
+ if (preg_match('#^HTTP/(2|1.1|1.0)#', $rawHeader)) {
+ $responseStatusLines[] = $rawHeader;
+ return $len;
+ }
+ $header = explode(':', $rawHeader);
+ if (count($header) === 1) {
+ return $len;
+ }
+ $name = mb_strtolower(trim($header[0]));
+ $value = trim(implode(':', array_slice($header, 1)));
+ if (!isset($responseHeaders[$name])) {
+ $responseHeaders[$name] = [];
+ }
+ $responseHeaders[$name][] = $value;
+ return $len;
+ });
+
+ $attempts = 0;
+ while (true) {
+ $attempts++;
+ $data = curl_exec($ch);
+ if ($data !== false) {
+ // The network call was successful, so break out of the loop
+ break;
+ }
+ if ($attempts > $config['retries']) {
+ // Finally give up
+ $curl_error = curl_error($ch);
+ $curl_errno = curl_errno($ch);
+ throw new HttpException(sprintf(
+ 'cURL error %s: %s (%s) for %s',
+ $curl_error,
+ $curl_errno,
+ 'https://curl.haxx.se/libcurl/c/libcurl-errors.html',
+ $url
+ ));
+ }
}
- }
- $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
- curl_close($ch);
- return [
- 'code' => $statusCode,
- 'status_lines' => $responseStatusLines,
- 'headers' => $responseHeaders,
- 'body' => $data,
- ];
+ $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+ curl_close($ch);
+ return [
+ 'code' => $statusCode,
+ 'status_lines' => $responseStatusLines,
+ 'headers' => $responseHeaders,
+ 'body' => $data,
+ ];
+ }
}
/**
@@ -385,7 +391,7 @@ function getSimpleHTMLDOM(
* _Notice_: Cached contents are forcefully removed after 24 hours (86400 seconds).
*
* @param string $url The URL.
- * @param int $duration Cache duration in seconds.
+ * @param int $timeout Cache duration in seconds.
* @param array $header (optional) A list of cURL header.
* For more information follow the links below.
* * https://php.net/manual/en/function.curl-setopt.php
@@ -410,7 +416,7 @@ function getSimpleHTMLDOM(
*/
function getSimpleHTMLDOMCached(
$url,
- $duration = 86400,
+ $timeout = 86400,
$header = [],
$opts = [],
$lowercase = true,
@@ -420,40 +426,18 @@ function getSimpleHTMLDOMCached(
$defaultBRText = DEFAULT_BR_TEXT,
$defaultSpanText = DEFAULT_SPAN_TEXT
) {
- Logger::debug(sprintf('Caching url %s, duration %d', $url, $duration));
-
- // Initialize cache
- $cacheFactory = new CacheFactory();
-
- $cache = $cacheFactory->create();
+ $cache = RssBridge::getCache();
$cache->setScope('pages');
- $cache->purgeCache(86400); // 24 hours (forced)
-
- $params = [$url];
- $cache->setKey($params);
-
- // Determine if cached file is within duration
- $time = $cache->getTime();
- if (
- $time !== false
- && (time() - $duration < $time)
- && !Debug::isEnabled()
- ) {
- // Contents within duration and debug mode is disabled
- $content = $cache->loadData();
- } else {
- // Contents not within duration, or debug mode is enabled
- $content = getContents(
- $url,
- $header ?? [],
- $opts ?? []
- );
- // todo: fix bad if statement
- if ($content !== false) {
- $cache->saveData($content);
- }
+ $cache->setKey([$url]);
+ $content = $cache->loadData($timeout);
+ if (!$content || Debug::isEnabled()) {
+ $content = getContents($url, $header ?? [], $opts ?? []);
+ }
+ if ($content) {
+ $cache->setScope('pages');
+ $cache->setKey([$url]);
+ $cache->saveData($content);
}
-
return str_get_html(
$content,
$lowercase,
diff --git a/lib/utils.php b/lib/utils.php
index ea329f8dec4..94f928cd7ad 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -51,11 +51,13 @@ function get_current_url(): string
function create_sane_exception_message(\Throwable $e): string
{
+ $sanitizedMessage = sanitize_root($e->getMessage());
+ $sanitizedFilepath = sanitize_root($e->getFile());
return sprintf(
'%s: %s in %s line %s',
get_class($e),
- sanitize_root($e->getMessage()),
- sanitize_root($e->getFile()),
+ $sanitizedMessage,
+ $sanitizedFilepath,
$e->getLine()
);
}
diff --git a/tests/Actions/ActionImplementationTest.php b/tests/Actions/ActionImplementationTest.php
index bf5dc4f9c78..e70dd7e2fab 100644
--- a/tests/Actions/ActionImplementationTest.php
+++ b/tests/Actions/ActionImplementationTest.php
@@ -10,6 +10,11 @@ class ActionImplementationTest extends TestCase
private $class;
private $obj;
+ public function setUp(): void
+ {
+ \Configuration::loadConfiguration();
+ }
+
/**
* @dataProvider dataActionsProvider
*/
diff --git a/tests/Actions/ListActionTest.php b/tests/Actions/ListActionTest.php
index 4373be7616b..e0625fb38ce 100644
--- a/tests/Actions/ListActionTest.php
+++ b/tests/Actions/ListActionTest.php
@@ -7,6 +7,11 @@
class ListActionTest extends TestCase
{
+ public function setUp(): void
+ {
+ \Configuration::loadConfiguration();
+ }
+
public function testHeaders()
{
$action = new \ListAction();
diff --git a/tests/BridgeFactoryTest.php b/tests/BridgeFactoryTest.php
new file mode 100644
index 00000000000..a97711ef25b
--- /dev/null
+++ b/tests/BridgeFactoryTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace RssBridge\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class BridgeFactoryTest extends TestCase
+{
+ public function setUp(): void
+ {
+ \Configuration::loadConfiguration();
+ }
+
+ public function testNormalizeBridgeName()
+ {
+ $this->assertSame('TwitterBridge', \BridgeFactory::normalizeBridgeName('TwitterBridge'));
+ $this->assertSame('TwitterBridge', \BridgeFactory::normalizeBridgeName('TwitterBridge.php'));
+ $this->assertSame('TwitterBridge', \BridgeFactory::normalizeBridgeName('Twitter'));
+ }
+
+ public function testSanitizeBridgeName()
+ {
+ $sut = new \BridgeFactory();
+
+ $this->assertSame('TwitterBridge', $sut->createBridgeClassName('twitterbridge'));
+ $this->assertSame('TwitterBridge', $sut->createBridgeClassName('twitter'));
+ $this->assertSame('TwitterBridge', $sut->createBridgeClassName('tWitTer'));
+ $this->assertSame('TwitterBridge', $sut->createBridgeClassName('TWITTERBRIDGE'));
+ }
+}
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
index 042fc7a1302..9a8ada142a3 100644
--- a/tests/CacheTest.php
+++ b/tests/CacheTest.php
@@ -6,6 +6,18 @@
class CacheTest extends TestCase
{
+ public function testConfig()
+ {
+ $sut = new \FileCache(['path' => '/tmp/']);
+ $this->assertSame(['path' => '/tmp/', 'enable_purge' => true], $sut->getConfig());
+
+ $sut = new \FileCache(['path' => '/', 'enable_purge' => false]);
+ $this->assertSame(['path' => '/', 'enable_purge' => false], $sut->getConfig());
+
+ $sut = new \FileCache(['path' => '/tmp', 'enable_purge' => true]);
+ $this->assertSame(['path' => '/tmp/', 'enable_purge' => true], $sut->getConfig());
+ }
+
public function testFileCache()
{
$temporaryFolder = sprintf('%s/rss_bridge_%s/', sys_get_temp_dir(), create_random_string());
@@ -19,6 +31,7 @@ public function testFileCache()
$sut->purgeCache(-1);
$sut->setKey(['key']);
+ $this->assertNull($sut->getTime());
$this->assertNull($sut->loadData());
$sut->saveData('data');
diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
index e913e463c1c..c2eca95cea3 100644
--- a/tests/ConfigurationTest.php
+++ b/tests/ConfigurationTest.php
@@ -14,6 +14,7 @@ public function testValueFromDefaultConfig()
Configuration::loadConfiguration();
$this->assertSame(null, Configuration::getConfig('foobar', ''));
$this->assertSame(null, Configuration::getConfig('foo', 'bar'));
+ $this->assertSame('baz', Configuration::getConfig('foo', 'bar', 'baz'));
$this->assertSame(null, Configuration::getConfig('cache', ''));
$this->assertSame('UTC', Configuration::getConfig('system', 'timezone'));
}
@@ -26,13 +27,18 @@ public function testValueFromCustomConfig()
public function testValueFromEnv()
{
- putenv('RSSBRIDGE_system_timezone=Europe/Berlin');
- putenv('RSSBRIDGE_TwitterV2Bridge_twitterv2apitoken=aaa');
- putenv('RSSBRIDGE_SQLiteCache_file=bbb');
- Configuration::loadConfiguration([], getenv());
+ $env = [
+ 'RSSBRIDGE_system_timezone' => 'Europe/Berlin',
+ 'RSSBRIDGE_SYSTEM_MESSAGE' => 'hello',
+ 'RSSBRIDGE_system_enabled_bridges' => 'TwitterBridge,GettrBridge',
+ 'RSSBRIDGE_system_enable_debug_mode' => 'true',
+ 'RSSBRIDGE_fileCache_path' => '/tmp/kek',
+ ];
+ Configuration::loadConfiguration([], $env);
$this->assertSame('Europe/Berlin', Configuration::getConfig('system', 'timezone'));
- $this->assertSame('aaa', Configuration::getConfig('TwitterV2Bridge', 'twitterv2apitoken'));
- $this->assertSame('bbb', Configuration::getConfig('SQLiteCache', 'file'));
- $this->assertSame('bbb', Configuration::getConfig('sqlitecache', 'file'));
+ $this->assertSame('hello', Configuration::getConfig('system', 'message'));
+ $this->assertSame(true, Configuration::getConfig('system', 'enable_debug_mode'));
+ $this->assertSame('/tmp/kek', Configuration::getConfig('FileCache', 'path'));
+ $this->assertSame(['TwitterBridge', 'GettrBridge'], Configuration::getConfig('system', 'enabled_bridges'));
}
}
diff --git a/whitelist.default.txt b/whitelist.default.txt
deleted file mode 100644
index 17df47ee548..00000000000
--- a/whitelist.default.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Youtube
-Twitter
-Telegram
-Reddit
-Filter
-Vk
-FeedMerge
-Twitch
-ThePirateBay