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

fix: various fixes (#3136)

Browse Source
This commit is contained in:
Dag 2022-11-08 21:17:32 +01:00 committed by GitHub
parent 00ff0890bb
commit b64f8f2a09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridges/FeedMergeBridge.php
View File

@ -64,7 +64,11 @@ TEXT;
} }
// Sort by timestamp descending // Sort by timestamp descending
usort($this->items, fn ($a, $b) => $b['timestamp'] <=> $a['timestamp']); usort($this->items, function ($a, $b) {
$t1 = $a['timestamp'] ?? $a['uri'] ?? $a['title'];
$t2 = $b['timestamp'] ?? $b['uri'] ?? $b['title'];
return $t2 <=> $t1;
});
// Remove duplicates by using url as unique key // Remove duplicates by using url as unique key
$items = []; $items = [];

10
bridges/TwitchBridge.php
View File

@ -84,12 +84,16 @@ query VODList($channel: String!, $types: [BroadcastType!]) {
} }
} }
EOD; EOD;
$channel = $this->getInput('channel');
$type = $this->getInput('type');
$variables = [ $variables = [
'channel' => $this->getInput('channel'), 'channel' => $channel,
'types' => self::BROADCAST_TYPES[$this->getInput('type')] 'types' => self::BROADCAST_TYPES[$type]
]; ];
$data = $this->apiRequest($query, $variables); $data = $this->apiRequest($query, $variables);
if ($data->user === null) {
throw new \Exception(sprintf('Unable to find channel `%s`', $channel));
}
$user = $data->user; $user = $data->user;
foreach ($user->videos->edges as $edge) { foreach ($user->videos->edges as $edge) {
$video = $edge->node; $video = $edge->node;

26
bridges/UsbekEtRicaBridge.php
View File

@ -49,20 +49,24 @@ class UsbekEtRicaBridge extends BridgeAbstract
$item['author'] = $author->plaintext; $item['author'] = $author->plaintext;
} }
$content = null;
$u = $article->find('a.card-img', 0); $u = $article->find('a.card-img', 0);
if ($u) {
$uri = $u->href; $uri = $u->href;
if (substr($uri, 0, 1) === 'h') { // absolute uri if (substr($uri, 0, 1) === 'h') {
$item['uri'] = $uri; // absolute uri
} else { // relative uri $item['uri'] = $uri;
$item['uri'] = $this->getURI() . $uri; } else {
// relative uri
$item['uri'] = $this->getURI() . $uri;
}
if ($fullarticle) {
$content = $this->loadFullArticle($item['uri']);
}
} }
if ($fullarticle) { if ($fullarticle && $content) {
$content = $this->loadFullArticle($item['uri']);
}
if ($fullarticle && !is_null($content)) {
$item['content'] = $content; $item['content'] = $content;
} else { } else {
$excerpt = $article->find('div.card-excerpt', 0); $excerpt = $article->find('div.card-excerpt', 0);