Update README.md

.dockerignore

@@ -1,6 +1,4 @@
 .git
-!.git/HEAD
-!.git/refs/heads/*
 .gitattributes
 .github/*
 .travis.yml

.github/prtester-requirements.txt

@@ -1,2 +0,0 @@
-beautifulsoup4>=4.10.0
-requests>=2.26.0

.github/prtester.py

@@ -1,101 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-from datetime import datetime
-import os.path
-
-# This script is specifically written to be used in automation for https://github.com/RSS-Bridge/rss-bridge
-#
-# This will scrape the whitelisted bridges in the current state (port 3000) and the PR state (port 3001) of
-# RSS-Bridge, generate a feed for each of the bridges and save the output as html files.
-# It also replaces the default static CSS link with a hardcoded link to @em92's public instance, so viewing
-# the HTML file locally will actually work as designed.
-
-def testBridges(bridges,status):
-    for bridge in bridges:
-        if bridge.get('data-ref'): # Some div entries are empty, this ignores those
-            bridgeid = bridge.get('id')
-            bridgeid = bridgeid.split('-')[1] # this extracts a readable bridge name from the bridge metadata
-            bridgestring = '/?action=display&bridge=' + bridgeid + '&format=Html'
-            forms = bridge.find_all("form")
-            formid = 1
-            for form in forms:
-                # a bridge can have multiple contexts, named 'forms' in html
-                # this code will produce a fully working formstring that should create a working feed when called
-                # this will create an example feed for every single context, to test them all
-                formstring = ''
-                errormessages = []
-                parameters = form.find_all("input")
-                lists = form.find_all("select")
-                # this for/if mess cycles through all available input parameters, checks if it required, then pulls
-                # the default or examplevalue and then combines it all together into the formstring
-                # if an example or default value is missing for a required attribute, it will throw an error
-                # any non-required fields are not tested!!!
-                for parameter in parameters:
-                    if parameter.get('type') == 'hidden' and parameter.get('name') == 'context':
-                        cleanvalue = parameter.get('value').replace(" ","+")
-                        formstring = formstring + '&' + parameter.get('name') + '=' + cleanvalue
-                    if parameter.get('type') == 'number' or parameter.get('type') == 'text':
-                        if parameter.has_attr('required'):
-                            if parameter.get('placeholder') == '':
-                                if parameter.get('value') == '':
-                                    errormessages.append(parameter.get('name'))
-                                else:
-                                    formstring = formstring + '&' + parameter.get('name') + '=' + parameter.get('value')
-                            else:
-                                formstring = formstring + '&' + parameter.get('name') + '=' + parameter.get('placeholder')
-                    # same thing, just for checkboxes. If a checkbox is checked per default, it gets added to the formstring
-                    if parameter.get('type') == 'checkbox':
-                        if parameter.has_attr('checked'):
-                            formstring = formstring + '&' + parameter.get('name') + '=on'
-                for list in lists:
-                    selectionvalue = ''
-                    for selectionentry in list.contents:
-                        if 'selected' in selectionentry.attrs:
-                            selectionvalue = selectionentry.get('value')
-                            break
-                    if selectionvalue == '':
-                        selectionvalue = list.contents[0].get('value')
-                    formstring = formstring + '&' + list.get('name') + '=' + selectionvalue
-                if not errormessages:
-                    # if all example/default values are present, form the full request string, run the request, replace the static css
-                    # file with the url of em's public instance and then upload it to termpad.com, a pastebin-like-site.
-                    r = requests.get(URL + bridgestring + formstring)
-                    pagetext = r.text.replace('static/HtmlFormat.css','https://feed.eugenemolotov.ru/static/HtmlFormat.css')
-                    pagetext = pagetext.encode("utf_8")
-                    termpad = requests.post(url="https://termpad.com/", data=pagetext)
-                    termpadurl = termpad.text
-                    termpadurl = termpadurl.replace('termpad.com/','termpad.com/raw/')
-                    termpadurl = termpadurl.replace('\n','')
-                    with open(os.getcwd() + '/comment.txt', 'a+') as file:
-                        file.write("\n")
-                        file.write("| [`" + bridgeid + '-' + status + '-context' + str(formid) + "`](" + termpadurl + ") | " + date_time + " |")
-                else:
-                    # if there are errors (which means that a required value has no example or default value), log out which error appeared
-                    termpad = requests.post(url="https://termpad.com/", data=str(errormessages))
-                    termpadurl = termpad.text
-                    termpadurl = termpadurl.replace('termpad.com/','termpad.com/raw/')
-                    termpadurl = termpadurl.replace('\n','')
-                    with open(os.getcwd() + '/comment.txt', 'a+') as file:
-                        file.write("\n")
-                        file.write("| [`" + bridgeid + '-' + status + '-context' + str(formid) + "`](" + termpadurl + ") | " + date_time + " |")
-                formid += 1
-
-gitstatus = ["current", "pr"]
-now = datetime.now()
-date_time = now.strftime("%Y-%m-%d, %H:%M:%S")
-
-with open(os.getcwd() + '/comment.txt', 'w+') as file:
-    file.write(''' ## Pull request artifacts
-| file | last change |
-| ---- | ------ |''')
-
-for status in gitstatus: # run this twice, once for the current version, once for the PR version
-    if status == "current":
-        port = "3000" # both ports are defined in the corresponding workflow .yml file
-    elif status == "pr":
-        port = "3001"
-    URL = "http://localhost:" + port
-    page = requests.get(URL) # Use python requests to grab the rss-bridge main page
-    soup = BeautifulSoup(page.content, "html.parser") # use bs4 to turn the page into soup
-    bridges = soup.find_all("section") # get a soup-formatted list of all bridges on the rss-bridge page
-    testBridges(bridges,status) # run the main scraping code with the list of bridges and the info if this is for the current version or the pr version

.github/workflows/dockerbuild.yml

@@ -1,61 +0,0 @@
-name: Build Image on Commit and Release
-
-on:
-  push:
-    branches:
-      - 'master'
-    tags:
-      - '20*'
-
-env:
-  DOCKERHUB_SLUG: rssbridge/rss-bridge
-  GHCR_SLUG: ghcr.io/rss-bridge/rss-bridge
-
-jobs:
-  bake:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2.3.4
-      -  
-        name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v3.5.0
-        with:
-          images: |
-            ${{ env.DOCKERHUB_SLUG }}
-            ${{ env.GHCR_SLUG }}
-          tags: |
-            type=raw,value=latest
-            type=sha
-            type=ref,event=tag,enable=${{ startsWith(github.ref, 'refs/tags/20') }}
-            type=raw,value=stable,enable=${{ startsWith(github.ref, 'refs/tags/20') }}
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.6.0
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1.10.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.10.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/bake-action@v1.6.0
-        with:
-          files: |
-            ./docker-bake.hcl
-            ${{ steps.docker_meta.outputs.bake-file }}
-          targets: image-all
-          push: true

.github/workflows/documentation.yml

@@ -1,27 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    paths:
-    - 'docs/**'
-
-jobs:
-  documentation:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        persist-credentials: false
-    - name: Setup PHP
-      uses: shivammathur/setup-php@2.17.1
-      with:
-        php-version: 8.0
-    - name: Install dependencies
-      run: composer global require daux/daux.io
-    - name: Generate documentation
-      run: daux generate
-    - name: Deploy same repository 🚀
-      uses: JamesIves/github-pages-deploy-action@v4.2.5
-      with:
-        folder: "static"
-        branch: gh-pages

.github/workflows/lint.yml

@@ -1,48 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  phpcs:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.1', '7.2', '7.3', '7.4']
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpcs
-      - run: phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p
-
-  phpcompatibility:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.1', '7.4']
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - run: composer global require dealerdirect/phpcodesniffer-composer-installer
-      - run: composer global require phpcompatibility/php-compatibility
-      - run: ~/.composer/vendor/bin/phpcs . --standard=phpcompatibility.xml --warning-severity=0 --extensions=php -p
-
-  executable_php_files_check:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          if find -name "*.php" -executable -type f -print -exec false {} +
-          then
-            echo 'Good, no executable php scripts found'
-          else
-            echo 'Please unmark php scripts above as non-executable'
-            exit 1
-          fi

.github/workflows/prhtmlgenerator.yml

@@ -1,69 +0,0 @@
-name: 'PR Testing'
-
-on:
-  pull_request_target:
-    branches: [ master ]
-
-jobs:
-  test-pr:
-    name: Generate HTML
-    runs-on: ubuntu-latest
-    # Needs additional permissions https://github.com/actions/first-interaction/issues/10#issuecomment-1041402989
-    steps:
-      - name: Check out self
-        uses: actions/checkout@v2.3.2
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Check out rss-bridge
-        run: |
-          PR=${{github.event.number}};
-          wget -O requirements.txt https://raw.githubusercontent.com/RSS-Bridge/rss-bridge/master/.github/prtester-requirements.txt;
-          wget https://raw.githubusercontent.com/RSS-Bridge/rss-bridge/master/.github/prtester.py;
-          wget https://patch-diff.githubusercontent.com/raw/$GITHUB_REPOSITORY/pull/$PR.patch;
-          touch DEBUG;
-          cat $PR.patch | grep " bridges/.*\.php" | sed "s= bridges/\(.*\)Bridge.php.*=\1=g" | sort | uniq > whitelist.txt
-      - name: Start Docker - Current
-        run: |
-          docker run -d -v $GITHUB_WORKSPACE/whitelist.txt:/app/whitelist.txt -v $GITHUB_WORKSPACE/DEBUG:/app/DEBUG -p 3000:80 ghcr.io/rss-bridge/rss-bridge:latest
-      - name: Start Docker - PR
-        run: |
-          docker build -t prbuild .;
-          docker run -d -v $GITHUB_WORKSPACE/whitelist.txt:/app/whitelist.txt -v $GITHUB_WORKSPACE/DEBUG:/app/DEBUG -p 3001:80 prbuild
-      - name: Setup python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-          cache: 'pip'
-      - name: Install requirements
-        run: |
-          cd $GITHUB_WORKSPACE
-          pip install -r requirements.txt
-      - name: Run bridge tests
-        id: testrun
-        run: |
-          mkdir results;
-          python prtester.py;
-          body="$(cat comment.txt)";
-          body="${body//'%'/'%25'}";
-          body="${body//$'\n'/'%0A'}";
-          body="${body//$'\r'/'%0D'}";
-          echo "::set-output name=bodylength::${#body}"
-          echo "::set-output name=body::$body"
-      - name: Find Comment
-        if: ${{ steps.testrun.outputs.bodylength > 130 }}
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Pull request artifacts
-      - name: Create or update comment
-        if: ${{ steps.testrun.outputs.bodylength > 130 }}
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            ${{ steps.testrun.outputs.body }}
-          edit-mode: replace

.github/workflows/tests.yml

@@ -1,34 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  phpunit7:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.1', '7.2', '7.3']
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - run: composer global require phpunit/phpunit ^7
-      - run: phpunit --configuration=phpunit.xml --include-path=lib/
-
-  phpunit8:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - run: composer global require phpunit/phpunit ^8
-      - run: phpunit --configuration=phpunit.xml --include-path=lib/

.gitignore

@@ -213,7 +213,6 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
-.phpunit.result.cache
 .tox
 
 #Translations

.travis.yml

@@ -0,0 +1,46 @@
+dist: trusty
+language: php
+
+install:
+  - composer global require dealerdirect/phpcodesniffer-composer-installer;
+  - composer global require phpcompatibility/php-compatibility;
+  - if [[ "$PHPUNIT" ]]; then
+      composer global require phpunit/phpunit ^$PHPUNIT;
+    fi
+
+script:
+  - phpenv rehash
+  # Run PHP_CodeSniffer on all versions
+  - ~/.config/composer/vendor/bin/phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p;
+  # Check PHP compatibility for the lowest and highest supported version
+  - if [[ $TRAVIS_PHP_VERSION == "5.6" || $TRAVIS_PHP_VERSION == "7.3" ]]; then
+      ~/.config/composer/vendor/bin/phpcs . --standard=phpcompatibility.xml --extensions=php -p;
+    fi
+  # Run unit tests on highest major version
+  - if [[ ${TRAVIS_PHP_VERSION:0:1} == "7" ]]; then
+      ~/.config/composer/vendor/bin/phpunit --configuration=phpunit.xml --include-path=lib/;
+    fi
+
+php:
+  - 7.3
+
+env:
+  - PHPUNIT=6
+  - PHPUNIT=7
+  - PHPUNIT=8
+
+matrix:
+  fast_finish: true
+
+  include:
+    - php: 5.6
+      env: PHPUNIT=
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+
+  allow_failures:
+    - php: 7.3
+      env: PHPUNIT=7
+    - php: 7.3
+      env: PHPUNIT=8

Dockerfile

@@ -1,8 +1,4 @@
-FROM php:7-apache-buster
-
-LABEL description="RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one."
-LABEL repository="https://github.com/RSS-Bridge/rss-bridge"
-LABEL website="https://github.com/RSS-Bridge/rss-bridge"
+FROM php:7-apache
 
 ENV APACHE_DOCUMENT_ROOT=/app
 
@@ -11,7 +7,6 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
 	&& apt-get --yes --no-install-recommends install \
 		zlib1g-dev \
 		libmemcached-dev \
-	&& rm -rf /var/lib/apt/lists/* \
 	&& pecl install memcached \
 	&& docker-php-ext-enable memcached \
 	&& sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
@@ -19,6 +14,4 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
 	&& sed -ri -e 's/(MinProtocol\s*=\s*)TLSv1\.2/\1None/' /etc/ssl/openssl.cnf \
 	&& sed -ri -e 's/(CipherString\s*=\s*DEFAULT)@SECLEVEL=2/\1/' /etc/ssl/openssl.cnf
 
-COPY --chown=www-data:www-data ./ /app/
-
-CMD ["/app/docker-entrypoint.sh"]
+COPY --chown=www-data:www-data ./ /app/

README.md

@@ -1,15 +1,10 @@
 ![RSS-Bridge](static/logo_600px.png)
-===
-[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE)
-[![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg?logo=github)](https://github.com/rss-bridge/rss-bridge/releases/latest)
-[![irc.libera.chat](https://img.shields.io/badge/irc.libera.chat-%23rssbridge-blue.svg)](https://web.libera.chat/#rssbridge)
-[![Chat on Matrix](https://matrix.to/img/matrix-badge.svg)](https://matrix.to/#/#rssbridge:libera.chat)
-[![Actions Status](https://img.shields.io/github/workflow/status/RSS-Bridge/rss-bridge/Tests/master?label=GitHub%20Actions&logo=github)](https://github.com/RSS-Bridge/rss-bridge/actions)
-[![Docker Build Status](https://img.shields.io/docker/cloud/build/rssbridge/rss-bridge?logo=docker)](https://hub.docker.com/r/rssbridge/rss-bridge/)
+====
+[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE) [![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg?logo=github)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?logo=debian&label=debian%20release&url=https%3A%2F%2Fsources.debian.org%2Fapi%2Fsrc%2Frss-bridge%2F&query=%24.versions%5B0%5D.version&colorB=blue)](https://tracker.debian.org/pkg/rss-bridge) [![Guix Release](https://img.shields.io/badge/guix%20release-unknown-blue.svg)](https://www.gnu.org/software/guix/packages/R/) [![Build Status](https://travis-ci.org/RSS-Bridge/rss-bridge.svg?branch=master)](https://travis-ci.org/RSS-Bridge/rss-bridge) [![Docker Build Status](https://img.shields.io/docker/build/rssbridge/rss-bridge.svg?logo=docker)](https://hub.docker.com/r/rssbridge/rss-bridge/)
 
 RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one. It can be used on webservers or as a stand-alone application in CLI mode.
 
-**Important**: RSS-Bridge is __not__ a feed reader or feed aggregator, but a tool to generate feeds that are consumed by feed readers and feed aggregators. Find a list of feed aggregators on [Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_feed_aggregators).
+**Important**: RSS-Bridge is __not__ aa feed reader or feed aggregator, but a tool to generate feeds that are consumed by feed readers and feed aggregators. Find a list of feed aggregators on [Wikipedia](https://en.wikipedia.org/wiki/Comparison_of_feed_aggregators).
 
 Supported sites/pages (examples)
 ===
@@ -18,11 +13,11 @@ Supported sites/pages (examples)
 * `Cryptome` : Returns the most recent documents from [Cryptome.org](http://cryptome.org/)
 * `DansTonChat`: Most recent quotes from [danstonchat.com](http://danstonchat.com/)
 * `DuckDuckGo`: Most recent results from [DuckDuckGo.com](https://duckduckgo.com/)
-* `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/) (There is an [issue](https://github.com/RSS-Bridge/rss-bridge/issues/2047) for public instances)
+* `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
 * `FlickrExplore` : [Latest interesting images](http://www.flickr.com/explore) from Flickr
 * `GoogleSearch` : Most recent results from Google Search
 * `Identi.ca` : Identica user timeline (Should be compatible with other Pump.io instances)
-* `Instagram`: Most recent photos from an Instagram user (It is recommended to [configure](https://rss-bridge.github.io/rss-bridge/Bridge_Specific/Instagram.html) this bridge to work)
+* `Instagram`: Most recent photos from an Instagram user
 * `OpenClassrooms`: Lastest tutorials from [fr.openclassrooms.com](http://fr.openclassrooms.com/)
 * `Pinterest`: Most recent photos from user or search
 * `ScmbBridge`: Newest stories from [secouchermoinsbete.fr](http://secouchermoinsbete.fr/)
@@ -62,7 +57,7 @@ RSS-Bridge hashtag (#rss-bridge) search on Twitter, in Atom format (as displayed
 Requirements
 ===
 
-RSS-Bridge requires PHP 7.1 or higher with following extensions enabled:
+RSS-Bridge requires PHP 5.6 or higher with following extensions enabled:
 
   - [`openssl`](https://secure.php.net/manual/en/book.openssl.php)
   - [`libxml`](https://secure.php.net/manual/en/book.libxml.php)
@@ -70,7 +65,6 @@ RSS-Bridge requires PHP 7.1 or higher with following extensions enabled:
   - [`simplexml`](https://secure.php.net/manual/en/book.simplexml.php)
   - [`curl`](https://secure.php.net/manual/en/book.curl.php)
   - [`json`](https://secure.php.net/manual/en/book.json.php)
-  - [`filter`](https://secure.php.net/manual/en/book.filter.php)
   - [`sqlite3`](http://php.net/manual/en/book.sqlite3.php) (only when using SQLiteCache)
 
 Find more information on our [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
@@ -88,11 +82,9 @@ Deploy
 ===
 
 Thanks to the community, hosting your own instance of RSS-Bridge is as easy as clicking a button!
-*Note: External providers' applications are packaged by 3rd parties. Use at your own discretion.*
 
 [![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
 [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
-[![Deploy to Cloudron](https://cloudron.io/img/button.svg)](https://www.cloudron.io/store/com.rssbridgeapp.cloudronapp.html)
 
 Getting involved
 ===
@@ -115,45 +107,36 @@ We are RSS-Bridge community, a group of developers continuing the project initia
 **Contributors** (sorted alphabetically):
 <!--
 Use this script to generate the list automatically (using the GitHub API):
-./contrib/prepare_release/fetch_contributors.php
+https://gist.github.com/LogMANOriginal/da00cd1e5f0ca31cef8e193509b17fd8
 -->
-
 * [16mhz](https://github.com/16mhz)
+* [86423355844265459587182778](https://github.com/86423355844265459587182778)
 * [adamchainz](https://github.com/adamchainz)
 * [Ahiles3005](https://github.com/Ahiles3005)
-* [akirk](https://github.com/akirk)
 * [Albirew](https://github.com/Albirew)
 * [aledeg](https://github.com/aledeg)
 * [alex73](https://github.com/alex73)
 * [alexAubin](https://github.com/alexAubin)
 * [AmauryCarrade](https://github.com/AmauryCarrade)
 * [AntoineTurmel](https://github.com/AntoineTurmel)
-* [arnd-s](https://github.com/arnd-s)
 * [ArthurHoaro](https://github.com/ArthurHoaro)
 * [Astalaseven](https://github.com/Astalaseven)
 * [Astyan-42](https://github.com/Astyan-42)
-* [AxorPL](https://github.com/AxorPL)
-* [ayacoo](https://github.com/ayacoo)
 * [az5he6ch](https://github.com/az5he6ch)
+* [azdkj532](https://github.com/azdkj532)
 * [b1nj](https://github.com/b1nj)
 * [benasse](https://github.com/benasse)
 * [Binnette](https://github.com/Binnette)
-* [Bockiii](https://github.com/Bockiii)
 * [captn3m0](https://github.com/captn3m0)
 * [chemel](https://github.com/chemel)
-* [Chouchen](https://github.com/Chouchen)
 * [ckiw](https://github.com/ckiw)
-* [cn-tools](https://github.com/cn-tools)
 * [cnlpete](https://github.com/cnlpete)
 * [corenting](https://github.com/corenting)
 * [couraudt](https://github.com/couraudt)
-* [csisoap](https://github.com/csisoap)
+* [cyberjacob](https://github.com/cyberjacob)
 * [da2x](https://github.com/da2x)
-* [dabenzel](https://github.com/dabenzel)
 * [Daiyousei](https://github.com/Daiyousei)
 * [dawidsowa](https://github.com/dawidsowa)
-* [DevonHess](https://github.com/DevonHess)
-* [dhuschde](https://github.com/dhuschde)
 * [disk0x](https://github.com/disk0x)
 * [DJCrashdummy](https://github.com/DJCrashdummy)
 * [Djuuu](https://github.com/Djuuu)
@@ -161,54 +144,32 @@ Use this script to generate the list automatically (using the GitHub API):
 * [dominik-th](https://github.com/dominik-th)
 * [Draeli](https://github.com/Draeli)
 * [Dreckiger-Dan](https://github.com/Dreckiger-Dan)
-* [drego85](https://github.com/drego85)
-* [drklee3](https://github.com/drklee3)
-* [dvikan](https://github.com/dvikan)
 * [em92](https://github.com/em92)
 * [eMerzh](https://github.com/eMerzh)
 * [EtienneM](https://github.com/EtienneM)
-* [f0086](https://github.com/f0086)
-* [fanch317](https://github.com/fanch317)
-* [fatuuse](https://github.com/fatuuse)
-* [fivefilters](https://github.com/fivefilters)
 * [floviolleau](https://github.com/floviolleau)
 * [fluffy-critter](https://github.com/fluffy-critter)
-* [fmachen](https://github.com/fmachen)
 * [Frenzie](https://github.com/Frenzie)
 * [fulmeek](https://github.com/fulmeek)
-* [ggiessen](https://github.com/ggiessen)
 * [Ginko-Aloe](https://github.com/Ginko-Aloe)
-* [girlpunk](https://github.com/girlpunk)
 * [Glandos](https://github.com/Glandos)
 * [gloony](https://github.com/gloony)
 * [GregThib](https://github.com/GregThib)
 * [griffaurel](https://github.com/griffaurel)
 * [Grummfy](https://github.com/Grummfy)
-* [gsantner](https://github.com/gsantner)
-* [guigot](https://github.com/guigot)
-* [hollowleviathan](https://github.com/hollowleviathan)
-* [hpacleb](https://github.com/hpacleb)
 * [hunhejj](https://github.com/hunhejj)
 * [husim0](https://github.com/husim0)
 * [IceWreck](https://github.com/IceWreck)
-* [imagoiq](https://github.com/imagoiq)
 * [j0k3r](https://github.com/j0k3r)
 * [JackNUMBER](https://github.com/JackNUMBER)
-* [jacquesh](https://github.com/jacquesh)
-* [JasonGhent](https://github.com/JasonGhent)
-* [jcgoette](https://github.com/jcgoette)
 * [jdesgats](https://github.com/jdesgats)
 * [jdigilio](https://github.com/jdigilio)
 * [JeremyRand](https://github.com/JeremyRand)
-* [JimDog546](https://github.com/JimDog546)
-* [jNullj](https://github.com/jNullj)
 * [Jocker666z](https://github.com/Jocker666z)
 * [johnnygroovy](https://github.com/johnnygroovy)
 * [johnpc](https://github.com/johnpc)
-* [joni1993](https://github.com/joni1993)
-* [KamaleiZestri](https://github.com/KamaleiZestri)
+* [killruana](https://github.com/killruana)
 * [klimplant](https://github.com/klimplant)
-* [kolarcz](https://github.com/kolarcz)
 * [kranack](https://github.com/kranack)
 * [kraoc](https://github.com/kraoc)
 * [l1n](https://github.com/l1n)
@@ -217,98 +178,62 @@ Use this script to generate the list automatically (using the GitHub API):
 * [lalannev](https://github.com/lalannev)
 * [ldidry](https://github.com/ldidry)
 * [Leomaradan](https://github.com/Leomaradan)
-* [leyrer](https://github.com/leyrer)
-* [liamka](https://github.com/liamka)
 * [Limero](https://github.com/Limero)
 * [LogMANOriginal](https://github.com/LogMANOriginal)
 * [lorenzos](https://github.com/lorenzos)
 * [lukasklinger](https://github.com/lukasklinger)
 * [m0zes](https://github.com/m0zes)
-* [Mar-Koeh](https://github.com/Mar-Koeh)
-* [marcus-at-localhost](https://github.com/marcus-at-localhost)
-* [marius8510000-bot](https://github.com/marius8510000-bot)
 * [matthewseal](https://github.com/matthewseal)
 * [mcbyte-it](https://github.com/mcbyte-it)
 * [mdemoss](https://github.com/mdemoss)
 * [melangue](https://github.com/melangue)
 * [metaMMA](https://github.com/metaMMA)
-* [mibe](https://github.com/mibe)
-* [mightymt](https://github.com/mightymt)
 * [mitsukarenai](https://github.com/mitsukarenai)
-* [Monocularity](https://github.com/Monocularity)
 * [MonsieurPoutounours](https://github.com/MonsieurPoutounours)
-* [mr-flibble](https://github.com/mr-flibble)
 * [mro](https://github.com/mro)
-* [mschwld](https://github.com/mschwld)
 * [mxmehl](https://github.com/mxmehl)
-* [Mynacol](https://github.com/Mynacol)
 * [nel50n](https://github.com/nel50n)
 * [niawag](https://github.com/niawag)
-* [Niehztog](https://github.com/Niehztog)
 * [Nono-m0le](https://github.com/Nono-m0le)
-* [obsiwitch](https://github.com/obsiwitch)
-* [Ololbu](https://github.com/Ololbu)
+* [ObsidianWitch](https://github.com/ObsidianWitch)
+* [OliverParoczai](https://github.com/OliverParoczai)
+* [oratosquilla-oratoria](https://github.com/oratosquilla-oratoria)
 * [ORelio](https://github.com/ORelio)
-* [otakuf](https://github.com/otakuf)
-* [Park0](https://github.com/Park0)
-* [Paroleen](https://github.com/Paroleen)
 * [PaulVayssiere](https://github.com/PaulVayssiere)
 * [pellaeon](https://github.com/pellaeon)
-* [PeterDaveHello](https://github.com/PeterDaveHello)
-* [Peterr-K](https://github.com/Peterr-K)
 * [Piranhaplant](https://github.com/Piranhaplant)
 * [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
 * [pitchoule](https://github.com/pitchoule)
 * [pmaziere](https://github.com/pmaziere)
 * [Pofilo](https://github.com/Pofilo)
 * [prysme01](https://github.com/prysme01)
-* [Qluxzz](https://github.com/Qluxzz)
 * [quentinus95](https://github.com/quentinus95)
-* [rakoo](https://github.com/rakoo)
-* [RawkBob](https://github.com/RawkBob)
 * [regisenguehard](https://github.com/regisenguehard)
 * [Riduidel](https://github.com/Riduidel)
 * [rogerdc](https://github.com/rogerdc)
 * [Roliga](https://github.com/Roliga)
-* [ronansalmon](https://github.com/ronansalmon)
-* [rremizov](https://github.com/rremizov)
-* [sal0max](https://github.com/sal0max)
 * [sebsauvage](https://github.com/sebsauvage)
 * [shutosg](https://github.com/shutosg)
-* [simon816](https://github.com/simon816)
-* [Simounet](https://github.com/Simounet)
 * [somini](https://github.com/somini)
-* [SpangleLabs](https://github.com/SpangleLabs)
 * [squeek502](https://github.com/squeek502)
 * [stjohnjohnson](https://github.com/stjohnjohnson)
-* [Stopka](https://github.com/Stopka)
 * [Strubbl](https://github.com/Strubbl)
 * [sublimz](https://github.com/sublimz)
 * [sunchaserinfo](https://github.com/sunchaserinfo)
-* [SuperSandro2000](https://github.com/SuperSandro2000)
 * [sysadminstory](https://github.com/sysadminstory)
-* [t0stiman](https://github.com/t0stiman)
 * [tameroski](https://github.com/tameroski)
 * [teromene](https://github.com/teromene)
 * [tgkenney](https://github.com/tgkenney)
 * [thefranke](https://github.com/thefranke)
 * [ThePadawan](https://github.com/ThePadawan)
 * [TheRadialActive](https://github.com/TheRadialActive)
-* [theScrabi](https://github.com/theScrabi)
-* [thezeroalpha](https://github.com/thezeroalpha)
-* [timendum](https://github.com/timendum)
 * [TitiTestScalingo](https://github.com/TitiTestScalingo)
-* [tomaszkane](https://github.com/tomaszkane)
-* [TReKiE](https://github.com/TReKiE)
 * [triatic](https://github.com/triatic)
 * [VerifiedJoseph](https://github.com/VerifiedJoseph)
 * [WalterBarrett](https://github.com/WalterBarrett)
 * [wtuuju](https://github.com/wtuuju)
 * [xurxof](https://github.com/xurxof)
-* [yamanq](https://github.com/yamanq)
 * [yardenac](https://github.com/yardenac)
-* [ymeister](https://github.com/ymeister)
-* [yue-dongchen](https://github.com/yue-dongchen)
 * [ZeNairolf](https://github.com/ZeNairolf)
 
 Licenses
@@ -340,6 +265,6 @@ You're not social when you hamper sharing by removing feeds. You're happy to hav
 
 We want to share with friends, using open protocols: RSS, Atom, XMPP, whatever. Because no one wants to have *your* service with *your* applications using *your* API force-feeding them. Friends must be free to choose whatever software and service they want.
 
-We are rebuilding bridges you have willfully destroyed.
+We are rebuilding bridges you have wilfully destroyed.
 
 Get your shit together: Put RSS/Atom back in.

actions/DisplayAction.php

@@ -38,7 +38,6 @@ class DisplayAction extends ActionAbstract {
 
 		// Data retrieval
 		$bridge = $bridgeFac->create($bridge);
-		$bridge->loadConfiguration();
 
 		$noproxy = array_key_exists('_noproxy', $this->userData)
 			&& filter_var($this->userData['_noproxy'], FILTER_VALIDATE_BOOLEAN);
@@ -151,7 +150,6 @@ class DisplayAction extends ActionAbstract {
 				$infos = array(
 					'name' => $bridge->getName(),
 					'uri'  => $bridge->getURI(),
-					'donationUri'  => $bridge->getDonationURI(),
 					'icon' => $bridge->getIcon()
 				);
 			} catch(Error $e) {

actions/ListAction.php

@@ -39,7 +39,6 @@ class ListAction extends ActionAbstract {
 			$list->bridges[$bridgeName] = array(
 				'status' => $status,
 				'uri' => $bridge->getURI(),
-				'donationUri' => $bridge->getDonationURI(),
 				'name' => $bridge->getName(),
 				'icon' => $bridge->getIcon(),
 				'parameters' => $bridge->getParameters(),

bridges/ABCNewsBridge.php

@@ -1,45 +0,0 @@
-<?php
-class ABCNewsBridge extends BridgeAbstract {
-	const NAME = 'ABC News Bridge';
-	const URI = 'https://www.abc.net.au';
-	const DESCRIPTION = 'Topics of the Australian Broadcasting Corporation';
-	const MAINTAINER = 'yue-dongchen';
-
-	const PARAMETERS = array(
-		array(
-			'topic' => array(
-				'type' => 'list',
-				'name' => 'Region',
-				'title' => 'Choose state',
-				'values' => array(
-					'ACT' => 'act',
-					'NSW' => 'nsw',
-					'NT' => 'nt',
-					'QLD' => 'qld',
-					'SA' => 'sa',
-					'TAS' => 'tas',
-					'VIC' => 'vic',
-					'WA' => 'wa'
-				),
-			)
-		)
-	);
-
-	public function collectData() {
-		$url = 'https://www.abc.net.au/news/' . $this->getInput('topic');
-		$html = getSimpleHTMLDOM($url)->find('.YAJzu._2FvRw.ZWhbj._3BZxh', 0);
-		$html = defaultLinkTo($html, $this->getURI());
-
-		foreach($html->find('._2H7Su') as $article) {
-			$item = array();
-
-			$title = $article->find('._3T9Id.fmhNa.nsZdE._2c2Zy._1tOey._3EOTW', 0);
-			$item['title'] = $title->plaintext;
-			$item['uri'] = $title->href;
-			$item['content'] = $article->find('.rMkro._1cBaI._3PhF6._10YQT._1yL-m', 0)->plaintext;
-			$item['timestamp'] = strtotime($article->find('time', 0)->datetime);
-
-			$this->items[] = $item;
-		}
-	}
-}

bridges/ABCTabsBridge.php

@@ -0,0 +1,42 @@
+<?php
+class ABCTabsBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'kranack';
+	const NAME = 'ABC Tabs Bridge';
+	const URI = 'https://www.abc-tabs.com/';
+	const DESCRIPTION = 'Returns 22 newest tabs';
+
+	public function collectData(){
+		$html = '';
+		$html = getSimpleHTMLDOM(static::URI . 'tablatures/nouveautes.html')
+			or returnClientError('No results for this query.');
+
+		$table = $html->find('table#myTable', 0)->children(1);
+
+		foreach ($table->find('tr') as $tab) {
+			$item = array();
+			$item['author'] = $tab->find('td', 1)->plaintext
+			. ' - '
+			. $tab->find('td', 2)->plaintext;
+
+			$item['title'] = $tab->find('td', 1)->plaintext
+			. ' - '
+			. $tab->find('td', 2)->plaintext;
+
+			$item['content'] = 'Le '
+			. $tab->find('td', 0)->plaintext
+			. '<br> Par: '
+			. $tab->find('td', 5)->plaintext
+			. '<br> Type: '
+			. $tab->find('td', 3)->plaintext;
+
+			$item['id'] = static::URI
+			. $tab->find('td', 2)->find('a', 0)->getAttribute('href');
+
+			$item['uri'] = static::URI
+			. $tab->find('td', 2)->find('a', 0)->getAttribute('href');
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/AO3Bridge.php

@@ -12,7 +12,8 @@ class AO3Bridge extends BridgeAbstract {
 				'name' => 'url',
 				'required' => true,
 				// Example: F/F tag, complete works only
-				'exampleValue' => 'https://archiveofourown.org/works?work_search[complete]=T&tag_id=F*s*F',
+				'exampleValue' => self::URI
+					. 'works?work_search[complete]=T&tag_id=F*s*F',
 			),
 		),
 		'Bookmarks' => array(
@@ -36,7 +37,8 @@ class AO3Bridge extends BridgeAbstract {
 	// Feed for lists of works (e.g. recent works, search results, filtered tags,
 	// bookmarks, series, collections).
 	private function collectList($url) {
-		$html = getSimpleHTMLDOM($url);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('could not request AO3');
 		$html = defaultLinkTo($html, self::URI);
 
 		foreach($html->find('.index.group > li') as $element) {
@@ -63,7 +65,8 @@ class AO3Bridge extends BridgeAbstract {
 	// Feed for recent chapters of a specific work.
 	private function collectWork($id) {
 		$url = self::URI . "/works/$id/navigate";
-		$html = getSimpleHTMLDOM($url);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('could not request AO3');
 		$html = defaultLinkTo($html, self::URI);
 
 		$this->title = $html->find('h2 a', 0)->plaintext;

bridges/ARDMediathekBridge.php

@@ -1,95 +0,0 @@
-<?php
-class ARDMediathekBridge extends BridgeAbstract {
-	const NAME = 'ARD-Mediathek Bridge';
-	const URI = 'https://www.ardmediathek.de';
-	const DESCRIPTION = 'Feed of any series in the ARD-Mediathek, specified by its path';
-	const MAINTAINER = 'yue-dongchen';
-	/*
-	 * Number of Items to be requested from ARDmediathek API
-	 * 12 has been observed on the wild
-	 * 29 is the highest successfully tested value
-	 * More Items could be fetched via pagination
-	 * The JSON-field pagination holds more information on that
-	 * @const PAGESIZE number of requested items
-	 */
-	const PAGESIZE = 29;
-	/*
-	 * The URL Prefix of the (Webapp-)API
-	 * @const APIENDPOINT https-URL of the used endpoint
-	 */
-	const APIENDPOINT = 'https://api.ardmediathek.de/page-gateway/widgets/ard/asset/';
-	/*
-	 * The URL prefix of the video link
-	 * URLs from the webapp include a slug containing titles of show, episode, and tv station.
-	 * It seems to work without that.
-	 * @const VIDEOLINKPREFIX https-URL prefix of video links
-	 */
-	const VIDEOLINKPREFIX = 'https://www.ardmediathek.de/video/';
-	/*
-	 * The requested width of the preview image
-	 * 432 has been observed on the wild
-	 * The webapp seems to also compute and add the height value
-	 * It seems to works without that.
-	 * @const IMAGEWIDTH width in px of the preview image
-	 */
-	const IMAGEWIDTH = 432;
-	/*
-	 * Placeholder that will be replace by IMAGEWIDTH in the preview image URL
-	 * @const IMAGEWIDTHPLACEHOLDER
-	 */
-	const IMAGEWIDTHPLACEHOLDER = '{width}';
-
-	const PARAMETERS = array(
-		array(
-			'path' => array(
-				'name' => 'Show Link or ID',
-				'required' => true,
-				'title' => 'Link to the show page or just its alphanumeric suffix',
-				'defaultValue' => 'https://www.ardmediathek.de/sendung/45-min/Y3JpZDovL25kci5kZS8xMzkx/'
-			)
-		)
-	);
-
-	public function collectData() {
-		$oldTz = date_default_timezone_get();
-
-		date_default_timezone_set('Europe/Berlin');
-
-		$pathComponents = explode('/', $this->getInput('path'));
-		if (empty($pathComponents)) {
-			returnClientError('Path may not be empty');
-		}
-		if (count($pathComponents) < 2) {
-			$showID = $pathComponents[0];
-		} else {
-			$lastKey = count($pathComponents) - 1;
-			$showID = $pathComponents[$lastKey];
-			if (strlen($showID) === 0) {
-				$showID = $pathComponents[$lastKey - 1];
-			}
-		}
-
-		$url = SELF::APIENDPOINT . $showID . '/?pageSize=' . SELF::PAGESIZE;
-		$rawJSON = getContents($url);
-		$processedJSON = json_decode($rawJSON);
-
-		foreach($processedJSON->teasers as $video) {
-			$item = array();
-			// there is also ->links->self->id, ->links->self->urlId, ->links->target->id, ->links->target->urlId
-			$item['uri'] = SELF::VIDEOLINKPREFIX . $video->id . '/';
-			// there is also ->mediumTitle and ->shortTitle
-			$item['title'] = $video->longTitle;
-			// in the test, aspect16x9 was the only child of images, not sure whether that is always true
-			$item['enclosures'] = array(
-				str_replace(SELF::IMAGEWIDTHPLACEHOLDER, SELF::IMAGEWIDTH, $video->images->aspect16x9->src)
-			);
-			$item['content'] = '<img src="' . $item['enclosures'][0] . '" /><p>';
-			$item['timestamp'] = $video->broadcastedOn;
-			$item['uid'] = $video->id;
-			$item['author'] = $video->publicationService->name;
-			$this->items[] = $item;
-		}
-
-		date_default_timezone_set($oldTz);
-	}
-}

bridges/ASRockNewsBridge.php

@@ -10,7 +10,8 @@ class ASRockNewsBridge extends BridgeAbstract {
 
 	public function collectData() {
 
-		$html = getSimpleHTMLDOM(self::URI . '/news/index.asp');
+		$html = getSimpleHTMLDOM(self::URI . '/news/index.asp')
+			or returnServerError('Could not request: ' . self::URI . '/news/index.asp');
 
 		$html = defaultLinkTo($html, self::URI . '/news/');
 
@@ -19,16 +20,17 @@ class ASRockNewsBridge extends BridgeAbstract {
 
 			$articlePath = $a->href;
 
-			$articlePageHtml = getSimpleHTMLDOMCached($articlePath, self::CACHE_TIMEOUT);
+			$articlePageHtml = getSimpleHTMLDOMCached($articlePath, self::CACHE_TIMEOUT)
+				or returnServerError('Could not request: ' . $articlePath);
 
 			$articlePageHtml = defaultLinkTo($articlePageHtml, self::URI);
 
 			$contents = $articlePageHtml->find('div.Contents', 0);
 
 			$item['uri'] = $articlePath;
-			$item['title'] = $contents->find('h3', 0)->innertext;
+			$item['title'] = $contents->find('h5', 0)->innertext;
 
-			$contents->find('h3', 0)->outertext = '';
+			$contents->find('h5', 0)->outertext = '';
 
 			$item['content'] = $contents->innertext;
 			$item['timestamp'] = $this->extractDate($a->plaintext);

bridges/AcrimedBridge.php

@@ -3,25 +3,12 @@ class AcrimedBridge extends FeedExpander {
 
 	const MAINTAINER = 'qwertygc';
 	const NAME = 'Acrimed Bridge';
-	const URI = 'https://www.acrimed.org/';
+	const URI = 'http://www.acrimed.org/';
 	const CACHE_TIMEOUT = 4800; //2hours
 	const DESCRIPTION = 'Returns the newest articles';
 
-	const PARAMETERS = [
-		[
-			'limit' => [
-				'name' => 'limit',
-				'type' => 'number',
-				'defaultValue' => -1,
-			]
-		]
-	];
-
 	public function collectData(){
-		$this->collectExpandableDatas(
-			static::URI . 'spip.php?page=backend',
-			$this->getInput('limit')
-		);
+		$this->collectExpandableDatas(static::URI . 'spip.php?page=backend');
 	}
 
 	protected function parseItem($newsItem){

bridges/AlbionOnlineBridge.php

@@ -10,8 +10,13 @@ class AlbionOnlineBridge extends BridgeAbstract {
 	const PARAMETERS = array( array(
 		'postcount' => array(
 			'name' => 'Limit',
-			'type' => 'number',
-			'required' => true,
+			'type' => 'list',
+			'values' => array(
+				'2' => 2,
+				'5' => 5,
+				'10' => 10,
+				'15' => 15,
+			 ),
 			'title' => 'Maximum number of items to return',
 			'defaultValue' => 5,
 		),
@@ -43,7 +48,8 @@ class AlbionOnlineBridge extends BridgeAbstract {
 		// Example: https://albiononline.com/en/changelog/1/5
 		$url = $api . $this->getInput('language') . '/changelog/1/' . $this->getInput('postcount');
 
-		$html = getSimpleHTMLDOM($url);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Unable to get changelog data from "' . $url . '"!');
 
 		foreach ($html->find('li') as $data) {
 			$item = array();
@@ -66,7 +72,8 @@ class AlbionOnlineBridge extends BridgeAbstract {
 	}
 
 	private function getFullChangelog($url) {
-		$html = getSimpleHTMLDOMCached($url);
+		$html = getSimpleHTMLDOMCached($url)
+			or returnServerError('Unable to load changelog post from "' . $url . '"!');
 		$html = defaultLinkTo($html, self::URI);
 		return $html->find('div.small-12.columns', 1)->innertext;
 	}

bridges/AlfaBankByBridge.php

@@ -1,83 +0,0 @@
-<?php
-class AlfaBankByBridge extends BridgeAbstract {
-
-	const MAINTAINER = 'lassana';
-	const NAME = 'AlfaBank.by Новости';
-	const URI = 'https://www.alfabank.by';
-	const DESCRIPTION = 'Уведомления Alfa-Now — новости от Альфа-Банка';
-	const CACHE_TIMEOUT = 3600; // 1 hour
-	const PARAMETERS = array(
-		'News' => array(
-			'business' => array(
-				'name' => 'Альфа Бизнес',
-				'type' => 'list',
-				'title' => 'В зависимости от выбора, возращает уведомления для" .
-					" клиентов физ. лиц либо для клиентов-юридических лиц и ИП',
-				'values' => array(
-					'Новости' => 'news',
-					'Новости бизнеса' => 'newsBusiness'
-				),
-				'defaultValue' => 'news'
-			),
-			'fullContent' => array(
-				'name' => 'Включать содержимое',
-				'type' => 'checkbox',
-				'title' => 'Если выбрано, содержимое уведомлений вставляется в поток (работает медленно)'
-			)
-		)
-	);
-
-	public function collectData() {
-		$business = $this->getInput('business') == 'newsBusiness';
-		$fullContent = $this->getInput('fullContent') == 'on';
-
-		$mainPageUrl = self::URI . '/about/articles/uvedomleniya/';
-		if($business) {
-			$mainPageUrl .= '?business=true';
-		}
-		$html = getSimpleHTMLDOM($mainPageUrl);
-		$limit = 0;
-
-		foreach($html->find('a.notifications__item') as $element) {
-			if($limit < 10) {
-				$item = array();
-				$item['uid'] = 'urn:sha1:' . hash('sha1', $element->getAttribute('data-notification-id'));
-				$item['title'] = $element->find('div.item-title', 0)->innertext;
-				$item['timestamp'] = DateTime::createFromFormat(
-					'd M Y',
-					$this->ruMonthsToEn($element->find('div.item-date', 0)->innertext)
-					)->getTimestamp();
-
-				$itemUrl = self::URI . $element->href;
-				if($business) {
-					$itemUrl = str_replace('?business=true', '', $itemUrl);
-				}
-				$item['uri'] = $itemUrl;
-
-				if($fullContent) {
-					$itemHtml = getSimpleHTMLDOM($itemUrl);
-					if($itemHtml) {
-						$item['content'] = $itemHtml->find('div.now-p__content-text', 0)->innertext;
-					}
-				}
-
-				$this->items[] = $item;
-				$limit++;
-			}
-		}
-	}
-
-	public function getIcon() {
-		return static::URI . '/local/images/favicon.ico';
-	}
-
-	private function ruMonthsToEn($date) {
-		$ruMonths = array(
-			'Января', 'Февраля', 'Марта', 'Апреля', 'Мая', 'Июня',
-			'Июля', 'Августа', 'Сентября', 'Октября', 'Ноября', 'Декабря' );
-		$enMonths = array(
-			'January', 'February', 'March', 'April', 'May', 'June',
-			'July', 'August', 'September', 'October', 'November', 'December' );
-		return str_replace($ruMonths, $enMonths, $date);
-	}
-}

bridges/AllocineFRBridge.php

@@ -4,7 +4,7 @@ class AllocineFRBridge extends BridgeAbstract {
 	const MAINTAINER = 'superbaillot.net';
 	const NAME = 'Allo Cine Bridge';
 	const CACHE_TIMEOUT = 25200; // 7h
-	const URI = 'https://www.allocine.fr/';
+	const URI = 'http://www.allocine.fr/';
 	const DESCRIPTION = 'Bridge for allocine.fr';
 	const PARAMETERS = array( array(
 		'category' => array(
@@ -77,7 +77,8 @@ class AllocineFRBridge extends BridgeAbstract {
 
 	public function collectData(){
 
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI() . ' !');
 
 		$category = array_search(
 				$this->getInput('category'),

bridges/AmazonBridge.php

@@ -12,7 +12,6 @@ class AmazonBridge extends BridgeAbstract {
 		'q' => array(
 			'name' => 'Keyword',
 			'required' => true,
-			'exampleValue' => 'watch',
 		),
 		'sort' => array(
 			'name' => 'Sort by',
@@ -62,7 +61,8 @@ class AmazonBridge extends BridgeAbstract {
 		$uri = 'https://www.amazon.' . $this->getInput('tld') . '/';
 		$uri .= 's/?field-keywords=' . urlencode($this->getInput('q')) . '&sort=' . $this->getInput('sort');
 
-		$html = getSimpleHTMLDOM($uri);
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Amazon.');
 
 		foreach($html->find('li.s-result-item') as $element) {
 

bridges/AmazonPriceTrackerBridge.php

@@ -1,7 +1,7 @@
 <?php
 
 class AmazonPriceTrackerBridge extends BridgeAbstract {
-	const MAINTAINER = 'captn3m0, sal0max';
+	const MAINTAINER = 'captn3m0';
 	const NAME = 'Amazon Price Tracker';
 	const URI = 'https://www.amazon.com/';
 	const CACHE_TIMEOUT = 3600; // 1h
@@ -32,7 +32,6 @@ class AmazonPriceTrackerBridge extends BridgeAbstract {
 				'Mexico' 		=> 'com.mx',
 				'Netherlands'	=> 'nl',
 				'Spain' 		=> 'es',
-				'Sweden' 		=> 'se',
 				'United Kingdom'	=> 'co.uk',
 				'United States'		=> 'com',
 			),
@@ -40,17 +39,6 @@ class AmazonPriceTrackerBridge extends BridgeAbstract {
 		),
 	));
 
-	const PRICE_SELECTORS = array(
-		'#priceblock_ourprice',
-		'.priceBlockBuyingPriceString',
-		'#newBuyBoxPrice',
-		'#tp_price_block_total_price_ww',
-		'span.offer-price',
-		'.a-color-price',
-	);
-
-	const WHITESPACE = " \t\n\r\0\x0B\xC2\xA0";
-
 	protected $title;
 
 	/**
@@ -65,7 +53,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract {
 	 */
 	public function getURI() {
 		if (!is_null($this->getInput('asin'))) {
-			return $this->getDomainName() . '/dp/' . $this->getInput('asin');
+			return $this->getDomainName() . '/dp/' . $this->getInput('asin') . '/';
 		}
 		return parent::getURI();
 	}
@@ -156,46 +144,15 @@ EOT;
 		return false;
 	}
 
-	private function scrapePriceTwister($html) {
-		$str = $html->find('.twister-plus-buying-options-price-data', 0);
-
-		$data = json_decode($str->innertext, true);
-		if(count($data) === 1) {
-			$data = $data[0];
-			return array(
-				'displayPrice' => $data['displayPrice'],
-				'currency' => $data['currency'],
-				'shipping' => '0',
-			);
-		}
-
-		return false;
-	}
-
 	private function scrapePriceGeneric($html) {
-		$priceDiv = null;
+		$priceDiv = $html->find('span.offer-price', 0) ?: $html->find('.a-color-price', 0);
 
-		foreach(self::PRICE_SELECTORS as $sel) {
-			$priceDiv = $html->find($sel, 0);
-			if ($priceDiv) {
-				break;
-			}
-		}
+		preg_match('/^\s*([A-Z]{3}|£|\$)\s?([\d.,]+)\s*$/', $priceDiv->plaintext, $matches);
 
-		if (!$priceDiv) {
-			return false;
-		}
-
-		$priceString = str_replace(str_split(self::WHITESPACE), '', $priceDiv->plaintext);
-		preg_match('/(\d+\.\d{0,2})/', $priceString, $matches);
-
-		$price = $matches[0];
-		$currency = str_replace($price, '', $priceString);
-
-		if ($price != null && $currency != null) {
+		if (count($matches) === 3) {
 			return array(
-				'price' 	=> $price,
-				'currency'	=> $currency,
+				'price' 	=> $matches[2],
+				'currency'	=> $matches[1],
 				'shipping'	=> '0'
 			);
 		}
@@ -203,21 +160,6 @@ EOT;
 		return false;
 	}
 
-	private function renderContent($image, $data) {
-		$price = $data['displayPrice'];
-		if (!$price) {
-			$price = "{$data['price']} {$data['currency']}";
-		}
-
-		$html = "$image<br>Price: $price";
-
-		if ($data['shipping'] !== '0') {
-			$html .= "<br>Shipping: {$data['shipping']} {$data['currency']}</br>";
-		}
-
-		return $html;
-	}
-
 	/**
 	 * Scrape method for Amazon product page
 	 * @return [type] [description]
@@ -227,16 +169,18 @@ EOT;
 		$this->title = $this->getTitle($html);
 		$imageTag = $this->getImage($html);
 
-		$data = $this->scrapePriceGeneric($html);
+		$data = $this->scrapePriceFromMetrics($html) ?: $this->scrapePriceGeneric($html);
 
 		$item = array(
 			'title' 	=> $this->title,
 			'uri' 		=> $this->getURI(),
-			'content' 	=> $this->renderContent($imageTag, $data),
-			// This is to ensure that feed readers notice the price change
-			'uid'		=> md5($data['price'])
+			'content' 	=> "$imageTag<br/>Price: {$data['price']} {$data['currency']}",
 		);
 
+		if ($data['shipping'] !== '0') {
+			$item['content'] .= "<br>Shipping: {$data['shipping']} {$data['currency']}</br>";
+		}
+
 		$this->items[] = $item;
 	}
 }

bridges/AnidexBridge.php

@@ -142,7 +142,8 @@ class AnidexBridge extends BridgeAbstract {
 		$opt[CURLOPT_SSL_VERIFYPEER] = 0;
 
 		// Retrieve torrent listing from search results, which does not contain torrent description
-		$html = getSimpleHTMLDOM($search_url, $headers, $opt);
+		$html = getSimpleHTMLDOM($search_url, $headers, $opt)
+		or returnServerError('Could not request Anidex: ' . $search_url);
 		$links = $html->find('a');
 		$results = array();
 		foreach ($links as $link)

bridges/AnimeUltimeBridge.php

@@ -37,11 +37,10 @@ class AnimeUltimeBridge extends BridgeAbstract {
 		$processedOK = 0;
 		foreach (array($thismonth, $lastmonth) as $requestFilter) {
 
+			//Retrive page contents
 			$url = self::URI . 'history-0-1/' . $requestFilter;
-			$html = getContents($url);
-			// Convert html from iso-8859-1 => utf8
-			$html = utf8_encode($html);
-			$html = str_get_html($html);
+			$html = getSimpleHTMLDOM($url)
+				or returnServerError('Could not request Anime-Ultime: ' . $url);
 
 			//Relases are sorted by day : process each day individually
 			foreach($html->find('div.history', 0)->find('h3') as $daySection) {
@@ -88,9 +87,8 @@ class AnimeUltimeBridge extends BridgeAbstract {
 						if(!empty($item_uri)) {
 
 							// Retrieve description from description page
-							$html_item = getContents($item_uri);
-							// Convert html from iso-8859-1 => utf8
-							$html_item = utf8_encode($html_item);
+							$html_item = getContents($item_uri)
+								or returnServerError('Could not request Anime-Ultime: ' . $item_uri);
 							$item_description = substr(
 								$html_item,
 								strpos($html_item, 'class="principal_contain" align="center">') + 41

bridges/AppleAppStoreBridge.php

@@ -35,8 +35,7 @@ class AppleAppStoreBridge extends BridgeAbstract {
 			'values'	=> array(
 				'US'	=> 'US',
 				'India'	=> 'IN',
-				'Canada' => 'CA',
-				'Germany' => 'DE',
+				'Canada'	=> 'CA'
 			),
 			'defaultValue'	=> 'US',
 		),
@@ -94,7 +93,6 @@ class AppleAppStoreBridge extends BridgeAbstract {
 
 		$headers = array(
 			"Authorization: Bearer $token",
-			'Origin: https://apps.apple.com',
 		);
 
 		$json = json_decode(getContents($uri, $headers), true);

bridges/AppleMusicBridge.php

@@ -4,52 +4,59 @@ class AppleMusicBridge extends BridgeAbstract {
 	const NAME = 'Apple Music';
 	const URI = 'https://www.apple.com';
 	const DESCRIPTION = 'Fetches the latest releases from an artist';
-	const MAINTAINER = 'bockiii';
+	const MAINTAINER = 'Limero';
 	const PARAMETERS = array(array(
-		'artist' => array(
-			'name' => 'Artist ID',
-			'exampleValue' => '909253',
+		'url' => array(
+			'name' => 'Artist URL',
+			'exampleValue' => 'https://itunes.apple.com/us/artist/dunderpatrullen/329796274',
 			'required' => true,
 		),
-		'limit' => array(
-			'name' => 'Latest X Releases (max 50)',
-			'defaultValue' => '10',
+		'imgSize' => array(
+			'name' => 'Image size for thumbnails (in px)',
+			'type' => 'number',
+			'defaultValue' => 512,
 			'required' => true,
-		),
+		)
 	));
 	const CACHE_TIMEOUT = 21600; // 6 hours
 
 	public function collectData() {
-		# Limit the amount of releases to 50
-		if ($this->getInput('limit') > 50) {
-			$limit = 50;
-		} else {
-			$limit = $this->getInput('limit');
-		}
+		$url = $this->getInput('url');
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request: ' . $url);
 
-		$url = 'https://itunes.apple.com/lookup?id='
-			. $this->getInput('artist')
-			. '&entity=album&limit='
-			. $limit .
-			'&sort=recent';
-		$html = getSimpleHTMLDOM($url);
+		$imgSize = $this->getInput('imgSize');
 
+		// Grab the json data from the page
+		$html = $html->find('script[id=shoebox-ember-data-store]', 0);
+		$html = strstr($html, '{');
+		$html = substr($html, 0, -9);
 		$json = json_decode($html);
 
-		foreach ($json->results as $obj) {
-			if ($obj->wrapperType === 'collection') {
+		// Loop through each object
+		foreach ($json->included as $obj) {
+			if ($obj->type === 'lockup/album') {
 				$this->items[] = array(
-					'title' => $obj->artistName . ' - ' . $obj->collectionName,
-					'uri' => $obj->collectionViewUrl,
-					'timestamp' => $obj->releaseDate,
-					'enclosures' => $obj->artworkUrl100,
-					'content' => '<a href=' . $obj->collectionViewUrl
-					. '><img src="' . $obj->artworkUrl100 . '" /></a><br><br>'
-					. $obj->artistName . ' - ' . $obj->collectionName
-					. '<br>'
-					. $obj->copyright,
+					'title' => $obj->attributes->artistName . ' - ' . $obj->attributes->name,
+					'uri' => $obj->attributes->url,
+					'timestamp' => $obj->attributes->releaseDate,
+					'enclosures' => $obj->relationships->artwork->data->id,
 				);
+			} elseif ($obj->type === 'image') {
+				$images[$obj->id] = $obj->attributes->url;
 			}
 		}
+
+		// Add the images to each item
+		foreach ($this->items as &$item) {
+			$item['enclosures'] = array(
+				str_replace('{w}x{h}bb.{f}', $imgSize . 'x0w.jpg', $images[$item['enclosures']]),
+			);
+		}
+
+		// Sort the order to put the latest albums first
+		usort($this->items, function($a, $b){
+			return $a['timestamp'] < $b['timestamp'];
+		});
 	}
 }

bridges/ArtStationBridge.php

@@ -10,8 +10,7 @@ class ArtStationBridge extends BridgeAbstract {
 		'Search Query' => array(
 			'q' => array(
 				'name' => 'Search term',
-				'required' => true,
-				'exampleValue'	=> 'bird'
+				'required' => true
 			)
 		)
 	);
@@ -40,13 +39,15 @@ class ArtStationBridge extends BridgeAbstract {
 		);
 
 		$jsonSearchURL = self::URI . '/api/v2/search/projects.json';
-		$jsonSearchStr = getContents($jsonSearchURL, $header, $opts);
+		$jsonSearchStr = getContents($jsonSearchURL, $header, $opts)
+			or returnServerError('Could not fetch JSON for search query.');
 		return json_decode($jsonSearchStr);
 	}
 
 	private function fetchProject($hashID) {
 		$jsonProjectURL = self::URI . '/projects/' . $hashID . '.json';
-		$jsonProjectStr = getContents($jsonProjectURL);
+		$jsonProjectStr = getContents($jsonProjectURL)
+			or returnServerError('Could not fetch JSON for project.');
 		return json_decode($jsonProjectStr);
 	}
 

bridges/Arte7Bridge.php

@@ -1,7 +1,7 @@
 <?php
 class Arte7Bridge extends BridgeAbstract {
 
-	// const MAINTAINER = 'mitsukarenai';
+	const MAINTAINER = 'mitsukarenai';
 	const NAME = 'Arte +7';
 	const URI = 'https://www.arte.tv/';
 	const CACHE_TIMEOUT = 1800; // 30min
@@ -10,82 +10,79 @@ class Arte7Bridge extends BridgeAbstract {
 	const API_TOKEN = 'Nzc1Yjc1ZjJkYjk1NWFhN2I2MWEwMmRlMzAzNjI5NmU3NWU3ODg4ODJjOWMxNTMxYzEzZGRjYjg2ZGE4MmIwOA';
 
 	const PARAMETERS = array(
-		'global' => [
-			'video_duration_filter' => [
-				'name' => 'Exclude short videos',
-				'type' => 'checkbox',
-				'title' => 'Exclude videos that are shorter than 3 minutes',
-				'defaultValue'	=> false,
-			],
-		],
-		'Category' => array(
-			'lang' => array(
+		'Catégorie (Français)' => array(
+			'catfr' => array(
 				'type' => 'list',
-				'name' => 'Language',
+				'name' => 'Catégorie',
 				'values' => array(
-					'Français' => 'fr',
-					'Deutsch' => 'de',
-					'English' => 'en',
-					'Español' => 'es',
-					'Polski' => 'pl',
-					'Italiano' => 'it'
-				),
-				'title' => 'ex. RC-014095 pour https://www.arte.tv/fr/videos/RC-014095/blow-up/',
-				'exampleValue'	=> 'RC-014095'
-			),
-			'cat' => array(
-				'type' => 'list',
-				'name' => 'Category',
-				'values' => array(
-					'All videos' => null,
-					'News & society' => 'ACT',
-					'Series & fiction' => 'SER',
-					'Cinema' => 'CIN',
-					'Culture' => 'ARS',
+					'Toutes les vidéos (français)' => null,
+					'Actu & société' => 'ACT',
+					'Séries & fiction' => 'SER',
+					'Cinéma' => 'CIN',
+					'Arts & spectacles classiques' => 'ARS',
 					'Culture pop' => 'CPO',
-					'Discovery' => 'DEC',
-					'History' => 'HIST',
+					'Découverte' => 'DEC',
+					'Histoire' => 'HIST',
 					'Science' => 'SCI',
-					'Other' => 'AUT'
+					'Autre' => 'AUT'
 				)
-			),
+			)
 		),
-		'Collection' => array(
-			'lang' => array(
-				'type' => 'list',
-				'name' => 'Language',
-				'values' => array(
-					'Français' => 'fr',
-					'Deutsch' => 'de',
-					'English' => 'en',
-					'Español' => 'es',
-					'Polski' => 'pl',
-					'Italiano' => 'it'
-				)
-			),
-			'col' => array(
+		'Collection (Français)' => array(
+			'colfr' => array(
 				'name' => 'Collection id',
 				'required' => true,
-				'title' => 'ex. RC-014095 pour https://www.arte.tv/de/videos/RC-014095/blow-up/',
-				'exampleValue'	=> 'RC-014095'
+				'title' => 'ex. RC-014095 pour https://www.arte.tv/fr/videos/RC-014095/blow-up/'
+			)
+		),
+		'Catégorie (Allemand)' => array(
+			'catde' => array(
+				'type' => 'list',
+				'name' => 'Catégorie',
+				'values' => array(
+					'Alle Videos (deutsch)' => null,
+					'Aktuelles & Gesellschaft' => 'ACT',
+					'Fernsehfilme & Serien' => 'SER',
+					'Kino' => 'CIN',
+					'Kunst & Kultur' => 'ARS',
+					'Popkultur & Alternativ' => 'CPO',
+					'Entdeckung' => 'DEC',
+					'Geschichte' => 'HIST',
+					'Wissenschaft' => 'SCI',
+					'Sonstiges' => 'AUT'
+				)
+			)
+		),
+		'Collection (Allemand)' => array(
+			'colde' => array(
+				'name' => 'Collection id',
+				'required' => true,
+				'title' => 'ex. RC-014095 pour https://www.arte.tv/de/videos/RC-014095/blow-up/'
 			)
 		)
 	);
 
 	public function collectData(){
-		$lang = $this->getInput('lang');
 		switch($this->queriedContext) {
-		case 'Category':
-			$category = $this->getInput('cat');
-			$collectionId = null;
+		case 'Catégorie (Français)':
+			$category = $this->getInput('catfr');
+			$lang = 'fr';
 			break;
-		case 'Collection':
-			$collectionId = $this->getInput('col');
-			$category = null;
+		case 'Collection (Français)':
+			$lang = 'fr';
+			$collectionId = $this->getInput('colfr');
+			break;
+		case 'Catégorie (Allemand)':
+			$category = $this->getInput('catde');
+			$lang = 'de';
+			break;
+		case 'Collection (Allemand)':
+			$lang = 'de';
+			$collectionId = $this->getInput('colde');
 			break;
 		}
 
-		$url = 'https://api.arte.tv/api/opa/v3/videos?sort=-lastModified&limit=15&language='
+		$url = 'https://api.arte.tv/api/opa/v3/videos?sort=-lastModified&limit=10&language='
 			. $lang
 			. ($category != null ? '&category.code=' . $category : '')
 			. ($collectionId != null ? '&collections.collectionId=' . $collectionId : '');
@@ -94,15 +91,11 @@ class Arte7Bridge extends BridgeAbstract {
 			'Authorization: Bearer ' . self::API_TOKEN
 		);
 
-		$input = getContents($url, $header);
+		$input = getContents($url, $header)
+			or returnServerError('Could not request ARTE.');
 		$input_json = json_decode($input, true);
 
 		foreach($input_json['videos'] as $element) {
-			$durationSeconds = $element['durationSeconds'];
-
-			if ($this->getInput('video_duration_filter') && $durationSeconds < 60 * 3) {
-				continue;
-			}
 
 			$item = array();
 			$item['uri'] = $element['url'];
@@ -114,10 +107,10 @@ class Arte7Bridge extends BridgeAbstract {
 			if(!empty($element['subtitle']))
 				$item['title'] = $element['title'] . ' | ' . $element['subtitle'];
 
-			$durationMinutes = round((int)$durationSeconds / 60);
+			$item['duration'] = round((int)$element['durationSeconds'] / 60);
 			$item['content'] = $element['teaserText']
 			. '<br><br>'
-			. $durationMinutes
+			. $item['duration']
 			. 'min<br><a href="'
 			. $item['uri']
 			. '"><img src="'

bridges/AsahiShimbunAJWBridge.php

@@ -26,7 +26,7 @@ class AsahiShimbunAJWBridge extends BridgeAbstract {
 					'Opinion » Editorial' => 'opinion/editorial',
 					'Opinion » Vox Populi' => 'opinion/vox',
 				),
-				'defaultValue' => 'politics',
+				'defaultValue' => 'Politics',
 			)
 		)
 	);
@@ -36,7 +36,8 @@ class AsahiShimbunAJWBridge extends BridgeAbstract {
 	}
 
 	public function collectData() {
-		$html = getSimpleHTMLDOM($this->getSectionURI($this->getInput('section')));
+		$html = getSimpleHTMLDOM($this->getSectionURI($this->getInput('section')))
+			or returnServerError('Could not load content');
 
 		foreach($html->find('#MainInner li a') as $element) {
 			if ($element->parent()->class == 'HeadlineTopImage-S') {

bridges/AskfmBridge.php

@@ -10,14 +10,14 @@ class AskfmBridge extends BridgeAbstract {
 		'Ask.fm username' => array(
 			'u' => array(
 				'name' => 'Username',
-				'required' => true,
-				'exampleValue'	=> 'ApprovedAndReal'
+				'required' => true
 			)
 		)
 	);
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Requested username can\'t be found.');
 
 		$html = defaultLinkTo($html, self::URI);
 

bridges/AssociatedPressNewsBridge.php

@@ -1,270 +0,0 @@
-<?php
-class AssociatedPressNewsBridge extends BridgeAbstract {
-	const NAME = 'Associated Press News Bridge';
-	const URI = 'https://apnews.com/';
-	const DESCRIPTION = 'Returns newest articles by topic';
-	const MAINTAINER = 'VerifiedJoseph';
-	const PARAMETERS = array(
-		'Standard Topics' => array(
-			'topic' => array(
-				'name' => 'Topic',
-				'type' => 'list',
-				'values' => array(
-					'AP Top News' => 'apf-topnews',
-					'Sports' => 'apf-sports',
-					'Entertainment' => 'apf-entertainment',
-					'Oddities' => 'apf-oddities',
-					'Travel' => 'apf-Travel',
-					'Technology' => 'apf-technology',
-					'Lifestyle' => 'apf-lifestyle',
-					'Business' => 'apf-business',
-					'U.S. News' => 'apf-usnews',
-					'Health' => 'apf-Health',
-					'Science' => 'apf-science',
-					'World News' => 'apf-WorldNews',
-					'Politics' => 'apf-politics',
-					'Religion' => 'apf-religion',
-					'Photo Galleries' => 'PhotoGalleries',
-					'Fact Checks' => 'APFactCheck',
-					'Videos' => 'apf-videos',
-				),
-				'defaultValue' => 'apf-topnews',
-			),
-		),
-		'Custom Topic' => array(
-			'topic' => array(
-				'name' => 'Topic',
-				'type' => 'text',
-				'required' => true,
-				'exampleValue' => 'europe'
-			),
-		)
-	);
-
-	const CACHE_TIMEOUT = 900; // 15 mins
-
-	private $detectParamRegex = '/^https?:\/\/(?:www\.)?apnews\.com\/(?:[tag|hub]+\/)?([\w-]+)$/';
-	private $tagEndpoint = 'https://afs-prod.appspot.com/api/v2/feed/tag?tags=';
-	private $feedName = '';
-
-	public function detectParameters($url) {
-		$params = array();
-
-		if(preg_match($this->detectParamRegex, $url, $matches) > 0) {
-			$params['topic'] = $matches[1];
-			$params['context'] = 'Custom Topic';
-			return $params;
-		}
-
-		return null;
-	}
-
-	public function collectData() {
-		switch($this->getInput('topic')) {
-			case 'Podcasts':
-				returnClientError('Podcasts topic feed is not supported');
-				break;
-			case 'PressReleases':
-				returnClientError('PressReleases topic feed is not supported');
-				break;
-			default:
-				$this->collectCardData();
-		}
-	}
-
-	public function getURI() {
-		if (!is_null($this->getInput('topic'))) {
-			return self::URI . $this->getInput('topic');
-		}
-
-		return parent::getURI();
-	}
-
-	public function getName() {
-		if (!empty($this->feedName)) {
-			return $this->feedName . ' - Associated Press';
-		}
-
-		return parent::getName();
-	}
-
-	private function getTagURI() {
-		if (!is_null($this->getInput('topic'))) {
-			return $this->tagEndpoint . $this->getInput('topic');
-		}
-
-		return parent::getURI();
-	}
-
-	private function collectCardData() {
-		$json = getContents($this->getTagURI())
-			or returnServerError('Could not request: ' . $this->getTagURI());
-
-		$tagContents = json_decode($json, true);
-
-		if (empty($tagContents['tagObjs'])) {
-			returnClientError('Topic not found: ' . $this->getInput('topic'));
-		}
-
-		$this->feedName = $tagContents['tagObjs'][0]['name'];
-
-		foreach ($tagContents['cards'] as $card) {
-			$item = array();
-
-			 // skip hub peeks & Notifications
-			if ($card['cardType'] == 'Hub Peek' || $card['cardType'] == 'Notification') {
-				continue;
-			}
-
-			$storyContent = $card['contents'][0];
-
-			switch($storyContent['contentType']) {
-				case 'web': // Skip link only content
-					continue 2;
-
-				case 'video':
-					$html = $this->processVideo($storyContent);
-
-					$item['enclosures'][] = 'https://storage.googleapis.com/afs-prod/media/'
-						. $storyContent['media'][0]['id'] . '/800.jpeg';
-					break;
-				default:
-					if (empty($storyContent['storyHTML'])) { // Skip if no storyHTML
-						continue 2;
-					}
-
-					$html = defaultLinkTo($storyContent['storyHTML'], self::URI);
-					$html = str_get_html($html);
-
-					$this->processMediaPlaceholders($html, $storyContent['id']);
-					$this->processHubLinks($html, $storyContent);
-					$this->processIframes($html);
-
-					if (!is_null($storyContent['leadPhotoId'])) {
-						$item['enclosures'][] = 'https://storage.googleapis.com/afs-prod/media/'
-							. $storyContent['leadPhotoId'] . '/800.jpeg';
-					}
-			}
-
-			$item['title'] = $card['contents'][0]['headline'];
-			$item['uri'] = self::URI . $card['shortId'];
-
-			if ($card['contents'][0]['localLinkUrl']) {
-				$item['uri'] = $card['contents'][0]['localLinkUrl'];
-			}
-
-			$item['timestamp'] = $storyContent['published'];
-
-			if (is_null($storyContent['bylines']) === false) {
-				// Remove 'By' from the bylines
-				if (substr($storyContent['bylines'], 0, 2) == 'By') {
-					$item['author'] = ltrim($storyContent['bylines'], 'By ');
-				} else {
-					$item['author'] = $storyContent['bylines'];
-				}
-			}
-
-			$item['content'] = $html;
-
-			foreach ($storyContent['tagObjs'] as $tag) {
-				$item['categories'][] = $tag['name'];
-			}
-
-			$this->items[] = $item;
-
-			if (count($this->items) >= 15) {
-				break;
-			}
-		}
-	}
-
-	private function processMediaPlaceholders($html, $id) {
-
-		if ($html->find('div.media-placeholder', 0)) {
-			// Fetch page content
-			$json = getContents('https://afs-prod.appspot.com/api/v2/content/' . $id);
-			$storyContent = json_decode($json, true);
-
-			foreach ($html->find('div.media-placeholder') as $div) {
-				$key = array_search($div->id, $storyContent['mediumIds']);
-
-				if (!isset($storyContent['media'][$key])) {
-					continue;
-				}
-
-				$media = $storyContent['media'][$key];
-
-				if ($media['type'] === 'Photo') {
-					$mediaUrl = $media['gcsBaseUrl'] . $media['imageRenderedSizes'][0] . $media['imageFileExtension'];
-					$mediaCaption = $media['caption'];
-
-					$div->outertext = <<<EOD
-	<figure><img loading="lazy" src="{$mediaUrl}"/><figcaption>{$mediaCaption}</figcaption></figure>
-EOD;
-				}
-
-				if ($media['type'] === 'YouTube') {
-					$div->outertext = <<<EOD
-	<iframe src="https://www.youtube.com/embed/{$media['externalId']}" width="560" height="315">
-	</iframe>
-EOD;
-				}
-			}
-		}
-	}
-
-	/*
-		Create full coverage links (HubLinks)
-	*/
-	private function processHubLinks($html, $storyContent) {
-
-		if (!empty($storyContent['richEmbeds'])) {
-			foreach ($storyContent['richEmbeds'] as $embed) {
-
-				if ($embed['type'] === 'Hub Link') {
-					$url = self::URI . $embed['tag']['id'];
-					$div = $html->find('div[id=' . $embed['id'] . ']', 0);
-
-					if ($div) {
-						$div->outertext = <<<EOD
-<p><a href="{$url}">{$embed['calloutText']} {$embed['displayName']}</a></p>
-EOD;
-					}
-				}
-			}
-		}
-	}
-
-	private function processVideo($storyContent) {
-		$video = $storyContent['media'][0];
-
-		if ($video['type'] === 'YouTube') {
-			$url = 'https://www.youtube.com/embed/' . $video['externalId'];
-			$html = <<<EOD
-<iframe width="560" height="315" src="{$url}" frameborder="0" allowfullscreen></iframe>
-EOD;
-		} else {
-			$html = <<<EOD
-<video controls poster="https://storage.googleapis.com/afs-prod/media/{$video['id']}/800.jpeg" preload="none">
-	<source src="{$video['gcsBaseUrl']} {$video['videoRenderedSizes'][0]} {$video['videoFileExtension']}" type="video/mp4">
-</video>
-EOD;
-		}
-
-		return $html;
-	}
-
-	// Remove datawrapper.dwcdn.net iframes and related javaScript
-	private function processIframes($html) {
-
-		foreach ($html->find('iframe') as $index => $iframe) {
-			if (preg_match('/datawrapper\.dwcdn\.net/', $iframe->src)) {
-				$iframe->outertext = '';
-
-				if ($html->find('script', $index)) {
-					$html->find('script', $index)->outertext = '';
-				}
-			}
-		}
-	}
-}

bridges/AtmoNouvelleAquitaineBridge.php

@@ -29,7 +29,8 @@ class AtmoNouvelleAquitaineBridge extends BridgeAbstract {
 	public function collectData() {
 		$uri = self::URI . '/monair/commune/' . $this->getInput('cities');
 
-		$html = getSimpleHTMLDOM($uri);
+		$html = getSimpleHTMLDOM($uri)
+				or returnServerError('Could not request ' . $uri);
 
 		$this->dom = $html->find('#block-system-main .city-prevision-map', 0);
 

bridges/AtmoOccitanieBridge.php

@@ -8,8 +8,7 @@ class AtmoOccitanieBridge extends BridgeAbstract {
 	const PARAMETERS = array(array(
 		'city' => array(
 			'name' => 'Ville',
-			'required' => true,
-			'exampleValue'	=> 'cahors'
+			'required' => true
 		)
 	));
 	const CACHE_TIMEOUT = 7200;
@@ -17,7 +16,8 @@ class AtmoOccitanieBridge extends BridgeAbstract {
 	public function collectData() {
 		$uri = self::URI . $this->getInput('city');
 
-		$html = getSimpleHTMLDOM($uri);
+		$html = getSimpleHTMLDOM($uri)
+				or returnServerError('Could not request ' . $uri);
 
 		$generalMessage = $html->find('.landing-ville .city-banner .iqa-avertissement', 0)->innertext;
 		$recommendationsDom = $html->find('.landing-ville .recommandations', 0);

bridges/AutoJMBridge.php

@@ -7,14 +7,51 @@ class AutoJMBridge extends BridgeAbstract {
 	const DESCRIPTION = 'Suivre les offres de véhicules proposés par AutoJM en fonction des critères de filtrages';
 	const MAINTAINER = 'sysadminstory';
 	const PARAMETERS = array(
-		'Afficher les offres de véhicules disponible sur la recheche AutoJM' => array(
+		'Afficher les offres de véhicules disponible en fonction des critères du site AutoJM' => array(
 			'url' => array(
-				'name' => 'URL de la page de recherche',
+				'name' => 'URL du modèle',
 				'type' => 'text',
 				'required' => true,
 				'title' => 'URL d\'une recherche avec filtre de véhicules sans le http://www.autojm.fr/',
-				'exampleValue' => 'recherche?brands[]=peugeot&ranges[]=peugeot-nouvelle-308-2021-5p'
+				'exampleValue' => 'achat-voitures-neuves-peugeot-nouvelle-308-5p'
 			),
+			'energy' => array(
+				'name' => 'Carburant',
+				'type' => 'list',
+				'values' => array(
+					'-' => '',
+					'Diesel' => 1,
+					'Essence' => 3,
+					'Hybride' => 5
+				),
+				'title' => 'Carburant'
+			),
+			'transmission' => array(
+				'name' => 'Transmission',
+				'type' => 'list',
+				'values' => array(
+					'-' => '',
+					'Automatique' => 1,
+					'Manuelle' => 2
+				),
+				'title' => 'Transmission'
+			),
+			'priceMin' => array(
+				'name' => 'Prix minimum',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Prix minimum du véhicule',
+				'exampleValue' => '10000',
+				'defaultValue' => '0'
+			),
+			'priceMax' => array(
+				'name' => 'Prix maximum',
+				'type' => 'number',
+				'required' => false,
+				'title' => 'Prix maximum du véhicule',
+				'exampleValue' => '15000',
+				'defaultValue' => '150000'
+			)
 		)
 	);
 	const CACHE_TIMEOUT = 3600;
@@ -25,8 +62,10 @@ class AutoJMBridge extends BridgeAbstract {
 
 	public function getName() {
 		switch($this->queriedContext) {
-		case 'Afficher les offres de véhicules disponible sur la recheche AutoJM':
-			return 'AutoJM | Recherche de véhicules';
+		case 'Afficher les offres de véhicules disponible en fonction des critères du site AutoJM':
+			$html = getSimpleHTMLDOMCached(self::URI . $this->getInput('url'), 86400);
+			$name = html_entity_decode($html->find('title', 0)->plaintext);
+			return $name;
 			break;
 		default:
 			return parent::getName();
@@ -36,8 +75,13 @@ class AutoJMBridge extends BridgeAbstract {
 
 	public function collectData() {
 
-		// Get the number of result for this search
-		$search_url = self::URI . $this->getInput('url') . '&open=energy&onlyFilters=false';
+		$model_url = self::URI . $this->getInput('url');
+
+		// Build the GET data
+		$get_data = 'form[energy]=' . $this->getInput('energy') .
+			'&form[transmission]=' . $this->getInput('transmission') .
+			'&form[priceMin]=' . $this->getInput('priceMin') .
+			'&form[priceMin]=' . $this->getInput('priceMin');
 
 		// Set the header 'X-Requested-With' like the website does it
 		$header = array(
@@ -45,91 +89,57 @@ class AutoJMBridge extends BridgeAbstract {
 		);
 
 		// Get the JSON content of the form
-		$json = getContents($search_url, $header);
+		$json = getContents($model_url . '?' . $get_data, $header)
+			or returnServerError('Could not request AutoJM.');
 
 		// Extract the HTML content from the JSON result
 		$data = json_decode($json);
+		$html = str_get_html($data->results);
 
-		$nb_results = $data->nbResults;
-		$total_pages = ceil($nb_results / 15);
+		// Go through every car of the model
+		$list = $html->find('div[class=car-card]');
+		foreach ($list as $car) {
 
-		// Limit the number of page to analyse to 10
-		for($page = 1; $page <= $total_pages && $page <= 10; $page++) {
-			// Get the result the next page
-			$html = $this->getResults($page);
-
-			// Go through every car of the search
-			$list = $html->find('div[class*=card-car card-car--listing]');
-			foreach ($list as $car) {
-
-				// Get the info about the car offer
-				$image = $car->find('div[class=card-car__header__img]', 0)->find('img', 0)->src;
-				// Decode HTML attribute JSON data
-				$car_data = json_decode(html_entity_decode($car->{'data-layer'}));
-				$car_model = $car->{'data-title'} . ' ' . $car->{'data-suptitle'};
-				$availability = $car->find('div[class=card-car__modalites]', 0)->find('div[class=col]', 0)->plaintext;
-				$warranty = $car->find('div[data-type=WarrantyCard]', 0)->plaintext;
-				$discount_html = $car->find('div[class=subtext vehicle_reference_element]', 0);
-				// Check if there is any discount info displayed
-				if ($discount_html != null) {
-					$reference_price_value = $discount_html->find('span[data-cfg=vehicle__reference_price]', 0)->plaintext;
-					$discount_percent_value = $discount_html->find('span[data-cfg=vehicle__discount_percent]', 0)->plaintext;
-					$reference_price = '<li>Prix de référence : <s>' . $reference_price_value . '</s></li>';
-					$discount_percent = '<li>Réduction : ' . $discount_percent_value . ' %</li>';
-				} else {
-					$reference_price = '';
-					$discount_percent = '';
-				}
-				$price = $car_data->price;
-				$kilometer = $car->find('span[data-cfg=vehicle__kilometer]', 0)->plaintext;
-				$energy = $car->find('span[data-cfg=vehicle__energy__label]', 0)->plaintext;
-				$power = $car->find('span[data-cfg=vehicle__tax_horse_power]', 0)->plaintext;
-				$seats = $car->find('span[data-cfg=vehicle__seats]', 0)->plaintext;
-				$doors = $car->find('span[data-cfg=vehicle__door__label]', 0)->plaintext;
-				$transmission = $car->find('span[data-cfg=vehicle__transmission]', 0)->plaintext;
-				$loa_html = $car->find('span[data-cfg=vehicle__loa]', 0);
-				// Check if any LOA price is displayed
-				if($loa_html != null) {
-					$loa_value = $car->find('span[data-cfg=vehicle__loa]', 0)->plaintext;
-					$loa = '<li>LOA : à partir de ' . $loa_value . ' / mois </li>';
-				} else {
-					$loa = '';
-				}
-
-				// Construct the new item
-				$item = array();
-				$item['title'] = $car_model;
-				$item['content'] = '<p><img style="vertical-align:middle ; padding: 10px" src="' . $image . '" />'
-					. $car_model . '</p>';
-				$item['content'] .= '<ul><li>Disponibilité : ' . $availability . '</li>';
-				$item['content'] .= '<li>Prix : ' . $price . ' €</li>';
-				$item['content'] .= $reference_price;
-				$item['content'] .= $loa;
-				$item['content'] .= $discount_percent;
-				$item['content'] .= '<li>Garantie : ' . $warranty . '</li>';
-				$item['content'] .= '<li>Kilométrage : ' . $kilometer . ' km</li>';
-				$item['content'] .= '<li>Energie : ' . $energy . '</li>';
-				$item['content'] .= '<li>Puissance: ' . $power . ' CV Fiscaux</li>';
-				$item['content'] .= '<li>Nombre de Places : ' . $seats . ' place(s)</li>';
-				$item['content'] .= '<li>Nombre de portes : ' . $doors . '</li>';
-				$item['content'] .= '<li>Boite de vitesse : ' . $transmission . '</li></ul>';
-				$item['uri'] = $car_data->{'uri'};
-				$item['uid'] = hash('md5', $item['content']);
-				$this->items[] = $item;
+			// Get the Finish name if this car is the first of a new finish
+			$prev_tag = $car->prev_sibling();
+			if($prev_tag->tag == 'div' &&  $prev_tag->class == 'results-title') {
+				$finish_name = $prev_tag->plaintext;
 			}
+
+			// Get the info about the car offer
+			$image = $car->find('div[class=car-card__visual]', 0)->find('img', 0)->src;
+			$serie = $car->find('div[class=car-card__title]', 0)->plaintext;
+			$url = $car->find('a', 0)->href;
+			// Check if the car model is in stock or available only on order
+			if($car->find('span[class*=tag--dispo]', 0) != null) {
+				$availability = 'En Stock';
+			} else {
+				$availability = 'Sur commande';
+			}
+			$discount_html = $car->find('span[class=promo]', 0);
+			// Check if there is any discount dsiplayed
+			if ($discount_html != null) {
+				$discount = $discount_html->plaintext;
+			} else {
+				$discount = 'inconnue';
+			}
+			$price = $car->find('span[class=price]', 0)->plaintext;
+
+			// Construct the new item
+			$item = array();
+			$item['title'] = $finish_name . ' ' . $serie;
+			$item['content'] = '<p><img style="vertical-align:middle ; padding: 10px" src="' . $image . '" />'
+				. $finish_name . ' ' . $serie . '</p>';
+			$item['content'] .= '<ul><li>Disponibilité : ' . $availability . '</li>';
+			$item['content'] .= '<li>Série : ' . $serie . '</li>';
+			$item['content'] .= '<li>Remise : ' . $discount . '</li>';
+			$item['content'] .= '<li>Prix : ' . $price . '</li></ul>';
+
+			// Add a fictionnal anchor to the RSS element URL, based on the item content ;
+			// As the URL could be identical even if the price change, some RSS reader will not show those offers as new items
+			$item['uri'] = $url . '#' . md5($item['content']);
+
+			$this->items[] = $item;
 		}
 	}
-
-	private function getResults(int $page)
-	{
-		$user_input = $this->getInput('url');
-		$search_data = preg_replace('#(recherche|recherche/[0-9]{1,10})\?#', 'recherche/' . $page . '?', $user_input);
-
-		$search_url = self::URI . $search_data . '&open=energy&onlyFilters=false';
-
-		// Get the HTML content of the page
-		$html = getSimpleHTMLDOMCached($search_url);
-
-		return $html;
-	}
 }

bridges/AwwwardsBridge.php

@@ -18,7 +18,8 @@ class AwwwardsBridge extends BridgeAbstract {
 
 	private function fetchSites() {
 		Debug::log('Fetching all sites');
-		$sites = getSimpleHTMLDOM(self::SITESURI);
+		$sites = getSimpleHTMLDOM(self::SITESURI)
+			or returnServerError('Could not fetch JSON for sites.');
 
 		Debug::log('Parsing all JSON data');
 		foreach($sites->find('li[data-model]') as $site) {

bridges/BadDragonBridge.php

@@ -220,7 +220,8 @@ class BadDragonBridge extends BridgeAbstract {
 	public function collectData() {
 		switch($this->queriedContext) {
 		case 'Sales':
-			$sales = json_decode(getContents(self::URI . 'api/sales'));
+			$sales = json_decode(getContents(self::URI . 'api/sales'))
+				or returnServerError('Failed to query BD API');
 
 			foreach($sales as $sale) {
 				$item = array();
@@ -273,10 +274,12 @@ class BadDragonBridge extends BridgeAbstract {
 			}
 			break;
 		case 'Clearance':
-			$toyData = json_decode(getContents($this->inputToURL(true)));
+			$toyData = json_decode(getContents($this->inputToURL(true)))
+				or returnServerError('Failed to query BD API');
 
 			$productList = json_decode(getContents(self::URI
-				. 'api/inventory-toy/product-list'));
+				. 'api/inventory-toy/product-list'))
+				or returnServerError('Failed to query BD API');
 
 			foreach($toyData->toys as $toy) {
 				$item = array();

bridges/BakaUpdatesMangaReleasesBridge.php

@@ -3,80 +3,23 @@ class BakaUpdatesMangaReleasesBridge extends BridgeAbstract {
 	const NAME = 'Baka Updates Manga Releases';
 	const URI = 'https://www.mangaupdates.com/';
 	const DESCRIPTION = 'Get the latest series releases';
-	const MAINTAINER = 'fulmeek, KamaleiZestri';
-	const PARAMETERS = array(
-		'By series' => array(
-			'series_id' => array(
-				'name'		=> 'Series ID',
-				'type'		=> 'number',
-				'required'	=> true,
-				'exampleValue'	=> '188066'
-			)
-		),
-		'By list' => array(
-			'list_id' => array(
-				'name' 		=> 'List ID and Type',
-				'type' 		=> 'text',
-				'required' 	=> true,
-				'exampleValue'	=> '4395&list=read'
-			)
+	const MAINTAINER = 'fulmeek';
+	const PARAMETERS = array(array(
+		'series_id' => array(
+			'name'		=> 'Series ID',
+			'type'		=> 'number',
+			'required'	=> true,
+			'exampleValue'	=> '12345'
 		)
-	);
+	));
 	const LIMIT_COLS = 5;
 	const LIMIT_ITEMS = 10;
-	const RELEASES_URL = 'https://www.mangaupdates.com/releases.html';
 
 	private $feedName = '';
 
 	public function collectData() {
-		if($this -> queriedContext == 'By series')
-			$this -> collectDataBySeries();
-		else	//queriedContext == 'By list'
-			$this -> collectDataByList();
-	}
-
-	public function getURI(){
-		if($this -> queriedContext == 'By series') {
-			$series_id = $this->getInput('series_id');
-			if (!empty($series_id)) {
-				return self::URI . 'releases.html?search=' . $series_id . '&stype=series';
-			}
-		} else	//queriedContext == 'By list'
-			return self::RELEASES_URL;
-
-		return self::URI;
-	}
-
-	public function getName(){
-		if(!empty($this->feedName)) {
-			return $this->feedName . ' - ' . self::NAME;
-		}
-		return parent::getName();
-	}
-
-	private function getSanitizedHash($string) {
-		return hash('sha1', preg_replace('/[^a-zA-Z0-9\-\.]/', '', ucwords(strtolower($string))));
-	}
-
-	private function filterText($text) {
-		return rtrim($text, '* ');
-	}
-
-	private function filterHTML($text) {
-		return $this->filterText(html_entity_decode($text));
-	}
-
-	private function findID($manga) {
-		// sometimes new series are on the release list that have no ID. just drop them.
-		if(@$this -> filterHTML($manga -> find('a', 0) -> href) != null) {
-			preg_match('/id=([0-9]*)/', $this -> filterHTML($manga -> find('a', 0) -> href), $match);
-			return $match[1];
-		} else
-			return 0;
-	}
-
-	private function collectDataBySeries() {
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Series not found');
 
 		// content is an unstructured pile of divs, ugly to parse
 		$cols = $html->find('div#main_content div.row > div.text');
@@ -125,62 +68,36 @@ class BakaUpdatesMangaReleasesBridge extends BridgeAbstract {
 
 			$item['title'] = implode(' ', $title);
 			$item['uri'] = $this->getURI();
-			$item['uid'] = $this->getSanitizedHash($item['title'] . $item['author']);
+			$item['uid'] = $this->getSanitizedHash($item['title']);
 
 			$this->items[] = $item;
 		}
 	}
 
-	private function collectDataByList() {
-		$this -> feedName = 'Releases';
-		$list = array();
-
-		$releasesHTML = getSimpleHTMLDOM(self::RELEASES_URL);
-
-		$list_id = $this -> getInput('list_id');
-		$listHTML = getSimpleHTMLDOM('https://www.mangaupdates.com/mylist.html?id=' . $list_id);
-
-		//get ids of the manga that the user follows,
-		$parts = $listHTML -> find('table#ptable tr > td.pl');
-		foreach($parts as $part) {
-			$list[] = $this -> findID($part);
+	public function getURI(){
+		$series_id = $this->getInput('series_id');
+		if (!empty($series_id)) {
+			return self::URI . 'releases.html?search=' . $series_id . '&stype=series';
 		}
+		return self::URI;
+	}
 
-		//similar to above, but the divs are in groups of 3.
-		$cols = $releasesHTML -> find('div#main_content div.row > div.pbreak');
-		$rows = array_slice(array_chunk($cols, 3), 0);
-
-		foreach($rows as $cols) {
-			//check if current manga is in user's list.
-			$id = $this -> findId($cols[0]);
-			if(!array_search($id, $list)) continue;
-
-			$item = array();
-			$title = array();
-
-			$item['content'] = '';
-
-			$objTitle = $cols[0];
-			if ($objTitle) {
-				$title[] = $this->filterHTML($objTitle->plaintext);
-				$item['content'] .= '<p>Series: ' . $this->filterHTML($objTitle -> innertext) . '</p>';
-			}
-
-			$objVolChap = $cols[1];
-			if ($objVolChap && !empty($objVolChap->plaintext))
-				$title[] = $this -> filterHTML($objVolChap -> innertext);
-
-			$objAuthor = $cols[2];
-			if ($objAuthor && !empty($objAuthor->plaintext)) {
-				$item['author'] = $this->filterHTML($objAuthor -> plaintext);
-				$item['content'] .= '<p>Groups: ' . $this->filterHTML($objAuthor -> innertext) . '</p>';
-			}
-
-			$item['title'] = implode(' ', $title);
-			$item['uri'] = self::URI . 'releases.html?search=' . $id . '&stype=series';
-			$item['uid'] = $this->getSanitizedHash($item['title'] . $item['author']);
-
-			$this->items[] = $item;
+	public function getName(){
+		if(!empty($this->feedName)) {
+			return $this->feedName . ' - ' . self::NAME;
 		}
+		return parent::getName();
+	}
+
+	private function getSanitizedHash($string) {
+		return hash('sha1', preg_replace('/[^a-zA-Z0-9\-\.]/', '', ucwords(strtolower($string))));
+	}
+
+	private function filterText($text) {
+		return rtrim($text, '* ');
+	}
+
+	private function filterHTML($text) {
+		return $this->filterText(html_entity_decode($text));
 	}
 }

bridges/BandcampBridge.php

@@ -11,8 +11,7 @@ class BandcampBridge extends BridgeAbstract {
 			'tag' => array(
 				'name' => 'tag',
 				'type' => 'text',
-				'required' => true,
-				'exampleValue'	=> 'hip-hop-rap'
+				'required' => true
 			)
 		),
 		'By band' => array(
@@ -20,32 +19,6 @@ class BandcampBridge extends BridgeAbstract {
 				'name' => 'band',
 				'type' => 'text',
 				'title' => 'Band name as seen in the band page URL',
-				'required' => true,
-				'exampleValue'	=> 'aesoprock'
-			),
-			'type' => array(
-				'name' => 'Articles are',
-				'type' => 'list',
-				'values' => array(
-					'Releases' => 'releases',
-					'Releases, new one when track list changes' => 'changes',
-					'Individual tracks' => 'tracks'
-				),
-				'defaultValue' => 'changes'
-			),
-			'limit' => array(
-				'name' => 'limit',
-				'type' => 'number',
-				'required' => true,
-				'title' => 'Number of releases to return',
-				'defaultValue' => 5
-			)
-		),
-		'By label' => array(
-			'label' => array(
-				'name' => 'label',
-				'type' => 'text',
-				'title' => 'label name as seen in the label page URL',
 				'required' => true
 			),
 			'type' => array(
@@ -70,15 +43,13 @@ class BandcampBridge extends BridgeAbstract {
 				'name' => 'band',
 				'type' => 'text',
 				'title' => 'Band name as seen in the album page URL',
-				'required' => true,
-				'exampleValue'	=> 'aesoprock'
+				'required' => true
 			),
 			'album' => array(
 				'name' => 'album',
 				'type' => 'text',
 				'title' => 'Album name as seen in the album page URL',
-				'required' => true,
-				'exampleValue'	=> 'appleseed'
+				'required' => true
 			),
 			'type' => array(
 				'name' => 'Articles are',
@@ -115,7 +86,8 @@ class BandcampBridge extends BridgeAbstract {
 				CURLOPT_CUSTOMREQUEST => 'POST',
 				CURLOPT_POSTFIELDS => $data
 			);
-			$content = getContents($url, $header, $opts);
+			$content = getContents($url, $header, $opts)
+				or returnServerError('Could not complete request to: ' . $url);
 
 			$json = json_decode($content);
 
@@ -150,15 +122,12 @@ class BandcampBridge extends BridgeAbstract {
 			}
 			break;
 		case 'By band':
-		case 'By label':
 		case 'By album':
 			$html = getSimpleHTMLDOMCached($this->getURI(), 86400);
 
-			if ($html->find('meta[name=title]', 0)) {
-				$this->feedName = $html->find('meta[name=title]', 0)->content;
-			} else {
-				$this->feedName = str_replace('Music | ', '', $html->find('title', 0)->plaintext);
-			}
+			$titleElement = $html->find('head meta[name=title]', 0)
+				or returnServerError('Unable to find title on: ' . $this->getURI());
+			$this->feedName = $titleElement->content;
 
 			$regex = '/band_id=(\d+)/';
 			if(preg_match($regex, $html, $matches) == false)
@@ -168,7 +137,6 @@ class BandcampBridge extends BridgeAbstract {
 			$tralbums = array();
 			switch($this->queriedContext) {
 			case 'By band':
-			case 'By label':
 				$query_data = array(
 					'band_id' => $band_id
 				);
@@ -304,7 +272,8 @@ class BandcampBridge extends BridgeAbstract {
 
 	private function apiGet($endpoint, $query_data) {
 		$url = self::URI . 'api/' . $endpoint . '?' . http_build_query($query_data);
-		$data = json_decode(getContents($url));
+		$data = json_decode(getContents($url))
+			or returnServerError('API request to "' . $url . '" failed.');
 		return $data;
 	}
 
@@ -318,13 +287,6 @@ class BandcampBridge extends BridgeAbstract {
 				. '?sort_field=date';
 			}
 			break;
-		case 'By label':
-			if(!is_null($this->getInput('label'))) {
-				return 'https://'
-					. $this->getInput('label')
-					. '.bandcamp.com/music';
-			}
-			break;
 		case 'By band':
 			if(!is_null($this->getInput('band'))) {
 				return 'https://'
@@ -359,13 +321,6 @@ class BandcampBridge extends BridgeAbstract {
 				return $this->getInput('band') . ' - Bandcamp Band';
 			}
 			break;
-		case 'By label':
-			if(isset($this->feedName)) {
-				return $this->feedName . ' - Bandcamp Label';
-			} elseif(!is_null($this->getInput('label'))) {
-				return $this->getInput('label') . ' - Bandcamp Label';
-			}
-			break;
 		case 'By album':
 			if(isset($this->feedName)) {
 				return $this->feedName . ' - Bandcamp Album';

bridges/BandcampDailyBridge.php

@@ -1,155 +0,0 @@
-<?php
-class BandcampDailyBridge extends BridgeAbstract {
-	const NAME = 'Bandcamp Daily Bridge';
-	const URI = 'https://daily.bandcamp.com';
-	const DESCRIPTION = 'Returns newest articles';
-	const MAINTAINER = 'VerifiedJoseph';
-	const PARAMETERS = array(
-		'Latest articles' => array(),
-		'Best of' => array(
-			'content' => array(
-				'name' => 'content',
-				'type' => 'list',
-				'values' => array(
-					'Best Ambient' => 'best-ambient',
-					'Best Beat Tapes' => 'best-beat-tapes',
-					'Best Dance 12\'s' => 'best-dance-12s',
-					'Best Contemporary Classical' => 'best-contemporary-classical',
-					'Best Electronic' => 'best-electronic',
-					'Best Experimental' => 'best-experimental',
-					'Best Hip-Hop' => 'best-hip-hop',
-					'Best Jazz' => 'best-jazz',
-					'Best Metal' => 'best-metal',
-					'Best Punk' => 'best-punk',
-					'Best Reissues' => 'best-reissues',
-					'Best Soul' => 'best-soul',
-				),
-				'defaultValue' => 'best-ambient',
-			),
-		),
-		'Genres' => array(
-			'content' => array(
-				'name' => 'content',
-				'type' => 'list',
-				'values' => array(
-					'Acoustic' => 'genres/acoustic',
-					'Alternative' => 'genres/alternative',
-					'Ambient' => 'genres/ambient',
-					'Blues' => 'genres/blues',
-					'Classical' => 'genres/classical',
-					'Comedy' => 'genres/comedy',
-					'Country' => 'genres/country',
-					'Devotional' => 'genres/devotional',
-					'Electronic' => 'genres/electronic',
-					'Experimental' => 'genres/experimental',
-					'Folk' => 'genres/folk',
-					'Funk' => 'genres/funk',
-					'Hip-Hop/Rap' => 'genres/hip-hop-rap',
-					'Jazz' => 'genres/jazz',
-					'Kids' => 'genres/kids',
-					'Latin' => 'genres/latin',
-					'Metal' => 'genres/metal',
-					'Pop' => 'genres/pop',
-					'Punk' => 'genres/punk',
-					'R&B/Soul' => 'genres/r-b-soul',
-					'Reggae' => 'genres/reggae',
-					'Rock' => 'genres/rock',
-					'Soundtrack' => 'genres/soundtrack',
-					'Spoken Word' => 'genres/spoken-word',
-					'World' => 'genres/world',
-				),
-				'defaultValue' => 'genres/acoustic',
-			),
-		),
-		'Franchises' => array(
-			'content' => array(
-				'name' => 'content',
-				'type' => 'list',
-				'values' => array(
-					'Lists' => 'lists',
-					'Features' => 'features',
-					'Album of the Day' => 'album-of-the-day',
-					'Acid Test' => 'acid-test',
-					'Bandcamp Navigator' => 'bandcamp-navigator',
-					'Big Ups' => 'big-ups',
-					'Certified' => 'certified',
-					'Gallery' => 'gallery',
-					'Hidden Gems' => 'hidden-gems',
-					'High Scores' => 'high-scores',
-					'Label Profile' => 'label-profile',
-					'Lifetime Achievement' => 'lifetime-achievement',
-					'Scene Report' => 'scene-report',
-					'Seven Essential Releases' => 'seven-essential-releases',
-					'The Merch Table' => 'the-merch-table',
-				),
-				'defaultValue' => 'lists',
-			),
-		)
-	);
-
-	const CACHE_TIMEOUT = 3600; // 1 hour
-
-	public function collectData() {
-		$html = getSimpleHTMLDOM($this->getURI())
-			or returnServerError('Could not request: ' . $this->getURI());
-
-		$html = defaultLinkTo($html, self::URI);
-
-		$articles = $html->find('articles-list', 0);
-
-		foreach($articles->find('div.list-article') as $index => $article) {
-			$item = array();
-
-			$articlePath = $article->find('a.title', 0)->href;
-
-			$articlePageHtml = getSimpleHTMLDOMCached($articlePath, 3600)
-				or returnServerError('Could not request: ' . $articlePath);
-
-			$item['uri'] = $articlePath;
-			$item['title'] = $articlePageHtml->find('article-title', 0)->innertext;
-			$item['author'] = $articlePageHtml->find('article-credits > a', 0)->innertext;
-			$item['content'] = html_entity_decode($articlePageHtml->find('meta[name="description"]', 0)->content, ENT_QUOTES);
-			$item['timestamp'] = $articlePageHtml->find('meta[property="article:published_time"]', 0)->content;
-			$item['categories'][] = $articlePageHtml->find('meta[property="article:section"]', 0)->content;
-
-			if ($articlePageHtml->find('meta[property="article:tag"]', 0)) {
-				$item['categories'][] = $articlePageHtml->find('meta[property="article:tag"]', 0)->content;
-			}
-
-			$item['enclosures'][] = $articlePageHtml->find('meta[name="twitter:image"]', 0)->content;
-
-			$this->items[] = $item;
-
-			if (count($this->items) >= 10) {
-				break;
-			}
-		}
-	}
-
-	public function getURI() {
-		switch($this->queriedContext) {
-			case 'Latest articles':
-				return self::URI . '/latest';
-			case 'Best of':
-			case 'Genres':
-			case 'Franchises':
-				return self::URI . '/' . $this->getInput('content');
-			default:
-				return parent::getURI();
-		}
-	}
-
-	public function getName() {
-		if ($this->queriedContext === 'Latest articles') {
-			return $this->queriedContext . ' - Bandcamp Daily';
-		}
-
-		if (!is_null($this->getInput('content'))) {
-			$contentValues = array_flip(self::PARAMETERS[$this->queriedContext]['content']['values']);
-
-			return $contentValues[$this->getInput('content')] . ' - Bandcamp Daily';
-		}
-
-		return parent::getName();
-	}
-}

bridges/BastaBridge.php

@@ -8,7 +8,8 @@ class BastaBridge extends BridgeAbstract {
 	const DESCRIPTION = 'Returns the newest articles.';
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend');
+		$html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend')
+			or returnServerError('Could not request Bastamag.');
 
 		$limit = 0;
 
@@ -18,11 +19,13 @@ class BastaBridge extends BridgeAbstract {
 				$item['title'] = $element->find('title', 0)->innertext;
 				$item['uri'] = $element->find('guid', 0)->plaintext;
 				$item['timestamp'] = strtotime($element->find('dc:date', 0)->plaintext);
-
-				$html = getSimpleHTMLDOM($item['uri']);
-				$html = defaultLinkTo($html, self::URI);
-
-				$item['content'] = $html->find('div.texte', 0)->innertext;
+				// Replaces all relative image URLs by absolute URLs.
+				// Relative URLs always start with 'local/'!
+				$item['content'] = preg_replace(
+					'/src=["\']{1}([^"\']+)/ims',
+					'src=\'' . self::URI . '$1\'',
+					getSimpleHTMLDOM($item['uri'])->find('div.texte', 0)->innertext
+				);
 				$this->items[] = $item;
 				$limit++;
 			}

bridges/BinanceBridge.php

@@ -1,34 +1,62 @@
 <?php
 class BinanceBridge extends BridgeAbstract {
-	const NAME = 'Binance Blog';
-	const URI = 'https://www.binance.com/en/blog';
-	const DESCRIPTION = 'Subscribe to the Binance blog.';
+	const NAME = 'Binance';
+	const URI = 'https://www.binance.com';
+	const DESCRIPTION = 'Subscribe to the Binance blog or the Binance Zendesk announcements.';
 	const MAINTAINER = 'thefranke';
 	const CACHE_TIMEOUT = 3600; // 1h
 
+	const PARAMETERS = array( array(
+		'category' => array(
+			'name' => 'category',
+			'type' => 'list',
+			'exampleValue' => 'Blog',
+			'title' => 'Select a category',
+			'values' => array(
+				'Blog' => 'Blog',
+				'Announcements' => 'Announcements'
+			)
+		)
+	));
+
 	public function getIcon() {
 		return 'https://bin.bnbstatic.com/static/images/common/favicon.ico';
 	}
 
-	public function collectData() {
-		$html = getSimpleHTMLDOM(self::URI)
+	public function getName() {
+		return self::NAME . ' ' . $this->getInput('category');
+	}
+
+	public function getURI() {
+		if ($this->getInput('category') == 'Blog')
+			return self::URI . '/en/blog';
+		else
+			return 'https://binance.zendesk.com/hc/en-us/categories/115000056351-Announcements';
+	}
+
+	protected function collectBlogData() {
+		$html = getSimpleHTMLDOM($this->getURI())
 			or returnServerError('Could not fetch Binance blog data.');
 
-		$appData = $html->find('script[id="__APP_DATA"]');
-		$appDataJson = json_decode($appData[0]->innertext);
+		foreach($html->find('div[direction="row"]') as $element) {
 
-		foreach($appDataJson->pageData->redux->blogList->blogList as $element) {
+			$date = $element->find('div[direction="column"]', 0);
+			$day = $date->find('div', 0)->innertext;
+			$month = $date->find('div', 1)->innertext;
+			$extractedDate = $day . ' ' . $month;
 
-			$date = $element->postTime;
-			$abstract = $element->brief;
-			$uri = self::URI . '/' . $element->lang . '/blog/' . $element->idStr;
-			$title = $element->title;
-			$content = $element->content;
+			$abstract = $element->find('div[direction="column"]', 1);
+			$a = $abstract->find('a', 0);
+			$uri = self::URI . $a->href;
+			$title = $a->innertext;
+
+			$full = getSimpleHTMLDOMCached($uri);
+			$content = $full->find('div.desc', 1);
 
 			$item = array();
 			$item['title'] = $title;
 			$item['uri'] = $uri;
-			$item['timestamp'] = substr($date, 0, -3);
+			$item['timestamp'] = strtotime($extractedDate);
 			$item['author'] = 'Binance';
 			$item['content'] = $content;
 
@@ -38,4 +66,38 @@ class BinanceBridge extends BridgeAbstract {
 				break;
 		}
 	}
+
+	protected function collectAnnouncementData() {
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not fetch Zendesk announcement data.');
+
+		foreach($html->find('a.article-list-link') as $a) {
+			$title = $a->innertext;
+			$uri = 'https://binance.zendesk.com' . $a->href;
+
+			$full = getSimpleHTMLDOMCached($uri);
+			$content = $full->find('div.article-body', 0);
+			$date = $full->find('time', 0)->getAttribute('datetime');
+
+			$item = array();
+
+			$item['title'] = $title;
+			$item['uri'] = $uri;
+			$item['timestamp'] = strtotime($date);
+			$item['author'] = 'Binance';
+			$item['content'] = $content;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+
+	public function collectData() {
+		if ($this->getInput('category') == 'Blog')
+			$this->collectBlogData();
+		else
+			$this->collectAnnouncementData();
+	}
 }

bridges/BingSearchBridge.php

@@ -0,0 +1,119 @@
+<?php
+
+class BingSearchBridge extends BridgeAbstract
+{
+	const NAME = 'Bing search';
+	const URI = 'https://www.bing.com/';
+	const DESCRIPTION = 'Return images from bing search discover';
+	const MAINTAINER = 'DnAp';
+	const PARAMETERS = array(
+		'Image Discover' => array(
+			'category' => array(
+				'name' => 'Categories',
+				'type' => 'list',
+				'values' => self::IMAGE_DISCOVER_CATEGORIES
+			),
+			'image_size' => array(
+				'name' => 'Image size',
+				'type' => 'list',
+				'values' => array(
+					'Small' => 'turl',
+					'Full size' => 'imgurl'
+				)
+			)
+		)
+	);
+
+	const IMAGE_DISCOVER_CATEGORIES = array(
+		'Abstract' => 'abstract',
+		'Animals' => 'animals',
+		'Anime' => 'anime',
+		'Architecture' => 'architecture',
+		'Arts and Crafts' => 'arts-and-crafts',
+		'Beauty' => 'beauty',
+		'Cars and Motorcycles' => 'cars-and-motorcycles',
+		'Cats' => 'cats',
+		'Celebrities' => 'celebrities',
+		'Comics' => 'comics',
+		'DIY' => 'diy',
+		'Dogs' => 'dogs',
+		'Fitness' => 'fitness',
+		'Food and Drink' => 'food-and-drink',
+		'Funny' => 'funny',
+		'Gadgets' => 'gadgets',
+		'Gardening' => 'gardening',
+		'Geeky' => 'geeky',
+		'Hairstyles' => 'hairstyles',
+		'Home Decor' => 'home-decor',
+		'Marine Life' => 'marine-life',
+		'Men\'s Fashion' => 'men%27s-fashion',
+		'Nature' => 'nature',
+		'Outdoors' => 'outdoors',
+		'Parenting' => 'parenting',
+		'Phone Wallpapers' => 'phone-wallpapers',
+		'Photography' => 'photography',
+		'Quotes' => 'quotes',
+		'Recipes' => 'recipes',
+		'Snow' => 'snow',
+		'Tattoos' => 'tattoos',
+		'Travel' => 'travel',
+		'Video Games' => 'video-games',
+		'Weddings' => 'weddings',
+		'Women\'s Fashion' => 'women%27s-fashion',
+	);
+
+	public function getIcon()
+	{
+		return 'https://www.bing.com/sa/simg/bing_p_rr_teal_min.ico';
+	}
+
+	public function collectData()
+	{
+		$this->items = $this->imageDiscover($this->getInput('category'));
+	}
+
+	public function getName()
+	{
+		if ($this->getInput('category')) {
+			if (self::IMAGE_DISCOVER_CATEGORIES[$this->getInput('categories')] !== null) {
+				$category = self::IMAGE_DISCOVER_CATEGORIES[$this->getInput('categories')];
+			} else {
+				$category = 'Unknown';
+			}
+
+			return 'Best ' . $category . ' - Bing Image Discover';
+		}
+		return parent::getName();
+	}
+
+	private function imageDiscover($category)
+	{
+		$html = getSimpleHTMLDOM(self::URI . '/discover/' . $category)
+		or returnServerError('Could not request ' . self::NAME);
+		$sizeKey = $this->getInput('image_size');
+
+		$items = array();
+		foreach ($html->find('a.iusc') as $element) {
+			$data = json_decode(htmlspecialchars_decode($element->getAttribute('m')), true);
+
+			$item = array();
+			$item['title'] = basename(rtrim($data['imgurl'], '/'));
+			$item['uri'] = $data['imgurl'];
+			$item['content'] = '<a href="' . $data['imgurl'] . '">
+				<img src="' . $data[$sizeKey] . '" alt="' . $item['title'] . '"></a>
+				<p>Source: <a href="' . $this->curUrl($data['surl']) . '"> </a></p>';
+			$item['enclosures'] = $data['imgurl'];
+
+			$items[] = $item;
+		}
+		return $items;
+	}
+
+	private function curUrl($url)
+	{
+		if (strlen($url) <= 80) {
+			return $url;
+		}
+		return substr($url, 0, 80) . '...';
+	}
+}

bridges/BlaguesDeMerdeBridge.php

@@ -13,7 +13,8 @@ class BlaguesDeMerdeBridge extends BridgeAbstract {
 
 	public function collectData(){
 
-		$html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request BDM.');
 
 		foreach($html->find('div.blague') as $element) {
 

bridges/BleepingComputerBridge.php

@@ -1,29 +0,0 @@
-<?php
-class BleepingComputerBridge extends FeedExpander {
-
-	const MAINTAINER = 'csisoap';
-	const NAME = 'Bleeping Computer';
-	const URI = 'https://www.bleepingcomputer.com/';
-	const DESCRIPTION = 'Returns the newest articles.';
-
-	protected function parseItem($item){
-		$item = parent::parseItem($item);
-
-		$article_html = getSimpleHTMLDOMCached($item['uri']);
-		if(!$article_html) {
-			$item['content'] .= '<p><em>Could not request ' . $this->getName() . ': ' . $item['uri'] . '</em></p>';
-			return $item;
-		}
-
-		$article_content = $article_html->find('div.articleBody', 0)->innertext;
-		$article_content = stripRecursiveHTMLSection($article_content, 'div', '<div class="cz-related-article-wrapp');
-		$item['content'] = trim($article_content);
-
-		return $item;
-	}
-
-	public function collectData(){
-		$feed = static::URI . 'feed/';
-		$this->collectExpandableDatas($feed);
-	}
-}

bridges/BlizzardNewsBridge.php

@@ -1,60 +0,0 @@
-<?php
-
-class BlizzardNewsBridge extends XPathAbstract {
-
-	const NAME = 'Blizzard News';
-	const URI = 'https://news.blizzard.com';
-	const DESCRIPTION = 'Blizzard (game company) newsfeed';
-	const MAINTAINER = 'Niehztog';
-	const PARAMETERS = array(
-		'' => array(
-			'locale' => array(
-				'name' => 'Language',
-				'type' => 'list',
-				'values' => array(
-					'Deutsch' => 'de-de',
-					'English (EU)' => 'en-gb',
-					'English (US)' => 'en-us',
-					'Español (EU)' => 'es-es',
-					'Español (AL)' => 'es-mx',
-					'Français' => 'fr-fr',
-					'Italiano' => 'it-it',
-					'日本語' => 'ja-jp',
-					'한국어' => 'ko-kr',
-					'Polski' => 'pl-pl',
-					'Português (AL)' => 'pt-br',
-					'Русский' => 'ru-ru',
-					'ภาษาไทย' => 'th-th',
-					'简体中文' => 'zh-cn',
-					'繁體中文' => 'zh-tw'
-				),
-				'defaultValue' => 'en-us',
-				'title' => 'Select your language'
-			)
-		)
-	);
-	const CACHE_TIMEOUT = 3600;
-
-	const XPATH_EXPRESSION_ITEM = '/html/body/div/div[4]/div[2]/div[2]/div/div/section/ol/li/article';
-	const XPATH_EXPRESSION_ITEM_TITLE = './/div/div[2]/h2';
-	const XPATH_EXPRESSION_ITEM_CONTENT = './/div[@class="ArticleListItem-description"]/div[@class="h6"]';
-	const XPATH_EXPRESSION_ITEM_URI = './/a[@class="ArticleLink ArticleLink"]/@href';
-	const XPATH_EXPRESSION_ITEM_AUTHOR = '';
-	const XPATH_EXPRESSION_ITEM_TIMESTAMP = './/time[@class="ArticleListItem-footerTimestamp"]/@timestamp';
-	const XPATH_EXPRESSION_ITEM_ENCLOSURES = './/div[@class="ArticleListItem-image"]/@style';
-	const XPATH_EXPRESSION_ITEM_CATEGORIES = './/div[@class="ArticleListItem-label"]';
-	const SETTING_FIX_ENCODING = true;
-
-	/**
-	 * Source Web page URL (should provide either HTML or XML content)
-	 * @return string
-	 */
-	protected function getSourceUrl(){
-
-		$locale = $this->getInput('locale');
-		if('zh-cn' === $locale) {
-			return 'https://cn.news.blizzard.com';
-		}
-		return 'https://news.blizzard.com/' . $locale;
-	}
-}

bridges/BooruprojectBridge.php

@@ -1,62 +1,35 @@
 <?php
-require_once('DanbooruBridge.php');
+require_once('GelbooruBridge.php');
 
-class BooruprojectBridge extends DanbooruBridge {
+class BooruprojectBridge extends GelbooruBridge {
 
 	const MAINTAINER = 'mitsukarenai';
 	const NAME = 'Booruproject';
-	const URI = 'https://booru.org/';
+	const URI = 'http://booru.org/';
 	const DESCRIPTION = 'Returns images from given page of booruproject';
 	const PARAMETERS = array(
 		'global' => array(
 			'p' => array(
 				'name' => 'page',
-				'defaultValue' => 0,
 				'type' => 'number'
 			),
 			't' => array(
-				'name' => 'tags',
-				'required' => true,
-				'exampleValue'	=> 'tagme',
-				'title'	=> 'Use "all" to get all posts'
+				'name' => 'tags'
 			)
 		),
 		'Booru subdomain (subdomain.booru.org)' => array(
 			'i' => array(
 				'name' => 'Subdomain',
-				'required' => true,
-				'exampleValue'	=> 'rm'
+				'required' => true
 			)
 		)
 	);
 
-	const PATHTODATA = '.thumb';
-	const IDATTRIBUTE = 'id';
-	const TAGATTRIBUTE = 'title';
 	const PIDBYPAGE = 20;
 
-	protected function getFullURI(){
-		return $this->getURI()
-		. 'index.php?page=post&s=list&pid='
-		. ($this->getInput('p') ? ($this->getInput('p') - 1) * static::PIDBYPAGE : '')
-		. '&tags=' . urlencode($this->getInput('t'));
-	}
-
-	protected function getTags($element){
-		$tags = parent::getTags($element);
-		$tags = explode(' ', $tags);
-
-		// Remove statistics from the tags list (identified by colon)
-		foreach($tags as $key => $tag) {
-			if(strpos($tag, ':') !== false) unset($tags[$key]);
-		}
-
-		return implode(' ', $tags);
-	}
-
 	public function getURI(){
 		if(!is_null($this->getInput('i'))) {
-			return 'https://' . $this->getInput('i') . '.booru.org/';
+			return 'http://' . $this->getInput('i') . '.booru.org/';
 		}
 
 		return parent::getURI();

bridges/BrutBridge.php

@@ -16,7 +16,6 @@ class BrutBridge extends BridgeAbstract {
 					'Entertainment' => 'entertainment',
 					'Sports' => 'sport',
 					'Nature' => 'nature',
-					'Health' => 'health',
 				),
 				'defaultValue' => 'news',
 			),
@@ -27,7 +26,6 @@ class BrutBridge extends BridgeAbstract {
 						'United States' => 'us',
 						'United Kingdom' => 'uk',
 						'France' => 'fr',
-						'Spain' => 'es',
 						'India' => 'in',
 						'Mexico' => 'mx',
 				),
@@ -44,7 +42,8 @@ class BrutBridge extends BridgeAbstract {
 
 	public function collectData() {
 
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request: ' . $this->getURI());
 
 		$results = $html->find('div.results', 0);
 
@@ -53,7 +52,8 @@ class BrutBridge extends BridgeAbstract {
 
 			$videoPath = self::URI . $li->children(0)->href;
 
-			$videoPageHtml = getSimpleHTMLDOMCached($videoPath, 3600);
+			$videoPageHtml = getSimpleHTMLDOMCached($videoPath, 3600)
+				or returnServerError('Could not request: ' . $videoPath);
 
 			$this->videoImage = $videoPageHtml->find('meta[name="twitter:image"]', 0)->content;
 

bridges/BukowskisBridge.php

@@ -1,218 +0,0 @@
-<?php
-
-class BukowskisBridge extends BridgeAbstract
-{
-	const NAME = 'Bukowskis';
-	const URI = 'https://www.bukowskis.com';
-	const DESCRIPTION = 'Fetches info about auction objects from Bukowskis auction house';
-	const MAINTAINER = 'Qluxzz';
-	const PARAMETERS = array(array(
-		'category' => array(
-			'name' => 'Category',
-			'type' => 'list',
-			'values' => array(
-				'All categories' => '',
-				'Art' => array(
-					'All' => 'art',
-					'Classic Art' => 'art.classic-art',
-					'Classic Finnish Art' => 'art.classic-finnish-art',
-					'Classic Swedish Art' => 'art.classic-swedish-art',
-					'Contemporary' => 'art.contemporary',
-					'Modern Finnish Art' => 'art.modern-finnish-art',
-					'Modern International Art' => 'art.modern-international-art',
-					'Modern Swedish Art' => 'art.modern-swedish-art',
-					'Old Masters' => 'art.old-masters',
-					'Other' => 'art.other',
-					'Photographs' => 'art.photographs',
-					'Prints' => 'art.prints',
-					'Sculpture' => 'art.sculpture',
-					'Swedish Old Masters' => 'art.swedish-old-masters',
-				),
-				'Asian Ceramics & Works of Art' => array(
-					'All' => 'asian-ceramics-works-of-art',
-					'Other' => 'asian-ceramics-works-of-art.other',
-					'Porcelain' => 'asian-ceramics-works-of-art.porcelain',
-				),
-				'Books & Manuscripts' => array(
-					'All' => 'books-manuscripts',
-					'Books' => 'books-manuscripts.books',
-				),
-				'Carpets, rugs & textiles' => array(
-					'All' => 'carpets-rugs-textiles',
-					'European' => 'carpets-rugs-textiles.european',
-					'Oriental' => 'carpets-rugs-textiles.oriental',
-					'Rest of the world' => 'carpets-rugs-textiles.rest-of-the-world',
-					'Scandinavian' => 'carpets-rugs-textiles.scandinavian',
-				),
-				'Ceramics & porcelain' => array(
-					'All' => 'ceramics-porcelain',
-					'Ceramic ware' => 'ceramics-porcelain.ceramic-ware',
-					'European' => 'ceramics-porcelain.european',
-					'Rest of the world' => 'ceramics-porcelain.rest-of-the-world',
-					'Scandinavian' => 'ceramics-porcelain.scandinavian',
-				),
-				'Collectibles' => array(
-					'All' => 'collectibles',
-					'Advertising & Retail' => 'collectibles.advertising-retail',
-					'Memorabilia' => 'collectibles.memorabilia',
-					'Movies & music' => 'collectibles.movies-music',
-					'Other' => 'collectibles.other',
-					'Retro & Popular Culture' => 'collectibles.retro-popular-culture',
-					'Technica & Nautica' => 'collectibles.technica-nautica',
-					'Toys' => 'collectibles.toys',
-				),
-				'Design' => array(
-					'All' => 'design',
-					'Art glass' => 'design.art-glass',
-					'Furniture' => 'design.furniture',
-					'Other' => 'design.other',
-				),
-				'Folk art' => array(
-					'All' => 'folk-art',
-					'All categories' => 'lots',
-				),
-				'Furniture' => array(
-					'All' => 'furniture',
-					'Armchairs & Sofas' => 'furniture.armchairs-sofas',
-					'Cabinets & Bureaus' => 'furniture.cabinets-bureaus',
-					'Chairs' => 'furniture.chairs',
-					'Garden furniture' => 'furniture.garden-furniture',
-					'Mirrors' => 'furniture.mirrors',
-					'Other' => 'furniture.other',
-					'Shelves & Book cases' => 'furniture.shelves-book-cases',
-					'Tables' => 'furniture.tables',
-				),
-				'Glassware' => array(
-					'All' => 'glassware',
-					'Glassware' => 'glassware.glassware',
-					'Other' => 'glassware.other',
-				),
-				'Jewellery' => array(
-					'All' => 'jewellery',
-					'Bracelets' => 'jewellery.bracelets',
-					'Brooches' => 'jewellery.brooches',
-					'Earrings' => 'jewellery.earrings',
-					'Necklaces & Pendants' => 'jewellery.necklaces-pendants',
-					'Other' => 'jewellery.other',
-					'Rings' => 'jewellery.rings',
-				),
-				'Lighting' => array(
-					'All' => 'lighting',
-					'Candle sticks & Candelabras' => 'lighting.candle-sticks-candelabras',
-					'Ceiling lights' => 'lighting.ceiling-lights',
-					'Chandeliers' => 'lighting.chandeliers',
-					'Floor lights' => 'lighting.floor-lights',
-					'Other' => 'lighting.other',
-					'Table lights' => 'lighting.table-lights',
-					'Wall lights' => 'lighting.wall-lights',
-				),
-				'Militaria' => array(
-					'All' => 'militaria',
-					'Honors & Medals' => 'militaria.honors-medals',
-					'Other militaria' => 'militaria.other-militaria',
-					'Weaponry' => 'militaria.weaponry',
-				),
-				'Miscellaneous' => array(
-					'All' => 'miscellaneous',
-					'Brass, Copper & Pewter' => 'miscellaneous.brass-copper-pewter',
-					'Nickel silver' => 'miscellaneous.nickel-silver',
-					'Oriental' => 'miscellaneous.oriental',
-					'Other' => 'miscellaneous.other',
-				),
-				'Silver' => array(
-					'All' => 'silver',
-					'Candle sticks' => 'silver.candle-sticks',
-					'Cups & Bowls' => 'silver.cups-bowls',
-					'Cutlery' => 'silver.cutlery',
-					'Other' => 'silver.other',
-				),
-				'Timepieces' => array(
-					'All' => 'timepieces',
-					'Other' => 'timepieces.other',
-					'Pocket watches' => 'timepieces.pocket-watches',
-					'Table clocks' => 'timepieces.table-clocks',
-					'Wrist watches' => 'timepieces.wrist-watches',
-				),
-				'Vintage & Fashion' => array(
-					'All' => 'vintage-fashion',
-					'Accessories' => 'vintage-fashion.accessories',
-					'Bags & Trunks' => 'vintage-fashion.bags-trunks',
-					'Clothes' => 'vintage-fashion.clothes',
-				),
-			)
-		),
-		'sort_order' => array(
-			'name' => 'Sort order',
-			'type' => 'list',
-			'values' => array(
-				'Ending soon' => 'ending',
-				'Most recent' => 'recent',
-				'Most bids' => 'most',
-				'Fewest bids' => 'fewest',
-				'Lowest price' => 'lowest',
-				'Highest price' => 'highest',
-				'Lowest estimate' => 'low',
-				'Highest estimate' => 'high',
-				'Alphabetical' => 'alphabetical',
-			),
-		),
-		'language' => array(
-			'name' => 'Language',
-			'type' => 'list',
-			'values' => array(
-				'English' => 'en',
-				'Swedish' => 'sv',
-				'Finnish' => 'fi'
-			),
-		),
-	));
-
-	const CACHE_TIMEOUT = 3600; // 1 hour
-
-	private $title;
-
-	public function collectData()
-	{
-		$baseUrl = 'https://www.bukowskis.com';
-		$category = $this->getInput('category');
-		$language = $this->getInput('language');
-		$sort_order = $this->getInput('sort_order');
-
-		$url = $baseUrl . '/' . $language . '/lots';
-
-		if ($category)
-			$url = $url . '/category/' . $category;
-
-		if ($sort_order)
-			$url = $url . '/sort/' . $sort_order;
-
-		$html = getSimpleHTMLDOM($url);
-
-		$this->title = htmlspecialchars_decode($html->find('title', 0)->innertext);
-
-		foreach ($html->find('div.c-lot-index-lot') as $lot) {
-			$title = $lot->find('a.c-lot-index-lot__title', 0)->plaintext;
-			$relative_url = $lot->find('a.c-lot-index-lot__link', 0)->href;
-			$images = json_decode(
-				htmlspecialchars_decode(
-					$lot
-						->find('img.o-aspect-ratio__image', 0)
-						->getAttribute('data-thumbnails')
-				)
-			);
-
-			$this->items[] = array(
-				'title' => $title,
-				'uri' => $baseUrl . $relative_url,
-				'uid' => $lot->getAttribute('data-lot-id'),
-				'content' => count($images) > 0 ? "<img src='$images[0]'/><br/>$title" : $title,
-				'enclosures' => array_slice($images, 1),
-			);
-		}
-	}
-
-	public function getName()
-	{
-		return $this->title ?: parent::getName();
-	}
-}

bridges/BundesbankBridge.php

@@ -41,7 +41,8 @@ class BundesbankBridge extends BridgeAbstract {
 
 	public function collectData() {
 
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('No response for ' . $this->getURI());
 
 		$html = defaultLinkTo($html, $this->getURI());
 

bridges/BundestagParteispendenBridge.php

@@ -1,89 +0,0 @@
-<?php
-class BundestagParteispendenBridge extends BridgeAbstract {
-	const MAINTAINER = 'mibe';
-	const NAME = 'Deutscher Bundestag - Parteispenden';
-	const URI = 'https://www.bundestag.de/parlament/praesidium/parteienfinanzierung/fundstellen50000';
-
-	const CACHE_TIMEOUT = 86400; // 24h
-	const DESCRIPTION = 'Returns the latest "soft money" donations to parties represented in the German Bundestag.';
-	const CONTENT_TEMPLATE = <<<TMPL
-<p><b>Partei:</b><br>%s</p>
-<p><b>Spendenbetrag:</b><br>%s</p>
-<p><b>Spender:</b><br>%s</p>
-<p><b>Eingang der Spende:</b><br>%s</p>
-TMPL;
-
-	public function getIcon()
-	{
-		return 'https://www.bundestag.de/static/appdata/includes/images/layout/favicon.ico';
-	}
-
-	public function collectData()
-	{
-		$ajaxUri = <<<URI
-https://www.bundestag.de/ajax/filterlist/de/parlament/praesidium/parteienfinanzierung/fundstellen50000/462002-462002
-URI;
-		// Get the main page
-		$html = getSimpleHTMLDOMCached($ajaxUri, self::CACHE_TIMEOUT)
-			or returnServerError('Could not request AJAX list.');
-
-		// Build the URL from the first anchor element. The list is sorted by year, descending, so the first element is the current year.
-		$firstAnchor = $html->find('a', 0)
-			or returnServerError('Could not find the proper HTML element.');
-
-		$url = 'https://www.bundestag.de' . $firstAnchor->href;
-
-		// Get the actual page with the soft money donations
-		$html = getSimpleHTMLDOMCached($url, self::CACHE_TIMEOUT)
-			or returnServerError('Could not request ' . $url);
-
-		$rows = $html->find('table.table > tbody > tr')
-			or returnServerError('Could not find the proper HTML elements.');
-
-		foreach($rows as $row) {
-			$item = $this->generateItemFromRow($row);
-			if (is_array($item)) {
-				$item['uri'] = $url;
-				$this->items[] = $item;
-			}
-		}
-	}
-
-	private function generateItemFromRow(simple_html_dom_node $row)
-	{
-		// The row must have 5 columns. There are monthly header rows, which are ignored here.
-		if(count($row->children) != 5)
-			return null;
-
-		$item = array();
-
-		//              | column     | paragraph inside column
-		$party  = $row->children[0]->children[0]->innertext;
-		$amount = $row->children[1]->children[0]->innertext . ' €';
-		$donor  = $row->children[2]->children[0]->innertext;
-		$date   = $row->children[3]->children[0]->innertext;
-		$dip    = $row->children[4]->children[0]->find('a.dipLink', 0);
-
-		// Strip whitespace from date string.
-		$date = str_replace(' ', '', $date);
-
-		$content = sprintf(self::CONTENT_TEMPLATE, $party, $amount, $donor, $date);
-
-		$item = array(
-			'title' => $party . ': ' . $amount,
-			'content' => $content,
-			'uid' => sha1($content),
-			);
-
-		// Try to get the link to the official document
-		if ($dip != null)
-			$item['enclosures'] = array($dip->href);
-
-		// Try to parse the date
-		$dateTime = DateTime::createFromFormat('d.m.Y', $date);
-		if ($dateTime !== false)
-			$item['timestamp'] = $dateTime->getTimestamp();
-
-		return $item;
-	}
-}

bridges/CBCEditorsBlogBridge.php

@@ -1,36 +0,0 @@
-<?php
-class CBCEditorsBlogBridge extends BridgeAbstract {
-
-	const MAINTAINER = 'quickwick';
-	const NAME = 'CBC Editors Blog';
-	const URI = 'https://www.cbc.ca/news/editorsblog';
-	const DESCRIPTION = 'Recent CBC Editor\'s Blog posts';
-
-	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI);
-
-		// Loop on each blog post entry
-		foreach($html->find('div.contentListCards', 0)->find('a[data-test=type-story]') as $element) {
-			$headline = ($element->find('.headline', 0))->innertext;
-			$timestamp = ($element->find('time', 0))->datetime;
-			$articleUri = 'https://www.cbc.ca' . $element->href;
-			$summary = ($element->find('div.description', 0))->innertext;
-			$thumbnailUris = ($element->find('img[loading=lazy]', 0))->srcset;
-			$thumbnailUri = rtrim(explode(',', $thumbnailUris)[0], ' 300w');
-
-			// Fill item
-			$item = array();
-			$item['uri'] = $articleUri;
-			$item['id'] = $item['uri'];
-			$item['timestamp'] = $timestamp;
-			$item['title'] = $headline;
-			$item['content'] = '<img src="'
-			. $thumbnailUri . '" /><br>' . $summary;
-			$item['author'] = 'Editor\'s Blog';
-
-			if(isset($item['title'])) {
-				$this->items[] = $item;
-			}
-		}
-	}
-}

bridges/CNETBridge.php

@@ -53,7 +53,8 @@ class CNETBridge extends BridgeAbstract {
 
 		// Retrieve webpage
 		$pageUrl = self::URI . (empty($topic) ? 'news/' : $topic . '/');
-		$html = getSimpleHTMLDOM($pageUrl);
+		$html = getSimpleHTMLDOM($pageUrl)
+		or returnServerError('Could not request CNET: ' . $pageUrl);
 
 		// Process articles
 		foreach($html->find('div.assetBody, div.riverPost') as $element) {

bridges/CNETFranceBridge.php

@@ -12,13 +12,13 @@ class CNETFranceBridge extends FeedExpander
 				'name' => 'Exclude by title',
 				'required' => false,
 				'title' => 'Title term, separated by semicolon (;)',
-				'exampleValue' => 'bon plan;bons plans;au meilleur prix;des meilleures offres;Amazon Prime Day;RED by SFR ou B&You'
+				'defaultValue' => 'bon plan;bons plans;au meilleur prix;des meilleures offres;Amazon Prime Day;RED by SFR ou B&You'
 			),
 			'url' => array(
 				'name' => 'Exclude by url',
 				'required' => false,
 				'title' => 'URL term, separated by semicolon (;)',
-				'exampleValue' => 'bon-plan;bons-plans'
+				'defaultValue' => 'bon-plan;bons-plans'
 			)
 		)
 	);

bridges/CVEDetailsBridge.php

@@ -1,140 +0,0 @@
-<?php
-
-// CVE Details is a collection of CVEs, taken from the National Vulnerability
-// Database (NVD) and other sources like the Exploit DB and Metasploit. The
-// website categorizes it by vendor and product and attach the CWE category.
-// There is a Atom feed available, but only logged in users can use it,
-// it is not reliable and contain no useful information. This bridge create a
-// sane feed with additional information like tags and a link to the CWE
-// a description of the vulnerability.
-class CVEDetailsBridge extends BridgeAbstract {
-	const MAINTAINER = 'Aaron Fischer';
-	const NAME = 'CVE Details';
-	const CACHE_TIMEOUT = 60 * 60 * 6; // 6 hours
-	const DESCRIPTION = 'Report new CVE vulnerabilities for a given vendor (and product)';
-	const URI = 'https://www.cvedetails.com';
-
-	const PARAMETERS = array(array(
-		// The Vendor ID can be taken from the URL
-		'vendor_id' => array(
-			'name' => 'Vendor ID',
-			'type' => 'number',
-			'required' => true,
-			'exampleValue' => 74, // PHP
-		),
-		// The optional Product ID can be taken from the URL as well
-		'product_id' => array(
-			'name' => 'Product ID',
-			'type' => 'number',
-			'required' => false,
-			'exampleValue' => 128, // PHP
-		),
-	));
-
-	private $html = null;
-	private $vendor = '';
-	private $product = '';
-
-	// Return the URL to query.
-	// Because of the optional product ID, we need to attach it if it is
-	// set. The search result page has the exact same structure (with and
-	// without the product ID).
-	private function _buildURL() {
-		$url = self::URI . '/vulnerability-list/vendor_id-' . $this->getInput('vendor_id');
-		if ($this->getInput('product_id') !== '') {
-			$url .= '/product_id-' . $this->getInput('product_id');
-		}
-		// Sadly, there is no way (prove me wrong please) to sort the search
-		// result by publish date. So the nearest alternative is the CVE
-		// number, which should be mostly accurate.
-		$url .= '?order=1'; // Order by CVE number DESC
-
-		return $url;
-	}
-
-	// Make the actual request to cvedetails.com and stores the response
-	// (HTML) for later use and extract vendor and product from it.
-	private function _fetchContent() {
-		$html = getSimpleHTMLDOM($this->_buildURL());
-		$this->html = defaultLinkTo($html, self::URI);
-
-		$vendor = $html->find('#contentdiv > h1 > a', 0);
-		if ($vendor == null) {
-			returnServerError('Invalid Vendor ID ' .
-				$this->getInput('vendor_id') .
-				' or Product ID ' .
-				$this->getInput('product_id'));
-		}
-		$this->vendor = $vendor->innertext;
-
-		$product = $html->find('#contentdiv > h1 > a', 1);
-		if ($product != null) {
-			$this->product = $product->innertext;
-		}
-	}
-
-	// Build the name of the feed.
-	public function getName() {
-		if ($this->getInput('vendor_id') == '') {
-			return self::NAME;
-		}
-
-		if ($this->html == null) {
-			$this->_fetchContent();
-		}
-
-		$name = 'CVE Vulnerabilities for ' . $this->vendor;
-		if ($this->product != '') {
-			$name .= '/' . $this->product;
-		}
-
-		return $name;
-	}
-
-	// Pull the data from the HTML response and fill the items..
-	public function collectData() {
-		if ($this->html == null) {
-			$this->_fetchContent();
-		}
-
-		foreach ($this->html->find('#vulnslisttable .srrowns') as $i => $tr) {
-			// There are some optional vulnerability types, which will be
-			// added to the categories as well as the CWE number -- which is
-			// always given.
-			$categories = array($this->vendor);
-			$enclosures = array();
-
-			$cwe = $tr->find('td', 2)->find('a', 0);
-			if ($cwe != null) {
-				$cwe = $cwe->innertext;
-				$categories[] = 'CWE-' . $cwe;
-				$enclosures[] = 'https://cwe.mitre.org/data/definitions/' . $cwe . '.html';
-			}
-			$c = $tr->find('td', 4)->innertext;
-			if (trim($c) != '') {
-				$categories[] = $c;
-			}
-			if ($this->product != '') {
-				$categories[] = $this->product;
-			}
-
-			// The CVE number itself
-			$title = $tr->find('td', 1)->find('a', 0)->innertext;
-
-			$this->items[] = array(
-				'uri' => $tr->find('td', 1)->find('a', 0)->href,
-				'title' => $title,
-				'timestamp' => $tr->find('td', 5)->innertext,
-				'content' => $tr->next_sibling()->innertext,
-				'categories' => $categories,
-				'enclosures' => $enclosures,
-				'uid' => $tr->find('td', 1)->find('a', 0)->innertext,
-			);
-
-			// We only want to fetch the latest 10 CVEs
-			if (count($this->items) >= 10) {
-				break;
-			}
-		}
-	}
-}

bridges/CarThrottleBridge.php

@@ -1,41 +0,0 @@
-<?php
-class CarThrottleBridge extends FeedExpander {
-	const NAME = 'Car Throttle ';
-	const URI = 'https://www.carthrottle.com';
-	const DESCRIPTION = 'Get the latest car-related news from Car Throttle.';
-	const MAINTAINER = 't0stiman';
-
-	public function collectData() {
-		$this->collectExpandableDatas('https://www.carthrottle.com/rss', 10);
-	}
-
-	protected function parseItem($feedItem) {
-		$item = parent::parseItem($feedItem);
-
-		//fetch page
-		$articlePage = getSimpleHTMLDOMCached($feedItem->link)
-			or returnServerError('Could not retrieve ' . $feedItem->link);
-
-		$subtitle = $articlePage->find('p.standfirst', 0);
-		$article = $articlePage->find('div.content_field', 0);
-
-		$item['content'] = str_get_html($subtitle . $article);
-
-		//convert <iframe>s to <a>s. meant for embedded videos.
-		foreach($item['content']->find('iframe') as $found) {
-
-			$iframeUrl = $found->getAttribute('src');
-
-			if ($iframeUrl) {
-				$found->outertext = '<a href="' . $iframeUrl . '">' . $iframeUrl . '</a>';
-			}
-		}
-
-		//remove scripts from the text
-		foreach ($item['content']->find('script') as $remove) {
-			$remove->outertext = '';
-		}
-
-		return $item;
-	}
-}

bridges/CastorusBridge.php

@@ -13,8 +13,8 @@ class CastorusBridge extends BridgeAbstract {
 				'name' => 'ZIP code',
 				'type' => 'text',
 				'required' => true,
-				'exampleValue' => '7',
-				'title' => 'Insert ZIP code (complete or partial). e.g: 78125 OR 781 OR 7'
+				'exampleValue' => '74910, 74',
+				'title' => 'Insert ZIP code (complete or partial)'
 			)
 		),
 		'Get latest changes via city name' => array(
@@ -22,8 +22,8 @@ class CastorusBridge extends BridgeAbstract {
 				'name' => 'City name',
 				'type' => 'text',
 				'required' => true,
-				'exampleValue' => 'Paris',
-				'title' => 'Insert city name (complete or partial). e.g: Paris OR Par OR P'
+				'exampleValue' => 'Seyssel, Seys',
+				'title' => 'Insert city name (complete or partial)'
 			)
 		)
 	);

bridges/CdactionBridge.php

@@ -1,60 +0,0 @@
-<?php
-
-class CdactionBridge extends BridgeAbstract {
-	const NAME = 'CD-ACTION bridge';
-	const URI = 'https://cdaction.pl';
-	const DESCRIPTION = 'Fetches the latest posts from given category.';
-	const MAINTAINER = 'tomaszkane';
-	const PARAMETERS = array( array(
-		'category' => array(
-			'name' => 'Kategoria',
-			'type' => 'list',
-			'values' => array(
-				'Najnowsze (wszystkie)' => 'najnowsze',
-				'Newsy' => 'newsy',
-				'Recenzje' => 'recenzje',
-				'Teksty' => array(
-					'Publicystyka' => 'publicystyka',
-					'Zapowiedzi' => 'zapowiedzi',
-					'Już graliśmy' => 'juz-gralismy',
-					'Poradniki' => 'poradniki',
-				),
-				'Kultura' => 'kultura',
-				'Wideo' => 'wideo',
-				'Czasopismo' => 'czasopismo',
-				'Technologie' => array(
-					'Artykuły' => 'artykuly',
-					'Testy' => 'testy',
-				),
-				'Na luzie' => array(
-					'Konkursy' => 'konkursy',
-					'Nadgodziny' => 'nadgodziny',
-				)
-			)
-		))
-	);
-
-	public function collectData() {
-		$html = getSimpleHTMLDOM($this->getURI() . '/' . $this->getInput('category'));
-
-		$newsJson = $html->find('script#__NEXT_DATA__', 0)->innertext;
-		if (!$newsJson = json_decode($newsJson)) {
-			return;
-		}
-
-		$queriesIndex = $this->getInput('category') === 'najnowsze' ? 0 : 1;
-		foreach ($newsJson->props->pageProps->dehydratedState->queries[$queriesIndex]->state->data->results as $news) {
-			$item = array();
-			$item['uri'] = $this->getURI() . '/' . $news->category->slug . '/' . $news->slug;
-			$item['title'] = $news->title;
-			$item['timestamp'] = $news->publishedAt;
-			$item['author'] = $news->editor->fullName;
-			$item['content'] = $news->lead;
-			$item['enclosures'][] = $news->bannerUrl;
-			$item['categories'] = array_column($news->tags, 'name');
-			$item['uid'] = $news->id;
-
-			$this->items[] = $item;
-		}
-	}
-}

bridges/CeskaTelevizeBridge.php

@@ -13,7 +13,7 @@ class CeskaTelevizeBridge extends BridgeAbstract {
 			'url' => array(
 				'name' => 'url to the show',
 				'required' => true,
-				'exampleValue' => 'https://www.ceskatelevize.cz/porady/1097181328-udalosti/'
+				'exampleValue' => 'https://www.ceskatelevize.cz/porady/1097181328-udalosti/dily/'
 			)
 		)
 	);
@@ -38,7 +38,7 @@ class CeskaTelevizeBridge extends BridgeAbstract {
 	public function collectData() {
 		$url = $this->getInput('url');
 
-		$validUrl = '/^(https:\/\/www\.ceskatelevize\.cz\/porady\/\d+-[a-z0-9-]+\/)(bonus\/)?$/';
+		$validUrl = '/^(https:\/\/www\.ceskatelevize\.cz\/porady\/\d+-[a-z0-9-]+\/)(dily\/((nove|vysilani)\/)?)?$/';
 		if (!preg_match($validUrl, $url, $match)) {
 			returnServerError('Invalid url');
 		}
@@ -46,7 +46,8 @@ class CeskaTelevizeBridge extends BridgeAbstract {
 		$category = isset($match[4]) ? $match[4] : 'nove';
 		$fixedUrl = "{$match[1]}dily/{$category}/";
 
-		$html = getSimpleHTMLDOM($fixedUrl);
+		$html = getSimpleHTMLDOM($fixedUrl)
+			or returnServerError('Could not request Česká televize');
 
 		$this->feedUri = $fixedUrl;
 		$this->feedName = str_replace('Přehled dílů — ', '', $this->fixChars($html->find('title', 0)->plaintext));
@@ -54,17 +55,17 @@ class CeskaTelevizeBridge extends BridgeAbstract {
 			$this->feedName .= " ({$category})";
 		}
 
-		foreach ($html->find('#episodeListSection a[data-testid=next-link]') as $element) {
-			$itemTitle = $element->find('h3', 0);
-			$itemContent = $element->find('div[class^=content-]', 0);
-			$itemDate = $element->find('div[class^=playTime-] span', 0);
+		foreach ($html->find('.episodes-broadcast-content a.episode_list_item') as $element) {
+			$itemTitle = $element->find('.episode_list_item-title', 0);
+			$itemContent = $element->find('.episode_list_item-desc', 0);
+			$itemDate = $element->find('.episode_list_item-date', 0);
 			$itemThumbnail = $element->find('img', 0);
 			$itemUri = self::URI . $element->getAttribute('href');
 
 			$item = array(
 				'title' => $this->fixChars($itemTitle->plaintext),
 				'uri' => $itemUri,
-				'content' => '<img src="' . $itemThumbnail->getAttribute('src') . '" /><br />'
+				'content' => '<img src="https:' . $itemThumbnail->getAttribute('src') . '" /><br />'
 					. $this->fixChars($itemContent->plaintext),
 				'timestamp' => $this->getUploadTimeFromString($itemDate->plaintext)
 			);
@@ -73,8 +74,8 @@ class CeskaTelevizeBridge extends BridgeAbstract {
 		}
 	}
 
-	public function getURI() {
-		return isset($this->feedUri) ? $this->feedUri : parent::getURI();
+	public function getUri() {
+		return isset($this->feedUri) ? $this->feedUri : parent::getUri();
 	}
 
 	public function getName() {

bridges/ChristianDailyReporterBridge.php

@@ -0,0 +1,28 @@
+<?php
+class ChristianDailyReporterBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'rogerdc';
+	const NAME = 'Christian Daily Reporter Unofficial RSS';
+	const URI = 'https://www.christiandailyreporter.com/';
+	const DESCRIPTION = 'The Unofficial Christian Daily Reporter RSS';
+	// const CACHE_TIMEOUT = 86400; // 1 day
+
+	public function getIcon() {
+		return self::URI . 'images/cdrfavicon.png';
+	}
+
+	public function collectData() {
+		$uri = 'https://www.christiandailyreporter.com/';
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Christian Daily Reporter.');
+		foreach($html->find('div.top p a,div.column p a') as $element) {
+			$item = array();
+			// Title
+			$item['title'] = $element->innertext;
+			// URL
+			$item['uri'] = $element->href;
+			$this->items[] = $item;
+		}
+	}
+}

bridges/CodebergBridge.php

@@ -1,403 +0,0 @@
-<?php
-class CodebergBridge extends BridgeAbstract {
-	const NAME = 'Codeberg Bridge';
-	const URI = 'https://codeberg.org/';
-	const DESCRIPTION = 'Returns commits, issues, pull requests or releases for a repository.';
-	const MAINTAINER = 'VerifiedJoseph';
-	const PARAMETERS = array(
-		'Commits' => array(
-			'branch' => array(
-				'name' => 'branch',
-				'type' => 'text',
-				'exampleValue' => 'main',
-				'required' => false,
-				'title' => 'Optional, main branch is used by default.',
-			),
-		),
-		'Issues' => array(),
-		'Issue Comments' => array(
-			'issueId' => array(
-				'name' => 'Issue ID',
-				'type' => 'text',
-				'required' => true,
-				'exampleValue' => '513',
-			)
-		),
-		'Pull Requests' => array(),
-		'Releases' => array(),
-		'global' => array(
-			'username' => array(
-				'name' => 'Username',
-				'type' => 'text',
-				'exampleValue' => 'Codeberg',
-				'title' => 'Username of account that the repository belongs to.',
-				'required' => true,
-			),
-			'repo' => array(
-				'name' => 'Repository',
-				'type' => 'text',
-				'exampleValue' => 'Community',
-				'required' => true,
-			)
-		)
-	);
-
-	const CACHE_TIMEOUT = 1800;
-
-	const TEST_DETECT_PARAMETERS = array(
-		'https://codeberg.org/Codeberg/Community/issues/507' => array(
-			'context' => 'Issue Comments', 'username' => 'Codeberg', 'repo' => 'Community', 'issueId' => '507'
-		),
-		'https://codeberg.org/Codeberg/Community/issues' => array(
-			'context' => 'Issues', 'username' => 'Codeberg', 'repo' => 'Community'
-		),
-		'https://codeberg.org/Codeberg/Community/pulls' => array(
-			'context' => 'Pull Requests', 'username' => 'Codeberg', 'repo' => 'Community'
-		),
-		'https://codeberg.org/Codeberg/Community/releases' => array(
-			'context' => 'Releases', 'username' => 'Codeberg', 'repo' => 'Community'
-		),
-		'https://codeberg.org/Codeberg/Community/commits/branch/master' => array(
-			'context' => 'Commits', 'username' => 'Codeberg', 'repo' => 'Community', 'branch' => 'master'
-		),
-		'https://codeberg.org/Codeberg/Community/commits' => array(
-			'context' => 'Commits', 'username' => 'Codeberg', 'repo' => 'Community'
-		)
-	);
-
-	private $defaultBranch = 'main';
-	private $issueTitle = '';
-
-	private $urlRegex = '/codeberg\.org\/([\w]+)\/([\w]+)(?:\/commits\/branch\/([\w]+))?/';
-	private $issuesUrlRegex = '/codeberg\.org\/([\w]+)\/([\w]+)\/issues/';
-	private $pullsUrlRegex = '/codeberg\.org\/([\w]+)\/([\w]+)\/pulls/';
-	private $releasesUrlRegex = '/codeberg\.org\/([\w]+)\/([\w]+)\/releases/';
-	private $issueCommentsUrlRegex = '/codeberg\.org\/([\w]+)\/([\w]+)\/issues\/([0-9]+)/';
-
-	public function detectParameters($url) {
-		$params = array();
-
-		// Issue Comments
-		if(preg_match($this->issueCommentsUrlRegex, $url, $matches)) {
-			$params['context'] = 'Issue Comments';
-			$params['username'] = $matches[1];
-			$params['repo'] = $matches[2];
-			$params['issueId'] = $matches[3];
-
-			return $params;
-		}
-
-		// Issues
-		if(preg_match($this->issuesUrlRegex, $url, $matches)) {
-			$params['context'] = 'Issues';
-			$params['username'] = $matches[1];
-			$params['repo'] = $matches[2];
-
-			return $params;
-		}
-
-		// Pull Requests
-		if(preg_match($this->pullsUrlRegex, $url, $matches)) {
-			$params['context'] = 'Pull Requests';
-			$params['username'] = $matches[1];
-			$params['repo'] = $matches[2];
-
-			return $params;
-		}
-
-		// Releases
-		if(preg_match($this->releasesUrlRegex, $url, $matches)) {
-			$params['context'] = 'Releases';
-			$params['username'] = $matches[1];
-			$params['repo'] = $matches[2];
-
-			return $params;
-		}
-
-		// Commits
-		if(preg_match($this->urlRegex, $url, $matches)) {
-			$params['context'] = 'Commits';
-			$params['username'] = $matches[1];
-			$params['repo'] = $matches[2];
-
-			if (isset($matches[3])) {
-				$params['branch'] = $matches[3];
-			}
-
-			return $params;
-		}
-
-		return null;
-	}
-
-	public function collectData() {
-		$html = getSimpleHTMLDOM($this->getURI());
-
-		$html = defaultLinkTo($html, $this->getURI());
-
-		switch($this->queriedContext) {
-			case 'Commits':
-				$this->extractCommits($html);
-				break;
-			case 'Issues':
-				$this->extractIssues($html);
-				break;
-			case 'Issue Comments':
-				$this->extractIssueComments($html);
-				break;
-			case 'Pull Requests':
-				$this->extractPulls($html);
-				break;
-			case 'Releases':
-				$this->extractReleases($html);
-				break;
-			default:
-				returnClientError('Invalid context: ' . $this->queriedContext);
-		}
-	}
-
-	public function getName() {
-		switch($this->queriedContext) {
-			case 'Commits':
-				if ($this->getBranch() === $this->defaultBranch) {
-					return $this->getRepo() . ' Commits';
-				}
-
-				return $this->getRepo() . ' Commits (' . $this->getBranch() . ' branch) - ' . self::NAME;
-			case 'Issues':
-				return $this->getRepo() . ' Issues - ' . self::NAME;
-			case 'Issue Comments':
-				return $this->issueTitle . ' - Issue Comments - ' . self::NAME;
-			case 'Pull Requests':
-				return $this->getRepo() . ' Pull Requests - ' . self::NAME;
-			case 'Releases':
-				return $this->getRepo() . ' Releases - ' . self::NAME;
-			default:
-				return parent::getName();
-		}
-	}
-
-	public function getURI() {
-		switch($this->queriedContext) {
-			case 'Commits':
-				return self::URI . $this->getRepo() . '/commits/branch/' . $this->getBranch();
-			case 'Issues':
-				return self::URI . $this->getRepo() . '/issues/';
-			case 'Issue Comments':
-				return self::URI . $this->getRepo() . '/issues/' . $this->getInput('issueId');
-			case 'Pull Requests':
-				return self::URI . $this->getRepo() . '/pulls';
-			case 'Releases':
-				return self::URI . $this->getRepo() . '/releases';
-			default:
-				return parent::getURI();
-		}
-	}
-
-	private function getBranch() {
-		if ($this->getInput('branch')) {
-			return $this->getInput('branch');
-		}
-
-		return $this->defaultBranch;
-	}
-
-	private function getRepo() {
-		return $this->getInput('username') . '/' . $this->getInput('repo');
-	}
-
-	/**
-	 * Extract commits
-	 */
-	private function extractCommits($html) {
-		$table = $html->find('table#commits-table', 0);
-		$tbody = $table->find('tbody.commit-list', 0);
-
-		foreach ($tbody->find('tr') as $tr) {
-			$item = array();
-
-			$message = $tr->find('td.message', 0);
-
-			$item['title'] = $message->find('span.message-wrapper', 0)->plaintext;
-			$item['uri'] = $tr->find('td.sha', 0)->find('a', 0)->href;
-			$item['author'] = $tr->find('td.author', 0)->plaintext;
-			$item['timestamp'] = $tr->find('td', 3)->find('span', 0)->title;
-
-			if ($message->find('pre.commit-body', 0)) {
-				$message->find('pre.commit-body', 0)->style = '';
-
-				$item['content'] = $message->find('pre.commit-body', 0);
-			} else {
-				$item['content'] = '<blockquote>' . $item['title'] . '</blockquote>';
-			}
-
-			$this->items[] = $item;
-		}
-	}
-
-	/**
-	 * Extract issues
-	 */
-	private function extractIssues($html) {
-		$div = $html->find('div.issue.list', 0);
-
-		foreach ($div->find('li.item') as $li) {
-			$item = array();
-
-			$number = trim($li->find('a.index,ml-0.mr-2', 0)->plaintext);
-
-			$item['title'] = $li->find('a.title', 0)->plaintext . ' (' . $number . ')';
-			$item['uri'] = $li->find('a.title', 0)->href;
-			$item['timestamp'] = $li->find('span.time-since', 0)->title;
-			$item['author'] = $li->find('div.desc', 0)->find('a', 1)->plaintext;
-
-			// Fetch issue page
-			$issuePage = getSimpleHTMLDOMCached($item['uri'], 3600);
-			$issuePage = defaultLinkTo($issuePage, self::URI);
-
-			$item['content'] = $issuePage->find('div.timeline-item.comment.first', 0)->find('div.render-content.markup', 0);
-
-			foreach ($li->find('a.ui.label') as $label) {
-				$item['categories'][] = $label->plaintext;
-			}
-
-			$this->items[] = $item;
-		}
-	}
-
-	/**
-	 * Extract issue comments
-	 */
-	private function extractIssueComments($html) {
-		$this->issueTitle = $html->find('span#issue-title', 0)->plaintext
-			. ' (' . $html->find('span.index', 0)->plaintext . ')';
-
-		foreach ($html->find('div.timeline-item.comment') as $div) {
-			$item = array();
-
-			if ($div->class === 'timeline-item comment merge box') {
-				continue;
-			}
-
-			$item['title'] = $this->ellipsisTitle($div->find('div.render-content.markup', 0)->plaintext);
-			$item['uri'] = $div->find('span.text.grey', 0)->find('a', 1)->href;
-			$item['content'] = $div->find('div.render-content.markup', 0);
-
-			if ($div->find('div.dropzone-attachments', 0)) {
-				$item['content'] .= $div->find('div.dropzone-attachments', 0);
-			}
-
-			$item['author'] = $div->find('a.author', 0)->innertext;
-			$item['timestamp'] = $div->find('span.time-since', 0)->title;
-
-			$this->items[] = $item;
-		}
-	}
-
-	/**
-	 * Extract pulls
-	 */
-	private function extractPulls($html) {
-		$div = $html->find('div.issue.list', 0);
-
-		foreach ($div->find('li.item') as $li) {
-			$item = array();
-
-			$number = trim($li->find('a.index,ml-0.mr-2', 0)->plaintext);
-
-			$item['title'] = $li->find('a.title', 0)->plaintext . ' (' . $number . ')';
-			$item['uri'] = $li->find('a.title', 0)->href;
-			$item['timestamp'] = $li->find('span.time-since', 0)->title;
-			$item['author'] = $li->find('div.desc', 0)->find('a', 1)->plaintext;
-
-			// Fetch pull request page
-			$pullRequestPage = getSimpleHTMLDOMCached($item['uri'], 3600);
-			$pullRequestPage = defaultLinkTo($pullRequestPage, self::URI);
-
-			$item['content'] = $pullRequestPage->find('ui.timeline', 0)->find('div.render-content.markup', 0);
-
-			foreach ($li->find('a.ui.label') as $label) {
-				$item['categories'][] = $label->plaintext;
-			}
-
-			$this->items[] = $item;
-		}
-	}
-
-	/**
-	 * Extract releases
-	 */
-	private function extractReleases($html) {
-		$ul = $html->find('ul#release-list', 0);
-
-		foreach ($ul->find('li.ui.grid') as $li) {
-			$item = array();
-			$item['title'] = $li->find('h4', 0)->plaintext;
-			$item['uri'] = $li->find('h4', 0)->find('a', 0)->href;
-
-			$tag = $this->stripSvg($li->find('span.tag', 0));
-			$commit = $this->stripSvg($li->find('span.commit', 0));
-			$downloads = $this->extractDownloads($li->find('details.download', 0));
-
-			$item['content'] = $li->find('div.markup.desc', 0);
-			$item['content'] .= <<<HTML
-<strong>Tag</strong>
-<p>{$tag}</p>
-<strong>Commit</strong>
-<p>{$commit}</p>
-{$downloads}
-HTML;
-
-			$item['timestamp'] = $li->find('span.time', 0)->find('span', 0)->title;
-			$item['author'] = $li->find('span.author', 0)->find('a', 0)->plaintext;
-
-			$this->items[] = $item;
-		}
-	}
-
-	/**
-	 * Extract downloads for a releases
-	 */
-	private function extractDownloads($html, $skipFirst = false) {
-		$downloads = '';
-
-		foreach ($html->find('a') as $index => $a) {
-			if ($skipFirst === true && $index === 0) {
-				continue;
-			}
-
-			$downloads .= <<<HTML
-<a href="{$a->herf}">{$a->plaintext}</a><br>
-HTML;
-		}
-
-		return <<<EOD
-<strong>Downloads</strong>
-<p>{$downloads}</p>
-EOD;
-	}
-
-	/**
-	 * Ellipsis title to first 100 characters
-	 */
-	private function ellipsisTitle($text) {
-		$length = 100;
-
-		if (strlen($text) > $length) {
-			$text = explode('<br>', wordwrap($text, $length, '<br>'));
-			return $text[0] . '...';
-		}
-		return $text;
-	}
-
-	/**
-	 * Strip SVG tag
-	 */
-	private function stripSvg($html) {
-		if ($html->find('svg', 0)) {
-			$html->find('svg', 0)->outertext = '';
-		}
-
-		return $html;
-	}
-}

bridges/CollegeDeFranceBridge.php

@@ -34,7 +34,8 @@ class CollegeDeFranceBridge extends BridgeAbstract {
 		 * </li>
 		 */
 		$html = getSimpleHTMLDOM(self::URI
-		. 'components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all');
+		. 'components/search-audiovideo.jsp?fulltext=&siteid=1156951719600&lang=FR&type=all')
+			or returnServerError('Could not request CollegeDeFrance.');
 
 		foreach($html->find('a[data-target]') as $element) {
 			$item = array();

bridges/ComboiosDePortugalBridge.php

@@ -7,11 +7,8 @@ class ComboiosDePortugalBridge extends BridgeAbstract {
 	const MAINTAINER = 'somini';
 
 	public function collectData() {
-		# Do not verify SSL certificate (the server doesn't send the intermediate)
-		# https://github.com/RSS-Bridge/rss-bridge/issues/2397
-		$html = getSimpleHTMLDOM($this->getURI() . '/consultar-horarios/avisos', array(), array(
-			CURLOPT_SSL_VERIFYPEER => 0,
-		));
+		$html = getSimpleHTMLDOM($this->getURI() . '/consultar-horarios/avisos')
+			or returnServerError('Could not load content');
 
 		foreach($html->find('.warnings-table a') as $element) {
 			$item = array();

bridges/ComicsKingdomBridge.php

@@ -3,33 +3,36 @@ class ComicsKingdomBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'stjohnjohnson';
 	const NAME = 'Comics Kingdom Unofficial RSS';
-	const URI = 'https://comicskingdom.com/';
+	const URI = 'https://www.comicskingdom.com/';
 	const CACHE_TIMEOUT = 21600; // 6h
 	const DESCRIPTION = 'Comics Kingdom Unofficial RSS';
 	const PARAMETERS = array( array(
 		'comicname' => array(
 			'name' => 'comicname',
 			'type' => 'text',
-			'exampleValue' => 'mutts',
-			'title' => 'The name of the comic in the URL after https://comicskingdom.com/',
 			'required' => true
 		)
 	));
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM($this->getURI(), array(), array(), true, false);
+		$html = getSimpleHTMLDOM($this->getURI(), array(), array(), true, false)
+			or returnServerError('Could not request Comics Kingdom: ' . $this->getURI());
 
 		// Get author from first page
-		$author = $html->find('div.author p', 0);;
+		$author = $html->find('div.author p', 0)->plaintext
+			or returnServerError('Comics Kingdom comic does not exist: ' . $this->getURI());;
 
 		// Get current date/link
-		$link = $html->find('meta[property=og:url]', -1)->content;
-		for($i = 0; $i < 3; $i++) {
+		$link = $html->find('meta[property=og:url]', 0)->content;
+		for($i = 0; $i < 5; $i++) {
 			$item = array();
 
-			$page = getSimpleHTMLDOM($link);
+			$page = getSimpleHTMLDOM($link)
+				or returnServerError('Could not request Comics Kingdom: ' . $link);
 
 			$imagelink = $page->find('meta[property=og:image]', 0)->content;
+			$prevSlug = $page->find('slider-arrow[:is-left-arrow=true]', 0);
+			$link = $this->getURI() . '/' . $prevSlug->getAttribute('date-slug');
 
 			$date = explode('/', $link);
 
@@ -41,8 +44,6 @@ class ComicsKingdomBridge extends BridgeAbstract {
 			$item['content'] = '<img src="' . $imagelink . '" />';
 
 			$this->items[] = $item;
-			$link = $page->find('div.comic-viewer-inline a', 0)->href;
-			if (empty($link)) break; // allow bridge to continue if there's less than 3 comics
 		}
 	}
 

bridges/ContainerLinuxReleasesBridge.php

@@ -0,0 +1,96 @@
+<?php
+class ContainerLinuxReleasesBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'captn3m0';
+	const NAME = 'Core OS Container Linux Releases Bridge';
+	const URI = 'https://coreos.com/releases/';
+	const DESCRIPTION = 'Returns the releases notes for Container Linux';
+
+	const STABLE = 'stable';
+	const BETA = 'beta';
+	const ALPHA = 'alpha';
+
+	const PARAMETERS = array(
+		array(
+			'channel' => array(
+				'name' => 'Release Channel',
+				'type' => 'list',
+				'defaultValue' => self::STABLE,
+				'values' => array(
+					'Stable' => self::STABLE,
+					'Beta' => self::BETA,
+					'Alpha' => self::ALPHA,
+				),
+			)
+		)
+	);
+
+	private function getReleaseFeed($jsonUrl) {
+		$json = getContents($jsonUrl)
+			or returnServerError('Could not request Core OS Website.');
+		return json_decode($json, true);
+	}
+
+	public function getIcon() {
+		return 'https://coreos.com/assets/ico/favicon.png';
+	}
+
+	public function collectData() {
+		$data = $this->getReleaseFeed($this->getJsonUri());
+
+		foreach ($data as $releaseVersion => $release) {
+			$item = array();
+
+			$item['uri'] = "https://coreos.com/releases/#$releaseVersion";
+			$item['title'] = $releaseVersion;
+
+			$content = $release['release_notes'];
+			$content .= <<<EOT
+
+Major Software:
+* Kernel: {$release['major_software']['kernel'][0]}
+* Docker: {$release['major_software']['docker'][0]}
+* etcd: {$release['major_software']['etcd'][0]}
+EOT;
+			$item['timestamp'] = strtotime($release['release_date']);
+
+			// Based on https://gist.github.com/jbroadway/2836900
+			// Links
+			$regex = '/\[([^\[]+)\]\(([^\)]+)\)/';
+			$replacement = '<a href=\'\2\'>\1</a>';
+			$item['content'] = preg_replace($regex, $replacement, $content);
+
+			// Headings
+			$regex = '/^(.*)\:\s?$/m';
+			$replacement = '<h3>\1</h3>';
+			$item['content'] = preg_replace($regex, $replacement, $item['content']);
+
+			// Lists
+			$regex = '/\n\s*[\*|\-](.*)/';
+			$item['content'] = preg_replace_callback ($regex, function($regs) {
+				$item = $regs[1];
+				return sprintf ('<ul><li>%s</li></ul>', trim ($item));
+			}, $item['content']);
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function getJsonUri() {
+		$channel = $this->getInput('channel');
+
+		return "https://coreos.com/releases/releases-$channel.json";
+	}
+
+	public function getURI() {
+		return self::URI;
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('channel'))) {
+			return 'Container Linux Releases: ' . $this->getInput('channel') . ' Channel';
+		}
+
+		return parent::getName();
+	}
+}

bridges/CopieDoubleBridge.php

@@ -8,7 +8,8 @@ class CopieDoubleBridge extends BridgeAbstract {
 	const DESCRIPTION = 'CopieDouble';
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request CopieDouble.');
 
 		$table = $html->find('table table', 2);
 

bridges/CourrierInternationalBridge.php

@@ -1,26 +1,55 @@
 <?php
-class CourrierInternationalBridge extends FeedExpander {
+class CourrierInternationalBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'teromene';
 	const NAME = 'Courrier International Bridge';
 	const URI = 'https://www.courrierinternational.com/';
 	const CACHE_TIMEOUT = 300; // 5 min
-	const DESCRIPTION = 'Returns the newest articles';
+	const DESCRIPTION = 'Courrier International bridge';
 
 	public function collectData(){
-		$this->collectExpandableDatas(static::URI . 'feed/all/rss.xml', 20);
-	}
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Error.');
 
-	protected function parseItem($feedItem){
-		$item = parent::parseItem($feedItem);
+		$element = $html->find('article');
+		$article_count = 1;
 
-		$articlePage = getSimpleHTMLDOMCached($feedItem->link);
-		$content = $articlePage->find('.article-text, depeche-text', 0);
-		if (!$content) {
-			return $item;
+		foreach($element as $article) {
+			$item = array();
+
+			$item['uri'] = $article->parent->getAttribute('href');
+
+			if(strpos($item['uri'], 'http') === false) {
+				$item['uri'] = self::URI . $item['uri'];
+			}
+
+			$page = getSimpleHTMLDOMCached($item['uri']);
+
+			$content = $page->find('.article-text', 0);
+
+			if(!$content) {
+				$content = $page->find('.depeche-text', 0);
+			}
+
+			$item['content'] = sanitize($content);
+			$item['title'] = strip_tags($article->find('.title', 0));
+
+			$dateTime = date_parse($page->find('time', 0));
+
+			$item['timestamp'] = mktime(
+				$dateTime['hour'],
+				$dateTime['minute'],
+				$dateTime['second'],
+				$dateTime['month'],
+				$dateTime['day'],
+				$dateTime['year']
+			);
+
+			$this->items[] = $item;
+			$article_count ++;
+
+			if($article_count > 5)
+				break;
 		}
-		$item['content'] = sanitize($content);
-
-		return $item;
 	}
 }

bridges/CraigslistBridge.php

@@ -1,107 +0,0 @@
-<?php
-class CraigslistBridge extends BridgeAbstract {
-	const MAINTAINER = 'Yaman Qalieh';
-	const NAME = 'Craigslist Bridge';
-	const URI = 'https://craigslist.org/';
-	const DESCRIPTION = 'Returns craigslist search results';
-
-	const PARAMETERS = array( array(
-		'region' => array(
-			'name' => 'Region',
-			'title' => 'The subdomain before craigslist.org in the URL',
-			'exampleValue' => 'sfbay',
-			'required' => true
-		),
-		'search' => array(
-			'name' => 'Search Query',
-			'title' => 'Everything in the URL after /search/',
-			'exampleValue' => 'sya?query=laptop',
-			'required' => true
-		),
-		'limit' => array(
-			'name' => 'Number of Posts',
-			'type' => 'number',
-			'title' => 'The maximum number of posts is 120. Use 0 for unlimited posts.',
-			'defaultValue' => '25'
-		)
-	));
-
-	const TEST_DETECT_PARAMETERS = array(
-		'https://sfbay.craigslist.org/search/sya?query=laptop' => array(
-			'region' => 'sfbay', 'search' => 'sya?query=laptop'
-		),
-		'https://newyork.craigslist.org/search/sss?query=32gb+flash+drive&bundleDuplicates=1&max_price=20' => array(
-			'region' => 'newyork', 'search' => 'sss?query=32gb+flash+drive&bundleDuplicates=1&max_price=20'
-		),
-	);
-
-	const URL_REGEX = '/^https:\/\/(?<region>\w+).craigslist.org\/search\/(?<search>.+)/';
-
-	public function detectParameters($url) {
-		if(preg_match(self::URL_REGEX, $url, $matches)) {
-			$params = array();
-			$params['region'] = $matches['region'];
-			$params['search'] = $matches['search'];
-			return $params;
-		}
-	}
-
-	public function getURI() {
-		if (!is_null($this->getInput('region'))) {
-			$domain = 'https://' . $this->getInput('region') . '.craigslist.org/search/';
-			return urljoin($domain, $this->getInput('search'));
-		}
-		return parent::getURI();
-	}
-
-	public function collectData() {
-		$uri = $this->getURI();
-		$html = getSimpleHTMLDOM($uri);
-
-		// Check if no results page is shown (nearby results)
-		if ($html->find('.displaycountShow', 0)->plaintext == '0') {
-			return;
-		}
-
-		// Search for "more from nearby areas" banner in order to skip those results
-		$results = $html->find('.result-row, h4.nearby');
-
-		// Limit the number of posts
-		if ($this->getInput('limit') > 0) {
-			$results = array_slice($results, 0, $this->getInput('limit'));
-		}
-
-		foreach($results as $post) {
-
-			// Skip "nearby results" banner and results
-			// This only appears when searchNearby is not specified
-			if ($post->tag == 'h4') {
-				break;
-			}
-
-			$item = array();
-
-			$heading = $post->find('.result-heading a', 0);
-			$item['uri'] = $heading->href;
-			$item['title'] = $heading->plaintext;
-			$item['timestamp'] = $post->find('.result-date', 0)->datetime;
-			$item['uid'] = $heading->id;
-			$item['content'] = $post->find('.result-price', 0)->plaintext . ' '
-							 // Find the location (local and nearby results if searchNearby=1)
-							 . $post->find('.result-hood, span.nearby', 0)->plaintext;
-
-			$images = $post->find('.result-image[data-ids]', 0);
-			if (!is_null($images)) {
-				$item['content'] .= '<br>';
-				foreach(explode(',', $images->getAttribute('data-ids')) as $image) {
-					// Remove leading 3: from each image id
-					$id = substr($image, 2);
-					$image_uri = 'https://images.craigslist.org/' . $id . '_300x300.jpg';
-					$item['content'] .= '<img src="' . $image_uri . '">';
-					$item['enclosures'][] = $image_uri;
-				}
-			}
-			$this->items[] = $item;
-		}
-	}
-}

bridges/CryptomeBridge.php

@@ -4,41 +4,42 @@ class CryptomeBridge extends BridgeAbstract {
 	const MAINTAINER = 'BoboTiG';
 	const NAME = 'Cryptome';
 	const URI = 'https://cryptome.org/';
-	const CACHE_TIMEOUT = 21600; // 6h
+	const CACHE_TIMEOUT = 21600; //6h
 	const DESCRIPTION = 'Returns the N most recent documents.';
+
 	const PARAMETERS = array( array(
 		'n' => array(
 			'name' => 'number of elements',
 			'type' => 'number',
-			'required' => true,
+			'defaultValue' => 20,
 			'exampleValue' => 10
 		)
 	));
 
-	public function getIcon() {
-		return self::URI . '/favicon.ico';
-	}
-
 	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Cryptome.');
 
 		$number = $this->getInput('n');
+
+		/* number of documents */
 		if(!empty($number)) {
 			$num = min($number, 20);
 		}
-		$i = 0;
-		foreach($html->find('pre', 1)->find('b') as $element) {
-			foreach($element->find('a') as $element1) {
-				$item = array();
-				$item['uri'] = $element1->href;
-				$item['title'] = $element->plaintext;
-				$this->items[] = $item;
 
-				if ($i > $num) {
-					break 2;
-				}
-				$i++;
+		foreach($html->find('pre') as $element) {
+			for($i = 0; $i < $num; ++$i) {
+				$item = array();
+				$item['uri'] = self::URI . substr($element->find('a', $i)->href, 20);
+				$item['title'] = substr($element->find('b', $i)->plaintext, 22);
+				$item['content'] = preg_replace(
+					'#http://cryptome.org/#',
+					self::URI,
+					$element->find('b', $i)->innertext
+				);
+				$this->items[] = $item;
 			}
+			break;
 		}
 	}
 }

bridges/CuriousCatBridge.php

@@ -19,7 +19,8 @@ class CuriousCatBridge extends BridgeAbstract {
 
 		$url = self::URI . '/api/v2/profile?username=' . urlencode($this->getInput('username'));
 
-		$apiJson = getContents($url);
+		$apiJson = getContents($url)
+			or returnServerError('Could not request: ' . $url);
 
 		$apiData = json_decode($apiJson, true);
 

bridges/DailymotionBridge.php

@@ -11,22 +11,19 @@ class DailymotionBridge extends BridgeAbstract {
 		'By username' => array(
 			'u' => array(
 				'name' => 'username',
-				'required' => true,
-				'exampleValue' => 'moviepilot',
+				'required' => true
 			)
 		),
 		'By playlist id' => array(
 			'p' => array(
 				'name' => 'playlist id',
-				'required' => true,
-				'exampleValue' => 'x6xyc6',
+				'required' => true
 			)
 		),
 		'From search results' => array(
 			's' => array(
 				'name' => 'Search keyword',
-				'required' => true,
-				'exampleValue' => 'matrix',
+				'required' => true
 			),
 			'pa' => array(
 				'name' => 'Page',
@@ -49,7 +46,8 @@ class DailymotionBridge extends BridgeAbstract {
 
 		if ($this->queriedContext === 'By username' || $this->queriedContext === 'By playlist id') {
 
-			$apiJson = getContents($this->getApiUrl());
+			$apiJson = getContents($this->getApiUrl())
+				or returnServerError('Could not request: ' . $this->getApiUrl());
 
 			$apiData = json_decode($apiJson, true);
 
@@ -74,7 +72,8 @@ class DailymotionBridge extends BridgeAbstract {
 
 		if ($this->queriedContext === 'From search results') {
 
-			$html = getSimpleHTMLDOM($this->getURI());
+			$html = getSimpleHTMLDOM($this->getURI())
+				or returnServerError('Could not request Dailymotion.');
 
 			foreach($html->find('div.media a.preview_link') as $element) {
 				$item = array();
@@ -181,7 +180,8 @@ class DailymotionBridge extends BridgeAbstract {
 
 		$url = self::URI . 'playlist/' . $id;
 
-		$html = getSimpleHTMLDOM($url);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request: ' . $url);
 
 		$title = $html->find('meta[property=og:title]', 0)->getAttribute('content');
 		return $title;

bridges/DanbooruBridge.php

@@ -44,23 +44,93 @@ class DanbooruBridge extends BridgeAbstract {
 		$item['postid'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;
-		$item['categories'] = array_filter(explode(' ', $this->getTags($element)));
+		$item['tags'] = $this->getTags($element);
 		$item['title'] = $this->getName() . ' | ' . $item['postid'];
 		$item['content'] = '<a href="'
 		. $item['uri']
 		. '"><img src="'
 		. $thumbnailUri
 		. '" /></a><br>Tags: '
-		. $this->getTags($element);
+		. $item['tags'];
 
 		return $item;
 	}
 
 	public function collectData(){
-		$html = getSimpleHTMLDOMCached($this->getFullURI());
+		$content = getContents($this->getFullURI())
+			or returnServerError('Could not request ' . $this->getName());
+
+		$html = Fix_Simple_Html_Dom::str_get_html($content);
 
 		foreach($html->find(static::PATHTODATA) as $element) {
 			$this->items[] = $this->getItemFromElement($element);
 		}
 	}
 }
+
+/**
+ * This class is a monkey patch to 'extend' simplehtmldom to recognize <source>
+ * tags (HTML5) as self closing tag. This patch should be removed once
+ * simplehtmldom was fixed. This seems to be a issue with more tags:
+ * https://sourceforge.net/p/simplehtmldom/bugs/83/
+ *
+ * The tag itself is valid according to Mozilla:
+ *
+ * The HTML <picture> element serves as a container for zero or more <source>
+ * elements and one <img> element to provide versions of an image for different
+ * display device scenarios. The browser will consider each of the child <source>
+ * elements and select one corresponding to the best match found; if no matches
+ * are found among the <source> elements, the file specified by the <img>
+ * element's src attribute is selected. The selected image is then presented in
+ * the space occupied by the <img> element.
+ *
+ * -- https://developer.mozilla.org/en-US/docs/Web/HTML/Element/picture
+ *
+ * Notice: This class uses parts of the original simplehtmldom, adjusted to pass
+ * the guidelines of RSS-Bridge (formatting)
+ */
+final class Fix_Simple_Html_Dom extends simple_html_dom {
+
+	/* copy from simple_html_dom, added 'source' at the end */
+	protected $self_closing_tags = array(
+		'img' => 1,
+		'br' => 1,
+		'input' => 1,
+		'meta' => 1,
+		'link' => 1,
+		'hr' => 1,
+		'base' => 1,
+		'embed' => 1,
+		'spacer' => 1,
+		'source' => 1
+	);
+
+	/* copy from simplehtmldom, changed 'simple_html_dom' to 'Fix_Simple_Html_Dom' */
+	public static function str_get_html($str,
+	$lowercase = true,
+	$forceTagsClosed = true,
+	$target_charset = DEFAULT_TARGET_CHARSET,
+	$stripRN = true,
+	$defaultBRText = DEFAULT_BR_TEXT,
+	$defaultSpanText = DEFAULT_SPAN_TEXT)
+	{
+		$dom = new Fix_Simple_Html_Dom(null,
+		$lowercase,
+		$forceTagsClosed,
+		$target_charset,
+		$stripRN,
+		$defaultBRText,
+		$defaultSpanText);
+
+		if (empty($str) || strlen($str) > MAX_FILE_SIZE) {
+
+			$dom->clear();
+			return false;
+
+		}
+
+		$dom->load($str, $lowercase, $stripRN);
+
+		return $dom;
+	}
+}

bridges/DansTonChatBridge.php

@@ -9,7 +9,8 @@ class DansTonChatBridge extends BridgeAbstract {
 
 	public function collectData(){
 
-		$html = getSimpleHTMLDOM(self::URI . 'latest.html');
+		$html = getSimpleHTMLDOM(self::URI . 'latest.html')
+			or returnServerError('Could not request DansTonChat.');
 
 		foreach($html->find('div.item') as $element) {
 			$item = array();

bridges/DarkReadingBridge.php

@@ -48,24 +48,22 @@ class DarkReadingBridge extends FeedExpander {
 		if ($feed_id != '000') {
 			$feed_url .= '?f_n=' . $feed_id . '&f_ln=' . $feed_name;
 		}
-		$this->collectExpandableDatas($feed_url, 20);
+		$this->collectExpandableDatas($feed_url);
 	}
 
 	protected function parseItem($newsItem){
 		$item = parent::parseItem($newsItem);
-		$article = getSimpleHTMLDOMCached($item['uri']);
+		if (empty($item['content']))
+			return null; //ignore dummy articles
+		$article = getSimpleHTMLDOMCached($item['uri'])
+			or returnServerError('Could not request Dark Reading: ' . $item['uri']);
 		$item['content'] = $this->extractArticleContent($article);
 		$item['enclosures'] = array(); //remove author profile picture
-		$image = $article->find('meta[property="og:image"]', 0);
-		if (is_object($image)) {
-			$image = $image->content;
-			$item['enclosures'] = array($image);
-		}
 		return $item;
 	}
 
 	private function extractArticleContent($article){
-		$content = $article->find('div.article-content', 0)->innertext;
+		$content = $article->find('div#article-main', 0)->innertext;
 
 		foreach (array(
 			'<div class="divsplitter',
@@ -76,6 +74,8 @@ class DarkReadingBridge extends FeedExpander {
 			$content = stripRecursiveHTMLSection($content, 'div', $div_start);
 		}
 
+		$content = stripWithDelimiters($content, '<h1 ', '</h1>');
+
 		return $content;
 	}
 }

bridges/DaveRamseyBlogBridge.php

@@ -0,0 +1,24 @@
+<?php
+
+class DaveRamseyBlogBridge extends BridgeAbstract {
+	const MAINTAINER = 'johnpc';
+	const NAME = 'Dave Ramsey Blog';
+	const URI = 'https://www.daveramsey.com/blog';
+	const CACHE_TIMEOUT = 7200; // 2h
+	const DESCRIPTION = 'Returns blog posts from daveramsey.com';
+
+	public function collectData()
+	{
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request daveramsey.com.');
+
+		foreach ($html->find('.Post') as $element) {
+			$this->items[] = array(
+				'uri' => 'https://www.daveramsey.com' . $element->find('header > a', 0)->href,
+				'title' => $element->find('header > h2 > a', 0)->plaintext,
+				'tags' => $element->find('.Post-topic', 0)->plaintext,
+				'content' => $element->find('.Post-body', 0)->plaintext,
+			);
+		}
+	}
+}

bridges/DavesTrailerPageBridge.php

@@ -9,14 +9,7 @@ class DavesTrailerPageBridge extends BridgeAbstract {
 	$html = getSimpleHTMLDOM(static::URI)
 	or returnClientError('No results for this query.');
 
-	$curr_date = null;
-	foreach ($html->find('tr') as $tr) {
-		// If it's a date row, update the current date
-		if ($tr->align == 'center') {
-			$curr_date = $tr->plaintext;
-			continue;
-		}
-
+	foreach ($html->find('tr[!align]') as $tr) {
 		$item = array();
 
 		// title
@@ -28,9 +21,6 @@ class DavesTrailerPageBridge extends BridgeAbstract {
 		// uri
 		$item['uri'] = $tr->find('a', 3)->getAttribute('href');
 
-		// date: parsed by FeedItem using strtotime
-		$item['timestamp'] = $curr_date;
-
 		$this->items[] = $item;
 		}
 	}

bridges/DerpibooruBridge.php

@@ -2,7 +2,7 @@
 class DerpibooruBridge extends BridgeAbstract {
 	const NAME = 'Derpibooru Bridge';
 	const URI = 'https://derpibooru.org/';
-	const DESCRIPTION = 'Returns newest images from a Derpibooru search';
+	const DESCRIPTION = 'Returns newest posts from a Derpibooru search';
 	const CACHE_TIMEOUT = 300; // 5min
 	const MAINTAINER = 'Roliga';
 
@@ -24,8 +24,7 @@ class DerpibooruBridge extends BridgeAbstract {
 			),
 			'q' => array(
 				'name' => 'Query',
-				'required' => true,
-				'exampleValue' => 'dog',
+				'required' => true
 			)
 		)
 	);
@@ -74,42 +73,40 @@ class DerpibooruBridge extends BridgeAbstract {
 	public function collectData(){
 		$queryJson = json_decode(getContents(
 			self::URI
-			. 'api/v1/json/search/images?filter_id='
+			. 'search.json?filter_id='
 			. urlencode($this->getInput('f'))
 			. '&q='
 			. urlencode($this->getInput('q'))
-		));
+		)) or returnServerError('Failed to query Derpibooru');
 
-		foreach($queryJson->images as $post) {
+		foreach($queryJson->search as $post) {
 			$item = array();
 
 			$postUri = self::URI . $post->id;
 
 			$item['uri'] = $postUri;
-			$item['title'] = $post->name;
+			$item['title'] = $post->id;
 			$item['timestamp'] = strtotime($post->created_at);
 			$item['author'] = $post->uploader;
-			$item['enclosures'] = array($post->view_url);
-			$item['categories'] = $post->tags;
+			$item['enclosures'] = array('https:' . $post->image);
+			$item['categories'] = explode(', ', $post->tags);
 
 			$item['content'] = '<p><a href="' // image preview
 				. $postUri
-				. '"><img src="'
+				. '"><img src="https:'
 				. $post->representations->medium
 				. '"></a></p><p>' // description
 				. $post->description
 				. '</p><p><b>Size:</b> ' // image size
 				. $post->width
 				. 'x'
-				. $post->height;
-			// source link
-			if ($post->source_url != null) {
-				$item['content'] .= '<br><b>Source:</b> <a href="'
+				. $post->height
+				. '<br><b>Source:</b> <a href="' // source link
 				. $post->source_url
 				. '">'
 				. $post->source_url
 				. '</a></p>';
-			};
+
 			$this->items[] = $item;
 		}
 	}

bridges/DesoutterBridge.php

@@ -16,7 +16,7 @@ class DesoutterBridge extends BridgeAbstract {
 				'name' => 'Language',
 				'type' => 'list',
 				'title' => 'Select your language',
-				'defaultValue' => 'https://www.desouttertools.com/about-desoutter/news-events',
+				'defaultValue' => 'Corporate',
 				'values' => array(
 					'Corporate'
 					=> 'https://www.desouttertools.com/about-desoutter/news-events',
@@ -120,7 +120,6 @@ class DesoutterBridge extends BridgeAbstract {
 			'limit' => array(
 				'name' => 'Limit',
 				'type' => 'number',
-				'required' => true,
 				'defaultValue' => 3,
 				'title' => "Maximum number of items to return in the feed.\n0 = unlimited"
 			)
@@ -156,7 +155,8 @@ class DesoutterBridge extends BridgeAbstract {
 		}
 		*/
 
-		$html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI());
 
 		$html = defaultLinkTo($html, $this->getURI());
 
@@ -184,7 +184,8 @@ class DesoutterBridge extends BridgeAbstract {
 	}
 
 	private function getFullNewsArticle($uri) {
-		$html = getSimpleHTMLDOMCached($uri);
+		$html = getSimpleHTMLDOMCached($uri)
+			or returnServerError('Unable to load full article!');
 
 		$html = defaultLinkTo($html, $this->getURI());
 
@@ -198,7 +199,8 @@ class DesoutterBridge extends BridgeAbstract {
 	 * @return void
 	 */
 	private function extractNewsLanguages() {
-		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/about-desoutter/news-events');
+		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/about-desoutter/news-events')
+			or returnServerError('Error loading news!');
 
 		$html = defaultLinkTo($html, static::URI);
 
@@ -223,7 +225,8 @@ class DesoutterBridge extends BridgeAbstract {
 	 * @return void
 	 */
 	private function extractIndustryLanguages() {
-		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/industry-4-0/news');
+		$html = getSimpleHTMLDOMCached('https://www.desouttertools.com/industry-4-0/news')
+			or returnServerError('Error loading news!');
 
 		$html = defaultLinkTo($html, static::URI);
 

bridges/DevToBridge.php

@@ -45,7 +45,8 @@ apple-icon-5c6fa9f2bce280428589c6195b7f1924206a53b782b371cfe2d02da932c8c173.png'
 	}
 
 	public function collectData() {
-		$html = getSimpleHTMLDOMCached($this->getURI());
+		$html = getSimpleHTMLDOMCached($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI());
 
 		$html = defaultLinkTo($html, static::URI);
 
@@ -94,7 +95,8 @@ EOD;
 	}
 
 	private function getFullArticle($url) {
-		$html = getSimpleHTMLDOMCached($url);
+		$html = getSimpleHTMLDOMCached($url)
+			or returnServerError('Unable to load article from "' . $url . '"!');
 
 		$html = defaultLinkTo($html, static::URI);
 

bridges/DiarioDeNoticiasBridge.php

@@ -8,7 +8,6 @@ class DiarioDeNoticiasBridge extends BridgeAbstract {
 		'Tag' => array(
 			'n' => array(
 				'name' => 'Tag Name',
-				'required' => true,
 				'exampleValue' => 'rogerio-casanova',
 			)
 		)
@@ -43,7 +42,6 @@ class DiarioDeNoticiasBridge extends BridgeAbstract {
 		}
 		return $name;
 	}
-
 	public function getURI() {
 		switch($this->queriedContext) {
 		case 'Tag':
@@ -57,7 +55,8 @@ class DiarioDeNoticiasBridge extends BridgeAbstract {
 
 	public function collectData() {
 		$archives = self::getURI();
-		$html = getSimpleHTMLDOMCached($archives);
+		$html = getSimpleHTMLDOMCached($archives)
+			or returnServerError('Could not load content');
 
 		foreach($html->find('article') as $element) {
 			$item = array();

bridges/DiarioDoAlentejoBridge.php

@@ -27,7 +27,8 @@ class DiarioDoAlentejoBridge extends BridgeAbstract {
 
 	public function collectData(){
 		/* This is slow as molasses (>30s!), keep the cache timeout high to avoid killing the host */
-		$html = getSimpleHTMLDOMCached($this->getURI() . '/pt/noticias-listagem.aspx');
+		$html = getSimpleHTMLDOMCached($this->getURI() . '/pt/noticias-listagem.aspx')
+			or returnServerError('Could not load content');
 
 		foreach($html->find('.list_news .item') as $element) {
 			$item = array();

bridges/DiceBridge.php

@@ -97,7 +97,8 @@ class DiceBridge extends BridgeAbstract {
 			$uri .= '&telecommute=true';
 		}
 
-		$html = getSimpleHTMLDOM($uri);
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Dice.');
 		foreach($html->find('div.complete-serp-result-div') as $element) {
 			$item = array();
 			// Title

bridges/DilbertBridge.php

@@ -9,7 +9,8 @@ class DilbertBridge extends BridgeAbstract {
 
 	public function collectData(){
 
-		$html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request Dilbert: ' . self::URI);
 
 		foreach($html->find('section.comic-item') as $element) {
 

bridges/DiscogsBridge.php

@@ -11,26 +11,18 @@ class DiscogsBridge extends BridgeAbstract {
 			'artistid' => array(
 				'name' => 'Artist ID',
 				'type' => 'number',
-				'required' => true,
-				'exampleValue' => '28104',
-				'title' => 'Only the ID from an artist page. EG /artist/28104-Aesop-Rock is 28104'
 			)
 		),
 		'Label Releases' => array(
 			'labelid' => array(
 				'name' => 'Label ID',
 				'type' => 'number',
-				'required' => true,
-				'exampleValue' => '8201',
-				'title' => 'Only the ID from a label page. EG /label/8201-Rhymesayers-Entertainment is 8201'
 			)
 		),
 		'User Wantlist' => array(
 			'username_wantlist' => array(
 				'name' => 'Username',
 				'type' => 'text',
-				'required' => true,
-				'exampleValue' => 'TheBlindMaster',
 			)
 		),
 		'User Folder' => array(
@@ -52,11 +44,13 @@ class DiscogsBridge extends BridgeAbstract {
 			if(!empty($this->getInput('artistid'))) {
 				$data = getContents('https://api.discogs.com/artists/'
 						. $this->getInput('artistid')
-						. '/releases?sort=year&sort_order=desc');
+						. '/releases?sort=year&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
 			} elseif(!empty($this->getInput('labelid'))) {
 				$data = getContents('https://api.discogs.com/labels/'
 						. $this->getInput('labelid')
-						. '/releases?sort=year&sort_order=desc');
+						. '/releases?sort=year&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
 			}
 
 			$jsonData = json_decode($data, true);
@@ -82,7 +76,8 @@ class DiscogsBridge extends BridgeAbstract {
 			if(!empty($this->getInput('username_wantlist'))) {
 				$data = getContents('https://api.discogs.com/users/'
 						. $this->getInput('username_wantlist')
-						. '/wants?sort=added&sort_order=desc');
+						. '/wants?sort=added&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
 				$jsonData = json_decode($data, true)['wants'];
 
 			} elseif(!empty($this->getInput('username_folder'))) {
@@ -90,7 +85,8 @@ class DiscogsBridge extends BridgeAbstract {
 						. $this->getInput('username_folder')
 						. '/collection/folders/'
 						. $this->getInput('folderid')
-						. '/releases?sort=added&sort_order=desc');
+						. '/releases?sort=added&sort_order=desc')
+						or returnServerError('Unable to query discogs !');
 				$jsonData = json_decode($data, true)['releases'];
 			}
 			foreach($jsonData as $element) {

bridges/DockerHubBridge.php

@@ -1,165 +0,0 @@
-<?php
-class DockerHubBridge extends BridgeAbstract {
-	const NAME = 'Docker Hub Bridge';
-	const URI = 'https://hub.docker.com';
-	const DESCRIPTION = 'Returns new images for a container';
-	const MAINTAINER = 'VerifiedJoseph';
-	const PARAMETERS = array(
-		'User Submitted Image' => array(
-			'user' => array(
-				'name' => 'User',
-				'type' => 'text',
-				'required' => true,
-				'exampleValue' => 'rssbridge',
-			),
-			'repo' => array(
-				'name' => 'Repository',
-				'type' => 'text',
-				'required' => true,
-				'exampleValue' => 'rss-bridge',
-			)
-		),
-		'Official Image' => array(
-			'repo' => array(
-				'name' => 'Repository',
-				'type' => 'text',
-				'required' => true,
-				'exampleValue' => 'postgres',
-			)
-		),
-	);
-
-	const CACHE_TIMEOUT = 3600; // 1 hour
-
-	private $apiURL = 'https://hub.docker.com/v2/repositories/';
-	private $imageUrlRegex = '/hub\.docker\.com\/r\/([\w]+)\/([\w-]+)\/?/';
-	private $officialImageUrlRegex = '/hub\.docker\.com\/_\/([\w-]+)\/?/';
-
-	public function detectParameters($url) {
-		$params = array();
-
-		// user submitted image
-		if(preg_match($this->imageUrlRegex, $url, $matches)) {
-			$params['context'] = 'User Submitted Image';
-			$params['user'] = $matches[1];
-			$params['repo'] = $matches[2];
-			return $params;
-		}
-
-		// official image
-		if(preg_match($this->officialImageUrlRegex, $url, $matches)) {
-			$params['context'] = 'Official Image';
-			$params['repo'] = $matches[1];
-			return $params;
-		}
-
-		return null;
-	}
-
-	public function collectData() {
-		$json = getContents($this->getApiUrl());
-
-		$data = json_decode($json, false);
-
-		foreach ($data->results as $result) {
-			$item = array();
-
-			$lastPushed = date('Y-m-d H:i:s', strtotime($result->tag_last_pushed));
-
-			$item['title'] = $result->name;
-			$item['uid'] = $result->id;
-			$item['uri'] = $this->getTagUrl($result->name);
-			$item['author'] = $result->last_updater_username;
-			$item['timestamp'] = $result->tag_last_pushed;
-			$item['content'] = <<<EOD
-<Strong>Tag</strong><br>
-<p>{$result->name}</p>
-<Strong>Last pushed</strong><br>
-<p>{$lastPushed}</p>
-<Strong>Images</strong><br>
-{$this->getImages($result)}
-EOD;
-
-			$this->items[] = $item;
-		}
-
-	}
-
-	public function getURI() {
-		if ($this->queriedContext === 'Official Image') {
-			return self::URI . '/_/' . $this->getRepo();
-		}
-
-		if ($this->getInput('repo')) {
-			return self::URI . '/r/' . $this->getRepo();
-		}
-
-		return parent::getURI();
-	}
-
-	public function getName() {
-		if ($this->getInput('repo')) {
-			return $this->getRepo() . ' - Docker Hub';
-		}
-
-		return parent::getName();
-	}
-
-	private function getRepo() {
-		if ($this->queriedContext === 'Official Image') {
-			return $this->getInput('repo');
-		}
-
-		return $this->getInput('user') . '/' . $this->getInput('repo');
-	}
-
-	private function getApiUrl() {
-		if ($this->queriedContext === 'Official Image') {
-			return $this->apiURL . 'library/' . $this->getRepo() . '/tags/?page_size=25&page=1';
-		}
-
-		return $this->apiURL . $this->getRepo() . '/tags/?page_size=25&page=1';
-	}
-
-	private function getLayerUrl($name, $digest) {
-		if ($this->queriedContext === 'Official Image') {
-			return self::URI . '/layers/' . $this->getRepo() . '/library/' .
-				$this->getRepo() . '/' . $name . '/images/' . $digest;
-		}
-
-		return self::URI . '/layers/' . $this->getRepo() . '/' . $name . '/images/' . $digest;
-	}
-
-	private function getTagUrl($name) {
-		if ($this->queriedContext === 'Official Image') {
-			return self::URI . '/_/' . $this->getRepo() . '?tab=tags&name=' . $name;
-		}
-
-		return self::URI . '/r/' . $this->getRepo() . '/tags?name=' . $name;
-	}
-
-	private function getImages($result) {
-		$html = <<<EOD
-<table style="width:300px;"><thead><tr><th>Digest</th><th>OS/architecture</th></tr></thead></tbody>
-EOD;
-
-		foreach ($result->images as $image) {
-			$layersUrl = $this->getLayerUrl($result->name, $image->digest);
-			$id = $this->getShortDigestId($image->digest);
-
-			$html .= <<<EOD
-			<tr>
-				<td><a href="{$layersUrl}">{$id}</a></td>
-				<td>{$image->os}/{$image->architecture}</td>
-			</tr>
-EOD;
-		}
-
-		return $html . '</tbody></table>';
-	}
-
-	private function getShortDigestId($digest) {
-		$parts = explode(':', $digest);
-		return substr($parts[1], 0, 12);
-	}
-}

bridges/DonnonsBridge.php

@@ -23,7 +23,6 @@ class DonnonsBridge extends BridgeAbstract {
 			'p' => array(
 				'name' => 'Nombre de pages à scanner',
 				'type' => 'number',
-				'required' => true,
 				'defaultValue' => 5,
 				'title' => 'Indique le nombre de pages de donnons.org qui seront scannées'
 			)
@@ -41,7 +40,8 @@ class DonnonsBridge extends BridgeAbstract {
 	private function collectDataByPage($page) {
 		$uri = $this->getPageURI($page);
 
-		$html = getSimpleHTMLDOM($uri);
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('No results for this query.');
 
 		$searchDiv = $html->find('div[id=search]', 0);
 
@@ -67,9 +67,7 @@ class DonnonsBridge extends BridgeAbstract {
 				$region = $json['availableAtOrFrom']['address']['addressRegion'];
 
 				// Grab info from HTML
-				$imageSrc = $element->find('img.ima-center', 0)->getAttribute('src');
-				// Use large image instead of small one
-				$imageSrc = str_replace('/xs/', '/lg/', $imageSrc);
+				$imageSrc = $element->find('img.ima-center', 0)->getAttribute('data-src');
 				$image = self::URI . $imageSrc;
 				$author = $element->find('div.avatar-holder', 0)->plaintext;
 

bridges/DribbbleBridge.php

@@ -13,7 +13,8 @@ favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico';
 	}
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Error while downloading the website content');
 
 		$json = $this->loadEmbeddedJsonData($html);
 
@@ -85,7 +86,7 @@ favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico';
 
 	private function getImageTag($preview_path, $title){
 		return sprintf(
-			'<br /> <a href="%s"><img srcset="%s" alt="%s" /></a>',
+			'<br /> <a href="%s"><img src="%s" alt="%s" /></a>',
 			$this->getFullSizeImagePath($preview_path),
 			$preview_path,
 			$title
@@ -93,11 +94,6 @@ favicon-63b2904a073c89b52b19aa08cebc16a154bcf83fee8ecc6439968b1e6db569c7.ico';
 	}
 
 	private function getFullSizeImagePath($preview_path){
-		// Get last image from srcset
-		$src_set_urls = explode(',', $preview_path);
-		$url = end($src_set_urls);
-		$url = explode(' ', $url)[1];
-
-		return htmlspecialchars_decode($url);
+		return explode("?compress=1", $preview_path)[0];
 	}
 }

bridges/Drive2ruBridge.php

@@ -1,205 +0,0 @@
-<?php
-class Drive2ruBridge extends BridgeAbstract {
-	const MAINTAINER = 'dotter-ak';
-	const NAME = 'Drive2.ru';
-	const URI = 'https://drive2.ru/';
-	const DESCRIPTION = 'Лента новостей и тестдрайвов, бортжурналов по выбранной марке или модели
-		(также работает с фильтром по категориям), блогов пользователей и публикаций по темам.';
-	const PARAMETERS = array(
-		'Новости и тест-драйвы' => array(),
-		'Бортжурналы (По модели или марке)' => array(
-			'url' => array(
-				'name' => 'Ссылка на страницу с бортжурналом',
-				'type' => 'text',
-				'required' => true,
-				'title' => 'Например: https://www.drive2.ru/experience/suzuki/g4895/',
-				'exampleValue' => 'https://www.drive2.ru/experience/suzuki/g4895/'
-			),
-		),
-		'Личные блоги' => array(
-			'username' => array(
-				'name' => 'Никнейм пользователя на сайте',
-				'type' => 'text',
-				'required' => true,
-				'title' => 'Например: Mickey',
-				'exampleValue' => 'Mickey'
-			)
-		),
-		'Публикации по темам (Стоит почитать)' => array(
-			'topic' => array(
-				'name' => 'Темы',
-				'type' => 'list',
-				'values' => array(
-					'Автозвук' => '16',
-					'Автомобильный дизайн' => '10',
-					'Автоспорт' => '11',
-					'Автошоу, музеи, выставки' => '12',
-					'Безопасность' => '18',
-					'Беспилотные автомобили' => '15',
-					'Видеосюжеты' => '20',
-					'Вне дорог' => '21',
-					'Встречи' => '22',
-					'Выбор и покупка машины' => '23',
-					'Гаджеты' => '30',
-					'Гибридные машины' => '32',
-					'Грузовики, автобусы, спецтехника' => '31',
-					'Доработка интерьера' => '35',
-					'Законодательство' => '40',
-					'История автомобилестроения' => '50',
-					'Мототехника' => '60',
-					'Новые модели и концепты' => '85',
-					'Обучение вождению' => '70',
-					'Путешествия' => '80',
-					'Ремонт и обслуживание' => '90',
-					'Реставрация ретро-авто' => '91',
-					'Сделай сам' => '104',
-					'Смешное' => '103',
-					'Спорткары' => '102',
-					'Стайлинг' => '101',
-					'Тест-драйвы' => '110',
-					'Тюнинг' => '111',
-					'Фотосессии' => '120',
-					'Шины и диски' => '140',
-					'Электрика' => '130',
-					'Электромобили' => '131'
-				),
-				'defaultValue' => '16',
-			)
-		),
-		'global' => array(
-			'full_articles' => array(
-				'name' => 'Загружать в ленту полный текст',
-				'type' => 'checkbox'
-			)
-		)
-	);
-
-	private $title;
-
-	private function getUserContent($url) {
-		$html = getSimpleHTMLDOM($url);
-		$this->title = $html->find('title', 0)->innertext;
-		$articles = $html->find('div.js-entity');
-		foreach ($articles as $article) {
-			$item = array();
-			$item['title'] = $article->find('a.c-link--text', 0)->plaintext;
-			$item['uri'] = urljoin(self::URI, $article->find('a.c-link--text', 0)->href);
-			if($this->getInput('full_articles')) {
-				$item['content'] = $this->addCommentsLink(
-					$this->adjustContent(getSimpleHTMLDomCached($item['uri'])->find('div.c-post__body', 0))->innertext,
-					$item['uri']
-				);
-			} else {
-				$item['content'] = $this->addReadMoreLink($article->find('div.c-post-preview__lead', 0), $item['uri']);
-			}
-			$item['author'] = $article->find('a.c-username--wrap', 0)->plaintext;
-			if (!is_null($article->find('img', 1))) $item['enclosures'][] = $article->find('img', 1)->src;
-			$this->items[] = $item;
-		}
-	}
-
-	private function getLogbooksContent($url) {
-		$html = getSimpleHTMLDOM($url);
-		$this->title = $html->find('title', 0)->innertext;
-		$articles = $html->find('div.js-entity');
-		foreach ($articles as $article) {
-			$item = array();
-			$item['title'] = $article->find('a.c-link--text', 1)->plaintext;
-			$item['uri'] = urljoin(self::URI, $article->find('a.c-link--text', 1)->href);
-			if($this->getInput('full_articles')) {
-				$item['content'] = $this->addCommentsLink(
-					$this->adjustContent(getSimpleHTMLDomCached($item['uri'])->find('div.c-post__body', 0))->innertext,
-					$item['uri']
-				);
-			} else {
-				$item['content'] = $this->addReadMoreLink($article->find('div.c-post-preview__lead', 0), $item['uri']);
-			}
-			$item['author'] = $article->find('a.c-username--wrap', 0)->plaintext;
-			if (!is_null($article->find('img', 1))) $item['enclosures'][] = $article->find('img', 1)->src;
-			$this->items[] = $item;
-		}
-	}
-
-	private function getNews() {
-		$html = getSimpleHTMLDOM('https://www.drive2.ru/editorial/');
-		$this->title = $html->find('title', 0)->innertext;
-		$articles = $html->find('div.c-article-card');
-		foreach ($articles as $article) {
-			$item = array();
-			$item['title'] = $article->find('a.c-link--text', 0)->plaintext;
-			$item['uri'] = urljoin(self::URI, $article->find('a.c-link--text', 0)->href);
-			if($this->getInput('full_articles')) {
-				$item['content'] = $this->addCommentsLink(
-					$this->adjustContent(getSimpleHTMLDomCached($item['uri'])->find('div.article', 0))->innertext,
-					$item['uri']
-				);
-			} else {
-				$item['content'] = $this->addReadMoreLink($article->find('div.c-article-card__lead', 0), $item['uri']);
-			}
-			$item['author'] = 'Новости и тест-драйвы на Drive2.ru';
-			if (!is_null($article->find('img', 0))) $item['enclosures'][] = $article->find('img', 0)->src;
-			$this->items[] = $item;
-		}
-	}
-
-	private function adjustContent($content) {
-				foreach ($content->find('div.o-group') as $node)
-					$node->outertext = '';
-				foreach($content->find('div, span') as $attrs)
-					foreach ($attrs->getAllAttributes() as $attr => $val)
-						$attrs->removeAttribute($attr);
-				foreach ($content->getElementsByTagName('figcaption') as $attrs)
-					$attrs->setAttribute(
-						'style',
-						'font-style: italic; font-size: small; margin: 0 100px 75px;');
-				foreach ($content->find('script') as $node)
-					$node->outertext = '';
-				foreach ($content->find('iframe') as $node) {
-					preg_match('/embed\/(.*?)\?/', $node->src, $match);
-					$node->outertext = '<a href="https://www.youtube.com/watch?v=' . $match[1] .
-						'">https://www.youtube.com/watch?v=' . $match[1] . '</a>';
-				}
-		return $content;
-	}
-
-	private function addCommentsLink ($content, $url) {
-				return $content . '<br><a href="' . $url . '#comments">Перейти к комментариям</a>';
-	}
-
-	private function addReadMoreLink ($content, $url) {
-				if (!is_null($content))
-					return preg_replace('!\s+!', ' ', str_replace('Читать дальше', '', $content->plaintext)) .
-						'<br><a href="' . $url . '">Читать далее</a>';
-				else return '';
-	}
-
-	public function collectData() {
-		switch($this->queriedContext) {
-			default:
-			case 'Новости и тест-драйвы':
-				$this->getNews();
-				break;
-			case 'Бортжурналы (По модели или марке)':
-				if (!preg_match('/^https:\/\/www.drive2.ru\/experience/', $this->getInput('url')))
-					returnServerError('Invalid url');
-				$this->getLogbooksContent($this->getInput('url'));
-				break;
-			case 'Личные блоги':
-				if (!preg_match('/^[a-zA-Z0-9-]{3,16}$/', $this->getInput('username')))
-					returnServerError('Invalid username');
-				$this->getUserContent('https://www.drive2.ru/users/' . $this->getInput('username'));
-				break;
-			case 'Публикации по темам (Стоит почитать)':
-				$this->getUserContent('https://www.drive2.ru/topics/' . $this->getInput('topic'));
-				break;
-		}
-	}
-
-	public function getName() {
-		return $this->title ?: parent::getName();
-	}
-
-	public function getIcon() {
-		return 'https://www.drive2.ru/favicon.ico';
-	}
-}

bridges/DuckDuckGoBridge.php

@@ -13,7 +13,6 @@ class DuckDuckGoBridge extends BridgeAbstract {
 	const PARAMETERS = array( array(
 		'u' => array(
 			'name' => 'keyword',
-			'exampleValue' => 'duck',
 			'required' => true
 		),
 		'sort' => array(
@@ -29,13 +28,14 @@ class DuckDuckGoBridge extends BridgeAbstract {
 	));
 
 	public function collectData(){
-		$html = getSimpleHTMLDOM(self::URI . 'html/?kd=-1&q=' . $this->getInput('u') . $this->getInput('sort'));
+		$html = getSimpleHTMLDOM(self::URI . 'html/?kd=-1&q=' . $this->getInput('u') . $this->getInput('sort'))
+			or returnServerError('Could not request DuckDuckGo.');
 
-		foreach($html->find('div.result') as $element) {
+		foreach($html->find('div.results_links') as $element) {
 			$item = array();
-			$item['uri'] = $element->find('a.result__a', 0)->href;
-			$item['title'] = $element->find('h2.result__title', 0)->plaintext;
-			$item['content'] = $element->find('a.result__snippet', 0)->plaintext;
+			$item['uri'] = $element->find('a', 0)->href;
+			$item['title'] = $element->find('a', 1)->innertext;
+			$item['content'] = $element->find('div.snippet', 0)->plaintext;
 			$this->items[] = $item;
 		}
 	}

bridges/ETTVBridge.php

@@ -0,0 +1,161 @@
+<?php
+class ETTVBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'GregThib';
+	const NAME = 'ETTV';
+	const URI = 'https://www.ettv.tv/';
+	const DESCRIPTION = 'Returns list of 20 latest torrents for a specific search.';
+	const CACHE_TIMEOUT = 14400; // 4 hours
+
+	const PARAMETERS = array( array(
+		'query' => array(
+			'name' => 'Keywords',
+			'required' => true
+		),
+		'cat' => array(
+			'type' => 'list',
+			'name' => 'Category',
+			'values' => array(
+				'(ALL TYPES)' => '0',
+				'Anime: Movies' => '73',
+				'Anime: Dubbed/Subbed' => '74',
+				'Anime: Others' => '75',
+				'Books: Ebooks' => '53',
+				'Books: Magazines' => '54',
+				'Books: Comics' => '55',
+				'Books: Audio' => '56',
+				'Books: Others' => '68',
+				'Games: Windows' => '57',
+				'Games: Android' => '58',
+				'Games: Others' => '71',
+				'Movies: HD 1080p' => '1',
+				'Movies: HD 720p' => '2',
+				'Movies: UltraHD/4K' => '3',
+				'Movies: XviD' => '42',
+				'Movies: X264/H264' => '47',
+				'Movies: 3D' => '49',
+				'Movies: Dubs/Dual Audio' => '51',
+				'Movies: CAM/TS' => '65',
+				'Movies: BluRay Disc/Remux' => '66',
+				'Movies: DVDR' => '67',
+				'Movies: HEVC/x265' => '76',
+				'Music: MP3' => '59',
+				'Music: FLAC' => '60',
+				'Music: Music Videos' => '61',
+				'Music: Others' => '69',
+				'Software: Windows' => '62',
+				'Software: Android' => '63',
+				'Software: Mac' => '64',
+				'Software: Others' => '70',
+				'TV: HD/X264/H264' => '41',
+				'TV: SD/X264/H264' => '5',
+				'TV: TV Packs' => '7',
+				'TV: SD/XVID' => '50',
+				'TV: Sport' => '72',
+				'TV: HEVC/x265' => '77',
+				'Unsorted: Unsorted' => '78'
+			),
+			'defaultValue' => '(ALL TYPES)'
+		),
+		'status' => array(
+			'type' => 'list',
+			'name' => 'Status',
+			'values' => array(
+				'Active Transfers' => '0',
+				'Included Dead' => '1',
+				'Only Dead' => '2'
+			),
+			'defaultValue' => 'Included Dead'
+		),
+		'lang' => array(
+			'type' => 'list',
+			'name' => 'Lang',
+			'values' => array(
+				'(ALL)' => '0',
+				'Arabic' => '17',
+				'Chinese ' => '10',
+				'Danish' => '13',
+				'Dutch' => '11',
+				'English' => '1',
+				'Finnish' => '18',
+				'French' => '2',
+				'German' => '3',
+				'Greek' => '15',
+				'Hindi' => '8',
+				'Italian' => '4',
+				'Japanese' => '5',
+				'Korean' => '9',
+				'Polish' => '14',
+				'Russian' => '7',
+				'Spanish' => '6',
+				'Turkish' => '16'
+			),
+			'defaultValue' => '(ALL)'
+		)
+	));
+
+	protected $results_link;
+
+	public function collectData(){
+		// No control on inputs, because all defaultValue are set
+		$query_str = 'torrents-search.php';
+		$query_str .= '?search=' . urlencode('+' . str_replace(' ', ' +', $this->getInput('query')));
+		$query_str .= '&cat=' . $this->getInput('cat');
+		$query_str .= '&incldead=' . $this->getInput('status');
+		$query_str .= '&lang=' . $this->getInput('lang');
+		$query_str .= '&sort=id&order=desc';
+
+		// Get results page
+		$this->results_link = self::URI . $query_str;
+		$html = getSimpleHTMLDOM($this->results_link)
+			or returnServerError('Could not request ' . $this->getName());
+
+		// Loop on each entry
+		foreach($html->find('table.table tr') as $element) {
+			if($element->parent->tag == 'thead') continue;
+			$entry = $element->find('td', 1)->find('a', 0);
+
+			// retrieve result page to get more details
+			$link = rtrim(self::URI, '/') . $entry->href;
+			$page = getSimpleHTMLDOM($link)
+				or returnServerError('Could not request page ' . $link);
+
+			// get details & download links
+			$details = $page->find('fieldset.download table', 0); // WHAT?? It should be the second one…
+			$dllinks = $page->find('div#downloadbox table', 0);
+
+			// fill item
+			$item = array();
+			$item['author'] = $details->children(6)->children(1)->plaintext;
+			$item['title'] = $entry->title;
+			$item['uri'] = $link;
+			$item['timestamp'] = strtotime($details->children(7)->children(1)->plaintext);
+			$item['content'] = '';
+			$item['content'] .= '<br/><b>Name: </b>' . $details->children(0)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Lang: </b>' . $details->children(3)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Size: </b>' . $details->children(4)->children(1)->innertext;
+			$item['content'] .= '<br/><b>Hash: </b>' . $details->children(5)->children(1)->innertext;
+			foreach($dllinks->children(0)->children(1)->find('a') as $dl) {
+				$item['content'] .= '<br/>' . $dl->outertext;
+			}
+			$item['content'] .= '<br/><br/>' . $details->children(1)->children(0)->innertext;
+			$this->items[] = $item;
+		}
+	}
+
+	public function getName(){
+		if($this->getInput('query')) {
+			return '[' . self::NAME . '] ' . $this->getInput('query');
+		}
+
+		return self::NAME;
+	}
+
+	public function getURI(){
+		if(isset($this->results_link) && !empty($this->results_link)) {
+			return $this->results_link;
+		}
+
+		return self::URI;
+	}
+}

bridges/EZTVBridge.php

@@ -3,109 +3,65 @@ class EZTVBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'alexAubin';
 	const NAME = 'EZTV';
-	const URI = 'https://eztv.re/';
-	const DESCRIPTION = 'Returns list of torrents for specific show(s)
-on EZTV. Get IMDB IDs from IMDB.';
+	const URI = 'https://eztv.ch/';
+	const DESCRIPTION = 'Returns list of *recent* torrents for a specific show
+on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name.';
 
-	const PARAMETERS = array(
-		array(
-			'ids' => array(
-				'name' => 'Show IMDB IDs',
-				'exampleValue' => '8740790,1733785',
-				'required' => true,
-				'title' => 'One or more IMDB show IDs (can be found in the IMDB show URL)'
-			),
-			'no480' => array(
-				'name' => 'No 480p',
-				'type' => 'checkbox',
-				'title' => 'Activate to exclude 480p torrents'
-			),
-			'no720' => array(
-				'name' => 'No 720p',
-				'type' => 'checkbox',
-				'title' => 'Activate to exclude 720p torrents'
-			),
-			'no1080' => array(
-				'name' => 'No 1080p',
-				'type' => 'checkbox',
-				'title' => 'Activate to exclude 1080p torrents'
-			),
-			'no2160' => array(
-				'name' => 'No 2160p',
-				'type' => 'checkbox',
-				'title' => 'Activate to exclude 2160p torrents'
-			),
-			'noUnknownRes' => array(
-				'name' => 'No Unknown resolution',
-				'type' => 'checkbox',
-				'title' => 'Activate to exclude unknown resolution torrents'
-			),
+	const PARAMETERS = array( array(
+		'i' => array(
+			'name' => 'Show ids',
+			'exampleValue' => 'showID1,showID2,…',
+			'required' => true
 		)
-	);
-
-	// Shamelessly lifted from https://stackoverflow.com/a/2510459
-	protected function formatBytes($bytes, $precision = 2) {
-		$units = array('B', 'KB', 'MB', 'GB', 'TB');
-
-		$bytes = max($bytes, 0);
-		$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
-		$pow = min($pow, count($units) - 1);
-		$bytes /= pow(1024, $pow);
-
-		return round($bytes, $precision) . ' ' . $units[$pow];
-	}
-
-	protected function getItemFromTorrent($torrent){
-		$item = array();
-		$item['uri'] = $torrent->episode_url;
-		$item['author'] = $torrent->imdb_id;
-		$item['timestamp'] = date('d F Y H:i:s', $torrent->date_released_unix);
-		$item['title'] = $torrent->title;
-		$item['enclosures'][] = $torrent->torrent_url;
-
-		$thumbnailUri = 'https:' . $torrent->small_screenshot;
-		$torrentSize = $this->formatBytes($torrent->size_bytes);
-
-		$item['content'] = $torrent->filename . '<br>File size: '
-		. $torrentSize . '<br><a href="' . $torrent->magnet_url
-		. '">magnet link</a><br><a href="' . $torrent->torrent_url
-		. '">torrent link</a><br><img src="' . $thumbnailUri . '" />';
-
-		return $item;
-	}
-
-	private static function compareDate($torrent1, $torrent2) {
-		return (strtotime($torrent1['timestamp']) < strtotime($torrent2['timestamp']) ? 1 : -1);
-	}
+	));
 
 	public function collectData(){
-		$showIds = explode(',', $this->getInput('ids'));
 
-		foreach($showIds as $showId) {
-			$eztvUri = $this->getURI() . 'api/get-torrents?imdb_id=' . $showId;
-			$content = getContents($eztvUri);
-			$torrents = json_decode($content)->torrents;
-			foreach($torrents as $torrent) {
-				$title = $torrent->title;
-				$regex480 = '/480p/';
-				$regex720 = '/720p/';
-				$regex1080 = '/1080p/';
-				$regex2160 = '/2160p/';
-				$regexUnknown = '/(480p|720p|1080p|2160p)/';
-				// Skip unwanted resolution torrents
-				if ((preg_match($regex480, $title) === 1 && $this->getInput('no480'))
-				|| (preg_match($regex720, $title) === 1 && $this->getInput('no720'))
-				|| (preg_match($regex1080, $title) === 1 && $this->getInput('no1080'))
-				|| (preg_match($regex2160, $title) === 1 && $this->getInput('no2160'))
-				|| (preg_match($regexUnknown, $title) !== 1 && $this->getInput('noUnknownRes'))) {
-					continue;
-				}
+		// Make timestamp from relative released time in table
+		function makeTimestamp($relativeReleaseTime){
 
-				$this->items[] = $this->getItemFromTorrent($torrent);
+			$relativeDays = 0;
+			$relativeHours = 0;
+
+			foreach(explode(' ', $relativeReleaseTime) as $relativeTimeElement) {
+				if(substr($relativeTimeElement, -1) == 'd') $relativeDays = substr($relativeTimeElement, 0, -1);
+				if(substr($relativeTimeElement, -1) == 'h') $relativeHours = substr($relativeTimeElement, 0, -1);
 			}
+			return mktime(date('h') - $relativeHours, 0, 0, date('m'), date('d') - $relativeDays, date('Y'));
 		}
 
-		// Sort all torrents in array by date
-		usort($this->items, array('EZTVBridge', 'compareDate'));
+		// Loop on show ids
+		$showList = explode(',', $this->getInput('i'));
+		foreach($showList as $showID) {
+
+			// Get show page
+			$html = getSimpleHTMLDOM(self::URI . 'shows/' . rawurlencode($showID) . '/')
+				or returnServerError('Could not request EZTV for id "' . $showID . '"');
+
+			// Loop on each element that look like an episode entry...
+			foreach($html->find('.forum_header_border') as $element) {
+
+				// Filter entries that are not episode entries
+				$ep = $element->find('td', 1);
+				if(empty($ep)) continue;
+				$epinfo = $ep->find('.epinfo', 0);
+				$released = $element->find('td', 3);
+				if(empty($epinfo)) continue;
+				if(empty($released->plaintext)) continue;
+
+				// Filter entries that are older than 1 week
+				if($released->plaintext == '&gt;1 week') continue;
+
+				// Fill item
+				$item = array();
+				$item['uri'] = self::URI . $epinfo->href;
+				$item['id'] = $item['uri'];
+				$item['timestamp'] = makeTimestamp($released->plaintext);
+				$item['title'] = $epinfo->plaintext;
+				$item['content'] = $epinfo->alt;
+				if(isset($item['title']))
+					$this->items[] = $item;
+			}
+		}
 	}
 }

bridges/EconomistBridge.php

@@ -1,143 +1,63 @@
 <?php
-class EconomistBridge extends FeedExpander {
+class EconomistBridge extends BridgeAbstract {
+	const NAME = 'The Economist: Latest Updates';
+	const URI = 'https://www.economist.com';
+	const DESCRIPTION = 'Fetches the latest updates from the Economist.';
+	const MAINTAINER = 'thefranke';
+	const CACHE_TIMEOUT = 3600; // 1h
 
-	const MAINTAINER = 'bockiii';
-	const NAME = 'Economist Bridge';
-	const URI = 'https://www.economist.com/';
-	const CACHE_TIMEOUT = 3600; //1hour
-	const DESCRIPTION = 'Returns the latest articles for the selected category';
-
-	const PARAMETERS = array(
-		'global' => array(
-			'limit' => array(
-				'name' => 'Feed Item Limit',
-				'required' => true,
-				'type' => 'number',
-				'defaultValue' => 10,
-				'title' => 'Maximum number of returned feed items. Maximum 30, default 10'
-			)
-		),
-		'Topics' => array(
-			'topic' => array(
-				'name' => 'Topics',
-				'type' => 'list',
-				'title' => 'Select a Topic',
-				'defaultValue' => 'latest',
-				'values' => array(
-					'Latest' => 'latest',
-					'The world this week' => 'the-world-this-week',
-					'Letters' => 'letters',
-					'Leaders' => 'leaders',
-					'Briefings' => 'briefing',
-					'Special reports' => 'special-report',
-					'Britain' => 'britain',
-					'Europe' => 'europe',
-					'United States' => 'united-states',
-					'The Americas' => 'the-americas',
-					'Middle East and Africa' => 'middle-east-and-africa',
-					'Asia' => 'asia',
-					'China' => 'china',
-					'International' => 'international',
-					'Business' => 'business',
-					'Finance and economics' => 'finance-and-economics',
-					'Science and technology' => 'science-and-technology',
-					'Books and arts' => 'books-and-arts',
-					'Obituaries' => 'obituary',
-					'Graphic detail' => 'graphic-detail',
-					'Indicators' => 'economic-and-financial-indicators',
-				)
-			)
-		),
-		'Blogs' => array(
-			'blog' => array(
-				'name' => 'Blogs',
-				'type' => 'list',
-				'title' => 'Select a Blog',
-				'values' => array(
-					'Bagehots notebook' => 'bagehots-notebook',
-					'Bartleby' => 'bartleby',
-					'Buttonwoods notebook' => 'buttonwoods-notebook',
-					'Charlemagnes notebook' => 'charlemagnes-notebook',
-					'Democracy in America' => 'democracy-in-america',
-					'Erasmus' => 'erasmus',
-					'Free exchange' => 'free-exchange',
-					'Game theory' => 'game-theory',
-					'Gulliver' => 'gulliver',
-					'Kaffeeklatsch' => 'kaffeeklatsch',
-					'Prospero' => 'prospero',
-					'The Economist Explains' => 'the-economist-explains',
-				)
-			)
-		)
-	);
-
-	public function collectData(){
-		// get if topics or blogs were selected and store the selected category
-		switch ($this->queriedContext) {
-			case 'Topics':
-				$category = $this->getInput('topic');
-				break;
-			case 'Blogs':
-				$category = $this->getInput('blog');
-				break;
-			default:
-				$category = 'latest';
-		}
-		// limit the returned articles to 30 at max
-		if ((int)$this->getInput('limit') <= 30) {
-			$limit = (int)$this->getInput('limit');
-		} else {
-			$limit = 30;
-		}
-
-		$this->collectExpandableDatas('https://www.economist.com/' . $category . '/rss.xml', $limit);
+	public function getIcon() {
+		return 'https://www.economist.com/sites/default/files/econfinal_favicon.ico';
 	}
 
-	protected function parseItem($feedItem){
-		$item = parent::parseItem($feedItem);
-		$article = getSimpleHTMLDOM($item['uri']);
-		// before the article can be added, it needs to be cleaned up, thus, the extra function
-		// We also need to distinguish between old style and new style articles
-		if ($article->find('article', 0)->getAttribute('data-test-id') == 'Article') {
-			$contentNode = 'div.layout-article-body';
-			$imgNode = 'div.article__lead-image';
-			$categoryNode = 'span.article__subheadline';
-		} elseif ($article->find('article', 0)->getAttribute('data-test-id') === 'NewArticle') {
-			$contentNode = 'section';
-			$imgNode = 'figure.css-12eysrk.e3y6nua0';
-			$categoryNode = 'span.ern1uyf0';
-		} else {
-			return;
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI . '/latest/')
+			or returnServerError('Could not fetch latest updates form The Economist.');
+
+		foreach($html->find('article') as $element) {
+
+			$a = $element->find('a', 0);
+			$href = self::URI . $a->href;
+			$full = getSimpleHTMLDOMCached($href);
+			$article = $full->find('article', 0);
+
+			$header = $article->find('h1', 0);
+			$author = $article->find('span[itemprop="author"]', 0);
+			$time = $article->find('time[itemprop="dateCreated"]', 0);
+			$content = $article->find('div[itemprop="description"]', 0);
+
+			// Remove newsletter subscription box
+			$newsletter = $content->find('div[class="newsletter-form__message"]', 0);
+			if ($newsletter)
+				$newsletter->outertext = '';
+
+			$newsletterForm = $content->find('form', 0);
+			if ($newsletterForm)
+				$newsletterForm->outertext = '';
+
+			// Remove next and previous article URLs at the bottom
+			$nextprev = $content->find('div[class="blog-post__next-previous-wrapper"]', 0);
+			if ($nextprev)
+				$nextprev->outertext = '';
+
+			$section = array( $article->find('h3[itemprop="articleSection"]', 0)->plaintext );
+
+			$item = array();
+			$item['title'] = $header->find('span', 0)->innertext . ': '
+				. $header->find('span', 1)->innertext;
+
+			$item['uri'] = $href;
+			$item['timestamp'] = strtotime($time->datetime);
+			$item['author'] = $author->innertext;
+			$item['categories'] = $section;
+
+			$item['content'] = '<img style="max-width: 100%" src="'
+				. $a->find('img', 0)->src . '">' . $content->innertext;
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
 		}
-
-		$item['content'] = $this->cleanContent($article, $contentNode);
-		// only the article lead image is retained if it's there
-		if (!is_null($article->find($imgNode, 0))) {
-			$item['enclosures'][] = $article->find($imgNode, 0)->find('img', 0)->getAttribute('src');
-		} else {
-			$item['enclosures'][] = '';
-		}
-		// add the subheadline as category. This will create a link in new articles
-		// and a text in old articles
-		$item['categories'][] = $article->find($categoryNode, 0)->innertext;
-
-		return $item;
-	}
-
-	private function cleanContent($article, $contentNode){
-		// the actual article is in this div
-		$content = $article->find($contentNode, 0)->innertext;
-		// clean the article content. Remove all div's since the text is in paragraph elements
-		foreach (array(
-			'<div '
-		) as $tag_start) {
-			$content = stripRecursiveHTMLSection($content, 'div', $tag_start);
-		}
-		// now remove embedded iframes. The podcast postings contain these for example
-		$content = preg_replace('/<iframe.*?\/iframe>/i', '', $content);
-		// fix the relative links
-		$content = defaultLinkTo($content, $this->getURI());
-
-		return $content;
 	}
 }

bridges/EliteDangerousGalnetBridge.php

@@ -25,7 +25,8 @@ class EliteDangerousGalnetBridge extends BridgeAbstract {
 		$language = $this->getInput('language');
 		$url = 'https://community.elitedangerous.com/';
 		$url = $url . $language . '/galnet';
-		$html = getSimpleHTMLDOM($url);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Error while downloading the website content');
 
 		foreach($html->find('div.article') as $element) {
 			$item = array();

bridges/ElloBridge.php

@@ -12,7 +12,6 @@ class ElloBridge extends BridgeAbstract {
 			'u' => array(
 				'name' => 'Username',
 				'required' => true,
-				'exampleValue' => 'zteph',
 				'title' => 'Username'
 			)
 		),
@@ -20,7 +19,6 @@ class ElloBridge extends BridgeAbstract {
 			's' => array(
 				'name' => 'Search',
 				'required' => true,
-				'exampleValue' => 'bird',
 				'title' => 'Search'
 			)
 		)

bridges/ElsevierBridge.php

@@ -1,7 +1,7 @@
 <?php
 class ElsevierBridge extends BridgeAbstract {
 
-	const MAINTAINER = 'dvikan';
+	const MAINTAINER = 'Pierre Mazière';
 	const NAME = 'Elsevier journals recent articles';
 	const URI = 'https://www.journals.elsevier.com/';
 	const CACHE_TIMEOUT = 43200; //12h
@@ -11,31 +11,69 @@ class ElsevierBridge extends BridgeAbstract {
 		'j' => array(
 			'name' => 'Journal name',
 			'required' => true,
-			'exampleValue' => 'academic-pediatrics',
+			'exampleValue' => 'academic-pediactrics',
 			'title' => 'Insert html-part of your journal'
 		)
 	));
 
-	public function collectData(){
-		// Not all journals have the /recent-articles page
-		$url = sprintf('https://www.journals.elsevier.com/%s/recent-articles/', $this->getInput('j'));
-		$html = getSimpleHTMLDOM($url);
+	// Extracts the list of names from an article as string
+	private function extractArticleName($article){
+		$names = $article->find('small', 0);
+		if($names)
+			return trim($names->plaintext);
+		return '';
+	}
 
-		foreach($html->find('article') as $recentArticle) {
-			$item = [];
-			$item['uri'] = $recentArticle->find('a', 0)->getAttribute('href');
-			$item['title'] = $recentArticle->find('h2', 0)->plaintext;
-			$item['author'] = $recentArticle->find('p > span', 0)->plaintext;
-			$publicationDateString = trim($recentArticle->find('p > span', 1)->plaintext);
-			$publicationDate = DateTimeImmutable::createFromFormat('F d, Y', $publicationDateString);
-			if ($publicationDate) {
-				$item['timestamp'] = $publicationDate->getTimestamp();
+	// Extracts the timestamp from an article
+	private function extractArticleTimestamp($article){
+		$time = $article->find('.article-info', 0);
+		if($time) {
+			$timestring = trim($time->plaintext);
+			/*
+				The format depends on the age of an article:
+				- Available online 29 July 2016
+				- July 2016
+				- May–June 2016
+			*/
+			if(preg_match('/\S*(\d+\s\S+\s\d{4})/ims', $timestring, $matches)) {
+				return strtotime($matches[0]);
+			} elseif (preg_match('/[A-Za-z]+\-([A-Za-z]+\s\d{4})/ims', $timestring, $matches)) {
+				return strtotime($matches[0]);
+			} elseif (preg_match('/([A-Za-z]+\s\d{4})/ims', $timestring, $matches)) {
+				return strtotime($matches[0]);
+			} else {
+				return 0;
 			}
+		}
+		return 0;
+	}
+
+	// Extracts the content from an article
+	private function extractArticleContent($article){
+		$content = $article->find('.article-content', 0);
+		if($content) {
+			return trim($content->plaintext);
+		}
+		return '';
+	}
+
+	public function getIcon() {
+		return 'https://cdn.elsevier.io/verona/includes/favicons/favicon-32x32.png';
+	}
+
+	public function collectData(){
+		$uri = self::URI . $this->getInput('j') . '/recent-articles/';
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('No results for Elsevier journal ' . $this->getInput('j'));
+
+		foreach($html->find('.pod-listing') as $article) {
+			$item = array();
+			$item['uri'] = $article->find('.pod-listing-header>a', 0)->getAttribute('href') . '?np=y';
+			$item['title'] = $article->find('.pod-listing-header>a', 0)->plaintext;
+			$item['author'] = $this->extractArticleName($article);
+			$item['timestamp'] = $this->extractArticleTimestamp($article);
+			$item['content'] = $this->extractArticleContent($article);
 			$this->items[] = $item;
 		}
 	}
-
-	public function getIcon(): string {
-		return 'https://cdn.elsevier.io/verona/includes/favicons/favicon-32x32.png';
-	}
 }

bridges/EpicgamesBridge.php

@@ -10,8 +10,14 @@ class EpicgamesBridge extends BridgeAbstract {
 	const PARAMETERS = array( array(
 		'postcount' => array(
 			'name' => 'Limit',
-			'type' => 'number',
-			'required' => true,
+			'type' => 'list',
+			'values' => array(
+				'5' => 5,
+				'10' => 10,
+				'15' => 15,
+				'20' => 20,
+				'25' => 25,
+			 ),
 			'title' => 'Maximum number of items to return',
 			'defaultValue' => 10,
 		),
@@ -51,8 +57,10 @@ class EpicgamesBridge extends BridgeAbstract {
 		// Example: https://store-content.ak.epicgames.com/api/ru/content/blog?limit=25
 		$urlBlog = $api . $this->getInput('language') . '/content/blog?limit=' . $this->getInput('postcount');
 
-		$dataSticky = getContents($urlSticky);
-		$dataBlog = getContents($urlBlog);
+		$dataSticky = getContents($urlSticky)
+			or returnServerError('Unable to get the sticky posts from epicgames.com!');
+		$dataBlog = getContents($urlBlog)
+			or returnServerError('Unable to get the news posts from epicgames.com!');
 
 		// Merge data
 		$decodedData = array_merge(json_decode($dataSticky), json_decode($dataBlog));