diff --git a/bridges/EBayBridge.php b/bridges/EBayBridge.php index f2919938..a867a179 100644 --- a/bridges/EBayBridge.php +++ b/bridges/EBayBridge.php @@ -84,7 +84,12 @@ class EBayBridge extends BridgeAbstract $sellerInfo = $listing->find('.s-item__seller-info-text', 0)->plaintext ?? ''; - $item['enclosures'] = [ $listing->find('.s-item__image-wrapper > img', 0)->src . '#.image' ]; + $image = $listing->find('.s-item__image-wrapper > img', 0); + if ($image) { + // Not quite sure why append fragment here + $imageUrl = $image->src . '#.image'; + $item['enclosures'] = [$imageUrl]; + } $item['content'] = <<$sellerInfo $location

diff --git a/bridges/JustWatchBridge.php b/bridges/JustWatchBridge.php index 59e60a16..66b61aff 100644 --- a/bridges/JustWatchBridge.php +++ b/bridges/JustWatchBridge.php @@ -169,10 +169,17 @@ class JustWatchBridge extends BridgeAbstract foreach ($titles as $title) { $item = []; $item['uri'] = $title->find('a', 0)->href; - $item['title'] = $provider->find('picture > img', 0)->alt . ' - ' . $title->find('.title-poster__image > img', 0)->alt; - $image = $title->find('.title-poster__image > img', 0)->attr['src']; - if (str_starts_with($image, 'data')) { - $image = $title->find('.title-poster__image > img', 0)->attr['data-src']; + + $itemTitle = sprintf( + '%s - %s', + $provider->find('picture > img', 0)->alt ?? '', + $title->find('.title-poster__image > img', 0)->alt ?? '' + ); + $item['title'] = $itemTitle; + + $imageUrl = $title->find('.title-poster__image > img', 0)->attr['src'] ?? ''; + if (str_starts_with($imageUrl, 'data')) { + $imageUrl = $title->find('.title-poster__image > img', 0)->attr['data-src']; } $content = 'Provider: ' @@ -190,7 +197,7 @@ class JustWatchBridge extends BridgeAbstract $content .= 'Poster:
'; $item['content'] = $content; diff --git a/bridges/PatreonBridge.php b/bridges/PatreonBridge.php index fdf84e7e..b64102da 100644 --- a/bridges/PatreonBridge.php +++ b/bridges/PatreonBridge.php @@ -100,12 +100,14 @@ class PatreonBridge extends BridgeAbstract ); $item['author'] = $user->full_name; - if (isset($post->attributes->image)) { - $item['content'] .= '

'; + $image = $post->attributes->image ?? null; + if ($image) { + $logo = sprintf( + '

', + $post->attributes->url, + $image->thumb_url ?? $image->url ?? $this->getURI() + ); + $item['content'] .= $logo; } if (isset($post->attributes->content)) { diff --git a/bridges/PepperBridgeAbstract.php b/bridges/PepperBridgeAbstract.php index 4ecd4c43..85178e54 100644 --- a/bridges/PepperBridgeAbstract.php +++ b/bridges/PepperBridgeAbstract.php @@ -129,7 +129,7 @@ class PepperBridgeAbstract extends BridgeAbstract // Find the text corresponding to the clock $spanDateDiv = $clock->parent()->find('span[class=hide--toW3]', 0); - $itemDate = $spanDateDiv->plaintext; + $itemDate = $spanDateDiv->plaintext ?? ''; // In case of a Local deal, there is no date, but we can use // this case for other reason (like date not in the last field) if ($this->contains($itemDate, $this->i8n('localdeal'))) { @@ -481,12 +481,12 @@ HEREDOC; ] ); if ($deal->find('span[class*=' . $selector . ']', 0) != null) { - return '
' - . $deal->find('span[class*=' . $selector . ']', 0)->children(2)->plaintext - . '
'; - } else { - return ''; + $children = $deal->find('span[class*=' . $selector . ']', 0)->children(2); + if ($children) { + return '
' . $children->plaintext . '
'; + } } + return ''; } /** diff --git a/bridges/TikTokBridge.php b/bridges/TikTokBridge.php index 2a038245..a426d065 100644 --- a/bridges/TikTokBridge.php +++ b/bridges/TikTokBridge.php @@ -53,7 +53,13 @@ class TikTokBridge extends BridgeAbstract $views = $div->find('strong.video-count', 0)->plaintext; $item['uri'] = $link; - $item['title'] = $div->find('a', 1)->plaintext; + + $a = $div->find('a', 1); + if ($a) { + $item['title'] = $a->plaintext; + } else { + $item['title'] = $this->getName(); + } $item['enclosures'][] = $image; $item['content'] = <<share_link; $item['title'] = $post->title; - $item['timestamp'] = date(DateTimeInterface::ATOM, $post->publication_date); + + $publicationDateUnixTimestamp = $post->publication_date ?? null; + if ($publicationDateUnixTimestamp) { + $item['timestamp'] = date(DateTimeInterface::ATOM, $publicationDateUnixTimestamp); + } + $item['content'] = $post->text; $item['enclosures'] = [ $post->image, diff --git a/lib/BridgeAbstract.php b/lib/BridgeAbstract.php index 322481e2..ddc1f175 100644 --- a/lib/BridgeAbstract.php +++ b/lib/BridgeAbstract.php @@ -316,7 +316,9 @@ abstract class BridgeAbstract implements BridgeInterface } $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) { + // todo: this cast emits error if it's an array + $valueString = (string) $first_level_value; + if ($needle === $valueString) { return $first_level_key; } elseif (is_array($first_level_value)) { foreach ($first_level_value as $second_level_key => $second_level_value) { diff --git a/lib/Logger.php b/lib/Logger.php index e15035fe..22553dce 100644 --- a/lib/Logger.php +++ b/lib/Logger.php @@ -43,6 +43,7 @@ final class Logger $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', diff --git a/lib/contents.php b/lib/contents.php index a1630e3c..3fbaa620 100644 --- a/lib/contents.php +++ b/lib/contents.php @@ -420,14 +420,11 @@ 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->setScope('pages'); - $cache->purgeCache(86400); // 24 hours (forced) + $cache->purgeCache(86400); $params = [$url]; $cache->setKey($params);