cuqmbr/rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-04-03 16:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks (#4065)

Browse Source
This commit is contained in:
Dag 2024-04-06 18:07:45 +02:00 committed by GitHub
parent b3ac1d176c
commit 4602f4f475
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/FilterBridge.php
View File

@ -77,7 +77,7 @@ class FilterBridge extends FeedExpander
{
$url = $this->getInput('url');
if (!Url::validate($url)) {
returnClientError('The url parameter must either refer to http or https protocol.');
throw new \Exception('The url parameter must either refer to http or https protocol.');
}
$this->collectExpandableDatas($this->getURI());
}

34
bridges/TrelloBridge.php
View File

@ -553,10 +553,8 @@ class TrelloBridge extends BridgeAbstract
private function queryAPI($path, $params = [])
{
$data = json_decode(getContents('https://trello.com/1/'
. $path
. '?'
. http_build_query($params)));
$url = 'https://trello.com/1/' . $path . '?' . http_build_query($params);
$data = json_decode(getContents($url));
return $data;
}
@ -576,33 +574,21 @@ class TrelloBridge extends BridgeAbstract
&& !$textOnly
&& isset($entity->originalUrl)
) {
$string = '<p><a href="'
. $entity->originalUrl
. '"><img src="'
. $entity->previewUrl
. '"></a></p>';
$string = sprintf(
'<p><a href="%s"><img src="%s"></a></p>',
$entity->originalUrl,
$entity->previewUrl ?? ''
);
} elseif ($type === 'card' && !$textOnly) {
$string = '<a href="https://trello.com/c/'
. $entity->shortLink
. '">'
. $entity->text
. '</a>';
$string = sprintf('<a href="https://trello.com/c/%s">%s</a>', $entity->shortLink, $entity->text);
} elseif ($type === 'member' && !$textOnly) {
$string = '<a href="https://trello.com/'
. $entity->username
. '">'
. $entity->text
. '</a>';
$string = sprintf('<a href="https://trello.com/%s">%s</a>', $entity->username, $entity->text);
} elseif ($type === 'date') {
$string = gmdate('M j, Y \a\t g:i A T', strtotime($entity->date));
} elseif ($type === 'translatable') {
$string = self::ACTION_TEXTS[$entity->translationKey];
} else {
if (isset($entity->text)) {
$string = $entity->text;
} else {
$string = '';
}
$string = $entity->text ?? '';
}
$strings['{' . $entity_name . '}'] = $string;
}

2
bridges/TwitchBridge.php
View File

@ -99,7 +99,7 @@ EOD;
$user = $data->user;
if ($user->videos === null) {
// twitch regularly does this for unknown reasons
$this->logger->info('Twitch returned empty set of videos', ['data' => $data]);
//$this->logger->info('Twitch returned empty set of videos', ['data' => $data]);
return;
}

2
formats/HtmlFormat.php
View File

@ -6,7 +6,7 @@ class HtmlFormat extends FormatAbstract
public function stringify()
{
// This query string comes in already url decoded
// This query string is url encoded
$queryString = $_SERVER['QUERY_STRING'];
$feedArray = $this->getFeed();

9
lib/BridgeAbstract.php
View File

@ -6,8 +6,17 @@ abstract class BridgeAbstract
const URI = '';
const DONATION_URI = '';
const DESCRIPTION = 'No description provided';
/**
* Preferably a github username
*/
const MAINTAINER = 'No maintainer';
/**
* Cache TTL in seconds
*/
const CACHE_TIMEOUT = 3600;
const CONFIGURATION = [];
const PARAMETERS = [];
const TEST_DETECT_PARAMETERS = [];

2
lib/contents.php
View File

@ -17,6 +17,8 @@ function getContents(
$httpClient = RssBridge::getHttpClient();
$cache = RssBridge::getCache();
// TODO: consider url validation at this point
$httpHeadersNormalized = [];
foreach ($httpHeaders as $httpHeader) {
$parts = explode(':', $httpHeader);