Revert "[CommonDreamBridge] Promote to secure bridge (fix #777) (#909)"

This reverts commit 8c97953211.

.devcontainer/Dockerfile

@@ -1,8 +0,0 @@
-FROM rssbridge/rss-bridge:latest
-
-RUN  apt-get update && \
-    apt-get install --yes --no-install-recommends \
-      git && \
-    pecl install xdebug && \
-    pear install PHP_CodeSniffer && \
-    docker-php-ext-enable xdebug

.devcontainer/devcontainer.json

@@ -1,27 +0,0 @@
-{
-	"name": "rss-bridge dev",
-	"build": { "dockerfile": "Dockerfile" },
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-			// Set *default* container specific settings.json values on container create.
-			"settings": {
-				"php.validate.executablePath": "/usr/local/bin/php",
-				"phpSniffer.executablesFolder": "/usr/local/bin/",
-				"phpcs.executablePath": "/usr/local/bin/phpcs",
-				"phpcs.lintOnType": false
-			},
-
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"xdebug.php-debug",
-				"bmewburn.vscode-intelephense-client",
-				"philfontaine.autolaunch",
-				"eamodio.gitlens",
-				"shevaua.phpcs"
-			]
-		}
-	},
-	"forwardPorts": [3100, 9000, 9003],
-	"postCreateCommand": "cp .devcontainer/nginx.conf /etc/nginx/conf.d/default.conf && cp .devcontainer/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && mkdir .vscode && cp .devcontainer/launch.json .vscode && echo '*' > whitelist.txt && chmod a+x \"$(pwd)\" && rm -rf /var/www/html && ln -s \"$(pwd)\" /var/www/html && nginx && php-fpm -D"
-}

.devcontainer/launch.json

@@ -1,49 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Listen for Xdebug",
-            "type": "php",
-            "request": "launch",
-            "port": 9003,
-            "auto": true
-        },
-        {
-            "name": "Launch currently open script",
-            "type": "php",
-            "request": "launch",
-            "program": "${file}",
-            "cwd": "${fileDirname}",
-            "port": 0,
-            "runtimeArgs": [
-                "-dxdebug.start_with_request=yes"
-            ],
-            "env": {
-                "XDEBUG_MODE": "debug,develop",
-                "XDEBUG_CONFIG": "client_port=${port}"
-            }
-        },
-        {
-            "name": "Launch Built-in web server",
-            "type": "php",
-            "request": "launch",
-            "runtimeArgs": [
-                "-dxdebug.mode=debug",
-                "-dxdebug.start_with_request=yes",
-                "-S",
-                "localhost:0"
-            ],
-            "program": "",
-            "cwd": "${workspaceRoot}",
-            "port": 9003,
-            "serverReadyAction": {
-                "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started",
-                "uriFormat": "http://localhost:%s",
-                "action": "openExternally"
-            }
-        }
-    ]
-}

.devcontainer/nginx.conf

@@ -1,17 +0,0 @@
-server {
-    listen 3100 default_server;
-    root /workspaces/rss-bridge;
-    access_log /var/log/nginx/rssbridge.access.log;
-    error_log /var/log/nginx/rssbridge.error.log;
-    index index.php;
-
-    location ~ /(\.|vendor|tests) {
-        deny all;
-        return 403; # Forbidden
-    }
-
-    location ~ \.php$ {
-        include snippets/fastcgi-php.conf;
-        fastcgi_pass 127.0.0.1:9000;
-    }
-}

.devcontainer/xdebug.ini

@@ -1,7 +0,0 @@
-[xdebug]
-xdebug.mode=develop,debug
-xdebug.client_host=localhost
-xdebug.client_port=9003
-xdebug.start_with_request=yes
-xdebug.discover_client_host=false
-xdebug.log='/var/www/html/xdebug.log'

.dockerignore

@@ -1,16 +1,8 @@
 .git
-!.git/HEAD
-!.git/refs/heads/*
-.gitattributes
-.github/*
-.travis.yml
 cache/*
-CONTRIBUTING.md
 DEBUG
 Dockerfile
-phpcompatibility.xml
-phpcs.xml
-phpcs.xml
-scalingo.json
-tests/*
 whitelist.txt
+phpcs.xml
+CHANGELOG.md
+CONTRIBUTING.md

.git-blame-ignore-revs

@@ -1,4 +0,0 @@
-# Reformat code base to PSR12
-4f75591060d95208a301bc6bf460d875631b29cc
-# Fix coding style missed by phpbcf
-951092eef374db048b77bac85e75e3547bfac702

.gitattributes

@@ -1,6 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-*.sh text eol=lf
 
 # Custom for Visual Studio
 *.cs     diff=csharp
@@ -21,50 +20,3 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
-
-# Ignore files in git archive (i.e. GitHub release builds)
-
-## Docker
-Dockerfile                              export-ignore
-.dockerignore                           export-ignore
-
-## Travis
-.travis.yml                             export-ignore
-
-## GitHub
-.github/                                export-ignore
-
-## Git
-.gitattributes                          export-ignore
-.gitignore                              export-ignore
-
-## Scalingo
-scalingo.json                           export-ignore
-
-## RSS-Bridge
-phpunit.xml                             export-ignore
-phpcs.xml                               export-ignore
-phpcompatibility.xml                    export-ignore
-tests/                                  export-ignore
-cache/.gitkeep                          export-ignore
-bridges/DemoBridge.php                  export-ignore
-bridges/FeedExpanderExampleBridge.php   export-ignore
-
-## Composer
-#
-# Keep the following lines commented out. Heroku does
-# not function if the composer files are ignored during
-# export. For more information see
-# https://github.com/rss-bridge/rss-bridge/issues/1165
-#
-# composer.json                         export-ignore
-# composer.lock                         export-ignore
-
-## Heroku
-#
-# Keep the following line commented out. Heroku does
-# not function if app.json is ignored during export.
-# For more information see
-# https://github.com/rss-bridge/rss-bridge/issues/1165
-#
-# app.json                              export-ignore

.github/CONTRIBUTING.md

@@ -1,7 +0,0 @@
-### Pull request policy
-
-See the [Pull request policy page on the documentation](https://rss-bridge.github.io/rss-bridge/For_Developers/Pull_Request_policy.html) for more information on the pull request policy.
-
-### Coding style
-
-See the [Coding style policy page on the documentation](https://rss-bridge.github.io/rss-bridge/For_Developers/Coding_style_policy.html) for more information on the coding style of the project.

.github/ISSUE_TEMPLATE/bridge-request.md

@@ -1,64 +0,0 @@
----
-name: Bridge request
-about: Use this template for requesting a new bridge
-title: Bridge request for ...
-labels: Bridge-Request
-assignees: ''
-
----
-
-# Bridge request
-
-<!--
-This is a bridge request. Start by adding a descriptive title (i.e. `Bridge request for GitHub`). Use the "Preview" button to see a preview of your request. Make sure your request is complete before submitting!
-
-Notice: This comment is only visible to you while you work on your request. Please do not remove any of the lines in the template (you may add your own outside the "<!--" and "- ->" lines!)
--->
-
-## General information
-
-<!--
-Please describe what you expect from the bridge. Whenever possible provide sample links and screenshots (you can just paste them here) to express your expectations and help others understand your request. If possible, mark relevant areas in your screenshot. Use the following questions for reference:
--->
-
-- _Host URI for the bridge_ (i.e. `https://github.com`):
-
-- Which information would you like to see?
-
-
-
-- How should the information be displayed/formatted?
-
-
-
-- Which of the following parameters do you expect?
-
-  - [X] Title
-  - [X] URI (link to the original article)
-  - [ ] Author
-  - [ ] Timestamp
-  - [X] Content (the content of the article)
-  - [ ] Enclosures (pictures, videos, etc...)
-  - [ ] Categories (categories, tags, etc...)
-
-## Options
-
-<!--Select options from the list below. Add your own option if one is missing:-->
-
-- [ ] Limit number of returned items
-  - _Default limit_: 5
-- [ ] Load full articles
-  - _Cache articles_ (articles are stored in a local cache on first request): yes
-  - _Cache timeout_ (max = 24 hours): 24 hours
-- [X] Balance requests (RSS-Bridge uses cached versions to reduce bandwith usage)
-  - _Timeout_ (default = 5 minutes, max = 24 hours): 5 minutes
-
-<!--Be aware that some options might not be available for your specific request due to technical limitations!-->
-
-<!--
-## Additional notes
-
-Keep in mind that opening a request does not guarantee the bridge being implemented! That depends entirely on the interest and time of others to make the bridge for you.
-
-You can also implement your own bridge (with support of the community if needed). Find more information in the [RSS-Bridge Documentation](https://rss-bridge.github.io/rss-bridge/For_Developers/index.html) developer section.
--->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: Bug-Report
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Feature-Request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/prtester-requirements.txt

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

.github/prtester.py

@@ -1,113 +0,0 @@
-import requests
-import itertools
-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
-            print(bridgeid + "\n")
-            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 listing in lists:
-                    selectionvalue = ''
-                    listname = listing.get('name')
-                    cleanlist = []
-                    for option in listing.contents:
-                        if 'optgroup' in option.name:
-                            cleanlist.extend(option)
-                        else:
-                            cleanlist.append(option)
-                    firstselectionentry = 1
-                    for selectionentry in cleanlist:
-                        if firstselectionentry:
-                            selectionvalue = selectionentry.get('value')
-                            firstselectionentry = 0
-                        else:
-                            if 'selected' in selectionentry.attrs:
-                                selectionvalue = selectionentry.get('value')
-                                break
-                    formstring = formstring + '&' + listname + '=' + 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/style.css','https://rss-bridge.org/bridge01/static/style.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@v3
-      -  
-        name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v4
-        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@v2
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        uses: docker/bake-action@v2
-        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@v3
-      with:
-        persist-credentials: false
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      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
-      with:
-        folder: "static"
-        branch: gh-pages

.github/workflows/lint.yml

@@ -1,49 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  phpcs:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.4']
-    steps:
-      - uses: actions/checkout@v3
-      - 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.4']
-    steps:
-      - uses: actions/checkout@v3
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - run: composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
-      - 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@v3
-      - 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,67 +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@v3
-        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@v4
-        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 "bodylength=${#body}" >> $GITHUB_OUTPUT
-      - 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-file: comment.txt
-          edit-mode: replace

.github/workflows/tests.yml

@@ -1,21 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  phpunit8:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-versions: ['7.4', '8.0', '8.1']
-    steps:
-      - uses: actions/checkout@v3
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-      - run: composer install
-      - run: composer test

.gitignore

@@ -213,7 +213,6 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
-.phpunit.result.cache
 .tox
 
 #Translations
@@ -229,7 +228,6 @@ pip-log.txt
 /whitelist.txt
 DEBUG
 config.ini.php
-config/*
 
 ######################
 ## VisualStudioCode ##
@@ -238,10 +236,3 @@ config/*
 
 #Builder
 .buildconfig
-
-#Auth
-.htaccess
-.htpasswd
-
-#Crawler
-robots.txt

.travis.yml

@@ -0,0 +1,38 @@
+dist: trusty
+sudo: false
+language: php
+
+install:
+  - if [[ $TRAVIS_PHP_VERSION == "hhvm" ]]; then
+      composer global require squizlabs/PHP_CodeSniffer;
+    else
+      pear channel-update pear.php.net;
+      pear install PHP_CodeSniffer;
+    fi
+  - if [[ $TRAVIS_PHP_VERSION == "7.0" ]]; then
+      composer global require phpunit/phpunit ^6;
+    fi
+
+script:
+  - phpenv rehash
+  - if [[ $TRAVIS_PHP_VERSION == "hhvm" ]]; then
+      /home/travis/.composer/vendor/bin/phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p;
+    else
+      phpcs . --standard=phpcs.xml --warning-severity=0 --extensions=php -p;
+    fi
+  - if [[ $TRAVIS_PHP_VERSION == "7.0" ]]; then
+      phpunit --configuration=phpunit.xml --include-path=lib/;
+    fi
+
+matrix:
+  fast_finish: true
+
+  include:
+    - php: 5.6
+    - php: 7.0
+    - php: hhvm
+    - php: nightly
+
+  allow_failures:
+    - php: hhvm
+    - php: nightly

CHANGELOG.md

@@ -0,0 +1,263 @@
+rss-bridge Changelog
+===
+
+RSS-Bridge 2017-08-19
+==
+
+## General changes
+* whitelist: Do case-insensitive whitelist matching
+* [FeedExpander] Fix Serialization of 'SimpleXMLElement' is not allowed
+* [FeedExpander] Remove whitespace from source content
+* [index] Add GET parameter 'q' for search queries
+  - **Example**: You can now add `&q=Twitter` to load into the search field
+* [index] Check permissions for cache folder and whitelist file
+* [index] Show bridge options when loading with URL fragment
+  - **Example**: You can now add `#bridge-Twitter` to load the card with all
+parameters visible
+* [style] Center search cursor and hide placeholder
+* [validation] Fix error on undefined optional numeric value
+
+## Modified bridges
+* [DanbooruBridge] Allow descendant classes to override tag collection
+* [DribbbleBridge] Add dribble bridge listing last dribble popular shots (#558)
+* [FacebookBridge] Fix & in URLs
+* [GelbooruBridge] Fix bridge not getting tags correctly
+* [GoComicsBridge] Fix for page structure changes (#568)
+* [LeBonCoinBridge] Fix bridge is marked executable
+* [LWNprevBridge] Fix everchanging url
+* [YoutubeBridge] Fix error on certain keywords
+* [YoutubeBridge] Fix issues loading playlists
+
+## Removed bridges
+* VineBridge
+
+RSS-Bridge 2017-08-03
+==
+
+## Important changes
+* RSS-Bridge now has [contribution guidelines](CONTRIBUTING.md)
+* [phpcs rules](phpcs.xml) follow the [contribution guidelines](CONTRIBUTING.md)
+
+## General changes
+* Added a search bar to make searching for bridges easier
+* Added user friendly error page for when a bridge fails
+* Added caching of extraInfos (name, uri)
+* Added an indicator to warn for bridges using HTTP instead of HTTPS
+* Various bug fixes and improvements
+
+## Modified bridges
+* AllocineFRBridge] Update Faux Raccord link
+* [DanbooruBridge] Fix broken URI
+* [DuckDuckGoBridge] Disable DuckDuckGo redirects so that the links returned are correct.
+* [FacebookBridge] Add option to hide posts with facebook videos
+* [FacebookBridge] Add requester languages to HTTP header
+* [FacebookBridge] Handle summary posts
+* [FacebookBridge] Replace 'novideo' with 'media_type'
+* [FilterBridge] Initial implementation of basic title permit and block
+* [FlickrTagBridge] Fix and improve bridge by using the FlickrExploreBridge approach
+* [GooglePlusPostBridge] Autofix user names
+* [GooglePlusPostBridge] Fix bridge implementation
+* [GooglePlusPostBridge] Fix content loading
+* [InstagramBridge] Add option to filter for videos and pictures
+* [LWNprevBridge] full rewrite
+* [MangareaderBridge] Fix double forward slashes
+* [NasaApodBridge] Use HTTPS instead of HTTP
+* [PinterestBridge] Fix checkbox not working
+* [PinterestBridge] Fix implementation after DOM changes
+* [RTBFBridge] Update URI
+* [SexactuBridge] Fix URI and timestamp
+* [SexactuBridge] Use most modern version of bridge api and cached pages (#504)
+* [ShanaprojectBridge] Don't throw error if timestamp is missing
+* [TwitterBridge] Add option to hide retweets
+* [TwitterBridge] Avoid empty content caused by new login policy
+* [TwitterBridge] Fix double slashes in URI
+* [TwitterBridge] Fix missing spaces
+* [TwitterBridge] Fix title includes anchors in plaintext format
+* [TwitterBridge] ignore promoted tweets
+* [TwitterBridge] Optimize returned image sizes
+* [TwitterBridge] Show quotes and pictures
+* [WebfailBridge] Properly handle gifs (DOM changed)
+* [YoutubeBridge] Improve readability of feed contents
+* [YoutubeBridge] Improve URL handling in video descriptions
+
+## New bridges
+* AmazonBridge
+* DiceBridge
+* EtsyBridge
+* FB2Bridge
+* FilterBridge
+* FlickrBridge
+* GithubSearchBridge
+* GoComicsBridge
+* KATBridge
+* KernelBugTrackerBridge
+* MixCloudBridge
+* MoinMoinBridge
+* RainbowSixSiegeBridge
+* SteamBridge
+* TheTVDBBridge
+* Torrent9Bridge
+* UsbekEtRicaBridge
+* WikiLeaksBridge
+* WordPressPluginUpdateBridge
+
+Alpha 0.2
+===
+
+## Important changes
+* RSS-Bridge has been [UNLICENSED](UNLICENSE)
+* RSS-Bridge is now a community-managed project on [GitHub](https://github.com/rss-bridge/rss-bridge)
+* RSS-Bridge now has a [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
+* RSS-Bridge now supports [Travis-CI](https://travis-ci.org)
+
+## General changes
+* Added [CHANGELOG](CHANGELOG.md) (this file)
+* Added [PHP Simple HTML DOM Parser](http://simplehtmldom.sourceforge.net) to [vendor](vendor/simplehtmldom/)
+* Added cache purging function (cache will be force-purged after 24 hours or as defined by bridge)
+* Added new format [MrssFormat](formats/MrssFormat.php)
+* Added parameter `author` - for display of the feed author name - to all formats
+* Added new abstraction of the BridgeInterface:
+  - [FeedExpander](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API)
+* Added optional support for proxy usage on each individual bridge
+* Added support for [custom bridge parameter](https://github.com/RSS-Bridge/rss-bridge/wiki/BridgeAbstract#format-specifications) (text, number, list, checkbox)
+* Changed design of the welcome screen
+* Changed design of HtmlFormat
+* Changed behavior of debug mode:
+  - Enable debug mode by placing a file called "DEBUG" in the root folder
+  - Debug mode automatically disables cache file loading
+* Changed implementation of bridges - see [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
+  - Changed comment-style metadata to constants
+  - Added support for multiple utilizations per bridge
+  - Changed the parameter loading algorithm to be loaded by RSS-Bridge core
+* Improved checks for PHP version, configuration and extensions
+* Many bug fixes
+
+## Modified Bridges
+* FlickrExploreBridge
+* GoogleSearchBridge
+* TwitterBridge
+
+## New Bridges
+* ABCTabsBridge
+* AcrimedBridge
+* AllocineFRBridge
+* AnimeUltimeBridge
+* Arte7Bridge
+* AskfmBridge
+* BandcampBridge
+* BastaBridge
+* BlaguesDeMerdeBridge
+* BooruprojectBridge
+* CADBridge
+* CNETBridge
+* CastorusBridge
+* CollegeDeFranceBridge
+* CommonDreamsBridge
+* CopieDoubleBridge
+* CourrierInternationalBridge
+* CpasbienBridge
+* CryptomeBridge
+* DailymotionBridge
+* DanbooruBridge
+* DansTonChatBridge
+* DauphineLibereBridge
+* DemoBridge
+* DeveloppezDotComBridge
+* DilbertBridge
+* DollbooruBridge
+* DuckDuckGoBridge
+* EZTVBridge
+* EliteDangerousGalnetBridge
+* ElsevierBridge
+* EstCeQuonMetEnProdBridge
+* FacebookBridge
+* FierPandaBridge
+* FlickrTagBridge
+* FootitoBridge
+* FourchanBridge
+* FuturaSciencesBridge
+* GBAtempBridge
+* GelbooruBridge
+* GiphyBridge
+* GithubIssueBridge
+* GizmodoBridge
+* GooglePlusPostBridge
+* HDWallpapersBridge
+* HentaiHavenBridge
+* IdenticaBridge
+* InstagramBridge
+* IsoHuntBridge
+* JapanExpoBridge
+* KonachanBridge
+* KoreusBridge
+* KununuBridge
+* LWNprevBridge
+* LeBonCoinBridge
+* LegifranceJOBridge
+* LeMondeInformatiqueBridge
+* LesJoiesDuCodeBridge
+* LichessBridge
+* LinkedInCompanyBridge
+* LolibooruBridge
+* MangareaderBridge
+* MilbooruBridge
+* MoebooruBridge
+* MondeDiploBridge
+* MsnMondeBridge
+* MspabooruBridge
+* NasaApodBridge
+* NeuviemeArtBridge
+* NextInpactBridge
+* NextgovBridge
+* NiceMatinBridge
+* NovelUpdatesBridge
+* OpenClassroomsBridge
+* ParuVenduImmoBridge
+* PickyWallpapersBridge
+* PinterestBridge
+* PlanetLibreBridge
+* RTBFBridge
+* ReadComicsBridge
+* Releases3DSBridge
+* ReporterreBridge
+* Rue89Bridge
+* Rule34Bridge
+* Rule34pahealBridge
+* SafebooruBridge
+* SakugabooruBridge
+* ScmbBridge
+* ScoopItBridge
+* SensCritiqueBridge
+* SexactuBridge
+* ShanaprojectBridge
+* Shimmie2Bridge
+* SoundcloudBridge
+* StripeAPIChangeLogBridge
+* SuperbWallpapersBridge
+* T411Bridge
+* TagBoardBridge
+* TbibBridge
+* TheCodingLoveBridge
+* TheHackerNewsBridge
+* ThePirateBayBridge
+* UnsplashBridge
+* ViadeoCompanyBridge
+* VineBridge
+* VkBridge
+* WallpaperStopBridge
+* WebfailBridge
+* WeLiveSecurityBridge
+* WhydBridge
+* WikipediaBridge
+* WordPressBridge
+* WorldOfTanksBridge
+* XbooruBridge
+* YandereBridge
+* YoutubeBridge
+* ZDNetBridge
+
+Alpha 0.1
+===
+* First tagged version.
+* Includes refactoring.
+* Unstable.

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+### Pull request policy
+
+* [Fix one issue per pull request](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#fix-one-issue-per-pull-request)
+* [Respect the coding style policy](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#respect-the-coding-style-policy)
+* [Properly name your commits](https://github.com/RSS-Bridge/rss-bridge/wiki/Pull-request-policy#properly-name-your-commits)
+  * When fixing a bridge (located in the `bridges` directory), write `[BridgeName] Feature` <br>(i.e. `[YoutubeBridge] Fix typo in video titles`).
+  * When fixing other files, use `[FileName] Feature` <br>(i.e. `[index.php] Add multilingual support`).
+  * When fixing a general problem that applies to multiple files, write `category: feature` <br>(i.e. `bridges: Fix various typos`).
+
+Note that all pull-requests must pass all tests before they can be merged.
+
+### Coding style
+
+* [Whitespace](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace)
+  * [Add a new line at the end of a file](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#add-a-new-line-at-the-end-of-a-file)
+  * [Do not add a whitespace before a semicolon](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#add-a-new-line-at-the-end-of-a-file)
+  * [Do not add whitespace at start or end of a file or end of a line](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitespace#do-not-add-whitespace-at-start-or-end-of-a-file-or-end-of-a-line)
+* [Indentation](https://github.com/RSS-Bridge/rss-bridge/wiki/Indentation)
+  * [Use tabs for indentation](https://github.com/RSS-Bridge/rss-bridge/wiki/Indentation#use-tabs-for-indentation)
+* [Maximum line length](https://github.com/RSS-Bridge/rss-bridge/wiki/Maximum-line-length)
+  * [The maximum line length should not exceed 80 characters](https://github.com/RSS-Bridge/rss-bridge/wiki/Maximum-line-length#the-maximum-line-length-should-not-exceed-80-characters)
+* [Strings](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings)
+  * [Whenever possible use single quoted strings](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#whenever-possible-use-single-quote-strings)
+  * [Add spaces around the concatenation operator](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#add-spaces-around-the-concatenation-operator)
+  * [Use a single string instead of concatenating](https://github.com/RSS-Bridge/rss-bridge/wiki/Strings#use-a-single-string-instead-of-concatenating)
+* [Constants](https://github.com/RSS-Bridge/rss-bridge/wiki/Constants)
+  * [Use UPPERCASE for constants](https://github.com/RSS-Bridge/rss-bridge/wiki/Constants#use-uppercase-for-constants)
+* [Keywords](https://github.com/RSS-Bridge/rss-bridge/wiki/Keywords)
+  * [Use lowercase for `true`, `false` and `null`](https://github.com/RSS-Bridge/rss-bridge/wiki/Keywords#use-lowercase-for-true-false-and-null)
+* [Operators](https://github.com/RSS-Bridge/rss-bridge/wiki/Operators)
+  * [Operators must have a space around them](https://github.com/RSS-Bridge/rss-bridge/wiki/Operators#operators-must-have-a-space-around-them)
+* [Functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions)
+  * [Parameters with default values must appear last in functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#parameters-with-default-values-must-appear-last-in-functions)
+  * [Calling functions](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#calling-functions)
+  * [Do not add spaces after opening or before closing bracket](https://github.com/RSS-Bridge/rss-bridge/wiki/Functions#do-not-add-spaces-after-opening-or-before-closing-bracket)
+* [Structures](https://github.com/RSS-Bridge/rss-bridge/wiki/Structures)
+  * [Structures must always be formatted as multi-line blocks](https://github.com/RSS-Bridge/rss-bridge/wiki/Structures#structures-must-always-be-formatted-as-multi-line-blocks)
+* [If-Statement](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement)
+  * [Use `elseif` instead of `else if`](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#use-elseif-instead-of-else-if)
+  * [Do not write empty statements](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#do-not-write-empty-statements)
+  * [Do not write unconditional if-statements](https://github.com/RSS-Bridge/rss-bridge/wiki/if-Statement#do-not-write-unconditional-if-statements)
+* [Classes](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes)
+  * [Use PascalCase for class names](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#use-pascalcase-for-class-names)
+  * [Do not use final statements inside final classes](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#do-not-use-final-statements-inside-final-classes)
+  * [Do not override methods to call their parent](https://github.com/RSS-Bridge/rss-bridge/wiki/Classes#do-not-override-methods-to-call-their-parent)
+* [Casting](https://github.com/RSS-Bridge/rss-bridge/wiki/Casting)
+  * [Do not add spaces when casting](https://github.com/RSS-Bridge/rss-bridge/wiki/Casting#do-not-add-spaces-when-casting)

CONTRIBUTORS.md

@@ -1,223 +0,0 @@
-# Contributors
-
-* [16mhz](https://github.com/16mhz)
-* [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)
-* [Alkarex](https://github.com/Alkarex)
-* [AmauryCarrade](https://github.com/AmauryCarrade)
-* [arnd-s](https://github.com/arnd-s)
-* [ArthurHoaro](https://github.com/ArthurHoaro)
-* [Astalaseven](https://github.com/Astalaseven)
-* [Astyan-42](https://github.com/Astyan-42)
-* [austinhuang0131](https://github.com/austinhuang0131)
-* [AxorPL](https://github.com/AxorPL)
-* [ayacoo](https://github.com/ayacoo)
-* [az5he6ch](https://github.com/az5he6ch)
-* [b1nj](https://github.com/b1nj)
-* [benasse](https://github.com/benasse)
-* [Binnette](https://github.com/Binnette)
-* [BoboTiG](https://github.com/BoboTiG)
-* [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)
-* [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)
-* [DnAp](https://github.com/DnAp)
-* [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)
-* [DRogueRonin](https://github.com/DRogueRonin)
-* [dvikan](https://github.com/dvikan)
-* [eggwhalefrog](https://github.com/eggwhalefrog)
-* [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)
-* [gileri](https://github.com/gileri)
-* [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)
-* [jakubvalenta](https://github.com/jakubvalenta)
-* [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)
-* [jtojnar](https://github.com/jtojnar)
-* [KamaleiZestri](https://github.com/KamaleiZestri)
-* [kkoyung](https://github.com/kkoyung)
-* [klimplant](https://github.com/klimplant)
-* [KN4CK3R](https://github.com/KN4CK3R)
-* [kolarcz](https://github.com/kolarcz)
-* [kranack](https://github.com/kranack)
-* [kraoc](https://github.com/kraoc)
-* [krisu5](https://github.com/krisu5)
-* [l1n](https://github.com/l1n)
-* [laBecasse](https://github.com/laBecasse)
-* [lagaisse](https://github.com/lagaisse)
-* [lalannev](https://github.com/lalannev)
-* [langfingaz](https://github.com/langfingaz)
-* [lassana](https://github.com/lassana)
-* [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)
-* [mickaelBert](https://github.com/mickaelBert)
-* [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)
-* [muekoeff](https://github.com/muekoeff)
-* [mw80](https://github.com/mw80)
-* [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)
-* [NikNikYkt](https://github.com/NikNikYkt)
-* [Nono-m0le](https://github.com/Nono-m0le)
-* [obsiwitch](https://github.com/obsiwitch)
-* [Ololbu](https://github.com/Ololbu)
-* [ORelio](https://github.com/ORelio)
-* [otakuf](https://github.com/otakuf)
-* [Park0](https://github.com/Park0)
-* [Paroleen](https://github.com/Paroleen)
-* [Patricol](https://github.com/Patricol)
-* [paulchen](https://github.com/paulchen)
-* [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)
-* [pirnz](https://github.com/pirnz)
-* [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)
-* [pubak42](https://github.com/pubak42)
-* [Qluxzz](https://github.com/Qluxzz)
-* [quentinus95](https://github.com/quentinus95)
-* [quickwick](https://github.com/quickwick)
-* [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)
-* [s0lesurviv0r](https://github.com/s0lesurviv0r)
-* [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)
-* [SqrtMinusOne](https://github.com/SqrtMinusOne)
-* [squeek502](https://github.com/squeek502)
-* [StelFux](https://github.com/StelFux)
-* [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)
-* [TheRadialActive](https://github.com/TheRadialActive)
-* [theScrabi](https://github.com/theScrabi)
-* [thezeroalpha](https://github.com/thezeroalpha)
-* [thibaultcouraud](https://github.com/thibaultcouraud)
-* [timendum](https://github.com/timendum)
-* [TitiTestScalingo](https://github.com/TitiTestScalingo)
-* [tomaszkane](https://github.com/tomaszkane)
-* [tomershvueli](https://github.com/tomershvueli)
-* [TotalCaesar659](https://github.com/TotalCaesar659)
-* [tpikonen](https://github.com/tpikonen)
-* [TReKiE](https://github.com/TReKiE)
-* [triatic](https://github.com/triatic)
-* [User123698745](https://github.com/User123698745)
-* [VerifiedJoseph](https://github.com/VerifiedJoseph)
-* [vitkabele](https://github.com/vitkabele)
-* [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)

Dockerfile

@@ -1,36 +1,5 @@
-FROM lwthiker/curl-impersonate:0.5-ff-slim-buster AS curlimpersonate
+FROM ulsmith/alpine-apache-php7
 
-FROM php:8.0.27-fpm-buster AS rssbridge
+COPY ./ /app/public/
 
-LABEL description="RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one."
+RUN chown -R apache:root /app/public
-LABEL repository="https://github.com/RSS-Bridge/rss-bridge"
-LABEL website="https://github.com/RSS-Bridge/rss-bridge"
-
-RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
-      nginx \
-      zlib1g-dev \
-      libzip-dev \
-      libmemcached-dev \
-      nss-plugin-pem \
-      libicu-dev && \
-    docker-php-ext-install zip && \
-    docker-php-ext-install intl && \
-    pecl install memcached && \
-    docker-php-ext-enable memcached && \
-    docker-php-ext-enable opcache && \
-    mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
-
-COPY ./config/nginx.conf /etc/nginx/sites-enabled/default
-
-COPY --chown=www-data:www-data ./ /app/
-
-COPY --from=curlimpersonate /usr/local/lib/libcurl-impersonate-ff.so /usr/local/lib/curl-impersonate/
-
-ENV LD_PRELOAD /usr/local/lib/curl-impersonate/libcurl-impersonate-ff.so
-
-ENV CURL_IMPERSONATE ff91esr
-
-EXPOSE 80
-
-ENTRYPOINT ["/app/docker-entrypoint.sh"]

README.md

@@ -1,242 +1,38 @@
-# RSS-Bridge
+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)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?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-light--gray.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)](https://hub.docker.com/r/rssbridge/rss-bridge/)
 
-![RSS-Bridge](static/logo_600px.png)
+RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one. It can be used on webservers or as stand alone application in CLI mode.
 
-RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one.
+**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).
 
-[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE)
+Supported sites/pages (examples)
-[![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/actions/workflow/status/RSS-Bridge/rss-bridge/tests.yml?branch=master&label=GitHub%20Actions&logo=github)](https://github.com/RSS-Bridge/rss-bridge/actions)
 
-|||
+* `Bandcamp` : Returns last release from [bandcamp](https://bandcamp.com/) for a tag
-|:-:|:-:|
+* `Cryptome` : Returns the most recent documents from [Cryptome.org](http://cryptome.org/)
-|![Screenshot #1](/static/screenshot-1.png?raw=true)|![Screenshot #2](/static/screenshot-2.png?raw=true)|
+* `DansTonChat`: Most recent quotes from [danstonchat.com](http://danstonchat.com/)
-|![Screenshot #3](/static/screenshot-3.png?raw=true)|![Screenshot #4](/static/screenshot-4.png?raw=true)|
+* `DuckDuckGo`: Most recent results from [DuckDuckGo.com](https://duckduckgo.com/)
-|![Screenshot #5](/static/screenshot-5.png?raw=true)|![Screenshot #6](/static/screenshot-6.png?raw=true)|
+* `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
-|![Screenshot #7](/static/twitter-form.png?raw=true)|![Screenshot #8](/static/twitter-rasmus.png?raw=true)|
+* `FlickrExplore` : [Latest interesting images](http://www.flickr.com/explore) from Flickr
-
+* `GooglePlus` : Most recent posts of user timeline
-## A subset of bridges
+* `GoogleSearch` : Most recent results from Google Search
-
+* `Identi.ca` : Identica user timeline (Should be compatible with other Pump.io instances)
-* `YouTube` : YouTube user channel, playlist or search
+* `Instagram`: Most recent photos from an Instagram user
-* `Twitter` : Return keyword/hashtag search or user timeline
+* `OpenClassrooms`: Lastest tutorials from [fr.openclassrooms.com](http://fr.openclassrooms.com/)
-* `Telegram` : Return the latest posts from a public group
+* `Pinterest`: Most recent photos from user or search
-* `Reddit` : Return the latest posts from a subreddit or user
+* `ScmbBridge`: Newest stories from [secouchermoinsbete.fr](http://secouchermoinsbete.fr/)
-* `Filter` : Filter an existing feed url
-* `Vk` : Latest posts from a user or group
-* `FeedMerge` : Merge two or more existing feeds into one
-* `Twitch` : Fetch the latest videos from a channel
 * `ThePirateBay` : Returns the newest indexed torrents from [The Pirate Bay](https://thepiratebay.se/) with keywords
+* `Twitter` : Return keyword/hashtag search or user timeline
+* `Wikipedia`: highlighted articles from [Wikipedia](https://wikipedia.org/) in English, German, French or Esperanto
+* `YouTube` : YouTube user channel, playlist or search
 
 And [many more](bridges/), thanks to the community!
 
-[Full documentation](https://rss-bridge.github.io/rss-bridge/index.html)
+Output format
+===
 
-Check out RSS-Bridge right now on https://rss-bridge.org/bridge01 or find another
+RSS-Bridge is capable of producing several output formats:
-[public instance](https://rss-bridge.github.io/rss-bridge/General/Public_Hosts.html).
-
-## Tutorial
-
-RSS-Bridge requires php 7.4 (or higher).
-
-### Install with composer or git
-
-```shell
-cd /var/www
-composer create-project --no-dev rss-bridge/rss-bridge
-```
-
-```shell
-cd /var/www
-git clone https://github.com/RSS-Bridge/rss-bridge.git
-```
-
-Config:
-
-```shell
-# Give the http user write permission to the cache folder
-chown www-data:www-data /var/www/rss-bridge/cache
-
-# Optionally copy over the default config file
-cp config.default.ini.php config.ini.php
-```
-
-Example config for nginx:
-
-```nginx
-# /etc/nginx/sites-enabled/rssbridge
-server {
-    listen 80;
-    server_name example.com;
-    root /var/www/rss-bridge;
-    index index.php;
-
-    location ~ \.php$ {
-        include snippets/fastcgi-php.conf;
-        fastcgi_read_timeout 60s;
-        fastcgi_pass unix:/run/php/php-fpm.sock;
-    }
-}
-```
-
-### Install with Docker:
-
-Install by using docker image from Docker Hub:
-
-```bash
-# Create container
-docker create --name=rss-bridge --publish 3000:80 rssbridge/rss-bridge
-
-# Start container
-docker start rss-bridge
-```
-
-Browse http://localhost:3000/
-
-Install by locally building the image:
-
-```bash
-# Build image from Dockerfile
-docker build -t rss-bridge .
-
-# Create container
-docker create --name rss-bridge --publish 3000:80 rss-bridge
-
-# Start the container
-docker start rss-bridge
-```
-
-Browse http://localhost:3000/
-
-#### Install with docker-compose
-
-Create a `docker-compose.yml` file locally with with the following content:
-```yml
-version: '2'
-services:
-  rss-bridge:
-    image: rssbridge/rss-bridge:latest
-    volumes:
-      - </local/custom/path>:/config
-    ports:
-      - 3000:80
-    restart: unless-stopped
-```
-
-Then launch with `docker-compose`:
-
-```bash
-docker-compose up
-```
-
-Browse http://localhost:3000/
-
-### Alternative installation methods
-
-[![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)
-
-The Heroku quick deploy currently does not work. It might possibly work if you fork this repo and
-modify the `repository` in `scalingo.json`. See https://github.com/RSS-Bridge/rss-bridge/issues/2688
-
-Learn more in
-[Installation](https://rss-bridge.github.io/rss-bridge/For_Hosts/Installation.html).
-
-## How-to
-
-### How to create a new bridge from scratch
-
-Create the new bridge in e.g. `bridges/BearBlogBridge.php`:
-
-```php
-<?php
-
-class BearBlogBridge extends BridgeAbstract
-{
-    const NAME = 'BearBlog (bearblog.dev)';
-
-    public function collectData()
-    {
-        $dom = getSimpleHTMLDOM('https://herman.bearblog.dev/blog/');
-        foreach ($dom->find('.blog-posts li') as $li) {
-            $a = $li->find('a', 0);
-            $this->items[] = [
-                'title' => $a->plaintext,
-                'uri' => 'https://herman.bearblog.dev' . $a->href,
-            ];
-        }
-    }
-}
-```
-
-Learn more in [bridge api](https://rss-bridge.github.io/rss-bridge/Bridge_API/index.html).
-
-### How to enable all bridges
-
-    enabled_bridges[] = *
-
-### How to enable some bridges
-
-```
-enabled_bridges[] = TwitchBridge
-enabled_bridges[] = GettrBridge
-```
-
-### How to enable debug mode
-
-    enable_debug_mode = true
-
-Learn more in [debug mode](https://rss-bridge.github.io/rss-bridge/For_Developers/Debug_mode.html).
-
-### How to create a new output format
-
-[Create a new format](https://rss-bridge.github.io/rss-bridge/Format_API/index.html).
-
-## Explanation
-
-We are RSS-Bridge community, a group of developers continuing the project initiated by sebsauvage,
-webmaster of
-[sebsauvage.net](https://sebsauvage.net), author of
-[Shaarli](https://sebsauvage.net/wiki/doku.php?id=php:shaarli) and
-[ZeroBin](https://sebsauvage.net/wiki/doku.php?id=php:zerobin).
-
-See [CONTRIBUTORS.md](CONTRIBUTORS.md)
-
-RSS-Bridge uses caching to prevent services from banning your server for repeatedly updating feeds.
-The specific cache duration can be different between bridges. Cached files are deleted automatically after 24 hours.
-
-RSS-Bridge allows you to take full control over which bridges are displayed to the user.
-That way you can host your own RSS-Bridge service with your favorite collection of bridges!
-
-
-## Reference
-
-### FeedItem properties
-
-```php
-    $item = [
-        'uri' => 'https://example.com/blog/hello',
-        'title' => 'Hello world',
-        // Publication date in unix timestamp
-        'timestamp' => 1668706254,
-        'author' => 'Alice',
-        'content' => 'Here be item content',
-        'enclosures' => [
-            'https://example.com/foo.png',
-            'https://example.com/bar.png'
-        ],
-        'categories' => [
-            'news',
-            'tech',
-        ],
-        // Globally unique id
-        'uid' => 'e7147580c8747aad',
-    ]
-```
-
-### Output formats:
 
 * `Atom` : Atom feed, for use in feed readers
 * `Html` : Simple HTML page
@@ -244,18 +40,178 @@ That way you can host your own RSS-Bridge service with your favorite collection
 * `Mrss` : MRSS feed, for use in feed readers
 * `Plaintext` : Raw text, for consumption by other applications
 
-### Licenses
+You can extend RSS-Bridge with your own format, using the [Format API](https://github.com/RSS-Bridge/rss-bridge/wiki/Format-API)!
+
+Screenshot
+===
+
+Welcome screen:
+
+![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_rss-bridge_welcome.png)
+
+***
+
+RSS-Bridge hashtag (#rss-bridge) search on Twitter, in Atom format (as displayed by Firefox):
+
+![Screenshot](https://github.com/RSS-Bridge/rss-bridge/wiki/images/screenshot_twitterbridge_atom.png)
+
+Requirements
+===
+
+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)
+  - [`mbstring`](https://secure.php.net/manual/en/book.mbstring.php)
+  - [`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)
+
+Find more information on our [Wiki](https://github.com/rss-bridge/rss-bridge/wiki)
+
+Enable / Disable bridges
+===
+
+RSS-Bridge allows you to take full control over which bridges are displayed to the user. That way you can host your own RSS-Bridge service with your favorite collection of bridges!
+
+Find more information on the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitelisting)
+
+**Notice**: By default RSS-Bridge will only show a small subset of bridges. Make sure to read up on [whitelisting](https://github.com/RSS-Bridge/rss-bridge/wiki/Whitelisting) to unlock the full potential of RSS-Bridge!
+
+Deploy
+===
+
+Thanks to the community, hosting your own instance of RSS-Bridge is as easy as clicking a button!
+
+[![Deploy on Scalingo](https://cdn.scalingo.com/deploy/button.svg)](https://my.scalingo.com/deploy?source=https://github.com/sebsauvage/rss-bridge)
+[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/rss-bridge/rss-bridge)
+
+Getting involved
+===
+
+There are many ways for you to getting involved with RSS-Bridge. Here are a few things:
+
+- Share RSS-Bridge with your friends (Twitter, Facebook, ..._you name it_...)
+- Report broken bridges or bugs by opening [Issues](https://github.com/RSS-Bridge/rss-bridge/issues) on GitHub
+- Request new features or suggest ideas (via [Issues](https://github.com/RSS-Bridge/rss-bridge/issues))
+- Discuss bugs, features, ideas or [issues](https://github.com/RSS-Bridge/rss-bridge/issues)
+- Add new bridges or improve the API
+- Improve the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki)
+- Host an instance of RSS-Bridge for your personal use or make it available to the community :sparkling_heart:
+
+Authors
+===
+
+We are RSS-Bridge community, a group of developers continuing the project initiated by sebsauvage, webmaster of [sebsauvage.net](http://sebsauvage.net), author of [Shaarli](http://sebsauvage.net/wiki/doku.php?id=php:shaarli) and [ZeroBin](http://sebsauvage.net/wiki/doku.php?id=php:zerobin).
+
+**Contributors** (sorted alphabetically):
+<!--
+Use this script to generate the list automatically (using the GitHub API):
+https://gist.github.com/LogMANOriginal/da00cd1e5f0ca31cef8e193509b17fd8
+-->
+
+  * [16mhz](https://api.github.com/users/16mhz)
+  * [Ahiles3005](https://api.github.com/users/Ahiles3005)
+  * [Albirew](https://api.github.com/users/Albirew)
+  * [AmauryCarrade](https://api.github.com/users/AmauryCarrade)
+  * [ArthurHoaro](https://api.github.com/users/ArthurHoaro)
+  * [Astalaseven](https://api.github.com/users/Astalaseven)
+  * [Astyan-42](https://api.github.com/users/Astyan-42)
+  * [Daiyousei](https://api.github.com/users/Daiyousei)
+  * [Djuuu](https://api.github.com/users/Djuuu)
+  * [Draeli](https://api.github.com/users/Draeli)
+  * [EtienneM](https://api.github.com/users/EtienneM)
+  * [Frenzie](https://api.github.com/users/Frenzie)
+  * [Ginko-Aloe](https://api.github.com/users/Ginko-Aloe)
+  * [Glandos](https://api.github.com/users/Glandos)
+  * [GregThib](https://api.github.com/users/GregThib)
+  * [Grummfy](https://api.github.com/users/Grummfy)
+  * [JackNUMBER](https://api.github.com/users/JackNUMBER)
+  * [JeremyRand](https://api.github.com/users/JeremyRand)
+  * [Jocker666z](https://api.github.com/users/Jocker666z)
+  * [LogMANOriginal](https://api.github.com/users/LogMANOriginal)
+  * [MonsieurPoutounours](https://api.github.com/users/MonsieurPoutounours)
+  * [ORelio](https://api.github.com/users/ORelio)
+  * [PaulVayssiere](https://api.github.com/users/PaulVayssiere)
+  * [Piranhaplant](https://api.github.com/users/Piranhaplant)
+  * [Riduidel](https://api.github.com/users/Riduidel)
+  * [Strubbl](https://api.github.com/users/Strubbl)
+  * [TheRadialActive](https://api.github.com/users/TheRadialActive)
+  * [TwizzyDizzy](https://api.github.com/users/TwizzyDizzy)
+  * [WalterBarrett](https://api.github.com/users/WalterBarrett)
+  * [ZeNairolf](https://api.github.com/users/ZeNairolf)
+  * [adamchainz](https://api.github.com/users/adamchainz)
+  * [aledeg](https://api.github.com/users/aledeg)
+  * [alexAubin](https://api.github.com/users/alexAubin)
+  * [az5he6ch](https://api.github.com/users/az5he6ch)
+  * [b1nj](https://api.github.com/users/b1nj)
+  * [benasse](https://api.github.com/users/benasse)
+  * [captn3m0](https://api.github.com/users/captn3m0)
+  * [chemel](https://api.github.com/users/chemel)
+  * [ckiw](https://api.github.com/users/ckiw)
+  * [cnlpete](https://api.github.com/users/cnlpete)
+  * [corenting](https://api.github.com/users/corenting)
+  * [da2x](https://api.github.com/users/da2x)
+  * [eMerzh](https://api.github.com/users/eMerzh)
+  * [em92](https://api.github.com/users/em92)
+  * [griffaurel](https://api.github.com/users/griffaurel)
+  * [hunhejj](https://api.github.com/users/hunhejj)
+  * [j0k3r](https://api.github.com/users/j0k3r)
+  * [jdigilio](https://api.github.com/users/jdigilio)
+  * [kranack](https://api.github.com/users/kranack)
+  * [kraoc](https://api.github.com/users/kraoc)
+  * [laBecasse](https://api.github.com/users/laBecasse)
+  * [lagaisse](https://api.github.com/users/lagaisse)
+  * [lalannev](https://api.github.com/users/lalannev)
+  * [ldidry](https://api.github.com/users/ldidry)
+  * [m0zes](https://api.github.com/users/m0zes)
+  * [matthewseal](https://api.github.com/users/matthewseal)
+  * [mcbyte-it](https://api.github.com/users/mcbyte-it)
+  * [mdemoss](https://api.github.com/users/mdemoss)
+  * [melangue](https://api.github.com/users/melangue)
+  * [metaMMA](https://api.github.com/users/metaMMA)
+  * [mickael-bertrand](https://api.github.com/users/mickael-bertrand)
+  * [mitsukarenai](https://api.github.com/users/mitsukarenai)
+  * [mro](https://api.github.com/users/mro)
+  * [mxmehl](https://api.github.com/users/mxmehl)
+  * [nel50n](https://api.github.com/users/nel50n)
+  * [niawag](https://api.github.com/users/niawag)
+  * [pellaeon](https://api.github.com/users/pellaeon)
+  * [pit-fgfjiudghdf](https://api.github.com/users/pit-fgfjiudghdf)
+  * [pitchoule](https://api.github.com/users/pitchoule)
+  * [pmaziere](https://api.github.com/users/pmaziere)
+  * [prysme01](https://api.github.com/users/prysme01)
+  * [quentinus95](https://api.github.com/users/quentinus95)
+  * [qwertygc](https://api.github.com/users/qwertygc)
+  * [regisenguehard](https://api.github.com/users/regisenguehard)
+  * [rogerdc](https://api.github.com/users/rogerdc)
+  * [sebsauvage](https://api.github.com/users/sebsauvage)
+  * [sublimz](https://api.github.com/users/sublimz)
+  * [sysadminstory](https://api.github.com/users/sysadminstory)
+  * [tameroski](https://api.github.com/users/tameroski)
+  * [teromene](https://api.github.com/users/teromene)
+  * [triatic](https://api.github.com/users/triatic)
+  * [wtuuju](https://api.github.com/users/wtuuju)
+
+Licenses
+===
 
 The source code for RSS-Bridge is [Public Domain](UNLICENSE).
 
 RSS-Bridge uses third party libraries with their own license:
 
-  * [`Parsedown`](https://github.com/erusev/parsedown) licensed under the [MIT License](https://opensource.org/licenses/MIT)
+  * [`PHP Simple HTML DOM Parser`](http://simplehtmldom.sourceforge.net/) licensed under the [MIT License](http://opensource.org/licenses/MIT)
-  * [`PHP Simple HTML DOM Parser`](https://simplehtmldom.sourceforge.io/docs/1.9/index.html) licensed under the [MIT License](https://opensource.org/licenses/MIT)
+  * [`php-urljoin`](https://github.com/fluffy-critter/php-urljoin) licensed under the [MIT License](http://opensource.org/licenses/MIT)
-  * [`php-urljoin`](https://github.com/fluffy-critter/php-urljoin) licensed under the [MIT License](https://opensource.org/licenses/MIT)
-  * [`Laravel framework`](https://github.com/laravel/framework/) licensed under the [MIT License](https://opensource.org/licenses/MIT)
 
-## Rant
+Technical notes
+===
+
+  * RSS-Bridge uses caching to prevent services from banning your server for repeatedly updating feeds. The specific cache duration can be different between bridges. Cached files are deleted automatically after 24 hours.
+  * You can implement your own bridge, [following these instructions](https://github.com/RSS-Bridge/rss-bridge/wiki/Bridge-API).
+  * You can enable debug mode to disable caching. Find more information on the [Wiki](https://github.com/RSS-Bridge/rss-bridge/wiki/Debug-mode)
+
+Rant
+===
 
 *Dear so-called "social" websites.*
 
@@ -265,6 +221,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/ConnectivityAction.php

@@ -1,80 +0,0 @@
-<?php
-
-/**
- * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
- * Atom feeds for websites that don't have one.
- *
- * For the full license information, please view the UNLICENSE file distributed
- * with this source code.
- *
- * @package Core
- * @license http://unlicense.org/ UNLICENSE
- * @link    https://github.com/rss-bridge/rss-bridge
- */
-
-/**
- * Checks if the website for a given bridge is reachable.
- *
- * **Remarks**
- * - This action is only available in debug mode.
- * - Returns the bridge status as Json-formatted string.
- * - Returns an error if the bridge is not whitelisted.
- * - Returns a responsive web page that automatically checks all whitelisted
- * bridges (using JavaScript) if no bridge is specified.
- */
-class ConnectivityAction implements ActionInterface
-{
-    private BridgeFactory $bridgeFactory;
-
-    public function __construct()
-    {
-        $this->bridgeFactory = new BridgeFactory();
-    }
-
-    public function execute(array $request)
-    {
-        if (!Debug::isEnabled()) {
-            throw new \Exception('This action is only available in debug mode!');
-        }
-
-        if (!isset($request['bridge'])) {
-            return render_template('connectivity.html.php');
-        }
-
-        $bridgeClassName = $this->bridgeFactory->createBridgeClassName($request['bridge']);
-
-        return $this->reportBridgeConnectivity($bridgeClassName);
-    }
-
-    private function reportBridgeConnectivity($bridgeClassName)
-    {
-        if (!$this->bridgeFactory->isEnabled($bridgeClassName)) {
-            throw new \Exception('Bridge is not whitelisted!');
-        }
-
-        $retVal = [
-            'bridge' => $bridgeClassName,
-            'successful' => false,
-            'http_code' => 200,
-        ];
-
-        $bridge = $this->bridgeFactory->create($bridgeClassName);
-        $curl_opts = [
-            CURLOPT_CONNECTTIMEOUT => 5
-        ];
-        try {
-            $reply = getContents($bridge::URI, [], $curl_opts, true);
-
-            if ($reply['code'] === 200) {
-                $retVal['successful'] = true;
-                if (strpos(implode('', $reply['status_lines']), '301 Moved Permanently')) {
-                    $retVal['http_code'] = 301;
-                }
-            }
-        } catch (\Exception $e) {
-            $retVal['successful'] = false;
-        }
-
-        return new Response(Json::encode($retVal), 200, ['Content-Type' => 'text/json']);
-    }
-}

actions/DetectAction.php

@@ -1,53 +0,0 @@
-<?php
-
-/**
- * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
- * Atom feeds for websites that don't have one.
- *
- * For the full license information, please view the UNLICENSE file distributed
- * with this source code.
- *
- * @package Core
- * @license http://unlicense.org/ UNLICENSE
- * @link    https://github.com/rss-bridge/rss-bridge
- */
-
-class DetectAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        $targetURL = $request['url'] ?? null;
-        $format = $request['format'] ?? null;
-
-        if (!$targetURL) {
-            throw new \Exception('You must specify a url!');
-        }
-        if (!$format) {
-            throw new \Exception('You must specify a format!');
-        }
-
-        $bridgeFactory = new BridgeFactory();
-
-        foreach ($bridgeFactory->getBridgeClassNames() as $bridgeClassName) {
-            if (!$bridgeFactory->isEnabled($bridgeClassName)) {
-                continue;
-            }
-
-            $bridge = $bridgeFactory->create($bridgeClassName);
-
-            $bridgeParams = $bridge->detectParameters($targetURL);
-
-            if (is_null($bridgeParams)) {
-                continue;
-            }
-
-            $bridgeParams['bridge'] = $bridgeClassName;
-            $bridgeParams['format'] = $format;
-
-            $url = '?action=display&' . http_build_query($bridgeParams);
-            return new Response('', 301, ['Location' => $url]);
-        }
-
-        throw new \Exception('No bridge found for given URL: ' . $targetURL);
-    }
-}

actions/DisplayAction.php

@@ -1,260 +0,0 @@
-<?php
-
-/**
- * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
- * Atom feeds for websites that don't have one.
- *
- * For the full license information, please view the UNLICENSE file distributed
- * with this source code.
- *
- * @package Core
- * @license http://unlicense.org/ UNLICENSE
- * @link    https://github.com/rss-bridge/rss-bridge
- */
-
-class DisplayAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        if (Configuration::getConfig('system', 'enable_maintenance_mode')) {
-            return new Response('503 Service Unavailable', 503);
-        }
-
-        $bridgeFactory = new BridgeFactory();
-
-        $bridgeClassName = $bridgeFactory->createBridgeClassName($request['bridge'] ?? '');
-
-        $format = $request['format'] ?? null;
-        if (!$format) {
-            throw new \Exception('You must specify a format!');
-        }
-        if (!$bridgeFactory->isEnabled($bridgeClassName)) {
-            throw new \Exception('This bridge is not whitelisted');
-        }
-
-        $formatFactory = new FormatFactory();
-        $format = $formatFactory->create($format);
-
-        $bridge = $bridgeFactory->create($bridgeClassName);
-        $bridge->loadConfiguration();
-
-        $noproxy = $request['_noproxy'] ?? null;
-        if (
-            Configuration::getConfig('proxy', 'url')
-            && Configuration::getConfig('proxy', 'by_bridge')
-            && $noproxy
-        ) {
-            // This const is only used once in getContents()
-            define('NOPROXY', true);
-        }
-
-        $cacheTimeout = $request['_cache_timeout'] ?? null;
-        if (Configuration::getConfig('cache', 'custom_timeout') && $cacheTimeout) {
-            $cacheTimeout = (int) $cacheTimeout;
-        } else {
-            // At this point the query argument might still be in the url but it won't be used
-            $cacheTimeout = $bridge->getCacheTimeout();
-        }
-
-        // Remove parameters that don't concern bridges
-        $bridge_params = array_diff_key(
-            $request,
-            array_fill_keys(
-                [
-                    'action',
-                    'bridge',
-                    'format',
-                    '_noproxy',
-                    '_cache_timeout',
-                    '_error_time'
-                ],
-                ''
-            )
-        );
-
-        // Remove parameters that don't concern caches
-        $cache_params = array_diff_key(
-            $request,
-            array_fill_keys(
-                [
-                    'action',
-                    'format',
-                    '_noproxy',
-                    '_cache_timeout',
-                    '_error_time'
-                ],
-                ''
-            )
-        );
-
-        $cache = RssBridge::getCache();
-        $cache->setScope('');
-        $cache->setKey($cache_params);
-        // This cache purge will basically delete all cache items older than 24h, regardless of scope and key
-        $cache->purgeCache(86400);
-
-        $items = [];
-        $infos = [];
-        $mtime = $cache->getTime();
-
-        if (
-            $mtime
-            && (time() - $cacheTimeout < $mtime)
-            && !Debug::isEnabled()
-        ) {
-            // At this point we found the feed in the cache and debug mode is disabled
-
-            if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-                // The client wants to know if the feed has changed since its last check
-                $stime = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
-                if ($mtime <= $stime) {
-                    $lastModified2 = gmdate('D, d M Y H:i:s ', $mtime) . 'GMT';
-                    return new Response('', 304, ['Last-Modified' => $lastModified2]);
-                }
-            }
-
-            // Load the feed from cache and prepare it
-            $cached = $cache->loadData();
-            if (isset($cached['items']) && isset($cached['extraInfos'])) {
-                foreach ($cached['items'] as $item) {
-                    $items[] = new FeedItem($item);
-                }
-                $infos = $cached['extraInfos'];
-            }
-        } else {
-            // At this point we did NOT find the feed in the cache or debug mode is enabled.
-            try {
-                $bridge->setDatas($bridge_params);
-                $bridge->collectData();
-
-                $items = $bridge->getItems();
-
-                if (isset($items[0]) && is_array($items[0])) {
-                    $feedItems = [];
-                    foreach ($items as $item) {
-                        $feedItems[] = new FeedItem($item);
-                    }
-                    $items = $feedItems;
-                }
-                $infos = [
-                    'name' => $bridge->getName(),
-                    'uri'  => $bridge->getURI(),
-                    'donationUri'  => $bridge->getDonationURI(),
-                    'icon' => $bridge->getIcon()
-                ];
-            } catch (\Throwable $e) {
-                if ($e instanceof HttpException) {
-                    // Produce a smaller log record for http exceptions
-                    Logger::warning(sprintf('Exception in %s: %s', $bridgeClassName, create_sane_exception_message($e)));
-                } else {
-                    // Log the exception
-                    Logger::error(sprintf('Exception in %s', $bridgeClassName), ['e' => $e]);
-                }
-
-                // Emit error only if we are passed the error report limit
-                $errorCount = self::logBridgeError($bridge->getName(), $e->getCode());
-                if ($errorCount >= Configuration::getConfig('error', 'report_limit')) {
-                    if (Configuration::getConfig('error', 'output') === 'feed') {
-                        // Emit the error as a feed item in a feed so that feed readers can pick it up
-                        $items[] = $this->createFeedItemFromException($e, $bridge);
-                    } elseif (Configuration::getConfig('error', 'output') === 'http') {
-                        // Emit as a regular web response
-                        throw $e;
-                    }
-                }
-            }
-
-            // Unfortunately need to set scope and key again because they might be modified
-            $cache->setScope('');
-            $cache->setKey($cache_params);
-            $cache->saveData([
-                'items' => array_map(function (FeedItem $item) {
-                    return $item->toArray();
-                }, $items),
-                'extraInfos' => $infos
-            ]);
-        }
-
-        $format->setItems($items);
-        $format->setExtraInfos($infos);
-        $lastModified = $cache->getTime();
-        $format->setLastModified($lastModified);
-        $headers = [];
-        if ($lastModified) {
-            $headers['Last-Modified'] = gmdate('D, d M Y H:i:s ', $lastModified) . 'GMT';
-        }
-        $headers['Content-Type'] = $format->getMimeType() . '; charset=' . $format->getCharset();
-        return new Response($format->stringify(), 200, $headers);
-    }
-
-    private function createFeedItemFromException($e, BridgeInterface $bridge): FeedItem
-    {
-        $item = new FeedItem();
-
-        // Create a unique identifier every 24 hours
-        $uniqueIdentifier = urlencode((int)(time() / 86400));
-        $itemTitle = sprintf('Bridge returned error %s! (%s)', $e->getCode(), $uniqueIdentifier);
-        $item->setTitle($itemTitle);
-        $item->setURI(get_current_url());
-        $item->setTimestamp(time());
-
-        // Create an item identifier for feed readers e.g. "staysafetv twitch videos_19389"
-        $item->setUid($bridge->getName() . '_' . $uniqueIdentifier);
-
-        $content = render_template(__DIR__ . '/../templates/bridge-error.html.php', [
-            'error' => render_template(__DIR__ . '/../templates/error.html.php', ['e' => $e]),
-            'searchUrl' => self::createGithubSearchUrl($bridge),
-            'issueUrl' => self::createGithubIssueUrl($bridge, $e, create_sane_exception_message($e)),
-            'maintainer' => $bridge->getMaintainer(),
-        ]);
-        $item->setContent($content);
-        return $item;
-    }
-
-    private static function logBridgeError($bridgeName, $code)
-    {
-        $cache = RssBridge::getCache();
-        $cache->setScope('error_reporting');
-        $cache->setkey([$bridgeName . '_' . $code]);
-
-        if ($report = $cache->loadData()) {
-            $report = Json::decode($report);
-            $report['time'] = time();
-            $report['count']++;
-        } else {
-            $report = [
-                'error' => $code,
-                'time' => time(),
-                'count' => 1,
-            ];
-        }
-        $cache->saveData(Json::encode($report));
-        return $report['count'];
-    }
-
-    private static function createGithubIssueUrl($bridge, $e, string $message): string
-    {
-        return sprintf('https://github.com/RSS-Bridge/rss-bridge/issues/new?%s', http_build_query([
-            'title' => sprintf('%s failed with error %s', $bridge->getName(), $e->getCode()),
-            'body' => sprintf(
-                "```\n%s\n\n%s\n\nQuery string: %s\nVersion: %s\nOs: %s\nPHP version: %s\n```",
-                $message,
-                implode("\n", trace_to_call_points(trace_from_exception($e))),
-                $_SERVER['QUERY_STRING'] ?? '',
-                Configuration::getVersion(),
-                PHP_OS_FAMILY,
-                phpversion() ?: 'Unknown'
-            ),
-            'labels' => 'Bridge-Broken',
-            'assignee' => $bridge->getMaintainer(),
-        ]));
-    }
-
-    private static function createGithubSearchUrl($bridge): string
-    {
-        return sprintf(
-            'https://github.com/RSS-Bridge/rss-bridge/issues?q=%s',
-            urlencode('is:issue is:open ' . $bridge->getName())
-        );
-    }
-}

actions/FrontpageAction.php

@@ -1,36 +0,0 @@
-<?php
-
-final class FrontpageAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        $showInactive = (bool) ($request['show_inactive'] ?? null);
-        $activeBridges = 0;
-
-        $bridgeFactory = new BridgeFactory();
-        $bridgeClassNames = $bridgeFactory->getBridgeClassNames();
-
-        $formatFactory = new FormatFactory();
-        $formats = $formatFactory->getFormatNames();
-
-        $body = '';
-        foreach ($bridgeClassNames as $bridgeClassName) {
-            if ($bridgeFactory->isEnabled($bridgeClassName)) {
-                $body .= BridgeCard::displayBridgeCard($bridgeClassName, $formats);
-                $activeBridges++;
-            } elseif ($showInactive) {
-                $body .= BridgeCard::displayBridgeCard($bridgeClassName, $formats, false) . PHP_EOL;
-            }
-        }
-
-        return render(__DIR__ . '/../templates/frontpage.html.php', [
-            'messages' => [],
-            'admin_email' => Configuration::getConfig('admin', 'email'),
-            'admin_telegram' => Configuration::getConfig('admin', 'telegram'),
-            'bridges' => $body,
-            'active_bridges' => $activeBridges,
-            'total_bridges' => count($bridgeClassNames),
-            'show_inactive' => $showInactive,
-        ]);
-    }
-}

actions/HealthAction.php

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-class HealthAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        $response = [
-            'code' => 200,
-            'message' => 'all is good',
-        ];
-        return new Response(Json::encode($response), 200, ['content-type' => 'application/json']);
-    }
-}

actions/ListAction.php

@@ -1,42 +0,0 @@
-<?php
-
-/**
- * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
- * Atom feeds for websites that don't have one.
- *
- * For the full license information, please view the UNLICENSE file distributed
- * with this source code.
- *
- * @package Core
- * @license http://unlicense.org/ UNLICENSE
- * @link    https://github.com/rss-bridge/rss-bridge
- */
-
-class ListAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        $list = new \stdClass();
-        $list->bridges = [];
-        $list->total = 0;
-
-        $bridgeFactory = new BridgeFactory();
-
-        foreach ($bridgeFactory->getBridgeClassNames() as $bridgeClassName) {
-            $bridge = $bridgeFactory->create($bridgeClassName);
-
-            $list->bridges[$bridgeClassName] = [
-                'status' => $bridgeFactory->isEnabled($bridgeClassName) ? 'active' : 'inactive',
-                'uri' => $bridge->getURI(),
-                'donationUri' => $bridge->getDonationURI(),
-                'name' => $bridge->getName(),
-                'icon' => $bridge->getIcon(),
-                'parameters' => $bridge->getParameters(),
-                'maintainer' => $bridge->getMaintainer(),
-                'description' => $bridge->getDescription()
-            ];
-        }
-        $list->total = count($list->bridges);
-        return new Response(Json::encode($list), 200, ['Content-Type' => 'application/json']);
-    }
-}

actions/SetBridgeCacheAction.php

@@ -1,50 +0,0 @@
-<?php
-
-/**
- * This file is part of RSS-Bridge, a PHP project capable of generating RSS and
- * Atom feeds for websites that don't have one.
- *
- * For the full license information, please view the UNLICENSE file distributed
- * with this source code.
- *
- * @package Core
- * @license http://unlicense.org/ UNLICENSE
- * @link    https://github.com/rss-bridge/rss-bridge
- */
-
-class SetBridgeCacheAction implements ActionInterface
-{
-    public function execute(array $request)
-    {
-        $authenticationMiddleware = new ApiAuthenticationMiddleware();
-        $authenticationMiddleware($request);
-
-        $key = $request['key'] or returnClientError('You must specify key!');
-
-        $bridgeFactory = new BridgeFactory();
-
-        $bridgeClassName = $bridgeFactory->createBridgeClassName($request['bridge'] ?? '');
-
-        // whitelist control
-        if (!$bridgeFactory->isEnabled($bridgeClassName)) {
-            throw new \Exception('This bridge is not whitelisted', 401);
-            die;
-        }
-
-        $bridge = $bridgeFactory->create($bridgeClassName);
-        $bridge->loadConfiguration();
-        $value = $request['value'];
-
-        $cache = RssBridge::getCache();
-        $cache->setScope(get_class($bridge));
-        if (!is_array($key)) {
-            // not sure if $key is an array when it comes in from request
-            $key = [$key];
-        }
-        $cache->setKey($key);
-        $cache->saveData($value);
-
-        header('Content-Type: text/plain');
-        echo 'done';
-    }
-}

app.json

@@ -1,8 +0,0 @@
-{
-  "service": "Heroku",
-  "name": "rss-bridge-heroku",
-  "description": "RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one.",
-  "repository": "https://github.com/RSS-Bridge/rss-bridge?1651005770",
-  "keywords": ["php", "rss-bridge", "rss"]
-}
-

bridges/ABCNewsBridge.php

@@ -1,49 +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 = [
-        [
-            'topic' => [
-                'type' => 'list',
-                'name' => 'Region',
-                'title' => 'Choose state',
-                'values' => [
-                    'ACT' => 'act',
-                    'NSW' => 'nsw',
-                    'NT' => 'nt',
-                    'QLD' => 'qld',
-                    'SA' => 'sa',
-                    'TAS' => 'tas',
-                    'VIC' => 'vic',
-                    'WA' => 'wa'
-                ],
-            ]
-        ]
-    ];
-
-    public function collectData()
-    {
-        $url = sprintf('https://www.abc.net.au/news/%s', $this->getInput('topic'));
-        $dom = getSimpleHTMLDOM($url);
-        $dom = $dom->find('div[data-component="CardList"]', 0);
-        if (!$dom) {
-            throw new \Exception(sprintf('Unable to find css selector on `%s`', $url));
-        }
-        $dom = defaultLinkTo($dom, $this->getURI());
-        foreach ($dom->find('div[data-component="GenericCard"]') as $article) {
-            $a = $article->find('a', 0);
-            $this->items[] = [
-                'title' => $a->plaintext,
-                'uri' => $a->href,
-                'content' => $article->find('[data-component="CardDescription"]', 0)->plaintext,
-                'timestamp' => strtotime($article->find('time', 0)->datetime),
-            ];
-        }
-    }
-}

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/ABolaBridge.php

@@ -1,116 +0,0 @@
-<?php
-
-class ABolaBridge extends BridgeAbstract
-{
-    const NAME = 'A Bola';
-    const URI = 'https://abola.pt/';
-    const DESCRIPTION = 'Returns news from the Portuguese sports newspaper A BOLA.PT';
-    const MAINTAINER = 'rmscoelho';
-    const CACHE_TIMEOUT = 3600;
-    const PARAMETERS = [
-        [
-            'feed' => [
-                'name' => 'News Feed',
-                'type' => 'list',
-                'title' => 'Feeds from the Portuguese sports newspaper A BOLA.PT',
-                'values' => [
-                    'Últimas' => 'Nnh/Noticias',
-                    'Seleção Nacional' => 'Selecao/Noticias',
-                    'Futebol Nacional' => [
-                        'Notícias' => 'Nacional/Noticias',
-                        'Primeira Liga' => 'Nacional/Liga/Noticias',
-                        'Liga 2' => 'Nacional/Liga2/Noticias',
-                        'Liga 3' => 'Nacional/Liga3/Noticias',
-                        'Liga Revelação' => 'Nacional/Liga-Revelacao/Noticias',
-                        'Campeonato de Portugal' => 'Nacional/Campeonato-Portugal/Noticias',
-                        'Distritais' => 'Nacional/Distritais/Noticias',
-                        'Taça de Portugal' => 'Nacional/TPortugal/Noticias',
-                        'Futebol Feminino' => 'Nacional/FFeminino/Noticias',
-                        'Futsal' => 'Nacional/Futsal/Noticias',
-                    ],
-                    'Futebol Internacional' => [
-                        'Notícias' => 'Internacional/Noticias/Noticias',
-                        'Liga dos Campeões' => 'Internacional/Liga-dos-campeoes/Noticias',
-                        'Liga Europa' => 'Internacional/Liga-europa/Noticias',
-                        'Liga Conferência' => 'Internacional/Liga-conferencia/Noticias',
-                        'Liga das Nações' => 'Internacional/Liga-das-nacoes/Noticias',
-                        'UEFA Youth League' => 'Internacional/Uefa-Youth-League/Noticias',
-                    ],
-                    'Mercado' => 'Mercado',
-                    'Modalidades' => 'Modalidades/Noticias',
-                    'Motores' => 'Motores/Noticias',
-                ]
-            ]
-        ]
-    ];
-
-    public function getIcon()
-    {
-        return 'https://abola.pt/img/icons/favicon-96x96.png';
-    }
-
-    public function getName()
-    {
-        return !is_null($this->getKey('feed')) ? self::NAME . ' | ' . $this->getKey('feed') : self::NAME;
-    }
-
-    public function getURI()
-    {
-        return self::URI . $this->getInput('feed');
-    }
-
-    public function collectData()
-    {
-        $url = sprintf('https://abola.pt/%s', $this->getInput('feed'));
-        $dom = getSimpleHTMLDOM($url);
-        if ($this->getInput('feed') !== 'Mercado') {
-            $dom = $dom->find('div#body_Todas1_upNoticiasTodas', 0);
-        } else {
-            $dom = $dom->find('div#body_NoticiasMercado_upNoticiasTodas', 0);
-        }
-        if (!$dom) {
-            throw new \Exception(sprintf('Unable to find css selector on `%s`', $url));
-        }
-        $dom = defaultLinkTo($dom, $this->getURI());
-        foreach ($dom->find('div.media') as $key => $article) {
-            //Get thumbnail
-            $image = $article->find('.media-img', 0)->style;
-            $image = preg_replace('/background-image: url\(/i', '', $image);
-            $image = substr_replace($image, '', -4);
-            $image = preg_replace('/https:\/\//i', '', $image);
-            $image = preg_replace('/www\./i', '', $image);
-            $image = preg_replace('/\/\//', '/', $image);
-            $image = preg_replace('/\/\/\//', '//', $image);
-            $image = substr($image, 7);
-            $image = 'https://' . $image;
-            $image = preg_replace('/ptimg/', 'pt/img', $image);
-            $image = preg_replace('/\/\/bola/', 'www.abola', $image);
-            //Timestamp
-            $date = date('Y/m/d');
-            if (!is_null($article->find("span#body_Todas1_rptNoticiasTodas_lblData_$key", 0))) {
-                $date = $article->find("span#body_Todas1_rptNoticiasTodas_lblData_$key", 0)->plaintext;
-                $date = preg_replace('/\./', '/', $date);
-            }
-            $time = $article->find("span#body_Todas1_rptNoticiasTodas_lblHora_$key", 0)->plaintext;
-            $date = explode('/', $date);
-            $time = explode(':', $time);
-            $year = $date[0];
-            $month = $date[1];
-            $day = $date[2];
-            $hour = $time[0];
-            $minute = $time[1];
-            $timestamp = mktime($hour, $minute, 0, $month, $day, $year);
-            //Content
-            $image = '<img src="' . $image . '" alt="' . $article->find('h4 span', 0)->plaintext . '" />';
-            $description = '<p>' . $article->find('.media-texto > span', 0)->plaintext . '</p>';
-            $content = $image . '</br>' . $description;
-            $a = $article->find('.media-body > a', 0);
-            $this->items[] = [
-                'title' => $a->find('h4 span', 0)->plaintext,
-                'uri' => $a->href,
-                'content' => $content,
-                'timestamp' => $timestamp,
-            ];
-        }
-    }
-}

bridges/AO3Bridge.php

@@ -1,134 +0,0 @@
-<?php
-
-class AO3Bridge extends BridgeAbstract
-{
-    const NAME = 'AO3';
-    const URI = 'https://archiveofourown.org/';
-    const CACHE_TIMEOUT = 1800;
-    const DESCRIPTION = 'Returns works or chapters from Archive of Our Own';
-    const MAINTAINER = 'Obsidienne';
-    const PARAMETERS = [
-        'List' => [
-            'url' => [
-                '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',
-            ],
-        ],
-        'Bookmarks' => [
-            'user' => [
-                'name' => 'user',
-                'required' => true,
-                // Example: Nyaaru's bookmarks
-                'exampleValue' => 'Nyaaru',
-            ],
-        ],
-        'Work' => [
-            'id' => [
-                'name' => 'id',
-                'required' => true,
-                // Example: latest chapters from A Better Past by LysSerris
-                'exampleValue' => '18181853',
-            ],
-        ]
-    ];
-
-    public function collectData()
-    {
-        switch ($this->queriedContext) {
-            case 'Bookmarks':
-                $user = $this->getInput('user');
-                $this->title = $user;
-                $url = self::URI
-                    . '/users/' . $user
-                    . '/bookmarks?bookmark_search[sort_column]=bookmarkable_date';
-                $this->collectList($url);
-                break;
-            case 'List':
-                $this->collectList($this->getInput('url'));
-                break;
-            case 'Work':
-                $this->collectWork($this->getInput('id'));
-                break;
-        }
-    }
-
-    /**
-     * Feed for lists of works (e.g. recent works, search results, filtered tags,
-     * bookmarks, series, collections).
-     */
-    private function collectList($url)
-    {
-        $html = getSimpleHTMLDOM($url);
-        $html = defaultLinkTo($html, self::URI);
-
-        foreach ($html->find('.index.group > li') as $element) {
-            $item = [];
-
-            $title = $element->find('div h4 a', 0);
-            if (!isset($title)) {
-                continue; // discard deleted works
-            }
-            $item['title'] = $title->plaintext;
-            $item['content'] = $element;
-            $item['uri'] = $title->href;
-
-            $strdate = $element->find('div p.datetime', 0)->plaintext;
-            $item['timestamp'] = strtotime($strdate);
-
-            $chapters = $element->find('dl dd.chapters', 0);
-            // bookmarked series and external works do not have a chapters count
-            $chapters = (isset($chapters) ? $chapters->plaintext : 0);
-            $item['uid'] = $item['uri'] . "/$strdate/$chapters";
-
-            $this->items[] = $item;
-        }
-    }
-
-    /**
-     * Feed for recent chapters of a specific work.
-     */
-    private function collectWork($id)
-    {
-        $url = self::URI . "/works/$id/navigate";
-        $response = _http_request($url, ['useragent' => 'rss-bridge bot (https://github.com/RSS-Bridge/rss-bridge)']);
-        $html = \str_get_html($response['body']);
-        $html = defaultLinkTo($html, self::URI);
-
-        $this->title = $html->find('h2 a', 0)->plaintext;
-
-        foreach ($html->find('ol.index.group > li') as $element) {
-            $item = [];
-
-            $item['title'] = $element->find('a', 0)->plaintext;
-            $item['content'] = $element;
-            $item['uri'] = $element->find('a', 0)->href;
-
-            $strdate = $element->find('span.datetime', 0)->plaintext;
-            $strdate = str_replace('(', '', $strdate);
-            $strdate = str_replace(')', '', $strdate);
-            $item['timestamp'] = strtotime($strdate);
-
-            $item['uid'] = $item['uri'] . "/$strdate";
-
-            $this->items[] = $item;
-        }
-
-        $this->items = array_reverse($this->items);
-    }
-
-    public function getName()
-    {
-        $name = parent::getName() . " $this->queriedContext";
-        if (isset($this->title)) {
-            $name .= " - $this->title";
-        }
-        return $name;
-    }
-
-    public function getIcon()
-    {
-        return self::URI . '/favicon.ico';
-    }
-}

bridges/ARDAudiothekBridge.php

@@ -1,158 +0,0 @@
-<?php
-
-class ARDAudiothekBridge extends BridgeAbstract
-{
-    const NAME = 'ARD-Audiothek Bridge';
-    const URI = 'https://www.ardaudiothek.de';
-    const DESCRIPTION = 'Feed of any show in the ARD-Audiothek, specified by its path';
-    const MAINTAINER = 'Mar-Koeh';
-    /*
-     * The URL Prefix of the API
-     * @const APIENDPOINT https-URL of the used endpoint, ending in `/`
-     */
-    const APIENDPOINT = 'https://api.ardaudiothek.de/';
-    /*
-     * The requested width of the preview image
-     * 448 and 128 have been observed on the wild
-     * @const IMAGEWIDTH width in px of the preview image
-     */
-    const IMAGEWIDTH = 448;
-    /*
-     * Placeholder that will be replace by IMAGEWIDTH in the preview image URL
-     * @const IMAGEWIDTHPLACEHOLDER
-     */
-    const IMAGEWIDTHPLACEHOLDER = '{width}';
-    /*
-     * File extension appended to image link in $this->icon
-     * @const IMAGEEXTENSION
-     */
-    const IMAGEEXTENSION = '.jpg';
-
-    const PARAMETERS = [
-        [
-            'path' => [
-                'name' => 'Show Link or ID',
-                'required' => true,
-                'title' => 'Link to the show page or just its numeric suffix',
-                'defaultValue' => 'https://www.ardaudiothek.de/sendung/kalk-welk/10777871/'
-            ],
-            'limit' => self::LIMIT,
-        ]
-    ];
-
-
-    /**
-     * Holds the title of the current show
-     *
-     * @var string
-     */
-    private $title;
-
-    /**
-     * Holds the URI of the show
-     *
-     * @var string
-     */
-    private $uri;
-
-    /**
-     * Holds the icon of the feed
-     *
-     */
-    private $icon;
-
-    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 . 'programsets/' . $showID . '/';
-        $rawJSON = getContents($url);
-        $processedJSON = json_decode($rawJSON)->data->programSet;
-
-        $limit = $this->getInput('limit');
-        $answerLength = 1;
-        $offset = 0;
-        $numberOfElements = 1;
-
-        while ($answerLength != 0 && $offset < $numberOfElements && (is_null($limit) || $offset < $limit)) {
-            $rawJSON = getContents($url . '?offset=' . $offset);
-            $processedJSON = json_decode($rawJSON)->data->programSet;
-
-            $answerLength = count($processedJSON->items->nodes);
-            $offset = $offset + $answerLength;
-            $numberOfElements = $processedJSON->numberOfElements;
-
-            foreach ($processedJSON->items->nodes as $audio) {
-                $item = [];
-                $item['uri'] = $audio->sharingUrl;
-                $item['title'] = $audio->title;
-                $imageSquare = str_replace(self::IMAGEWIDTHPLACEHOLDER, self::IMAGEWIDTH, $audio->image->url1X1);
-                $image = str_replace(self::IMAGEWIDTHPLACEHOLDER, self::IMAGEWIDTH, $audio->image->url);
-                $item['enclosures'] = [
-                    $audio->audios[0]->url,
-                    $imageSquare
-                ];
-                // synopsis in list is shortened, full synopsis is available using one request per item
-                $item['content'] = '<img src="' . $image . '" /><p>' . $audio->synopsis . '</p>';
-                $item['timestamp'] = $audio->publicationStartDateAndTime;
-                $item['uid'] = $audio->id;
-                $item['author'] = $audio->programSet->publicationService->title;
-                $item['categories'] = [ $audio->programSet->editorialCategories->title ];
-                $this->items[] = $item;
-            }
-        }
-        $this->title = $processedJSON->title;
-        $this->uri = $processedJSON->sharingUrl;
-        $this->icon = str_replace(self::IMAGEWIDTHPLACEHOLDER, self::IMAGEWIDTH, $processedJSON->image->url1X1);
-        // add image file extension to URL so icon is shown in generated RSS feeds, see
-        // https://github.com/RSS-Bridge/rss-bridge/blob/4aed05c7b678b5673386d61374bba13637d15487/formats/MrssFormat.php#L76
-        $this->icon = $this->icon . self::IMAGEEXTENSION;
-
-        $this->items = array_slice($this->items, 0, $limit);
-
-        date_default_timezone_set($oldTz);
-    }
-
-    /** {@inheritdoc} */
-    public function getURI()
-    {
-        if (!empty($this->uri)) {
-            return $this->uri;
-        }
-        return parent::getURI();
-    }
-
-    /** {@inheritdoc} */
-    public function getName()
-    {
-        if (!empty($this->title)) {
-            return $this->title;
-        }
-        return parent::getName();
-    }
-
-    /** {@inheritdoc} */
-    public function getIcon()
-    {
-        if (!empty($this->icon)) {
-            return $this->icon;
-        }
-        return parent::getIcon();
-    }
-}

bridges/ARDMediathekBridge.php

@@ -1,98 +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 = [
-        [
-            'path' => [
-                '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 = [];
-            // 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'] = [
-                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

@@ -1,63 +0,0 @@
-<?php
-
-class ASRockNewsBridge extends BridgeAbstract
-{
-    const NAME = 'ASRock News Bridge';
-    const URI = 'https://www.asrock.com';
-    const DESCRIPTION = 'Returns latest news articles';
-    const MAINTAINER = 'VerifiedJoseph';
-    const PARAMETERS = [];
-
-    const CACHE_TIMEOUT = 3600; // 1 hour
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM(self::URI . '/news/index.asp');
-
-        $html = defaultLinkTo($html, self::URI . '/news/');
-
-        foreach ($html->find('div.inner > a') as $index => $a) {
-            $item = [];
-
-            $articlePath = $a->href;
-
-            $articlePageHtml = getSimpleHTMLDOMCached($articlePath, self::CACHE_TIMEOUT);
-
-            $articlePageHtml = defaultLinkTo($articlePageHtml, self::URI);
-
-            $contents = $articlePageHtml->find('div.Contents', 0);
-
-            $item['uri'] = $articlePath;
-            $item['title'] = $contents->find('h3', 0)->innertext;
-
-            $contents->find('h3', 0)->outertext = '';
-
-            $item['content'] = $contents->innertext;
-            $item['timestamp'] = $this->extractDate($a->plaintext);
-
-            $img = $a->find('img', 0);
-            if ($img) {
-                $item['enclosures'][] = $img->src;
-            }
-
-            $this->items[] = $item;
-
-            if (count($this->items) >= 10) {
-                break;
-            }
-        }
-    }
-
-    private function extractDate($text)
-    {
-        $dateRegex = '/^([0-9]{4}\/[0-9]{1,2}\/[0-9]{1,2})/';
-
-        $text = trim($text);
-
-        if (preg_match($dateRegex, $text, $matches)) {
-            return $matches[1];
-        }
-
-        return '';
-    }
-}

bridges/AcrimedBridge.php

@@ -1,33 +1,17 @@
 <?php
+class AcrimedBridge extends FeedExpander {
 
-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 = [
+	public function collectData(){
-        [
+		$this->collectExpandableDatas(static::URI . 'spip.php?page=backend');
-            'limit' => [
-                'name' => 'limit',
-                'type' => 'number',
-                'defaultValue' => -1,
-            ]
-        ]
-    ];
-
-    public function collectData()
-    {
-        $this->collectExpandableDatas(
-            static::URI . 'spip.php?page=backend',
-            $this->getInput('limit')
-        );
 	}
 
-    protected function parseItem($newsItem)
+	protected function parseItem($newsItem){
-    {
 		$item = parent::parseItem($newsItem);
 
 		$articlePage = getSimpleHTMLDOM($newsItem->link);
@@ -37,4 +21,5 @@ class AcrimedBridge extends FeedExpander
 
 		return $item;
 	}
+
 }

bridges/AirBreizhBridge.php

@@ -1,57 +0,0 @@
-<?php
-
-class AirBreizhBridge extends BridgeAbstract
-{
-    const MAINTAINER = 'fanch317';
-    const NAME = 'Air Breizh';
-    const URI = 'https://www.airbreizh.asso.fr/';
-    const DESCRIPTION = 'Returns newests publications on Air Breizh';
-    const PARAMETERS = [
-        'Publications' => [
-            'theme' => [
-                'name' => 'Thematique',
-                'type' => 'list',
-                'values' => [
-                    'Tout' => '',
-                    'Rapport d\'activite' => 'rapport-dactivite',
-                    'Etude' => 'etudes',
-                    'Information' => 'information',
-                    'Autres documents' => 'autres-documents',
-                    'Plan Régional de Surveillance de la qualité de l’air' => 'prsqa',
-                    'Transport' => 'transport'
-                ]
-            ]
-        ]
-    ];
-
-    public function getIcon()
-    {
-        return 'https://www.airbreizh.asso.fr/voy_content/uploads/2017/11/favicon.png';
-    }
-
-    public function collectData()
-    {
-        $html = '';
-        $html = getSimpleHTMLDOM(static::URI . 'publications/?fwp_publications_thematiques=' . $this->getInput('theme'))
-            or returnClientError('No results for this query.');
-
-        foreach ($html->find('article') as $article) {
-            $item = [];
-            // Title
-            $item['title'] = $article->find('h2', 0)->plaintext;
-            // Author
-            $item['author'] = 'Air Breizh';
-            // Image
-            $imagelink = $article->find('.card__image', 0)->find('img', 0)->getAttribute('src');
-            // Content preview
-            $item['content'] = '<img src="' . $imagelink . '" />
-			<br/>'
-            . $article->find('.card__text', 0)->plaintext;
-            // URL
-            $item['uri'] = $article->find('.publi__buttons', 0)->find('a', 0)->getAttribute('href');
-            // ID
-            $item['id'] = $article->find('.publi__buttons', 0)->find('a', 0)->getAttribute('href');
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AlbionOnlineBridge.php

@@ -1,76 +0,0 @@
-<?php
-
-class AlbionOnlineBridge extends BridgeAbstract
-{
-    const NAME = 'Albion Online Changelog';
-    const MAINTAINER = 'otakuf';
-    const URI = 'https://albiononline.com';
-    const DESCRIPTION = 'Returns the changes made to the Albion Online';
-    const CACHE_TIMEOUT = 3600; // 60min
-
-    const PARAMETERS = [ [
-        'postcount' => [
-            'name' => 'Limit',
-            'type' => 'number',
-            'required' => true,
-            'title' => 'Maximum number of items to return',
-            'defaultValue' => 5,
-        ],
-        'language' => [
-            'name' => 'Language',
-            'type' => 'list',
-            'values' => [
-                'English' => 'en',
-                'Deutsch' => 'de',
-                'Polski' => 'pl',
-                'Français' => 'fr',
-                'Русский' => 'ru',
-                'Português' => 'pt',
-                'Español' => 'es',
-             ],
-            'title' => 'Language of changelog posts',
-            'defaultValue' => 'en',
-        ],
-        'full' => [
-            'name' => 'Full changelog',
-            'type' => 'checkbox',
-            'required' => false,
-            'title' => 'Enable to receive the full changelog post for each item'
-        ],
-    ]];
-
-    public function collectData()
-    {
-        $api = 'https://albiononline.com/';
-        // Example: https://albiononline.com/en/changelog/1/5
-        $url = $api . $this->getInput('language') . '/changelog/1/' . $this->getInput('postcount');
-
-        $html = getSimpleHTMLDOM($url);
-
-        foreach ($html->find('li') as $data) {
-            $item = [];
-            $item['uri'] = self::URI . $data->find('a', 0)->getAttribute('href');
-            $item['title'] = trim(explode('|', $data->find('span', 0)->plaintext)[0]);
-            // Time below work only with en lang. Need to think about solution. May be separate request like getFullChangelog, but to english list for all language
-            //print_r( date_parse_from_format( 'M j, Y' , 'Sep 9, 2020') );
-            //$item['timestamp'] = $this->extractDate($a->plaintext);
-            $item['author'] = 'albiononline.com';
-            if ($this->getInput('full')) {
-                $item['content'] = $this->getFullChangelog($item['uri']);
-            } else {
-                //$item['content'] = trim(preg_replace('/\s+/', ' ', $data->find('span', 0)->plaintext));
-                // Just use title, no info at all or use title and date, see above
-                $item['content'] = $item['title'];
-            }
-            $item['uid'] = hash('sha256', $item['title']);
-            $this->items[] = $item;
-        }
-    }
-
-    private function getFullChangelog($url)
-    {
-        $html = getSimpleHTMLDOMCached($url);
-        $html = defaultLinkTo($html, self::URI);
-        return $html->find('div.small-12.columns', 1)->innertext;
-    }
-}

bridges/AlfaBankByBridge.php

@@ -1,87 +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 = [
-        'News' => [
-            'business' => [
-                'name' => 'Альфа Бизнес',
-                'type' => 'list',
-                'title' => 'В зависимости от выбора, возращает уведомления для" .
-					" клиентов физ. лиц либо для клиентов-юридических лиц и ИП',
-                'values' => [
-                    'Новости' => 'news',
-                    'Новости бизнеса' => 'newsBusiness'
-                ],
-                'defaultValue' => 'news'
-            ],
-            'fullContent' => [
-                '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 = [];
-                $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 = [
-            'Января', 'Февраля', 'Марта', 'Апреля', 'Мая', 'Июня',
-            'Июля', 'Августа', 'Сентября', 'Октября', 'Ноября', 'Декабря' ];
-        $enMonths = [
-            'January', 'February', 'March', 'April', 'May', 'June',
-            'July', 'August', 'September', 'October', 'November', 'December' ];
-        return str_replace($ruMonths, $enMonths, $date);
-    }
-}

bridges/AllSidesBridge.php

@@ -1,85 +0,0 @@
-<?php
-
-class AllSidesBridge extends BridgeAbstract
-{
-    const NAME = 'AllSides';
-    const URI = 'https://www.allsides.com';
-    const DESCRIPTION = 'Balanced news and media bias ratings.';
-    const MAINTAINER = 'Oliver Nutter';
-    const PARAMETERS = [
-        'global' => [
-            'limit' => [
-                'name' => 'Number of posts to return',
-                'type' => 'number',
-                'defaultValue' => 10,
-                'required' => false,
-                'title' => 'Zero or negative values return all posts (ignored if not fetching full article)',
-            ],
-            'fetch' => [
-                'name' => 'Fetch full article content',
-                'type' => 'checkbox',
-                'defaultValue' => 'checked',
-            ],
-        ],
-        'Headline Roundups' => [],
-    ];
-
-    private const ROUNDUPS_URI = self::URI . '/headline-roundups';
-
-    public function collectData()
-    {
-        switch ($this->queriedContext) {
-            case 'Headline Roundups':
-                $index = getSimpleHTMLDOM(self::ROUNDUPS_URI);
-                defaultLinkTo($index, self::ROUNDUPS_URI);
-                $entries = $index->find('table.views-table > tbody > tr');
-
-                $limit = (int) $this->getInput('limit');
-                $fetch = (bool) $this->getInput('fetch');
-
-                if ($limit > 0 && $fetch) {
-                    $entries = array_slice($entries, 0, $limit);
-                }
-
-                foreach ($entries as $entry) {
-                    $item = [
-                        'title' => $entry->find('.views-field-name', 0)->text(),
-                        'uri' => $entry->find('a', 0)->href,
-                        'timestamp' => $entry->find('.date-display-single', 0)->content,
-                        'author' => 'AllSides Staff',
-                    ];
-
-                    if ($fetch) {
-                        $article = getSimpleHTMLDOMCached($item['uri']);
-                        defaultLinkTo($article, $item['uri']);
-
-                        $item['content'] = $article->find('.story-id-page-description', 0);
-
-                        foreach ($article->find('.page-tags a') as $tag) {
-                            $item['categories'][] = $tag->text();
-                        }
-                    }
-
-                    $this->items[] = $item;
-                }
-                break;
-        }
-    }
-
-    public function getName()
-    {
-        if ($this->queriedContext) {
-            return self::NAME . " - {$this->queriedContext}";
-        }
-        return self::NAME;
-    }
-
-    public function getURI()
-    {
-        switch ($this->queriedContext) {
-            case 'Headline Roundups':
-                return self::ROUNDUPS_URI;
-        }
-        return self::URI;
-    }
-}

bridges/AllegroBridge.php

@@ -1,144 +0,0 @@
-<?php
-
-class AllegroBridge extends BridgeAbstract
-{
-    const NAME = 'Allegro';
-    const URI = 'https://www.allegro.pl';
-    const DESCRIPTION = 'Returns the search results from the Allegro.pl shopping and bidding portal';
-    const MAINTAINER = 'wrobelda';
-    const PARAMETERS = [[
-        'url' => [
-            'name' => 'Search URL',
-            'title' => 'Copy the URL from your browser\'s address bar after searching for your items and paste it here',
-            'exampleValue' => 'https://allegro.pl/kategoria/swieze-warzywa-cebula-318660',
-            'required' => true,
-        ],
-        'sessioncookie' => [
-            'name' => 'The \'wdctx\' session cookie',
-            'title' => 'Paste the value of the \'wdctx\' cookie from your browser if you want to prevent Allegro imposing rate limits',
-            'pattern' => '^.{250,};?$',
-            // phpcs:ignore
-            'exampleValue' => 'v4.1-oCrmXTMqv2ppC21GTUCKLmUwRPP1ssQVALKuqwsZ1VXjcKgL2vO5TTRM5xMxS9GiyqxF1gAeyc-63dl0coUoBKXCXi_nAmr95yyqGpq2RAFoneZ4L399E8n6iYyemcuGARjAoSfjvLHJCEwvvHHynSgaxlFBu7hUnKfuy39zo9sSQdyTUjotJg3CAZ53q9v2raAnPCyGOAR4ytRILd9p24EJnxp7_oR0XbVPIo1hDa4WmjXFOxph8rHaO5tWd',
-            'required' => false,
-        ],
-        'includeSponsoredOffers' => [
-            'type' => 'checkbox',
-            'name' => 'Include Sponsored Offers'
-        ]
-    ]];
-
-    public function getName()
-    {
-        parse_str(parse_url($this->getInput('url'), PHP_URL_QUERY), $fields);
-
-        if ($query = array_key_exists('string', $fields) ? urldecode($fields['string']) : false) {
-            return $query;
-        }
-
-        return parent::getName();
-    }
-
-    public function getURI()
-    {
-        return $this->getInput('url') ?? parent::getURI();
-    }
-
-    public function collectData()
-    {
-        # make sure we order by the most recently listed offers
-        $url = preg_replace('/([?&])order=[^&]+(&|$)/', '$1', $this->getInput('url'));
-        $url .= (parse_url($url, PHP_URL_QUERY) ? '&' : '?') . 'order=n';
-
-        $opts = [];
-
-        // If a session cookie is provided
-        if ($sessioncookie = $this->getInput('sessioncookie')) {
-            $opts[CURLOPT_COOKIE] = 'wdctx=' . $sessioncookie;
-        }
-
-        $html = getSimpleHTMLDOM($url, [], $opts);
-
-        # if no results found
-        if ($html->find('.mzmg_6m.m9qz_yo._6a66d_-fJr5')) {
-            return;
-        }
-
-        $results = $html->find('._6a66d_V7Lel article');
-
-        if (!$this->getInput('includeSponsoredOffers')) {
-            $results = array_filter($results, function ($node) {
-                return $node->{'data-analytics-view-label'} != 'showSponsoredItems';
-            });
-        }
-
-        foreach ($results as $post) {
-            $item = [];
-
-            $item['uri'] = $post->find('._6a66d_LX75-', 0)->href;
-
-//TODO: port this over, whatever it does, from https://github.com/MK-PL/AllegroRSS
-//        if (arrayLinks.includes('events/clicks?')) {
-//            let sponsoredLink = new URL(arrayLinks).searchParams.get('redirect')
-//          arrayLinks = sponsoredLink.slice(0, sponsoredLink.indexOf('?'))
-//        }
-
-            $item['title'] = $post->find('._6a66d_LX75-', 0)->innertext;
-
-            $item['uid'] = $post->{'data-analytics-view-value'};
-
-            $descriptionPatterns = ['/<\s*dt[^>]*>\b/', '/<\/dt>/', '/<\s*dd[^>]*>\b/', '/<\/dd>/'];
-            $descriptionReplacements = ['<span>', ':</span> ', '<strong>', '&emsp;</strong> '];
-            $description = $post->find('.m7er_k4.mpof_5r.mpof_z0_s', 0)->innertext;
-            $descriptionPretty = preg_replace($descriptionPatterns, $descriptionReplacements, $description);
-
-            $buyNowAuction = $post->find('.mqu1_g3.mvrt_0.mgn2_12', 0)->innertext ?? '';
-            $buyNowAuction = str_replace('</span><span', '</span> <span', $buyNowAuction);
-
-            $auctionTimeLeft = $post->find('._6a66d_ImOzU', 0)->innertext ?? '';
-
-            $price = $post->find('._6a66d_6R3iN', 0)->plaintext;
-            $price = empty($auctionTimeLeft) ? $price : $price . '- kwota licytacji';
-
-            $image = $post->find('._6a66d_44ioA img', 0)->{'data-src'} ?: $post->find('._6a66d_44ioA img', 0)->src ?? false;
-            if ($image) {
-                $item['enclosures'] = [$image . '#.image'];
-            }
-
-            $offerExtraInfo = array_filter($post->find('.mqu1_g3.mgn2_12'), function ($node) {
-                return empty($node->find('.mvrt_0'));
-            });
-
-            $offerExtraInfo = $offerExtraInfo[0]->plaintext ?? '';
-
-            $isSmart = $post->find('._6a66d_TC2Zk', 0)->innertext ?? '';
-            if (str_contains($isSmart, 'z kurierem')) {
-                $offerExtraInfo .= ', Smart z kurierem';
-            } else {
-                $offerExtraInfo .= ', Smart';
-            }
-
-            $item['categories'] = [];
-            $parameters = $post->find('dd');
-            foreach ($parameters as $parameter) {
-                if (in_array(strtolower($parameter->innertext), ['brak', 'nie'])) {
-                    continue;
-                }
-
-                $item['categories'][] = $parameter->innertext;
-            }
-
-            $item['content'] = $descriptionPretty
-                . '<div><strong>'
-                . $price
-                . '</strong></div><div>'
-                . $auctionTimeLeft
-                . '</div><div>'
-                . $buyNowAuction
-                . '</div><dl>'
-                . $offerExtraInfo
-                . '</dl><hr>';
-
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AllocineFRBridge.php

@@ -1,107 +1,87 @@
 <?php
+class AllocineFRBridge extends BridgeAbstract {
 
-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 = [ [
+	const PARAMETERS = array( array(
-        'category' => [
+		'category' => array(
-            'name' => 'Emission',
+			'name' => 'category',
 			'type' => 'list',
-            'title' => 'Sélectionner l\'emission',
+			'required' => true,
-            'values' => [
+			'exampleValue' => 'Faux Raccord',
+			'title' => 'Select your category',
+			'values' => array(
 				'Faux Raccord' => 'faux-raccord',
-                'Fanzone' => 'fanzone',
+				'Top 5' => 'top-5',
-                'Game In Ciné' => 'game-in-cine',
+				'Tueurs en Séries' => 'tueurs-en-serie'
-                'Pour la faire courte' => 'pour-la-faire-courte',
+			)
-                'Home Cinéma' => 'home-cinema',
+		)
-                'PILS - Par Ici Les Sorties' => 'pils-par-ici-les-sorties',
+	));
-                'AlloCiné : l\'émission, sur LeStream' => 'allocine-lemission-sur-lestream',
-                'Give Me Five' => 'give-me-five',
-                'Aviez-vous remarqué ?' => 'aviez-vous-remarque',
-                'Et paf, il est mort' => 'et-paf-il-est-mort',
-                'The Big Fan Theory' => 'the-big-fan-theory',
-                'Clichés' => 'cliches',
-                'Complètement...' => 'completement',
-                '#Fun Facts' => 'fun-facts',
-                'Origin Story' => 'origin-story',
-            ]
-        ]
-    ]];
 
-    public function getURI()
+	public function getURI(){
-    {
 		if(!is_null($this->getInput('category'))) {
-            $categories = [
-                'faux-raccord' => '/video/programme-12284/',
-                'fanzone' => '/video/programme-12298/',
-                'game-in-cine' => '/video/programme-12288/',
-                'pour-la-faire-courte' => '/video/programme-20960/',
-                'home-cinema' => '/video/programme-12287/',
-                'pils-par-ici-les-sorties' => '/video/programme-25789/',
-                'allocine-lemission-sur-lestream' => '/video/programme-25123/',
-                'give-me-five' => '/video/programme-21919/saison-34518/',
-                'aviez-vous-remarque' => '/video/programme-19518/',
-                'et-paf-il-est-mort' => '/video/programme-25113/',
-                'the-big-fan-theory' => '/video/programme-20403/',
-                'cliches' => '/video/programme-24834/',
-                'completement' => '/video/programme-23859/',
-                'fun-facts' => '/video/programme-23040/',
-                'origin-story' => '/video/programme-25667/'
-            ];
 
-            $category = $this->getInput('category');
+			switch($this->getInput('category')) {
-            if (array_key_exists($category, $categories)) {
+			case 'faux-raccord':
-                return static::URI . $this->getLastSeasonURI($categories[$category]);
+				$uri = static::URI . 'video/programme-12284/saison-32180/';
-            } else {
+				break;
-                returnClientError('Emission inconnue');
+			case 'top-5':
+				$uri = static::URI . 'video/programme-12299/saison-29561/';
+				break;
+			case 'tueurs-en-serie':
+				$uri = static::URI . 'video/programme-12286/saison-22938/';
+				break;
 			}
+
+			return $uri;
 		}
 
 		return parent::getURI();
 	}
 
-    private function getLastSeasonURI($category)
+	public function getName(){
-    {
-        $html = getSimpleHTMLDOMCached(static::URI . $category, 86400);
-        $seasonLink = $html->find('section[class=section-wrap section]', 0)->find('div[class=cf]', 0)->find('a', 0);
-        $URI = $seasonLink->href;
-        return $URI;
-    }
-
-    public function getName()
-    {
 		if(!is_null($this->getInput('category'))) {
-            return self::NAME . ' : ' . $this->getKey('category');
+			return self::NAME . ' : '
+				. array_search(
+					$this->getInput('category'),
+					self::PARAMETERS[$this->queriedContext]['category']['values']
+				);
 		}
 
 		return parent::getName();
 	}
 
-    public function collectData()
+	public function collectData(){
-    {
-        $html = getSimpleHTMLDOM($this->getURI());
 
-        foreach ($html->find('div[class=gd-col-left]', 0)->find('div[class*=video-card]') as $element) {
+		$html = getSimpleHTMLDOM($this->getURI())
-            $item = [];
+			or returnServerError('Could not request ' . $this->getURI() . ' !');
 
-            $title = $element->find('a[class*=meta-title-link]', 0);
+		$category = array_search(
-            $content = trim(defaultLinkTo($element->outertext, static::URI));
+				$this->getInput('category'),
+				self::PARAMETERS[$this->queriedContext]['category']['values']
+			);
 
-            // Replace image 'src' with the one in 'data-src'
+		foreach($html->find('.media-meta-list figure.media-meta-fig') as $element) {
-            $content = preg_replace('@src="data:image/gif;base64,[A-Za-z0-9+\/]*"@', '', $content);
+			$item = array();
-            $content = preg_replace('@data-src=@', 'src=', $content);
 
-            // Remove date in the content to prevent content update while the video is getting older
+			$title = $element->find('div.titlebar h3.title a', 0);
-            $content = preg_replace('@<div class="meta-sub light">.*<span>[^<]*</span>[^<]*</div>@', '', $content);
+			$content = trim($element->innertext);
+			$figCaption = strpos($content, $category);
 
+			if($figCaption !== false) {
+				$content = str_replace('src="/', 'src="' . static::URI, $content);
+				$content = str_replace('href="/', 'href="' . static::URI, $content);
+				$content = str_replace('src=\'/', 'src=\'' . static::URI, $content);
+				$content = str_replace('href=\'/', 'href=\'' . static::URI, $content);
 				$item['content'] = $content;
 				$item['title'] = trim($title->innertext);
-            $item['uri'] = static::URI . '/' . substr($title->href, 1);
+				$item['uri'] = static::URI . $title->href;
 				$this->items[] = $item;
 			}
 		}
 	}
+
+}

bridges/AllocineFRSortiesBridge.php

@@ -1,41 +0,0 @@
-<?php
-
-class AllocineFRSortiesBridge extends BridgeAbstract
-{
-    const MAINTAINER = 'Simounet';
-    const NAME = 'AlloCiné Sorties Bridge';
-    const CACHE_TIMEOUT = 25200; // 7h
-    const BASE_URI = 'https://www.allocine.fr';
-    const URI = self::BASE_URI . '/film/sorties-semaine/';
-    const DESCRIPTION = 'Bridge for AlloCiné - Sorties cinéma cette semaine';
-
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM($this->getURI());
-
-        foreach ($html->find('section.section.section-wrap', 0)->find('li.mdl') as $element) {
-            $item = [];
-
-            $thumb = $element->find('figure.thumbnail', 0);
-            $meta = $element->find('div.meta-body', 0);
-            $synopsis = $element->find('div.synopsis', 0);
-
-            $title = $element->find('a[class*=meta-title-link]', 0);
-            $content = trim(defaultLinkTo($thumb->outertext . $meta->outertext . $synopsis->outertext, static::URI));
-
-            // Replace image 'src' with the one in 'data-src'
-            $content = preg_replace('@src="data:image/gif;base64,[A-Za-z0-9=+\/]*"@', '', $content);
-            $content = preg_replace('@data-src=@', 'src=', $content);
-
-            $item['content'] = $content;
-            $item['title'] = trim($title->innertext);
-            $item['uri'] = static::BASE_URI . '/' . substr($title->href, 1);
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AmazonBridge.php

@@ -1,35 +1,36 @@
 <?php
 
-class AmazonBridge extends BridgeAbstract
+class AmazonBridge extends BridgeAbstract {
-{
+
 	const MAINTAINER = 'Alexis CHEMEL';
 	const NAME = 'Amazon';
 	const URI = 'https://www.amazon.com/';
 	const CACHE_TIMEOUT = 3600; // 1h
 	const DESCRIPTION = 'Returns products from Amazon search';
 
-    const PARAMETERS = [[
+	const PARAMETERS = array(array(
-        'q' => [
+		'q' => array(
 			'name' => 'Keyword',
 			'required' => true,
-            'exampleValue' => 'watch',
+		),
-        ],
+		'sort' => array(
-        'sort' => [
 			'name' => 'Sort by',
 			'type' => 'list',
-            'values' => [
+			'required' => false,
+			'values' => array(
 				'Relevance' => 'relevanceblender',
 				'Price: Low to High' => 'price-asc-rank',
 				'Price: High to Low' => 'price-desc-rank',
 				'Average Customer Review' => 'review-rank',
 				'Newest Arrivals' => 'date-desc-rank',
-            ],
+			),
 			'defaultValue' => 'relevanceblender',
-        ],
+		),
-        'tld' => [
+		'tld' => array(
 			'name' => 'Country',
 			'type' => 'list',
-            'values' => [
+			'required' => true,
+			'values' => array(
 				'Australia' => 'com.au',
 				'Brazil' => 'com.br',
 				'Canada' => 'ca',
@@ -41,65 +42,53 @@ class AmazonBridge extends BridgeAbstract
 				'Japan' => 'co.jp',
 				'Mexico' => 'com.mx',
 				'Netherlands' => 'nl',
-                'Poland' => 'pl',
 				'Spain' => 'es',
-                'Sweden' => 'se',
-                'Turkey' => 'com.tr',
 				'United Kingdom' => 'co.uk',
 				'United States' => 'com',
-            ],
+			),
 			'defaultValue' => 'com',
-        ],
+		),
-    ]];
+	));
 
-    public function collectData()
+	public function getName(){
-    {
-        $baseUrl = sprintf('https://www.amazon.%s', $this->getInput('tld'));
-
-        $url = sprintf(
-            '%s/s/?field-keywords=%s&sort=%s',
-            $baseUrl,
-            urlencode($this->getInput('q')),
-            $this->getInput('sort')
-        );
-
-        $dom = getSimpleHTMLDOM($url);
-
-        $elements = $dom->find('div.s-result-item');
-
-        foreach ($elements as $element) {
-            $item = [];
-
-            $title = $element->find('h2', 0);
-            if (!$title) {
-                continue;
-            }
-
-            $item['title'] = $title->innertext;
-
-            $itemUrl = $element->find('a', 0)->href;
-            $item['uri'] = urljoin($baseUrl, $itemUrl);
-
-            $image = $element->find('img', 0);
-            if ($image) {
-                $item['content'] = '<img src="' . $image->getAttribute('src') . '" /><br />';
-            }
-
-            $price = $element->find('span.a-price > .a-offscreen', 0);
-            if ($price) {
-                $item['content'] .= $price->innertext;
-            }
-
-            $this->items[] = $item;
-        }
-    }
-
-    public function getName()
-    {
 		if(!is_null($this->getInput('tld')) && !is_null($this->getInput('q'))) {
 			return 'Amazon.' . $this->getInput('tld') . ': ' . $this->getInput('q');
 		}
 
 		return parent::getName();
 	}
+
+	public function collectData() {
+
+		$uri = 'https://www.amazon.' . $this->getInput('tld') . '/';
+		$uri .= 's/?field-keywords=' . urlencode($this->getInput('q')) . '&sort=' . $this->getInput('sort');
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request Amazon.');
+
+		foreach($html->find('li.s-result-item') as $element) {
+
+			$item = array();
+
+			// Title
+			$title = $element->find('h2', 0);
+
+			$item['title'] = html_entity_decode($title->innertext, ENT_QUOTES);
+
+			// Url
+			$uri = $title->parent()->getAttribute('href');
+			$uri = substr($uri, 0, strrpos($uri, '/'));
+
+			$item['uri'] = substr($uri, 0, strrpos($uri, '/'));
+
+			// Content
+			$image = $element->find('img', 0);
+			$price = $element->find('span.s-price', 0);
+			$price = ($price) ? $price->innertext : '';
+
+			$item['content'] = '<img src="' . $image->getAttribute('src') . '" /><br />' . $price;
+
+			$this->items[] = $item;
+		}
+	}
 }

bridges/AmazonPriceTrackerBridge.php

@@ -1,26 +1,26 @@
 <?php
 
-class AmazonPriceTrackerBridge extends BridgeAbstract
+class AmazonPriceTrackerBridge extends BridgeAbstract {
-{
+	const MAINTAINER = 'captn3m0';
-    const MAINTAINER = 'captn3m0, sal0max';
 	const NAME = 'Amazon Price Tracker';
 	const URI = 'https://www.amazon.com/';
 	const CACHE_TIMEOUT = 3600; // 1h
 	const DESCRIPTION = 'Tracks price for a single product on Amazon';
 
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        [
+		array(
-        'asin' => [
+		'asin' => array(
 			'name' 			=> 'ASIN',
 			'required' 		=> true,
 			'exampleValue' 	=> 'B071GB1VMQ',
 			// https://stackoverflow.com/a/12827734
 			'pattern'		=> 'B[\dA-Z]{9}|\d{9}(X|\d)',
-        ],
+		),
-        'tld' => [
+		'tld' => array(
 			'name' => 'Country',
 			'type' => 'list',
-            'values' => [
+			'required' => true,
+			'values' => array(
 				'Australia' 	=> 'com.au',
 				'Brazil' 		=> 'com.br',
 				'Canada' 		=> 'ca',
@@ -32,45 +32,29 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 				'Japan' 		=> 'co.jp',
 				'Mexico' 		=> 'com.mx',
 				'Netherlands'	=> 'nl',
-                'Poland'        => 'pl',
 				'Spain' 		=> 'es',
-                'Sweden'        => 'se',
-                'Turkey'        => 'com.tr',
 				'United Kingdom'	=> 'co.uk',
 				'United States'		=> 'com',
-            ],
+			),
 			'defaultValue' => 'com',
-        ],
+		),
-        ]];
+	));
-
-    const PRICE_SELECTORS = [
-        '#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;
 
 	/**
 	 * Generates domain name given a amazon TLD
 	 */
-    private function getDomainName()
+	private function getDomainName() {
-    {
 		return 'https://www.amazon.' . $this->getInput('tld');
 	}
 
 	/**
 	 * Generates URI for a Amazon product page
 	 */
-    public function getURI()
+	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();
 	}
@@ -79,8 +63,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 	 * Scrapes the product title from the html page
 	 * returns the default title if scraping fails
 	 */
-    private function getTitle($html)
+	private function getTitle($html) {
-    {
 		$titleTag = $html->find('#productTitle', 0);
 
 		if (!$titleTag) {
@@ -93,8 +76,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 	/**
 	 * Title used by the feed if none could be found
 	 */
-    private function getDefaultTitle()
+	private function getDefaultTitle() {
-    {
 		return 'Amazon.' . $this->getInput('tld') . ': ' . $this->getInput('asin');
 	}
 
@@ -102,8 +84,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 	 * Returns name for the feed
 	 * Uses title (already scraped) if it has one
 	 */
-    public function getName()
+	public function getName() {
-    {
 		if (isset($this->title)) {
 			return $this->title;
 		} else {
@@ -111,8 +92,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 		}
 	}
 
-    private function parseDynamicImage($attribute)
+	private function parseDynamicImage($attribute) {
-    {
 		$json = json_decode(html_entity_decode($attribute), true);
 
 		if ($json and count($json) > 0) {
@@ -123,8 +103,7 @@ class AmazonPriceTrackerBridge extends BridgeAbstract
 	/**
 	 * Returns a generated image tag for the product
 	 */
-    private function getImage($html)
+	private function getImage($html) {
-    {
 		$imageSrc = $html->find('#main-image-container img', 0);
 
 		if ($imageSrc) {
@@ -143,15 +122,13 @@ EOT;
 	 * Return \simple_html_dom object
 	 * for the entire html of the product page
 	 */
-    private function getHtml()
+	private function getHtml() {
-    {
 		$uri = $this->getURI();
 
 		return getSimpleHTMLDOM($uri) ?: returnServerError('Could not request Amazon.');
 	}
 
-    private function scrapePriceFromMetrics($html)
+	private function scrapePriceFromMetrics($html) {
-    {
 		$asinData = $html->find('#cerberus-data-metrics', 0);
 
 		// <div id="cerberus-data-metrics" style="display: none;"
@@ -168,86 +145,42 @@ EOT;
 		return false;
 	}
 
-    private function scrapePriceTwister($html)
+	private function scrapePriceGeneric($html) {
-    {
+		$priceDiv = $html->find('span.offer-price', 0) ?: $html->find('.a-color-price', 0);
-        $str = $html->find('.twister-plus-buying-options-price-data', 0);
 
-        $data = json_decode($str->innertext, true);
+		preg_match('/^\s*([A-Z]{3}|£|\$)\s?([\d.,]+)\s*$/', $priceDiv->plaintext, $matches);
-        if (count($data) === 1) {
+
-            $data = $data[0];
+		if (count($matches) === 3) {
 			return [
-                'displayPrice' => $data['displayPrice'],
+				'price' 	=> $matches[2],
-                'currency' => $data['currency'],
+				'currency'	=> $matches[1],
-                'shipping' => '0',
+				'shipping'	=> '0'
 			];
 		}
 
 		return false;
 	}
 
-    private function scrapePriceGeneric($html)
+	/**
-    {
+	 * Scrape method for Amazon product page
-        $default = [
+	 * @return [type] [description]
-            'price'         => null,
+	 */
-            'displayPrice'  => null,
+	public function collectData() {
-            'currency'      => null,
-            'shipping'      => null,
-        ];
-        $priceDiv = null;
-
-        foreach (self::PRICE_SELECTORS as $sel) {
-            $priceDiv = $html->find($sel, 0);
-            if ($priceDiv) {
-                break;
-            }
-        }
-
-        if (!$priceDiv) {
-            return $default;
-        }
-
-        $priceString = str_replace(str_split(self::WHITESPACE), '', $priceDiv->plaintext);
-        preg_match('/(\d+\.\d{0,2})/', $priceString, $matches);
-
-        $price = $matches[0] ?? null;
-        $currency = str_replace($price, '', $priceString);
-
-        if ($price != null && $currency != null) {
-            return [
-                'price'     => $price,
-                'displayPrice'  => null,
-                'currency'  => $currency,
-                'shipping'  => '0'
-            ];
-        }
-        return $default;
-    }
-
-    public function collectData()
-    {
 		$html = $this->getHtml();
 		$this->title = $this->getTitle($html);
-        $image = $this->getImage($html);
+		$imageTag = $this->getImage($html);
-        $data = $this->scrapePriceGeneric($html);
 
-        // render
+		$data = $this->scrapePriceFromMetrics($html) ?: $this->scrapePriceGeneric($html);
-        $content = '';
-        $price = $data['displayPrice'];
-        if (!$price) {
-            $price = sprintf('%s %s', $data['price'], $data['currency']);
-        }
-        $content .= sprintf('%s<br>Price: %s', $image, $price);
-        if ($data['shipping'] !== '0') {
-            $content .= sprintf('<br>Shipping: %s %s</br>', $data['shipping'], $data['currency']);
-        }
 
-        $item = [
+		$item = array(
 			'title' 	=> $this->title,
 			'uri' 		=> $this->getURI(),
-            'content'   => $content,
+			'content' 	=> "$imageTag<br/>Price: {$data['price']} {$data['currency']}",
-            // This is to ensure that feed readers notice the price change
+		);
-            'uid'       => md5($data['price'])
+
-        ];
+		if ($data['shipping'] !== '0') {
+			$item['content'] .= "<br>Shipping: {$data['shipping']} {$data['currency']}</br>";
+		}
 
 		$this->items[] = $item;
 	}

bridges/AnidexBridge.php

@@ -1,19 +1,16 @@
 <?php
+class AnidexBridge extends BridgeAbstract {
 
-class AnidexBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'ORelio';
 	const NAME = 'Anidex';
-    const URI = 'http://anidex.info/'; // anidex.info has ddos-guard so we need to use anidex.moe
+	const URI = 'https://anidex.info/';
-    const ALTERNATE_URI = 'https://anidex.moe/'; // anidex.moe returns 301 unless Host is set to anidex.info
-    const ALTERNATE_HOST = 'anidex.info'; // Correct host for requesting anidex.moe without 301 redirect
 	const DESCRIPTION = 'Returns the newest torrents, with optional search criteria.';
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        [
+		array(
-            'id' => [
+			'id' => array(
 				'name' => 'Category',
 				'type' => 'list',
-                'values' => [
+				'values' => array(
 					'All categories' => '0',
 					'Anime' => '1,2,3',
 					'Anime - Sub' => '1',
@@ -35,12 +32,12 @@ class AnidexBridge extends BridgeAbstract
 					'Pictures' => '14',
 					'Adult Video' => '15',
 					'Other' => '16'
-                ]
+				)
-            ],
+			),
-            'lang_id' => [
+			'lang_id' => array(
 				'name' => 'Language',
 				'type' => 'list',
-                'values' => [
+				'values' => array(
 					'All languages' => '0',
 					'English' => '1',
 					'Japanese' => '2',
@@ -73,52 +70,52 @@ class AnidexBridge extends BridgeAbstract
 					'Spanish (LATAM)' => '29',
 					'Persian' => '30',
 					'Malaysian' => '31'
-                ]
+				)
-            ],
+			),
-            'group_id' => [
+			'group_id' => array(
 				'name' => 'Group ID',
 				'type' => 'number'
-            ],
+			),
-            'r' => [
+			'r' => array(
 				'name' => 'Hide Remakes',
 				'type' => 'checkbox'
-            ],
+			),
-            'b' => [
+			'b' => array(
 				'name' => 'Only Batches',
 				'type' => 'checkbox'
-            ],
+			),
-            'a' => [
+			'a' => array(
 				'name' => 'Only Authorized',
 				'type' => 'checkbox'
-            ],
+			),
-            'q' => [
+			'q' => array(
 				'name' => 'Keyword',
 				'description' => 'Keyword(s)',
 				'type' => 'text'
-            ],
+			),
-            'h' => [
+			'h' => array(
 				'name' => 'Adult content',
 				'type' => 'list',
-                'values' => [
+				'values' => array(
 					'No filter' => '0',
 					'Hide +18' => '1',
 					'Only +18' => '2'
-                ]
+				)
-            ]
+			)
-        ]
+		)
-    ];
+	);
+
+	public function collectData() {
 
-    public function collectData()
-    {
 		// Build Search URL from user-provided parameters
-        $search_url = self::ALTERNATE_URI . '?s=upload_timestamp&o=desc';
+		$search_url = self::URI . '?s=upload_timestamp&o=desc';
-        foreach (['id', 'lang_id', 'group_id'] as $param_name) {
+		foreach (array('id', 'lang_id', 'group_id') as $param_name) {
 			$param = $this->getInput($param_name);
 			if (!empty($param) && intval($param) != 0 && ctype_digit(str_replace(',', '', $param))) {
 				$search_url .= '&' . $param_name . '=' . $param;
 			}
 		}
-        foreach (['r', 'b', 'a'] as $param_name) {
+		foreach (array('r', 'b', 'a') as $param_name) {
 			$param = $this->getInput($param_name);
 			if (!empty($param) && boolval($param)) {
 				$search_url .= '&' . $param_name . '=1';
@@ -128,35 +125,26 @@ class AnidexBridge extends BridgeAbstract
 		if (!empty($query)) {
 			$search_url .= '&q=' . urlencode($query);
 		}
-        $opt = [];
+		$opt = array();
 		$h = $this->getInput('h');
 		if (!empty($h) && intval($h) != 0 && ctype_digit($h)) {
 			$opt[CURLOPT_COOKIE] = 'anidex_h_toggle=' . $h;
 		}
 
-        // We need to use a different Host HTTP header to reach the correct page on ALTERNATE_URI
-        $headers = ['Host: ' . self::ALTERNATE_HOST];
-
-        // The HTTPS certificate presented by anidex.moe is for anidex.info. We need to ignore this.
-        // As a consequence, the bridge is intentionally marked as insecure by setting self::URI to http://
-        $opt[CURLOPT_SSL_VERIFYHOST] = 0;
-        $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, array(), $opt)
+		or returnServerError('Could not request Anidex: ' . $search_url);
 		$links = $html->find('a');
-        $results = [];
+		$results = array();
-        foreach ($links as $link) {
+		foreach ($links as $link)
-            if (strpos($link->href, '/torrent/') === 0 && !in_array($link->href, $results)) {
+			if (strpos($link->href, '/torrent/') === 0 && !in_array($link->href, $results))
 				$results[] = $link->href;
-            }
+		if (empty($results) && empty($this->getInput('q')))
-        }
-        if (empty($results) && empty($this->getInput('q'))) {
 			returnServerError('No results from Anidex: ' . $search_url);
-        }
 
 		//Process each item individually
 		foreach ($results as $element) {
+
 			//Limit total amount of requests
 			if(count($this->items) >= 20) {
 				break;
@@ -166,12 +154,13 @@ class AnidexBridge extends BridgeAbstract
 
 			//Ignore entries without valid torrent ID
 			if ($torrent_id != 0 && ctype_digit($torrent_id)) {
-                //Retrieve data for this torrent ID
-                $item_browse_uri = self::URI . 'torrent/' . $torrent_id;
-                $item_fetch_uri = self::ALTERNATE_URI . 'torrent/' . $torrent_id;
 
-                //Retrieve full description from torrent page (cached for 24 hours: 86400 seconds)
+				//Retrieve data for this torrent ID
-                if ($item_html = getSimpleHTMLDOMCached($item_fetch_uri, 86400, $headers, $opt)) {
+				$item_uri = self::URI . 'torrent/' . $torrent_id;
+
+				//Retrieve full description from torrent page
+				if ($item_html = getSimpleHTMLDOMCached($item_uri)) {
+
 					//Retrieve data from page contents
 					$item_title = str_replace(' (Torrent) - AniDex ', '', $item_html->find('title', 0)->plaintext);
 					$item_desc = $item_html->find('div.panel-body', 0);
@@ -201,12 +190,12 @@ class AnidexBridge extends BridgeAbstract
 					}
 
 					//Build and add final item
-                    $item = [];
+					$item = array();
-                    $item['uri'] = $item_browse_uri;
+					$item['uri'] = $item_uri;
 					$item['title'] = $item_title;
 					$item['author'] = $item_author;
 					$item['timestamp'] = $item_date;
-                    $item['enclosures'] = [$item_image];
+					$item['enclosures'] = array($item_image);
 					$item['content'] = $item_desc;
 					$this->items[] = $item;
 				}

bridges/AnimeUltimeBridge.php

@@ -1,31 +1,33 @@
 <?php
+class AnimeUltimeBridge extends BridgeAbstract {
 
-class AnimeUltimeBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'ORelio';
 	const NAME = 'Anime-Ultime';
 	const URI = 'http://www.anime-ultime.net/';
 	const CACHE_TIMEOUT = 10800; // 3h
 	const DESCRIPTION = 'Returns the newest releases posted on Anime-Ultime.';
-    const PARAMETERS = [ [
+	const PARAMETERS = array( array(
-        'type' => [
+		'type' => array(
 		'name' => 'Type',
 		'type' => 'list',
-        'values' => [
+		'values' => array(
 			'Everything' => '',
 			'Anime' => 'A',
 			'Drama' => 'D',
 			'Tokusatsu' => 'T'
-            ]
+			)
-        ]
+		)
-    ]];
+	));
 
 	private $filter = 'Releases';
 
-    public function collectData()
+	public function collectData(){
-    {
+
 		//Add type filter if provided
-        $typeFilter = $this->getKey('type');
+		$typeFilter = array_search(
+			$this->getInput('type'),
+			self::PARAMETERS[$this->queriedContext]['type']['values']
+		);
 
 		//Build date and filters for making requests
 		$thismonth = date('mY') . $typeFilter;
@@ -33,15 +35,16 @@ class AnimeUltimeBridge extends BridgeAbstract
 
 		//Process each HTML page until having 10 releases
 		$processedOK = 0;
-        foreach ([$thismonth, $lastmonth] as $requestFilter) {
+		foreach (array($thismonth, $lastmonth) as $requestFilter) {
+
+			//Retrive page contents
 			$url = self::URI . 'history-0-1/' . $requestFilter;
-            $html = getContents($url);
+			$html = getSimpleHTMLDOM($url)
-            // Convert html from iso-8859-1 => utf8
+				or returnServerError('Could not request Anime-Ultime: ' . $url);
-            $html = utf8_encode($html);
-            $html = str_get_html($html);
 
 			//Relases are sorted by day : process each day individually
 			foreach($html->find('div.history', 0)->find('h3') as $daySection) {
+
 				//Retrieve day and build date information
 				$dateString = $daySection->plaintext;
 				$day = intval(substr($dateString, strpos($dateString, ' ') + 1, 2));
@@ -57,6 +60,7 @@ class AnimeUltimeBridge extends BridgeAbstract
 				//Process each release of that day, ignoring first table row: contains table headers
 				while(!is_null($release = $release->next_sibling())) {
 					if(count($release->find('td')) > 0) {
+
 						//Retrieve metadata from table columns
 						$item_link_element = $release->find('td', 0)->find('a', 0);
 						$item_uri = self::URI . $item_link_element->href;
@@ -81,16 +85,15 @@ class AnimeUltimeBridge extends BridgeAbstract
 						$item_type = $release->find('td', 4)->plaintext;
 
 						if(!empty($item_uri)) {
+
 							// Retrieve description from description page
-                            $html_item = getContents($item_uri);
+							$html_item = getContents($item_uri)
-                            // Convert html from iso-8859-1 => utf8
+								or returnServerError('Could not request Anime-Ultime: ' . $item_uri);
-                            $html_item = utf8_encode($html_item);
 							$item_description = substr(
 								$html_item,
 								strpos($html_item, 'class="principal_contain" align="center">') + 41
 							);
-                            $item_description = substr(
+							$item_description = substr($item_description,
-                                $item_description,
 								0,
 								strpos($item_description, '<div id="table">')
 							);
@@ -99,20 +102,21 @@ class AnimeUltimeBridge extends BridgeAbstract
 							$item_description = defaultLinkTo($item_description, self::URI);
 							$item_description = str_replace("\r", '', $item_description);
 							$item_description = str_replace("\n", '', $item_description);
+							$item_description = utf8_encode($item_description);
 
 							//Build and add final item
-                            $item = [];
+							$item = array();
 							$item['uri'] = $item_uri;
 							$item['title'] = $item_name . ' ' . $item_type . ' ' . $item_episode;
 							$item['author'] = $item_fansub;
 							$item['timestamp'] = $item_date;
-                            $item['enclosures'] = [$item_image];
+							$item['enclosures'] = array($item_image);
 							$item['content'] = $item_description;
 							$this->items[] = $item;
 							$processedOK++;
 
 							//Stop processing once limit is reached
-                            if ($processedOK >= 10) {
+							if ($processedOK >= 10)
 								return;
 						}
 					}
@@ -120,14 +124,18 @@ class AnimeUltimeBridge extends BridgeAbstract
 			}
 		}
 	}
-    }
 
-    public function getName()
+	public function getName() {
-    {
 		if(!is_null($this->getInput('type'))) {
-            return 'Latest ' . $this->getKey('type') . ' - Anime-Ultime Bridge';
+			$typeFilter = array_search(
+				$this->getInput('type'),
+				self::PARAMETERS[$this->queriedContext]['type']['values']
+			);
+
+			return 'Latest ' . $typeFilter . ' - Anime-Ultime Bridge';
 		}
 
 		return parent::getName();
 	}
+
 }

bridges/AppleAppStoreBridge.php

@@ -1,171 +0,0 @@
-<?php
-
-class AppleAppStoreBridge extends BridgeAbstract
-{
-    const MAINTAINER = 'captn3m0';
-    const NAME = 'Apple App Store';
-    const URI = 'https://apps.apple.com/';
-    const CACHE_TIMEOUT = 3600; // 1h
-    const DESCRIPTION = 'Returns version updates for a specific application';
-
-    const PARAMETERS = [[
-        'id' => [
-            'name'  => 'Application ID',
-            'required'  => true,
-            'exampleValue'  => '310633997'
-        ],
-        'p' => [
-            'name'  => 'Platform',
-            'type'  => 'list',
-            'values'    => [
-                'iPad'  => 'ipad',
-                'iPhone'    => 'iphone',
-                'Mac'   => 'mac',
-
-                // The following 2 are present in responses
-                // but not yet tested
-                'Web'   => 'web',
-                'Apple TV'  => 'appletv',
-            ],
-            'defaultValue'  => 'iphone',
-        ],
-        'country'   => [
-            'name'  => 'Store Country',
-            'type'  => 'list',
-            'values'    => [
-                'US'    => 'US',
-                'India' => 'IN',
-                'Canada' => 'CA',
-                'Germany' => 'DE',
-                'Netherlands' => 'NL',
-                'Belgium (NL)' => 'BENL',
-                'Belgium (FR)' => 'BEFR',
-                'France' => 'FR',
-                'Italy' => 'IT',
-                'United Kingdom' => 'UK',
-                'Spain' => 'ES',
-                'Portugal' => 'PT',
-                'Australia' => 'AU',
-                'New Zealand' => 'NZ',
-                'Indonesia' => 'ID',
-                'Brazil' => 'BR',
-            ],
-            'defaultValue'  => 'US',
-        ],
-    ]];
-
-    const PLATFORM_MAPPING = [
-        'iphone'    => 'ios',
-        'ipad'  => 'ios',
-    ];
-
-    private function makeHtmlUrl($id, $country)
-    {
-        return 'https://apps.apple.com/' . $country . '/app/id' . $id;
-    }
-
-    private function makeJsonUrl($id, $platform, $country)
-    {
-        return "https://amp-api.apps.apple.com/v1/catalog/$country/apps/$id?platform=$platform&extend=versionHistory";
-    }
-
-    public function getName()
-    {
-        if (isset($this->name)) {
-            return $this->name . ' - AppStore Updates';
-        }
-
-        return parent::getName();
-    }
-
-    /**
-     * In case of some platforms, the data is present in the initial response
-     */
-    private function getDataFromShoebox($id, $platform, $country)
-    {
-        $uri = $this->makeHtmlUrl($id, $country);
-        $html = getSimpleHTMLDOMCached($uri, 3600);
-        $script = $html->find('script[id="shoebox-ember-data-store"]', 0);
-
-        $json = json_decode($script->innertext, true);
-        return $json['data'];
-    }
-
-    private function getJWTToken($id, $platform, $country)
-    {
-        $uri = $this->makeHtmlUrl($id, $country);
-
-        $html = getSimpleHTMLDOMCached($uri, 3600);
-
-        $meta = $html->find('meta[name="web-experience-app/config/environment"]', 0);
-
-        $json = urldecode($meta->content);
-
-        $json = json_decode($json);
-
-        return $json->MEDIA_API->token;
-    }
-
-    private function getAppData($id, $platform, $country, $token)
-    {
-        $uri = $this->makeJsonUrl($id, $platform, $country);
-
-        $headers = [
-            "Authorization: Bearer $token",
-            'Origin: https://apps.apple.com',
-        ];
-
-        $json = json_decode(getContents($uri, $headers), true);
-
-        return $json['data'][0];
-    }
-
-    /**
-     * Parses the version history from the data received
-     * @return array list of versions with details on each element
-     */
-    private function getVersionHistory($data, $platform)
-    {
-        switch ($platform) {
-            case 'mac':
-                return $data['relationships']['platforms']['data'][0]['attributes']['versionHistory'];
-            default:
-                $os = self::PLATFORM_MAPPING[$platform];
-                return $data['attributes']['platformAttributes'][$os]['versionHistory'];
-        }
-    }
-
-    public function collectData()
-    {
-        $id = $this->getInput('id');
-        $country = $this->getInput('country');
-        $platform = $this->getInput('p');
-
-        switch ($platform) {
-            case 'mac':
-                $data = $this->getDataFromShoebox($id, $platform, $country);
-                break;
-
-            default:
-                $token = $this->getJWTToken($id, $platform, $country);
-                $data = $this->getAppData($id, $platform, $country, $token);
-        }
-
-        $versionHistory = $this->getVersionHistory($data, $platform);
-        $name = $this->name = $data['attributes']['name'];
-        $author = $data['attributes']['artistName'];
-
-        foreach ($versionHistory as $row) {
-            $item = [];
-
-            $item['content'] = nl2br($row['releaseNotes']);
-            $item['title'] = $name . ' - ' . $row['versionDisplay'];
-            $item['timestamp'] = $row['releaseDate'];
-            $item['author'] = $author;
-
-            $item['uri'] = $this->makeHtmlUrl($id, $country);
-
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AppleMusicBridge.php

@@ -1,57 +0,0 @@
-<?php
-
-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 PARAMETERS = [[
-        'artist' => [
-            'name' => 'Artist ID',
-            'exampleValue' => '909253',
-            'required' => true,
-        ],
-        'limit' => [
-            'name' => 'Latest X Releases (max 50)',
-            'defaultValue' => '10',
-            '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 = 'https://itunes.apple.com/lookup?id='
-            . $this->getInput('artist')
-            . '&entity=album&limit='
-            . $limit .
-            '&sort=recent';
-        $html = getSimpleHTMLDOM($url);
-
-        $json = json_decode($html);
-
-        foreach ($json->results as $obj) {
-            if ($obj->wrapperType === 'collection') {
-                $this->items[] = [
-                    '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,
-                ];
-            }
-        }
-    }
-}

bridges/ArtStationBridge.php

@@ -1,101 +0,0 @@
-<?php
-
-class ArtStationBridge extends BridgeAbstract
-{
-    const NAME = 'ArtStation';
-    const URI = 'https://www.artstation.com';
-    const DESCRIPTION = 'Fetches the latest ten artworks from a search query on ArtStation.';
-    const MAINTAINER = 'thefranke';
-    const CACHE_TIMEOUT = 3600; // 1h
-
-    const PARAMETERS = [
-        'Search Query' => [
-            'q' => [
-                'name' => 'Search term',
-                'required' => true,
-                'exampleValue'  => 'bird'
-            ]
-        ]
-    ];
-
-    public function getIcon()
-    {
-        return 'https://www.artstation.com/assets/favicon-58653022bc38c1905ac7aa1b10bffa6b.ico';
-    }
-
-    public function getName()
-    {
-        return self::NAME . ': ' . $this->getInput('q');
-    }
-
-    private function fetchSearch($searchQuery)
-    {
-        $data = '{"query":"' . $searchQuery . '","page":1,"per_page":50,"sorting":"date",';
-        $data .= '"pro_first":"1","filters":[],"additional_fields":[]}';
-
-        $header = [
-            'Content-Type: application/json',
-            'Accept: application/json'
-        ];
-
-        $opts = [
-            CURLOPT_POST => true,
-            CURLOPT_POSTFIELDS => $data,
-            CURLOPT_RETURNTRANSFER => true
-        ];
-
-        $jsonSearchURL = self::URI . '/api/v2/search/projects.json';
-        $jsonSearchStr = getContents($jsonSearchURL, $header, $opts);
-        return json_decode($jsonSearchStr);
-    }
-
-    private function fetchProject($hashID)
-    {
-        $jsonProjectURL = self::URI . '/projects/' . $hashID . '.json';
-        $jsonProjectStr = getContents($jsonProjectURL);
-        return json_decode($jsonProjectStr);
-    }
-
-    public function collectData()
-    {
-        $searchTerm = $this->getInput('q');
-        $jsonQuery = $this->fetchSearch($searchTerm);
-
-        foreach ($jsonQuery->data as $media) {
-            // get detailed info about media item
-            $jsonProject = $this->fetchProject($media->hash_id);
-
-            // create item
-            $item = [];
-            $item['title'] = $media->title;
-            $item['uri'] = $media->url;
-            $item['timestamp'] = strtotime($jsonProject->published_at);
-            $item['author'] = $media->user->full_name;
-            $item['categories'] = implode(',', $jsonProject->tags);
-
-            $item['content'] = '<a href="'
-                . $media->url
-                . '"><img style="max-width: 100%" src="'
-                . $jsonProject->cover_url
-                . '"></a><p>'
-                . $jsonProject->description
-                . '</p>';
-
-            $numAssets = count($jsonProject->assets);
-
-            if ($numAssets > 1) {
-                $item['content'] .= '<p><a href="'
-                    . $media->url
-                    . '">Project contains '
-                    . ($numAssets - 1)
-                    . ' more item(s).</a></p>';
-            }
-
-            $this->items[] = $item;
-
-            if (count($this->items) >= 10) {
-                break;
-            }
-        }
-    }
-}

bridges/Arte7Bridge.php

@@ -1,7 +1,7 @@
 <?php
+class Arte7Bridge extends BridgeAbstract {
 
-class Arte7Bridge extends BridgeAbstract
+	const MAINTAINER = 'mitsukarenai';
-{
 	const NAME = 'Arte +7';
 	const URI = 'https://www.arte.tv/';
 	const CACHE_TIMEOUT = 1800; // 30min
@@ -9,147 +9,107 @@ class Arte7Bridge extends BridgeAbstract
 
 	const API_TOKEN = 'Nzc1Yjc1ZjJkYjk1NWFhN2I2MWEwMmRlMzAzNjI5NmU3NWU3ODg4ODJjOWMxNTMxYzEzZGRjYjg2ZGE4MmIwOA';
 
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        'global' => [
+		'Catégorie (Français)' => array(
-            'sort_by' => [
+			'catfr' => array(
 				'type' => 'list',
-                'name' => 'Sort by',
+				'name' => 'Catégorie',
-                'required' => false,
+				'values' => array(
-                'defaultValue' => null,
+					'Toutes les vidéos (français)' => null,
-                'values' => [
+					'Actu & société' => 'ACT',
-                    'Default' => null,
+					'Séries & fiction' => 'SER',
-                    'Video rights start date' => 'videoRightsBegin',
+					'Cinéma' => 'CIN',
-                    'Video rights end date' => 'videoRightsEnd',
+					'Arts & spectacles classiques' => 'ARS',
-                    'Brodcast date' => 'broadcastBegin',
-                    'Creation date' => 'creationDate',
-                    'Last modified' => 'lastModified',
-                    'Number of views' => 'views',
-                    'Number of views per period' => 'viewsPeriod',
-                    'Available screens' => 'availableScreens',
-                    'Episode' => 'episode'
-                ],
-            ],
-            'sort_direction' => [
-                'type' => 'list',
-                'name' => 'Sort direction',
-                'required' => false,
-                'defaultValue' => 'DESC',
-                'values' => [
-                    'Ascending' => 'ASC',
-                    'Descending' => 'DESC'
-                ],
-            ],
-            'exclude_trailers' => [
-                'name' => 'Exclude trailers',
-                'type' => 'checkbox',
-                'required' => false,
-                'defaultValue' => false
-            ],
-        ],
-        'Category' => [
-            'lang' => [
-                'type' => 'list',
-                'name' => 'Language',
-                'values' => [
-                    'Français' => 'fr',
-                    'Deutsch' => 'de',
-                    'English' => 'en',
-                    'Español' => 'es',
-                    'Polski' => 'pl',
-                    'Italiano' => 'it'
-                ],
-            ],
-            'cat' => [
-                'type' => 'list',
-                'name' => 'Category',
-                'values' => [
-                    'All videos' => null,
-                    'News & society' => 'ACT',
-                    'Series & fiction' => 'SER',
-                    'Cinema' => 'CIN',
-                    'Culture' => 'ARS',
 					'Culture pop' => 'CPO',
-                    'Discovery' => 'DEC',
+					'Découverte' => 'DEC',
-                    'History' => 'HIST',
+					'Histoire' => 'HIST',
 					'Science' => 'SCI',
-                    'Other' => 'AUT'
+					'Autre' => 'AUT'
-                ]
+				)
-            ],
+			)
-        ],
+		),
-        'Collection' => [
+		'Collection (Français)' => array(
-            'lang' => [
+			'colfr' => array(
-                'type' => 'list',
-                'name' => 'Language',
-                'values' => [
-                    'Français' => 'fr',
-                    'Deutsch' => 'de',
-                    'English' => 'en',
-                    'Español' => 'es',
-                    'Polski' => 'pl',
-                    'Italiano' => 'it'
-                ]
-            ],
-            'col' => [
 				'name' => 'Collection id',
 				'required' => true,
-                'title' => 'ex. RC-014095 pour https://www.arte.tv/de/videos/RC-014095/blow-up/',
+				'title' => 'ex. RC-014095 pour https://www.arte.tv/fr/videos/RC-014095/blow-up/'
-                'exampleValue'  => 'RC-014095'
+			)
-            ]
+		),
-        ]
+		'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()
+	public function collectData(){
-    {
 		switch($this->queriedContext) {
-            case 'Category':
+		case 'Catégorie (Français)':
-                $category = $this->getInput('cat');
+			$category = $this->getInput('catfr');
-                $collectionId = null;
+			$lang = 'fr';
 			break;
-            case 'Collection':
+		case 'Collection (Français)':
-                $collectionId = $this->getInput('col');
+			$lang = 'fr';
-                $category = null;
+			$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;
 		}
 
-        $lang = $this->getInput('lang');
+		$url = 'https://api.arte.tv/api/opa/v3/videos?sort=-lastModified&limit=10&language='
-        $sort_by = $this->getInput('sort_by');
-        $sort_direction = $this->getInput('sort_direction') == 'ASC' ? '' : '-';
-
-        $url = 'https://api.arte.tv/api/opa/v3/videos?limit=15&language='
 			. $lang
-            . ($sort_by != null ? '&sort=' . $sort_direction . $sort_by : '')
 			. ($category != null ? '&category.code=' . $category : '')
 			. ($collectionId != null ? '&collections.collectionId=' . $collectionId : '');
 
-        $header = [
+		$header = array(
 			'Authorization: Bearer ' . self::API_TOKEN
-        ];
+		);
 
-        $input = getContents($url, $header);
+		$input = getContents($url, $header) or die('Could not request ARTE.');
 		$input_json = json_decode($input, true);
 
 		foreach($input_json['videos'] as $element) {
-            if ($this->getInput('exclude_trailers') && $element['platform'] == 'EXTRAIT') {
-                continue;
-            }
 
-            $durationSeconds = $element['durationSeconds'];
+			$item = array();
-
-            $item = [];
 			$item['uri'] = $element['url'];
 			$item['id'] = $element['id'];
 
 			$item['timestamp'] = strtotime($element['videoRightsBegin']);
 			$item['title'] = $element['title'];
 
-            if (!empty($element['subtitle'])) {
+			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="'
@@ -159,4 +119,5 @@ class Arte7Bridge extends BridgeAbstract
 			$this->items[] = $item;
 		}
 	}
+
 }

bridges/AsahiShimbunAJWBridge.php

@@ -1,81 +0,0 @@
-<?php
-
-class AsahiShimbunAJWBridge extends BridgeAbstract
-{
-    const NAME = 'Asahi Shimbun AJW';
-    const BASE_URI = 'http://www.asahi.com';
-    const URI = self::BASE_URI . '/ajw/';
-    const DESCRIPTION = 'Asahi Shimbun - Asia & Japan Watch';
-    const MAINTAINER = 'somini';
-    const PARAMETERS = [
-        [
-            'section' => [
-                'type' => 'list',
-                'name' => 'Section',
-                'values' => [
-                    'Japan » Social Affairs' => 'japan/social',
-                    'Japan » People' => 'japan/people',
-                    'Japan » 3/11 Disaster' => 'japan/0311disaster',
-                    'Japan » Sci & Tech' => 'japan/sci_tech',
-                    'Politics' => 'politics',
-                    'Business' => 'business',
-                    'Culture » Style' => 'culture/style',
-                    'Culture » Movies' => 'culture/movies',
-                    'Culture » Manga & Anime' => 'culture/manga_anime',
-                    'Asia » China' => 'asia_world/china',
-                    'Asia » Korean Peninsula' => 'asia_world/korean_peninsula',
-                    'Asia » Around Asia' => 'asia_world/around_asia',
-                    'Asia » World' => 'asia_world/world',
-                    'Opinion » Editorial' => 'opinion/editorial',
-                    'Opinion » Vox Populi' => 'opinion/vox',
-                ],
-                'defaultValue' => 'politics',
-            ]
-        ]
-    ];
-
-    private function getSectionURI($section)
-    {
-        return $this->getURI() . $section . '/';
-    }
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM($this->getSectionURI($this->getInput('section')));
-
-        foreach ($html->find('#MainInner li a') as $element) {
-            if ($element->parent()->class == 'HeadlineTopImage-S') {
-                Debug::log('Skip Headline, it is repeated below');
-                continue;
-            }
-            $item = [];
-
-            $item['uri'] = self::BASE_URI . $element->href;
-            $e_lead = $element->find('span.Lead', 0);
-            if ($e_lead) {
-                $item['content'] = $e_lead->innertext;
-                $e_lead->outertext = '';
-            } else {
-                $item['content'] = $element->innertext;
-            }
-            $e_date = $element->find('span.EnDate', 0);
-            if ($e_date) {
-                $item['timestamp'] = strtotime($e_date->innertext);
-                $e_date->outertext = '';
-            }
-            $e_video = $element->find('span.EnVideo', 0);
-            if ($e_video) {
-                $e_video->outertext = '';
-                $element->innertext = "VIDEO: $element->innertext";
-            }
-            $e_title = $element->find('.title', 0);
-            if ($e_title) {
-                $item['title'] = $e_title->innertext;
-            } else {
-                $item['title'] = $element->innertext;
-            }
-
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AskfmBridge.php

@@ -1,36 +1,33 @@
 <?php
+class AskfmBridge extends BridgeAbstract {
 
-class AskfmBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'az5he6ch, logmanoriginal';
 	const NAME = 'Ask.fm Answers';
 	const URI = 'https://ask.fm/';
 	const CACHE_TIMEOUT = 300; //5 min
 	const DESCRIPTION = 'Returns answers from an Ask.fm user';
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        'Ask.fm username' => [
+		'Ask.fm username' => array(
-            'u' => [
+			'u' => array(
 				'name' => 'Username',
-                'required' => true,
+				'required' => true
-                'exampleValue'  => 'ApprovedAndReal'
+			)
-            ]
+		)
-        ]
+	);
-    ];
 
-    public function collectData()
+	public function collectData(){
-    {
+		$html = getSimpleHTMLDOM($this->getURI())
-        $html = getSimpleHTMLDOM($this->getURI());
+			or returnServerError('Requested username can\'t be found.');
 
 		$html = defaultLinkTo($html, self::URI);
 
 		foreach($html->find('article.streamItem-answer') as $element) {
-            $item = [];
+			$item = array();
 			$item['uri'] = $element->find('a.streamItem_meta', 0)->href;
 			$question = trim($element->find('header.streamItem_header', 0)->innertext);
 
 			$item['title'] = trim(
-                htmlspecialchars_decode(
+				htmlspecialchars_decode($element->find('header.streamItem_header', 0)->plaintext,
-                    $element->find('header.streamItem_header', 0)->plaintext,
 				ENT_QUOTES
 				)
 			);
@@ -59,8 +56,7 @@ class AskfmBridge extends BridgeAbstract
 		}
 	}
 
-    public function getName()
+	public function getName(){
-    {
 		if(!is_null($this->getInput('u'))) {
 			return self::NAME . ' : ' . $this->getInput('u');
 		}
@@ -68,8 +64,7 @@ class AskfmBridge extends BridgeAbstract
 		return parent::getName();
 	}
 
-    public function getURI()
+	public function getURI(){
-    {
 		if(!is_null($this->getInput('u'))) {
 			return self::URI . urlencode($this->getInput('u'));
 		}

bridges/AssociatedPressNewsBridge.php

@@ -1,281 +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 = [
-        'Standard Topics' => [
-            'topic' => [
-                'name' => 'Topic',
-                'type' => 'list',
-                'values' => [
-                    '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' => [
-            'topic' => [
-                '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 = [];
-
-        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 = [];
-
-            // 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'])) {
-                        $leadPhotoUrl = sprintf('https://storage.googleapis.com/afs-prod/media/%s/800.jpeg', $storyContent['leadPhotoId']);
-                        $leadPhotoImageTag = sprintf('<img src="%s">', $leadPhotoUrl);
-                        // Move the image to the beginning of the content
-                        $html = $leadPhotoImageTag . $html;
-                        // Explicitly not adding it to the item's enclosures!
-                    }
-            }
-
-            $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/AstrophysicsDataSystemBridge.php

@@ -1,53 +0,0 @@
-<?php
-
-class AstrophysicsDataSystemBridge extends BridgeAbstract
-{
-    const NAME = 'SAO/NASA Astrophysics Data System';
-    const DESCRIPTION = 'Returns the latest publications from a query';
-    const URI = 'https://ui.adsabs.harvard.edu';
-    const PARAMETERS = [
-        'Publications' => [
-            'query' => [
-                'name' => 'query',
-                'title' => 'Same format as the search bar on the website',
-                'exampleValue' => 'author:"huchra, john"',
-                'required' => true
-            ]
-        ]];
-
-    private $feedTitle;
-
-    public function getName()
-    {
-        if ($this->queriedContext === 'Publications') {
-            return $this->feedTitle;
-        }
-        return parent::getName();
-    }
-
-    public function getURI()
-    {
-        if ($this->queriedContext === 'Publications') {
-            return self::URI . '/search/?q=' . urlencode($this->getInput('query'));
-        }
-        return parent::getURI();
-    }
-
-    public function collectData()
-    {
-        $headers = [
-            'Cookie: core=always;'
-        ];
-        $html = str_get_html(defaultLinkTo(getContents($this->getURI(), $headers), self::URI));
-        $this->feedTitle = html_entity_decode($html->find('title', 0)->plaintext);
-        foreach ($html->find('div.row > ul > li') as $pub) {
-            $item = [];
-            $item['title'] = $pub->find('h3.s-results-title', 0)->plaintext;
-            $item['content'] = $pub->find('div.s-results-links', 0);
-            $item['uri'] = $pub->find('a.abs-redirect-link', 0)->href;
-            $item['author'] = rtrim($pub->find('li.article-author', 0)->plaintext, ' ;');
-            $item['timestamp'] = $pub->find('div[aria-label="date published"]', 0)->plaintext;
-            $this->items[] = $item;
-        }
-    }
-}

bridges/AtmoOccitanieBridge.php

@@ -1,60 +0,0 @@
-<?php
-
-class AtmoOccitanieBridge extends BridgeAbstract
-{
-    const NAME = 'Atmo Occitanie';
-    const URI = 'https://www.atmo-occitanie.org/';
-    const DESCRIPTION = 'Fetches the latest air polution of cities in Occitanie from Atmo';
-    const MAINTAINER = 'floviolleau';
-    const PARAMETERS = [[
-        'city' => [
-            'name' => 'Ville',
-            'required' => true,
-            'exampleValue'  => 'cahors'
-        ]
-    ]];
-    const CACHE_TIMEOUT = 7200;
-
-    public function collectData()
-    {
-        $uri = self::URI . $this->getInput('city');
-
-        $html = getSimpleHTMLDOM($uri);
-
-        $generalMessage = $html->find('.landing-ville .city-banner .iqa-avertissement', 0)->innertext;
-        $recommendationsDom = $html->find('.landing-ville .recommandations', 0);
-        $recommendationsItemDom = $recommendationsDom->find('.recommandation-item .label');
-
-        $recommendationsMessage = '';
-
-        $i = 0;
-        $len = count($recommendationsItemDom);
-        foreach ($recommendationsItemDom as $key => $value) {
-            if ($i == 0) {
-                $recommendationsMessage .= trim($value->innertext) . '.';
-            } else {
-                $recommendationsMessage .= ' ' . trim($value->innertext) . '.';
-            }
-            $i++;
-        }
-
-        $lastRecommendationsDom = $recommendationsDom->find('.col-md-6', -1);
-        $informationHeaderMessage = $lastRecommendationsDom->find('.heading', 0)->innertext;
-        $indice = $lastRecommendationsDom->find('.current-indice .indice div', 0)->innertext;
-        $informationDescriptionMessage = $lastRecommendationsDom->find('.current-indice .description p', 0)->innertext;
-
-        $message = "$generalMessage L'indice est de $indice/10. $informationDescriptionMessage. $recommendationsMessage";
-        $city = $this->getInput('city');
-
-        $item['uri'] = $uri;
-        $today = date('d/m/Y');
-        $item['title'] = "Bulletin de l'air du $today pour la ville : $city.";
-        //$item['title'] .= ' Retrouvez plus d\'informations en allant sur atmo-occitanie.org #QualiteAir. ' . $message;
-        $item['title'] .= ' #QualiteAir. ' . $message;
-        $item['author'] = 'floviolleau';
-        $item['content'] = $message;
-        $item['uid'] = hash('sha256', $item['title']);
-
-        $this->items[] = $item;
-    }
-}

bridges/AutoJMBridge.php

@@ -1,135 +1,65 @@
 <?php
 
-class AutoJMBridge extends BridgeAbstract
+class AutoJMBridge extends BridgeAbstract {
-{
+
 	const NAME = 'AutoJM';
-    const URI = 'https://www.autojm.fr/';
+	const URI = 'http://www.autojm.fr/';
 	const DESCRIPTION = 'Suivre les offres de véhicules proposés par AutoJM en fonction des critères de filtrages';
 	const MAINTAINER = 'sysadminstory';
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        'Afficher les offres de véhicules disponible sur la recheche AutoJM' => [
+		'Afficher les offres de véhicules disponible en fonction des critères du site AutoJM' => array(
-            'url' => [
+			'url' => array(
-                'name' => 'URL de la page de recherche',
+				'name' => 'URL de la recherche',
 				'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' => 'gammes/index/398?order_by=finition_asc&energie[]=3&transmission[]=2&dispo=all'
-            ],
+			)
-        ]
+		)
-    ];
+	);
 	const CACHE_TIMEOUT = 3600;
 
-    public function getIcon()
+	public function getIcon() {
-    {
+		return self::URI . 'assets/images/favicon.ico';
-        return self::URI . 'favicon.ico';
 	}
 
-    public function getName()
+	public function collectData() {
-    {
+		$html = getSimpleHTMLDOM(self::URI . $this->getInput('url'))
-        switch ($this->queriedContext) {
+			or returnServerError('Could not request AutoJM.');
-            case 'Afficher les offres de véhicules disponible sur la recheche AutoJM':
+		$list = $html->find('div[class*=ligne_modele]');
-                return 'AutoJM | Recherche de véhicules';
+		foreach($list as $element) {
-            break;
+			$image = $element->find('img[class=width-100]', 0)->src;
-            default:
+			$serie = $element->find('div[class=serie]', 0)->find('span', 0)->plaintext;
-                return parent::getName();
+			$url = $element->find('div[class=serie]', 0)->find('a[class=btn_ligne color-black]', 0)->href;
-        }
+			if($element->find('div[class*=hasStock-info]', 0) != null) {
-    }
+				$dispo = 'Disponible';
-
-    public function collectData()
-    {
-        // Get the number of result for this search
-        $search_url = self::URI . $this->getInput('url') . '&open=energy&onlyFilters=false';
-
-        // Set the header 'X-Requested-With' like the website does it
-        $header = [
-            'X-Requested-With: XMLHttpRequest'
-        ];
-
-        // Get the JSON content of the form
-        $json = getContents($search_url, $header);
-
-        // Extract the HTML content from the JSON result
-        $data = json_decode($json);
-
-        $nb_results = $data->nbResults;
-        $total_pages = ceil($nb_results / 15);
-
-        // 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 = '';
+				$dispo = 'Sur commande';
-                    $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 = '';
 			}
+			$carburant = str_replace('dispo |', '', $element->find('div[class=carburant]', 0)->plaintext);
+			$transmission = $element->find('div[class*=bv]', 0)->plaintext;
+			$places = $element->find('div[class*=places]', 0)->plaintext;
+			$portes = $element->find('div[class*=nb_portes]', 0)->plaintext;
+			$carosserie = $element->find('div[class*=coloris]', 0)->plaintext;
+			$remise = $element->find('div[class*=remise]', 0)->plaintext;
+			$prix = $element->find('div[class*=prixjm]', 0)->plaintext;
+
+			$item = array();
+			$item['uri'] = $url;
+			$item['title'] = $serie;
+			$item['content'] = '<p><img style="vertical-align:middle ; padding: 10px" src="' . $image . '" />' . $serie . '</p>';
+			$item['content'] .= '<ul><li>Disponibilité : ' . $dispo . '</li>';
+			$item['content'] .= '<li>Carburant : ' . $carburant . '</li>';
+			$item['content'] .= '<li>Transmission : ' . $transmission . '</li>';
+			$item['content'] .= '<li>Nombre de places : ' . $places . '</li>';
+			$item['content'] .= '<li>Nombre de portes : ' . $portes . '</li>';
+			$item['content'] .= '<li>Série : ' . $serie . '</li>';
+			$item['content'] .= '<li>Carosserie : ' . $carosserie . '</li>';
+			$item['content'] .= '<li>Remise : ' . $remise . '</li>';
+			$item['content'] .= '<li>Prix : ' . $prix . '</li></ul>';
 
-                // Construct the new item
-                $item = [];
-                $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;
 		}
-        }
+
-    }
-
-    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

@@ -1,59 +0,0 @@
-<?php
-
-class AwwwardsBridge extends BridgeAbstract
-{
-    const NAME = 'Awwwards';
-    const URI = 'https://www.awwwards.com/';
-    const DESCRIPTION = 'Fetches the latest ten sites of the day from Awwwards';
-    const MAINTAINER = 'Paroleen';
-    const CACHE_TIMEOUT = 3600;
-
-    const SITESURI = 'https://www.awwwards.com/websites/sites_of_the_day/';
-    const SITEURI = 'https://www.awwwards.com/sites/';
-    const ASSETSURI = 'https://assets.awwwards.com/awards/media/cache/thumb_417_299/';
-
-    private $sites = [];
-
-    public function getIcon()
-    {
-        return 'https://www.awwwards.com/favicon.ico';
-    }
-
-    private function fetchSites()
-    {
-        Debug::log('Fetching all sites');
-        $sites = getSimpleHTMLDOM(self::SITESURI);
-
-        Debug::log('Parsing all JSON data');
-        foreach ($sites->find('.grid-sites li') as $site) {
-            $decode = html_entity_decode($site->attr['data-collectable-model-value'], ENT_QUOTES, 'utf-8');
-            $decode = json_decode($decode, true);
-            $this->sites[] = $decode;
-        }
-    }
-
-    public function collectData()
-    {
-        $this->fetchSites();
-
-        Debug::log('Building RSS feed');
-        foreach ($this->sites as $site) {
-            $item = [];
-            $item['title'] = $site['title'];
-            $item['timestamp'] = $site['createdAt'];
-            $item['categories'] = $site['tags'];
-
-            $item['content'] = '<img src="'
-                . self::ASSETSURI
-                . $site['images']['thumbnail']
-                . '">';
-            $item['uri'] = self::SITEURI . $site['slug'];
-
-            $this->items[] = $item;
-
-            if (count($this->items) >= 10) {
-                break;
-            }
-        }
-    }
-}

bridges/BAEBridge.php

@@ -1,33 +1,30 @@
 <?php
-
+class BAEBridge extends BridgeAbstract {
-class BAEBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'couraudt';
 	const NAME = 'Bourse Aux Equipiers Bridge';
 	const URI = 'https://www.bourse-aux-equipiers.com';
 	const DESCRIPTION = 'Returns the newest sailing offers.';
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        [
+		array(
-            'keyword' => [
+			'keyword' => array(
 				'name' => 'Filtrer par mots clés',
 				'title' => 'Entrez le mot clé à filtrer ici'
-            ],
+			),
-            'type' => [
+			'type' => array(
 				'name' => 'Type de recherche',
 				'title' => 'Afficher seuleument un certain type d\'annonce',
 				'type' => 'list',
-                'values' => [
+				'values' => array(
 					'Toutes les annonces' => false,
 					'Les embarquements' => 'boat',
 					'Les skippers' => 'skipper',
 					'Les équipiers' => 'crew'
-                ]
+				)
-            ]
+			)
-        ]
+		)
-    ];
+	);
 
-    public function collectData()
+	public function collectData() {
-    {
 		$url = $this->getURI();
 		$html = getSimpleHTMLDOM($url) or returnClientError('No results for this query.');
 
@@ -36,21 +33,20 @@ class BAEBridge extends BridgeAbstract
 			$detail = $annonce->find('footer a', 0);
 
 			$htmlDetail = getSimpleHTMLDOMCached(parent::getURI() . $detail->href);
-            if (!$htmlDetail) {
+			if (!$htmlDetail)
 				continue;
-            }
 
-            $item = [];
+			$item = array();
 
 			$item['title'] = $annonce->find('header h2', 0)->plaintext;
 			$item['uri'] = parent::getURI() . $detail->href;
 
 			$content = $htmlDetail->find('article p', 0)->innertext;
 			if (!empty($this->getInput('keyword'))) {
-                $keyword = $this->removeAccents(strtolower($this->getInput('keyword')));
+				$keyword = $this->remove_accents(strtolower($this->getInput('keyword')));
-                $cleanTitle = $this->removeAccents(strtolower($item['title']));
+				$cleanTitle = $this->remove_accents(strtolower($item['title']));
 				if (strpos($cleanTitle, $keyword) === false) {
-                    $cleanContent = $this->removeAccents(strtolower($content));
+					$cleanContent = $this->remove_accents(strtolower($content));
 					if (strpos($cleanContent, $keyword) === false) {
 						continue;
 					}
@@ -59,17 +55,18 @@ class BAEBridge extends BridgeAbstract
 
 			$content .= '<hr>';
 			$content .= $htmlDetail->find('section', 0)->innertext;
-            $item['content'] = defaultLinkTo($content, parent::getURI());
+			$content = str_replace('src="/', 'src="' . parent::getURI() . '/', $content);
+			$content = str_replace('href="/', 'href="' . parent::getURI() . '/', $content);
+			$item['content'] = $content;
 			$image = $htmlDetail->find('#zoom', 0);
 			if ($image) {
-                $item['enclosures'] = [parent::getURI() . $image->getAttribute('src')];
+				$item['enclosures'] = array(parent::getURI() . $image->getAttribute('src'));
 			}
 			$this->items[] = $item;
 		}
 	}
 
-    public function getURI()
+	public function getURI() {
-    {
 		$uri = parent::getURI();
 		if (!empty($this->getInput('type'))) {
 			if ($this->getInput('type') == 'boat') {
@@ -84,9 +81,8 @@ class BAEBridge extends BridgeAbstract
 		return $uri;
 	}
 
-    private function removeAccents($string)
+	private function remove_accents($string) {
-    {
+		$chars = array(
-        $chars = [
 			// Decompositions for Latin-1 Supplement
 			'ª' => 'a', 'º' => 'o',
 			'À' => 'A', 'Á' => 'A',
@@ -260,7 +256,7 @@ class BAEBridge extends BridgeAbstract
 			'Ǚ' => 'U', 'ǚ' => 'u',
 			// grave accent
 			'Ǜ' => 'U', 'ǜ' => 'u',
-        ];
+		);
 
 		$string = strtr($string, $chars);
 

bridges/BadDragonBridge.php

@@ -1,440 +0,0 @@
-<?php
-
-class BadDragonBridge extends BridgeAbstract
-{
-    const NAME = 'Bad Dragon Bridge';
-    const URI = 'https://bad-dragon.com/';
-    const CACHE_TIMEOUT = 300; // 5min
-    const DESCRIPTION = 'Returns sales or new clearance items';
-    const MAINTAINER = 'Roliga';
-    const PARAMETERS = [
-        'Sales' => [
-        ],
-        'Clearance' => [
-            'ready_made' => [
-                'name' => 'Ready Made',
-                'type' => 'checkbox'
-            ],
-            'flop' => [
-                'name' => 'Flops',
-                'type' => 'checkbox'
-            ],
-            'skus' => [
-                'name' => 'Products',
-                'exampleValue' => 'chanceflared, crackers',
-                'title' => 'Comma separated list of product SKUs'
-            ],
-            'onesize' => [
-                'name' => 'One-Size',
-                'type' => 'checkbox'
-            ],
-            'mini' => [
-                'name' => 'Mini',
-                'type' => 'checkbox'
-            ],
-            'small' => [
-                'name' => 'Small',
-                'type' => 'checkbox'
-            ],
-            'medium' => [
-                'name' => 'Medium',
-                'type' => 'checkbox'
-            ],
-            'large' => [
-                'name' => 'Large',
-                'type' => 'checkbox'
-            ],
-            'extralarge' => [
-                'name' => 'Extra Large',
-                'type' => 'checkbox'
-            ],
-            'category' => [
-                'name' => 'Category',
-                'type' => 'list',
-                'values' => [
-                    'All' => 'all',
-                    'Accessories' => 'accessories',
-                    'Merchandise' => 'merchandise',
-                    'Dildos' => 'insertable',
-                    'Masturbators' => 'penetrable',
-                    'Packers' => 'packer',
-                    'Lil\' Squirts' => 'shooter',
-                    'Lil\' Vibes' => 'vibrator',
-                    'Wearables' => 'wearable'
-                ],
-                'defaultValue' => 'all',
-            ],
-            'soft' => [
-                'name' => 'Soft Firmness',
-                'type' => 'checkbox'
-            ],
-            'med_firm' => [
-                'name' => 'Medium Firmness',
-                'type' => 'checkbox'
-            ],
-            'firm' => [
-                'name' => 'Firm',
-                'type' => 'checkbox'
-            ],
-            'split' => [
-                'name' => 'Split Firmness',
-                'type' => 'checkbox'
-            ],
-            'maxprice' => [
-                'name' => 'Max Price',
-                'type' => 'number',
-                'required' => true,
-                'defaultValue' => 300
-            ],
-            'minprice' => [
-                'name' => 'Min Price',
-                'type' => 'number',
-                'defaultValue' => 0
-            ],
-            'cumtube' => [
-                'name' => 'Cumtube',
-                'type' => 'checkbox'
-            ],
-            'suctionCup' => [
-                'name' => 'Suction Cup',
-                'type' => 'checkbox'
-            ],
-            'noAccessories' => [
-                'name' => 'No Accessories',
-                'type' => 'checkbox'
-            ]
-        ]
-    ];
-
-    /*
-     * This sets index $strFrom (or $strTo if set) in $outArr to 'on' if
-     * $inArr[$param] contains $strFrom.
-     * It is used for translating BD's shop filter URLs into something we can use.
-     *
-     * For the query '?type[]=ready_made&type[]=flop' we would have an array like:
-     * Array (
-     *     [type] => Array (
-     *             [0] => ready_made
-     *             [1] => flop
-     *         )
-     * )
-     * which could be translated into:
-     * Array (
-     *     [ready_made] => on
-     *     [flop] => on
-     * )
-     * */
-    private function setParam($inArr, &$outArr, $param, $strFrom, $strTo = null)
-    {
-        if (isset($inArr[$param]) && in_array($strFrom, $inArr[$param])) {
-            $outArr[($strTo ?: $strFrom)] = 'on';
-        }
-    }
-
-    public function detectParameters($url)
-    {
-        $params = [];
-
-        // Sale
-        $regex = '/^(https?:\/\/)?bad-dragon\.com\/sales/';
-        if (preg_match($regex, $url, $matches) > 0) {
-            return $params;
-        }
-
-        // Clearance
-        $regex = '/^(https?:\/\/)?bad-dragon\.com\/shop\/clearance/';
-        if (preg_match($regex, $url, $matches) > 0) {
-            parse_str(parse_url($url, PHP_URL_QUERY), $urlParams);
-
-            $this->setParam($urlParams, $params, 'type', 'ready_made');
-            $this->setParam($urlParams, $params, 'type', 'flop');
-
-            if (isset($urlParams['skus'])) {
-                $skus = [];
-                foreach ($urlParams['skus'] as $sku) {
-                    is_string($sku) && $skus[] = $sku;
-                    is_array($sku) && $skus[] = $sku[0];
-                }
-                $params['skus'] = implode(',', $skus);
-            }
-
-            $this->setParam($urlParams, $params, 'sizes', 'onesize');
-            $this->setParam($urlParams, $params, 'sizes', 'mini');
-            $this->setParam($urlParams, $params, 'sizes', 'small');
-            $this->setParam($urlParams, $params, 'sizes', 'medium');
-            $this->setParam($urlParams, $params, 'sizes', 'large');
-            $this->setParam($urlParams, $params, 'sizes', 'extralarge');
-
-            if (isset($urlParams['category'])) {
-                $params['category'] = strtolower($urlParams['category']);
-            } else {
-                $params['category'] = 'all';
-            }
-
-            $this->setParam($urlParams, $params, 'firmnessValues', 'soft');
-            $this->setParam($urlParams, $params, 'firmnessValues', 'medium', 'med_firm');
-            $this->setParam($urlParams, $params, 'firmnessValues', 'firm');
-            $this->setParam($urlParams, $params, 'firmnessValues', 'split');
-
-            if (isset($urlParams['price'])) {
-                isset($urlParams['price']['max'])
-                    && $params['maxprice'] = $urlParams['price']['max'];
-                isset($urlParams['price']['min'])
-                    && $params['minprice'] = $urlParams['price']['min'];
-            }
-
-            isset($urlParams['cumtube'])
-                && $urlParams['cumtube'] === '1'
-                && $params['cumtube'] = 'on';
-            isset($urlParams['suctionCup'])
-                && $urlParams['suctionCup'] === '1'
-                && $params['suctionCup'] = 'on';
-            isset($urlParams['noAccessories'])
-                && $urlParams['noAccessories'] === '1'
-                && $params['noAccessories'] = 'on';
-
-            return $params;
-        }
-
-        return null;
-    }
-
-    public function getName()
-    {
-        switch ($this->queriedContext) {
-            case 'Sales':
-                return 'Bad Dragon Sales';
-            case 'Clearance':
-                return 'Bad Dragon Clearance Search';
-            default:
-                return parent::getName();
-        }
-    }
-
-    public function getURI()
-    {
-        switch ($this->queriedContext) {
-            case 'Sales':
-                return self::URI . 'sales';
-            case 'Clearance':
-                return $this->inputToURL();
-            default:
-                return parent::getURI();
-        }
-    }
-
-    public function collectData()
-    {
-        switch ($this->queriedContext) {
-            case 'Sales':
-                $sales = json_decode(getContents(self::URI . 'api/sales'));
-
-                foreach ($sales as $sale) {
-                    $item = [];
-
-                    $item['title'] = $sale->title;
-                    $item['timestamp'] = strtotime($sale->startDate);
-
-                    $item['uri'] = $this->getURI() . '/' . $sale->slug;
-
-                    $contentHTML = '<p><img src="' . $sale->image->url . '"></p>';
-                    if (isset($sale->endDate)) {
-                        $contentHTML .= '<p><b>This promotion ends on '
-                        . gmdate('M j, Y \a\t g:i A T', strtotime($sale->endDate))
-                        . '</b></p>';
-                    } else {
-                        $contentHTML .= '<p><b>This promotion never ends</b></p>';
-                    }
-                    $ul = false;
-                    $content = json_decode($sale->content);
-                    foreach ($content->blocks as $block) {
-                        switch ($block->type) {
-                            case 'header-one':
-                                $contentHTML .= '<h1>' . $block->text . '</h1>';
-                                break;
-                            case 'header-two':
-                                $contentHTML .= '<h2>' . $block->text . '</h2>';
-                                break;
-                            case 'header-three':
-                                $contentHTML .= '<h3>' . $block->text . '</h3>';
-                                break;
-                            case 'unordered-list-item':
-                                if (!$ul) {
-                                    $contentHTML .= '<ul>';
-                                    $ul = true;
-                                }
-                                $contentHTML .= '<li>' . $block->text . '</li>';
-                                break;
-                            default:
-                                if ($ul) {
-                                    $contentHTML .= '</ul>';
-                                    $ul = false;
-                                }
-                                $contentHTML .= '<p>' . $block->text . '</p>';
-                                break;
-                        }
-                    }
-                    $item['content'] = $contentHTML;
-
-                    $this->items[] = $item;
-                }
-                break;
-            case 'Clearance':
-                $toyData = json_decode(getContents($this->inputToURL(true)));
-
-                $productList = json_decode(getContents(self::URI
-                . 'api/inventory-toy/product-list'));
-
-                foreach ($toyData->toys as $toy) {
-                    $item = [];
-
-                    $item['uri'] = $this->getURI()
-                        . '#'
-                        . $toy->id;
-                    $item['timestamp'] = strtotime($toy->created);
-
-                    foreach ($productList as $product) {
-                        if ($product->sku == $toy->sku) {
-                            $item['title'] = $product->name;
-                            break;
-                        }
-                    }
-
-                    // images
-                    $content = '<p>';
-                    foreach ($toy->images as $image) {
-                        $content .= '<a href="'
-                        . $image->fullFilename
-                        . '"><img src="'
-                        . $image->thumbFilename
-                        . '" /></a>';
-                    }
-                    // price
-                    $content .= '</p><p><b>Price:</b> $'
-                    . $toy->price
-                    // size
-                    . '<br /><b>Size:</b> '
-                    . $toy->size
-                    // color
-                    . '<br /><b>Color:</b> '
-                    . $toy->color
-                    // features
-                    . '<br /><b>Features:</b> '
-                    . ($toy->suction_cup ? 'Suction cup' : '')
-                    . ($toy->suction_cup && $toy->cumtube ? ', ' : '')
-                    . ($toy->cumtube ? 'Cumtube' : '')
-                    . ($toy->suction_cup || $toy->cumtube ? '' : 'None');
-                    // firmness
-                    $firmnessTexts = [
-                    '2' => 'Extra soft',
-                    '3' => 'Soft',
-                    '5' => 'Medium',
-                    '8' => 'Firm'
-                    ];
-                    $firmnesses = explode('/', $toy->firmness);
-                    if (count($firmnesses) === 2) {
-                        $content .= '<br /><b>Firmness:</b> '
-                        . $firmnessTexts[$firmnesses[0]]
-                        . ', '
-                        . $firmnessTexts[$firmnesses[1]];
-                    } else {
-                        $content .= '<br /><b>Firmness:</b> '
-                        . $firmnessTexts[$firmnesses[0]];
-                    }
-                    // flop
-                    if ($toy->type === 'flop') {
-                        $content .= '<br /><b>Flop reason:</b> '
-                        . $toy->flop_reason;
-                    }
-                    $content .= '</p>';
-                    $item['content'] = $content;
-
-                    $enclosures = [];
-                    foreach ($toy->images as $image) {
-                        $enclosures[] = $image->fullFilename;
-                    }
-                    $item['enclosures'] = $enclosures;
-
-                    $categories = [];
-                    $categories[] = $toy->sku;
-                    $categories[] = $toy->type;
-                    $categories[] = $toy->size;
-                    if ($toy->cumtube) {
-                        $categories[] = 'cumtube';
-                    }
-                    if ($toy->suction_cup) {
-                        $categories[] = 'suction_cup';
-                    }
-                    $item['categories'] = $categories;
-
-                    $this->items[] = $item;
-                }
-                break;
-        }
-    }
-
-    private function inputToURL($api = false)
-    {
-        $url = self::URI;
-        $url .= ($api ? 'api/inventory-toys?' : 'shop/clearance?');
-
-        // Default parameters
-        $url .= 'limit=60';
-        $url .= '&page=1';
-        $url .= '&sort[field]=created';
-        $url .= '&sort[direction]=desc';
-
-        // Product types
-        $url .= ($this->getInput('ready_made') ? '&type[]=ready_made' : '');
-        $url .= ($this->getInput('flop') ? '&type[]=flop' : '');
-
-        // Product names
-        foreach (array_filter(explode(',', $this->getInput('skus'))) as $sku) {
-            $url .= '&skus[]=' . urlencode(trim($sku));
-        }
-
-        // Size
-        $url .= ($this->getInput('onesize') ? '&sizes[]=onesize' : '');
-        $url .= ($this->getInput('mini') ? '&sizes[]=mini' : '');
-        $url .= ($this->getInput('small') ? '&sizes[]=small' : '');
-        $url .= ($this->getInput('medium') ? '&sizes[]=medium' : '');
-        $url .= ($this->getInput('large') ? '&sizes[]=large' : '');
-        $url .= ($this->getInput('extralarge') ? '&sizes[]=extralarge' : '');
-
-        // Category
-        $url .= ($this->getInput('category') ? '&category='
-            . urlencode($this->getInput('category')) : '');
-
-        // Firmness
-        if ($api) {
-            $url .= ($this->getInput('soft') ? '&firmnessValues[]=3' : '');
-            $url .= ($this->getInput('med_firm') ? '&firmnessValues[]=5' : '');
-            $url .= ($this->getInput('firm') ? '&firmnessValues[]=8' : '');
-            if ($this->getInput('split')) {
-                $url .= '&firmnessValues[]=3/5';
-                $url .= '&firmnessValues[]=3/8';
-                $url .= '&firmnessValues[]=8/3';
-                $url .= '&firmnessValues[]=5/8';
-                $url .= '&firmnessValues[]=8/5';
-            }
-        } else {
-            $url .= ($this->getInput('soft') ? '&firmnessValues[]=soft' : '');
-            $url .= ($this->getInput('med_firm') ? '&firmnessValues[]=medium' : '');
-            $url .= ($this->getInput('firm') ? '&firmnessValues[]=firm' : '');
-            $url .= ($this->getInput('split') ? '&firmnessValues[]=split' : '');
-        }
-
-        // Price
-        $url .= ($this->getInput('maxprice') ? '&price[max]='
-            . $this->getInput('maxprice') : '&price[max]=300');
-        $url .= ($this->getInput('minprice') ? '&price[min]='
-            . $this->getInput('minprice') : '&price[min]=0');
-
-        // Features
-        $url .= ($this->getInput('cumtube') ? '&cumtube=1' : '');
-        $url .= ($this->getInput('suctionCup') ? '&suctionCup=1' : '');
-        $url .= ($this->getInput('noAccessories') ? '&noAccessories=1' : '');
-
-        return $url;
-    }
-}

bridges/BakaUpdatesMangaReleasesBridge.php

@@ -1,211 +0,0 @@
-<?php
-
-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 = [
-        'By series' => [
-            'series_id' => [
-                'name'      => 'Series ID',
-                'type'      => 'number',
-                'required'  => true,
-                'exampleValue'  => '188066'
-            ]
-        ],
-        'By list' => [
-            'list_id' => [
-                'name'      => 'List ID and Type',
-                'type'      => 'text',
-                'required'  => true,
-                'exampleValue'  => '4395&list=read'
-            ]
-        ]
-    ];
-    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());
-
-        // content is an unstructured pile of divs, ugly to parse
-        $cols = $html->find('div#main_content div.row > div.text');
-        if (!$cols) {
-            returnServerError('No releases');
-        }
-
-        $rows = array_slice(
-            array_chunk($cols, self::LIMIT_COLS),
-            0,
-            self::LIMIT_ITEMS
-        );
-
-        if (isset($rows[0][1])) {
-            $this->feedName = $this->filterHTML($rows[0][1]->plaintext);
-        }
-
-        foreach ($rows as $cols) {
-            if (count($cols) < self::LIMIT_COLS) {
-                continue;
-            }
-
-            $item = [];
-            $title = [];
-
-            $item['content'] = '';
-
-            $objDate = $cols[0];
-            if ($objDate) {
-                $item['timestamp'] = strtotime($objDate->plaintext);
-            }
-
-            $objTitle = $cols[1];
-            if ($objTitle) {
-                $title[] = $this->filterHTML($objTitle->plaintext);
-                $item['content'] .= '<p>Series: ' . $this->filterText($objTitle->innertext) . '</p>';
-            }
-
-            $objVolume = $cols[2];
-            if ($objVolume && !empty($objVolume->plaintext)) {
-                $title[] = 'Vol.' . $objVolume->plaintext;
-            }
-
-            $objChapter = $cols[3];
-            if ($objChapter && !empty($objChapter->plaintext)) {
-                $title[] = 'Chp.' . $objChapter->plaintext;
-            }
-
-            $objAuthor = $cols[4];
-            if ($objAuthor && !empty($objAuthor->plaintext)) {
-                $item['author'] = $this->filterHTML($objAuthor->plaintext);
-                $item['content'] .= '<p>Groups: ' . $this->filterText($objAuthor->innertext) . '</p>';
-            }
-
-            $item['title'] = implode(' ', $title);
-            $item['uri'] = $this->getURI();
-            $item['uid'] = $this->getSanitizedHash($item['title'] . $item['author']);
-
-            $this->items[] = $item;
-        }
-    }
-
-    private function collectDataByList()
-    {
-        $this -> feedName = 'Releases';
-        $list = [];
-
-        $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);
-        }
-
-        //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 = [];
-            $title = [];
-
-            $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;
-        }
-    }
-}

bridges/BandcampBridge.php

@@ -1,421 +1,67 @@
 <?php
+class BandcampBridge extends BridgeAbstract {
 
-class BandcampBridge extends BridgeAbstract
+	const MAINTAINER = 'sebsauvage';
-{
+	const NAME = 'Bandcamp Tag';
-    const MAINTAINER = 'sebsauvage, Roliga';
-    const NAME = 'Bandcamp Bridge';
 	const URI = 'https://bandcamp.com/';
 	const CACHE_TIMEOUT = 600; // 10min
-    const DESCRIPTION = 'New bandcamp releases by tag, band or album';
+	const DESCRIPTION = 'New bandcamp release by tag';
-    const PARAMETERS = [
+	const PARAMETERS = array( array(
-        'By tag' => [
+		'tag' => array(
-            'tag' => [
 			'name' => 'tag',
 			'type' => 'text',
-                'required' => true,
-                'exampleValue'  => 'hip-hop-rap'
-            ]
-        ],
-        'By band' => [
-            'band' => [
-                'name' => 'band',
-                'type' => 'text',
-                'title' => 'Band name as seen in the band page URL',
-                'required' => true,
-                'exampleValue'  => 'aesoprock'
-            ],
-            'type' => [
-                'name' => 'Articles are',
-                'type' => 'list',
-                'values' => [
-                    'Releases' => 'releases',
-                    'Releases, new one when track list changes' => 'changes',
-                    'Individual tracks' => 'tracks'
-                ],
-                'defaultValue' => 'changes'
-            ],
-            'limit' => [
-                'name' => 'limit',
-                'type' => 'number',
-                'required' => true,
-                'title' => 'Number of releases to return',
-                'defaultValue' => 5
-            ]
-        ],
-        'By label' => [
-            'label' => [
-                'name' => 'label',
-                'type' => 'text',
-                'title' => 'label name as seen in the label page URL',
 			'required' => true
-            ],
+		)
-            'type' => [
+	));
-                'name' => 'Articles are',
-                'type' => 'list',
-                'values' => [
-                    'Releases' => 'releases',
-                    'Releases, new one when track list changes' => 'changes',
-                    'Individual tracks' => 'tracks'
-                ],
-                'defaultValue' => 'changes'
-            ],
-            'limit' => [
-                'name' => 'limit',
-                'type' => 'number',
-                'title' => 'Number of releases to return',
-                'defaultValue' => 5
-            ]
-        ],
-        'By album' => [
-            'band' => [
-                'name' => 'band',
-                'type' => 'text',
-                'title' => 'Band name as seen in the album page URL',
-                'required' => true,
-                'exampleValue'  => 'aesoprock'
-            ],
-            'album' => [
-                'name' => 'album',
-                'type' => 'text',
-                'title' => 'Album name as seen in the album page URL',
-                'required' => true,
-                'exampleValue'  => 'appleseed'
-            ],
-            'type' => [
-                'name' => 'Articles are',
-                'type' => 'list',
-                'values' => [
-                    'Releases' => 'releases',
-                    'Releases, new one when track list changes' => 'changes',
-                    'Individual tracks' => 'tracks'
-                ],
-                'defaultValue' => 'tracks'
-            ]
-        ]
-    ];
-    const IMGURI = 'https://f4.bcbits.com/';
-    const IMGSIZE_300PX = 23;
-    const IMGSIZE_700PX = 16;
 
-    private $feedName;
+	public function getIcon() {
-
-    public function getIcon()
-    {
 		return 'https://s4.bcbits.com/img/bc_favicon.ico';
 	}
 
-    public function collectData()
+	public function collectData(){
-    {
+		$html = getSimpleHTMLDOM($this->getURI())
-        switch ($this->queriedContext) {
+			or returnServerError('No results for this query.');
-            case 'By tag':
-                $url = self::URI . 'api/hub/1/dig_deeper';
-                $data = $this->buildRequestJson();
-                $header = [
-                'Content-Type: application/json',
-                'Content-Length: ' . strlen($data)
-                ];
-                $opts = [
-                CURLOPT_CUSTOMREQUEST => 'POST',
-                CURLOPT_POSTFIELDS => $data
-                ];
-                $content = getContents($url, $header, $opts);
 
-                $json = json_decode($content);
+		foreach($html->find('li.item') as $release) {
+			$script = $release->find('div.art', 0)->getAttribute('onclick');
+			$uri = ltrim($script, "return 'url(");
+			$uri = rtrim($uri, "')");
 
-                if ($json->ok !== true) {
+			$item = array();
-                    returnServerError('Invalid response');
+			$item['author'] = $release->find('div.itemsubtext', 0)->plaintext
-                }
+			. ' - '
+			. $release->find('div.itemtext', 0)->plaintext;
 
-                foreach ($json->items as $entry) {
+			$item['title'] = $release->find('div.itemsubtext', 0)->plaintext
-                    $url = $entry->tralbum_url;
+			. ' - '
-                    $artist = $entry->artist;
+			. $release->find('div.itemtext', 0)->plaintext;
-                    $title = $entry->title;
-                    // e.g. record label is the releaser, but not the artist
-                    $releaser = $entry->band_name !== $entry->artist ? $entry->band_name : null;
 
-                    $full_title = $artist . ' - ' . $title;
+			$item['content'] = '<img src="'
-                    $full_artist = $artist;
+			. $uri
-                    if (isset($releaser)) {
+			. '"/><br/>'
-                        $full_title .= ' (' . $releaser . ')';
+			. $release->find('div.itemsubtext', 0)->plaintext
-                        $full_artist .= ' (' . $releaser . ')';
+			. ' - '
-                    }
+			. $release->find('div.itemtext', 0)->plaintext;
-                    $small_img = $this->getImageUrl($entry->art_id, self::IMGSIZE_300PX);
-                    $img = $this->getImageUrl($entry->art_id, self::IMGSIZE_700PX);
 
-                    $item = [
+			$item['id'] = $release->find('a', 0)->getAttribute('href');
-                    'uri' => $url,
+			$item['uri'] = $release->find('a', 0)->getAttribute('href');
-                    'author' => $full_artist,
-                    'title' => $full_title
-                    ];
-                    $item['content'] = "<img src='$small_img' /><br/>$full_title";
-                    $item['enclosures'] = [$img];
 			$this->items[] = $item;
 		}
-                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);
 	}
 
-                $regex = '/band_id=(\d+)/';
+	public function getURI(){
-                if (preg_match($regex, $html, $matches) == false) {
-                    returnServerError('Unable to find band ID on: ' . $this->getURI());
-                }
-                $band_id = $matches[1];
-
-                $tralbums = [];
-                switch ($this->queriedContext) {
-                    case 'By band':
-                    case 'By label':
-                        $query_data = [
-                        'band_id' => $band_id
-                        ];
-                        $band_data = $this->apiGet('mobile/22/band_details', $query_data);
-
-                        $num_albums = min(count($band_data->discography), $this->getInput('limit'));
-                        for ($i = 0; $i < $num_albums; $i++) {
-                            $album_basic_data = $band_data->discography[$i];
-
-                            // 'a' or 't' for albums and individual tracks respectively
-                            $tralbum_type = substr($album_basic_data->item_type, 0, 1);
-
-                            $query_data = [
-                            'band_id' => $band_id,
-                            'tralbum_type' => $tralbum_type,
-                            'tralbum_id' => $album_basic_data->item_id
-                            ];
-                            $tralbums[] = $this->apiGet('mobile/22/tralbum_details', $query_data);
-                        }
-                        break;
-                    case 'By album':
-                        $regex = '/album=(\d+)/';
-                        if (preg_match($regex, $html, $matches) == false) {
-                            returnServerError('Unable to find album ID on: ' . $this->getURI());
-                        }
-                        $album_id = $matches[1];
-
-                        $query_data = [
-                        'band_id' => $band_id,
-                        'tralbum_type' => 'a',
-                        'tralbum_id' => $album_id
-                        ];
-                        $tralbums[] = $this->apiGet('mobile/22/tralbum_details', $query_data);
-
-                        break;
-                }
-
-                foreach ($tralbums as $tralbum_data) {
-                    if ($tralbum_data->type === 'a' && $this->getInput('type') === 'tracks') {
-                        foreach ($tralbum_data->tracks as $track) {
-                            $query_data = [
-                            'band_id' => $band_id,
-                            'tralbum_type' => 't',
-                            'tralbum_id' => $track->track_id
-                            ];
-                            $track_data = $this->apiGet('mobile/22/tralbum_details', $query_data);
-
-                            $this->items[] = $this->buildTralbumItem($track_data);
-                        }
-                    } else {
-                        $this->items[] = $this->buildTralbumItem($tralbum_data);
-                    }
-                }
-                break;
-        }
-    }
-
-    private function buildTralbumItem($tralbum_data)
-    {
-        $band_data = $tralbum_data->band;
-
-        // Format title like: ARTIST - ALBUM/TRACK (OPTIONAL RELEASER)
-        // Format artist/author like: ARTIST (OPTIONAL RELEASER)
-        //
-        // If the album/track is released under a label/a band other than the artist
-        // themselves, append that releaser name to the title and artist/author.
-        //
-        // This sadly doesn't always work right for individual tracks as the artist
-        // of the track is always set to the releaser.
-        $artist = $tralbum_data->tralbum_artist;
-        $full_title = $artist . ' - ' . $tralbum_data->title;
-        $full_artist = $artist;
-        if (isset($tralbum_data->label)) {
-            $full_title .= ' (' . $tralbum_data->label . ')';
-            $full_artist .= ' (' . $tralbum_data->label . ')';
-        } elseif ($band_data->name !== $artist) {
-            $full_title .= ' (' . $band_data->name . ')';
-            $full_artist .= ' (' . $band_data->name . ')';
-        }
-
-        $small_img = $this->getImageUrl($tralbum_data->art_id, self::IMGSIZE_300PX);
-        $img = $this->getImageUrl($tralbum_data->art_id, self::IMGSIZE_700PX);
-
-        $item = [
-            'uri' => $tralbum_data->bandcamp_url,
-            'author' => $full_artist,
-            'title' => $full_title,
-            'enclosures' => [$img],
-            'timestamp' => $tralbum_data->release_date
-        ];
-
-        $item['categories'] = [];
-        foreach ($tralbum_data->tags as $tag) {
-            $item['categories'][] = $tag->norm_name;
-        }
-
-        // Give articles a unique UID depending on its track list
-        // Releases should then show up as new articles when tracks are added
-        if ($this->getInput('type') === 'changes') {
-            $item['uid'] = "bandcamp/$band_data->band_id/$tralbum_data->id/";
-            foreach ($tralbum_data->tracks as $track) {
-                $item['uid'] .= $track->track_id;
-            }
-        }
-
-        $item['content'] = "<img src='$small_img' /><br/>$full_title<br/>";
-        if ($tralbum_data->type === 'a') {
-            $item['content'] .= '<ol>';
-            foreach ($tralbum_data->tracks as $track) {
-                $item['content'] .= "<li>$track->title</li>";
-            }
-            $item['content'] .= '</ol>';
-        }
-        if (!empty($tralbum_data->about)) {
-            $item['content'] .= '<p>'
-                . nl2br($tralbum_data->about)
-                . '</p>';
-        }
-
-        return $item;
-    }
-
-    private function buildRequestJson()
-    {
-        $requestJson = [
-            'tag' => $this->getInput('tag'),
-            'page' => 1,
-            'sort' => 'date'
-        ];
-        return json_encode($requestJson);
-    }
-
-    private function getImageUrl($id, $size)
-    {
-        return self::IMGURI . 'img/a' . $id . '_' . $size . '.jpg';
-    }
-
-    private function apiGet($endpoint, $query_data)
-    {
-        $url = self::URI . 'api/' . $endpoint . '?' . http_build_query($query_data);
-        // todo: 429 Too Many Requests happens a lot
-        $data = json_decode(getContents($url));
-        return $data;
-    }
-
-    public function getURI()
-    {
-        switch ($this->queriedContext) {
-            case 'By tag':
 		if(!is_null($this->getInput('tag'))) {
-                    return self::URI
+			return self::URI . 'tag/' . urlencode($this->getInput('tag')) . '?sort_field=date';
-                    . 'tag/'
-                    . urlencode($this->getInput('tag'))
-                    . '?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://'
-                    . $this->getInput('band')
-                    . '.bandcamp.com/music';
-                }
-                break;
-            case 'By album':
-                if (!is_null($this->getInput('band')) && !is_null($this->getInput('album'))) {
-                    return 'https://'
-                    . $this->getInput('band')
-                    . '.bandcamp.com/album/'
-                    . $this->getInput('album');
-                }
-                break;
 		}
 
 		return parent::getURI();
 	}
 
-    public function getName()
+	public function getName(){
-    {
-        switch ($this->queriedContext) {
-            case 'By tag':
 		if(!is_null($this->getInput('tag'))) {
 			return $this->getInput('tag') . ' - Bandcamp Tag';
 		}
-                break;
-            case 'By band':
-                if (isset($this->feedName)) {
-                    return $this->feedName . ' - Bandcamp Band';
-                } elseif (!is_null($this->getInput('band'))) {
-                    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';
-                } elseif (!is_null($this->getInput('album'))) {
-                    return $this->getInput('album') . ' - Bandcamp Album';
-                }
-                break;
-        }
 
 		return parent::getName();
 	}
-
-    public function detectParameters($url)
-    {
-        $params = [];
-
-        // By tag
-        $regex = '/^(https?:\/\/)?bandcamp\.com\/tag\/([^\/.&?\n]+)/';
-        if (preg_match($regex, $url, $matches) > 0) {
-            $params['tag'] = urldecode($matches[2]);
-            return $params;
-        }
-
-        // By band
-        $regex = '/^(https?:\/\/)?([^\/.&?\n]+?)\.bandcamp\.com/';
-        if (preg_match($regex, $url, $matches) > 0) {
-            $params['band'] = urldecode($matches[2]);
-            return $params;
-        }
-
-        // By album
-        $regex = '/^(https?:\/\/)?([^\/.&?\n]+?)\.bandcamp\.com\/album\/([^\/.&?\n]+)/';
-        if (preg_match($regex, $url, $matches) > 0) {
-            $params['band'] = urldecode($matches[2]);
-            $params['album'] = urldecode($matches[3]);
-            return $params;
-        }
-
-        return null;
-    }
 }

bridges/BandcampDailyBridge.php

@@ -1,164 +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 = [
-        'Latest articles' => [],
-        'Best of' => [
-            'best-content' => [
-                'name' => 'content',
-                'type' => 'list',
-                'values' => [
-                    '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' => [
-            'genres-content' => [
-                'name' => 'content',
-                'type' => 'list',
-                'values' => [
-                    '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' => [
-            'franchises-content' => [
-                'name' => 'content',
-                'type' => 'list',
-                'values' => [
-                    '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 = [];
-
-            $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':
-                // TODO Switch to array_key_first once php >= 7.3
-                $contentKey = key(self::PARAMETERS[$this->queriedContext]);
-                return self::URI . '/' . $this->getInput($contentKey);
-            default:
-                return parent::getURI();
-        }
-    }
-
-    public function getName()
-    {
-        switch ($this->queriedContext) {
-            case 'Latest articles':
-                return $this->queriedContext . ' - Bandcamp Daily';
-            case 'Best of':
-            case 'Genres':
-            case 'Franchises':
-                $contentKey = array_key_first(self::PARAMETERS[$this->queriedContext]);
-                $contentValues = array_flip(self::PARAMETERS[$this->queriedContext][$contentKey]['values']);
-
-                return $contentValues[$this->getInput($contentKey)] . ' - Bandcamp Daily';
-            default:
-                return parent::getName();
-        }
-    }
-}

bridges/BastaBridge.php

@@ -1,30 +1,31 @@
 <?php
+class BastaBridge extends BridgeAbstract {
 
-class BastaBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'qwertygc';
 	const NAME = 'Bastamag Bridge';
-    const URI = 'https://www.bastamag.net/';
+	const URI = 'http://www.bastamag.net/';
 	const CACHE_TIMEOUT = 7200; // 2h
 	const DESCRIPTION = 'Returns the newest articles.';
 
-    public function collectData()
+	public function collectData(){
-    {
+		// Replaces all relative image URLs by absolute URLs.
-        $html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend');
+		// Relative URLs always start with 'local/'!
+		function replaceImageUrl($content){
+			return preg_replace('/src=["\']{1}([^"\']+)/ims', 'src=\'' . self::URI . '$1\'', $content);
+		}
+
+		$html = getSimpleHTMLDOM(self::URI . 'spip.php?page=backend')
+			or returnServerError('Could not request Bastamag.');
 
 		$limit = 0;
 
 		foreach($html->find('item') as $element) {
 			if($limit < 10) {
-                $item = [];
+				$item = array();
 				$item['title'] = $element->find('title', 0)->innertext;
 				$item['uri'] = $element->find('guid', 0)->plaintext;
 				$item['timestamp'] = strtotime($element->find('dc:date', 0)->plaintext);
-
+				$item['content'] = replaceImageUrl(getSimpleHTMLDOM($item['uri'])->find('div.texte', 0)->innertext);
-                $html = getSimpleHTMLDOM($item['uri']);
-                $html = defaultLinkTo($html, self::URI);
-
-                $item['content'] = $html->find('div.texte', 0)->innertext;
 				$this->items[] = $item;
 				$limit++;
 			}

bridges/BinanceBridge.php

@@ -1,55 +0,0 @@
-<?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 MAINTAINER = 'thefranke';
-    const CACHE_TIMEOUT = 3600; // 1h
-
-    public function getIcon()
-    {
-        return 'https://bin.bnbstatic.com/static/images/common/favicon.ico';
-    }
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM(self::URI)
-            or returnServerError('Could not fetch Binance blog data.');
-
-        $appData = $html->find('script[id="__APP_DATA"]');
-        $appDataJson = json_decode($appData[0]->innertext);
-        $allposts = $appDataJson->routeProps->f3ac->blogListRes->list;
-
-        foreach ($allposts as $element) {
-            $date = $element->releasedTime;
-            $title = $element->title;
-            $category = $element->category->name;
-
-            $suburl = strtolower($category);
-            $suburl = str_replace(' ', '_', $suburl);
-
-            $uri = self::URI . '/' . $suburl . '/' . $element->idStr;
-
-            $contentHTML = getSimpleHTMLDOMCached($uri);
-            $contentAppData = $contentHTML->find('script[id="__APP_DATA"]');
-            $contentAppDataJson = json_decode($contentAppData[0]->innertext);
-            $content = $contentAppDataJson->routeProps->a106->blogDetail->content;
-
-            $item = [];
-            $item['title'] = $title;
-            $item['uri'] = $uri;
-            $item['timestamp'] = substr($date, 0, -3);
-            $item['author'] = 'Binance';
-            $item['content'] = $content;
-            $item['categories'] = $category;
-
-            $this->items[] = $item;
-
-            if (count($this->items) >= 10) {
-                break;
-            }
-        }
-    }
-}

bridges/BlaguesDeMerdeBridge.php

@@ -1,24 +1,24 @@
 <?php
+class BlaguesDeMerdeBridge extends BridgeAbstract {
 
-class BlaguesDeMerdeBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'superbaillot.net, logmanoriginal';
 	const NAME = 'Blagues De Merde';
 	const URI = 'http://www.blaguesdemerde.fr/';
 	const CACHE_TIMEOUT = 7200; // 2h
 	const DESCRIPTION = 'Blagues De Merde';
 
-    public function getIcon()
+	public function getIcon() {
-    {
 		return self::URI . 'assets/img/favicon.ico';
 	}
 
-    public function collectData()
+	public function collectData(){
-    {
+
-        $html = getSimpleHTMLDOM(self::URI);
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not request BDM.');
 
 		foreach($html->find('div.blague') as $element) {
-            $item = [];
+
+			$item = array();
 
 			$item['uri'] = static::URI . '#' . $element->id;
 			$item['author'] = $element->find('div[class="blague-footer"] p strong', 0)->plaintext;
@@ -39,6 +39,9 @@ class BlaguesDeMerdeBridge extends BridgeAbstract
 			$item['timestamp'] = strtotime($matches[1]);
 
 			$this->items[] = $item;
+
 		}
+
 	}
+
 }

bridges/BleepingComputerBridge.php

@@ -1,32 +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 = [
-        '' => [
-            'locale' => [
-                'name' => 'Language',
-                'type' => 'list',
-                'values' => [
-                    '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/BloombergBridge.php

@@ -0,0 +1,69 @@
+<?php
+class BloombergBridge extends BridgeAbstract
+{
+	const NAME = 'Bloomberg';
+	const URI = 'https://www.bloomberg.com/';
+	const DESCRIPTION = 'Trending stories from Bloomberg';
+	const MAINTAINER = 'mdemoss';
+
+	const PARAMETERS = array(
+	'Trending Stories' => array(),
+	'From Search' => array(
+	'q' => array(
+				'name' => 'Keyword',
+				'required' => true
+	)
+	)
+	);
+
+	public function getName()
+	{
+		switch($this->queriedContext) {
+		case 'Trending Stories':
+			return self::NAME . ' Trending Stories';
+		case 'From Search':
+			if (!is_null($this->getInput('q'))) {
+					return self::NAME . ' Search : ' . $this->getInput('q');
+			}
+			break;
+		}
+
+		return parent::getName();
+	}
+
+	public function getIcon() {
+		return 'https://assets.bwbx.io/s3/javelin/public/hub/images/favicon-black-63fe5249d3.png';
+	}
+
+	public function collectData()
+	{
+		switch($this->queriedContext) {
+		case 'Trending Stories': // Get list of top new <article>s from the front page.
+			$html = getSimpleHTMLDOMCached($this->getURI(), 300);
+			$stories = $html->find('ul.top-news-v3__stories article.top-news-v3-story');
+			break;
+		case 'From Search': // Get list of <article> elements from search.
+			$html = getSimpleHTMLDOMCached(
+				$this->getURI() .
+				'search?sort=time:desc&page=1&query=' .
+				urlencode($this->getInput('q')), 300
+			);
+			$stories = $html->find('div.search-result-items article.search-result-story');
+			break;
+		}
+		foreach ($stories as $element) {
+			$item['uri'] = $element->find('h1 a', 0)->href;
+			if (preg_match('#^https://#i', $item['uri']) !== 1) {
+				$item['uri'] = $this->getURI() . $item['uri'];
+			}
+			$articleHtml = getSimpleHTMLDOMCached($item['uri']);
+			if (!$articleHtml) {
+				continue;
+			}
+			$item['title'] = $element->find('h1 a', 0)->plaintext;
+			$item['timestamp'] = strtotime($articleHtml->find('meta[name=iso-8601-publish-date],meta[name=date]', 0)->content);
+			$item['content'] = $articleHtml->find('meta[name=description]', 0)->content;
+			$this->items[] = $item;
+		}
+	}
+}

bridges/BooruprojectBridge.php

@@ -1,73 +1,41 @@
 <?php
+require_once('GelbooruBridge.php');
+
+class BooruprojectBridge extends GelbooruBridge {
 
-class BooruprojectBridge extends DanbooruBridge
-{
 	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 = [
+	const PARAMETERS = array(
-        'global' => [
+		'global' => array(
-            'p' => [
+			'p' => array(
 				'name' => 'page',
-                'defaultValue' => 0,
 				'type' => 'number'
-            ],
+			),
-            't' => [
+			't' => array(
-                'name' => 'tags',
+				'name' => 'tags'
-                'required' => true,
+			)
-                'exampleValue'  => 'tagme',
+		),
-                'title' => 'Use "all" to get all posts'
+		'Booru subdomain (subdomain.booru.org)' => array(
-            ]
+			'i' => array(
-        ],
-        'Booru subdomain (subdomain.booru.org)' => [
-            'i' => [
 				'name' => 'Subdomain',
-                'required' => true,
+				'required' => true
-                'exampleValue'  => 'rm'
+			)
-            ]
+		)
-        ]
+	);
-    ];
 
-    const PATHTODATA = '.thumb';
-    const IDATTRIBUTE = 'id';
-    const TAGATTRIBUTE = 'title';
 	const PIDBYPAGE = 20;
 
-    protected function getFullURI()
+	public function getURI(){
-    {
-        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();
 	}
 
-    public function getName()
+	public function getName(){
-    {
 		if(!is_null($this->getInput('i'))) {
 			return static::NAME . ' ' . $this->getInput('i');
 		}

bridges/BrutBridge.php

@@ -1,124 +0,0 @@
-<?php
-
-class BrutBridge extends BridgeAbstract
-{
-    const NAME = 'Brut Bridge';
-    const URI = 'https://www.brut.media';
-    const DESCRIPTION = 'Returns 10 newest videos by category and edition';
-    const MAINTAINER = 'VerifiedJoseph';
-    const PARAMETERS = [[
-            'category' => [
-                'name' => 'Category',
-                'type' => 'list',
-                'values' => [
-                    'News' => 'news',
-                    'International' => 'international',
-                    'Economy' => 'economy',
-                    'Science and Technology' => 'science-and-technology',
-                    'Entertainment' => 'entertainment',
-                    'Sports' => 'sport',
-                    'Nature' => 'nature',
-                    'Health' => 'health',
-                ],
-                'defaultValue' => 'news',
-            ],
-            'edition' => [
-                'name' => ' Edition',
-                'type' => 'list',
-                    'values' => [
-                        'United States' => 'us',
-                        'United Kingdom' => 'uk',
-                        'France' => 'fr',
-                        'Spain' => 'es',
-                        'India' => 'in',
-                        'Mexico' => 'mx',
-                ],
-                'defaultValue' => 'us',
-            ]
-        ]
-    ];
-
-    const CACHE_TIMEOUT = 1800; // 30 mins
-
-    private $jsonRegex = '/window\.__PRELOADED_STATE__ = ((?:.*)});/';
-
-    public function collectData()
-    {
-        $html = getSimpleHTMLDOM($this->getURI());
-
-        $results = $html->find('div.results', 0);
-
-        foreach ($results->find('li.col-6.col-sm-4.col-md-3.col-lg-2.px-2.pb-4') as $li) {
-            $item = [];
-
-            $videoPath = self::URI . $li->children(0)->href;
-            $videoPageHtml = getSimpleHTMLDOMCached($videoPath, 3600);
-
-            $json = $this->extractJson($videoPageHtml);
-            $id = array_keys((array) $json->media->index)[0];
-
-            $item['uri'] = $videoPath;
-            $item['title'] = $json->media->index->$id->title;
-            $item['timestamp'] = $json->media->index->$id->published_at;
-            $item['enclosures'][] = $json->media->index->$id->media->thumbnail;
-
-            $description = $json->media->index->$id->description;
-            $article = '';
-
-            if (is_null($json->media->index->$id->media->seo_article) === false) {
-                $article = markdownToHtml($json->media->index->$id->media->seo_article);
-            }
-
-            $item['content'] = <<<EOD
-			<video controls poster="{$json->media->index->$id->media->thumbnail}" preload="none">
-				<source src="{$json->media->index->$id->media->mp4_url}" type="video/mp4">
-			</video>
-			<p>{$description}</p>
-			{$article}
-EOD;
-
-            $this->items[] = $item;
-
-            if (count($this->items) >= 10) {
-                break;
-            }
-        }
-    }
-
-    public function getURI()
-    {
-        if (!is_null($this->getInput('edition')) && !is_null($this->getInput('category'))) {
-            return self::URI . '/' . $this->getInput('edition') . '/' . $this->getInput('category');
-        }
-
-        return parent::getURI();
-    }
-
-    public function getName()
-    {
-        if (!is_null($this->getInput('edition')) && !is_null($this->getInput('category'))) {
-            return $this->getKey('category') . ' - ' .
-                $this->getKey('edition') . ' - Brut.';
-        }
-
-        return parent::getName();
-    }
-
-    /**
-     * Extract JSON from page
-     */
-    private function extractJson($html)
-    {
-        if (!preg_match($this->jsonRegex, $html, $parts)) {
-            returnServerError('Failed to extract data from page');
-        }
-
-        $data = json_decode($parts[1]);
-
-        if ($data === false) {
-            returnServerError('Failed to decode extracted data');
-        }
-
-        return $data;
-    }
-}

bridges/BugzillaBridge.php

@@ -1,198 +0,0 @@
-<?php
-
-class BugzillaBridge extends BridgeAbstract
-{
-    const NAME = 'Bugzilla Bridge';
-    const URI = 'https://www.bugzilla.org/';
-    const DESCRIPTION = 'Bridge for any Bugzilla instance';
-    const MAINTAINER = 'Yaman Qalieh';
-    const PARAMETERS = [
-        'global' => [
-            'instance' => [
-                'name' => 'Instance URL',
-                'required' => true,
-                'exampleValue' => 'https://bugzilla.mozilla.org'
-            ]
-        ],
-        'Bug comments' => [
-            'id' => [
-                'name' => 'Bug tracking ID',
-                'type' => 'number',
-                'required' => true,
-                'title' => 'Insert bug tracking ID',
-                'exampleValue' => 121241
-            ],
-            'limit' => [
-                'name' => 'Number of comments to return',
-                'type' => 'number',
-                'required' => false,
-                'title' => 'Specify number of comments to return',
-                'defaultValue' => -1
-            ],
-            'skiptags' => [
-                'name' => 'Skip offtopic comments',
-                'type' => 'checkbox',
-                'title' => 'Excludes comments tagged as advocacy, metoo, or offtopic from the feed'
-            ]
-        ]
-    ];
-
-    const SKIPPED_ACTIVITY = [
-        'cc' => true,
-        'comment_tag' => true
-    ];
-
-    const SKIPPED_TAGS = ['advocacy', 'metoo', 'offtopic'];
-
-    private $instance;
-    private $bugid;
-    private $buguri;
-    private $title;
-
-    public function getName()
-    {
-        if (!is_null($this->title)) {
-            return $this->title;
-        }
-        return parent::getName();
-    }
-
-    public function getURI()
-    {
-        return $this->buguri ?? parent::getURI();
-    }
-
-    public function collectData()
-    {
-        $this->instance = rtrim($this->getInput('instance'), '/');
-        $this->bugid = $this->getInput('id');
-        $this->buguri = $this->instance . '/show_bug.cgi?id=' . $this->bugid;
-
-        $url = $this->instance . '/rest/bug/' . $this->bugid;
-        $this->getTitle($url);
-        $this->collectComments($url . '/comment');
-        $this->collectUpdates($url . '/history');
-
-        usort($this->items, function ($a, $b) {
-            return $b['timestamp'] <=> $a['timestamp'];
-        });
-
-        if ($this->getInput('limit') > 0) {
-            $this->items = array_slice($this->items, 0, $this->getInput('limit'));
-        }
-    }
-
-    protected function getTitle($url)
-    {
-        // Only request the summary for a faster request
-        $json = self::getJSON($url . '?include_fields=summary');
-        $this->title = 'Bug ' . $this->bugid . ' - ' .
-                     $json['bugs'][0]['summary'] . ' - ' .
-                     // Remove https://
-                     substr($this->instance, 8);
-    }
-
-    protected function collectComments($url)
-    {
-        $json = self::getJSON($url);
-
-        // Array of comments is here
-        if (!isset($json['bugs'][$this->bugid]['comments'])) {
-            returnClientError('Cannot find REST endpoint');
-        }
-
-        foreach ($json['bugs'][$this->bugid]['comments'] as $comment) {
-            $item = [];
-            if (
-                $this->getInput('skiptags') and
-                array_intersect(self::SKIPPED_TAGS, $comment['tags'])
-            ) {
-                continue;
-            }
-            $item['categories'] = $comment['tags'];
-            $item['uri'] = $this->buguri . '#c' . $comment['count'];
-            $item['title'] = 'Comment ' . $comment['count'];
-            $item['timestamp'] = $comment['creation_time'];
-            $item['author'] = $this->getUser($comment['creator']);
-            $item['content'] = $comment['text'];
-            if (isset($comment['is_markdown']) and $comment['is_markdown']) {
-                $item['content'] = markdownToHtml($item['content']);
-            }
-            if (!is_null($comment['attachment_id'])) {
-                $item['enclosures'] = [$this->instance . '/attachment.cgi?id=' . $comment['attachment_id']];
-            }
-            $this->items[] = $item;
-        }
-    }
-
-    protected function collectUpdates($url)
-    {
-        $json = self::getJSON($url);
-
-        // Array of changesets which contain an array of changes
-        if (!isset($json['bugs']['0']['history'])) {
-            returnClientError('Cannot find REST endpoint');
-        }
-
-        foreach ($json['bugs']['0']['history'] as $changeset) {
-            $author = $this->getUser($changeset['who']);
-            $timestamp = $changeset['when'];
-            foreach ($changeset['changes'] as $change) {
-                // Skip updates to the cc list and comment tagging
-                if (isset(self::SKIPPED_ACTIVITY[$change['field_name']])) {
-                    continue;
-                }
-
-                $item = [];
-                $item['uri'] = $this->buguri;
-                $item['title'] = 'Updated';
-                $item['timestamp'] = $timestamp;
-                $item['author'] = $author;
-                $item['content'] = ucfirst($change['field_name']) . ': ' .
-                                 ($change['removed'] === '' ? '[nothing]' : $change['removed']) . ' -> ' .
-                                 ($change['added'] === '' ? '[nothing]' : $change['added']);
-                $this->items[] = $item;
-            }
-        }
-    }
-
-    protected function getUser($user)
-    {
-        // Check if the user endpoint is available
-        if ($this->loadCacheValue($this->instance . 'userEndpointClosed', 86400)) {
-            return $user;
-        }
-
-        $cache = $this->loadCacheValue($this->instance . $user);
-        if (!is_null($cache)) {
-            return $cache;
-        }
-
-        $url = $this->instance . '/rest/user/' . $user . '?include_fields=real_name';
-        try {
-            $json = self::getJSON($url);
-            if (isset($json['error']) and $json['error']) {
-                throw new Exception();
-            }
-        } catch (Exception $e) {
-            $this->saveCacheValue($this->instance . 'userEndpointClosed', true);
-            return $user;
-        }
-
-        $username = $json['users']['0']['real_name'];
-
-        if (empty($username)) {
-            $username = $user;
-        }
-        $this->saveCacheValue($this->instance . $user, $username);
-        return $username;
-    }
-
-    protected static function getJSON($url)
-    {
-        $headers = [
-            'Accept: application/json',
-        ];
-        return json_decode(getContents($url, $headers), true);
-    }
-}

bridges/BukowskisBridge.php

@@ -1,220 +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 = [[
-        'category' => [
-            'name' => 'Category',
-            'type' => 'list',
-            'values' => [
-                'All categories' => '',
-                'Art' => [
-                    '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' => [
-                    'All' => 'asian-ceramics-works-of-art',
-                    'Other' => 'asian-ceramics-works-of-art.other',
-                    'Porcelain' => 'asian-ceramics-works-of-art.porcelain',
-                ],
-                'Books & Manuscripts' => [
-                    'All' => 'books-manuscripts',
-                    'Books' => 'books-manuscripts.books',
-                ],
-                'Carpets, rugs & textiles' => [
-                    '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' => [
-                    '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' => [
-                    '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' => [
-                    'All' => 'design',
-                    'Art glass' => 'design.art-glass',
-                    'Furniture' => 'design.furniture',
-                    'Other' => 'design.other',
-                ],
-                'Folk art' => [
-                    'All' => 'folk-art',
-                    'All categories' => 'lots',
-                ],
-                'Furniture' => [
-                    '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' => [
-                    'All' => 'glassware',
-                    'Glassware' => 'glassware.glassware',
-                    'Other' => 'glassware.other',
-                ],
-                'Jewellery' => [
-                    'All' => 'jewellery',
-                    'Bracelets' => 'jewellery.bracelets',
-                    'Brooches' => 'jewellery.brooches',
-                    'Earrings' => 'jewellery.earrings',
-                    'Necklaces & Pendants' => 'jewellery.necklaces-pendants',
-                    'Other' => 'jewellery.other',
-                    'Rings' => 'jewellery.rings',
-                ],
-                'Lighting' => [
-                    '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' => [
-                    'All' => 'militaria',
-                    'Honors & Medals' => 'militaria.honors-medals',
-                    'Other militaria' => 'militaria.other-militaria',
-                    'Weaponry' => 'militaria.weaponry',
-                ],
-                'Miscellaneous' => [
-                    'All' => 'miscellaneous',
-                    'Brass, Copper & Pewter' => 'miscellaneous.brass-copper-pewter',
-                    'Nickel silver' => 'miscellaneous.nickel-silver',
-                    'Oriental' => 'miscellaneous.oriental',
-                    'Other' => 'miscellaneous.other',
-                ],
-                'Silver' => [
-                    'All' => 'silver',
-                    'Candle sticks' => 'silver.candle-sticks',
-                    'Cups & Bowls' => 'silver.cups-bowls',
-                    'Cutlery' => 'silver.cutlery',
-                    'Other' => 'silver.other',
-                ],
-                'Timepieces' => [
-                    'All' => 'timepieces',
-                    'Other' => 'timepieces.other',
-                    'Pocket watches' => 'timepieces.pocket-watches',
-                    'Table clocks' => 'timepieces.table-clocks',
-                    'Wrist watches' => 'timepieces.wrist-watches',
-                ],
-                'Vintage & Fashion' => [
-                    'All' => 'vintage-fashion',
-                    'Accessories' => 'vintage-fashion.accessories',
-                    'Bags & Trunks' => 'vintage-fashion.bags-trunks',
-                    'Clothes' => 'vintage-fashion.clothes',
-                ],
-            ]
-        ],
-        'sort_order' => [
-            'name' => 'Sort order',
-            'type' => 'list',
-            'values' => [
-                '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' => [
-            'name' => 'Language',
-            'type' => 'list',
-            'values' => [
-                '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[] = [
-                '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

@@ -1,7 +1,6 @@
 <?php
+class BundesbankBridge extends BridgeAbstract {
 
-class BundesbankBridge extends BridgeAbstract
-{
 	const PARAM_LANG = 'lang';
 
 	const LANG_EN = 'en';
@@ -13,45 +12,43 @@ class BundesbankBridge extends BridgeAbstract
 	const MAINTAINER = 'logmanoriginal';
 	const CACHE_TIMEOUT = 86400; // 24 hours
 
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        [
+		array(
-            self::PARAM_LANG => [
+			self::PARAM_LANG => array(
 				'name' => 'Language',
 				'type' => 'list',
+				'required' => true,
 				'defaultValue' => self::LANG_DE,
-                'values' => [
+				'values' => array(
 					'English' => self::LANG_EN,
 					'Deutsch' => self::LANG_DE
-                ]
+				)
-            ]
+			)
-        ]
+		)
-    ];
+	);
 
-    public function getIcon()
+	public function getIcon() {
-    {
 		return self::URI . 'resource/crblob/1890/a7f48ee0ae35348748121770ba3ca009/mL/favicon-ico-data.ico';
 	}
 
-    public function getURI()
+	public function getURI() {
-    {
 		switch($this->getInput(self::PARAM_LANG)) {
-            case self::LANG_EN:
+			case self::LANG_EN: return self::URI . 'en/publications/reports/studies';
-                return self::URI . 'en/publications/reports/studies';
+			case self::LANG_DE: return self::URI . 'de/publikationen/berichte/studien';
-            case self::LANG_DE:
-                return self::URI . 'de/publikationen/berichte/studien';
 		}
 
 		return parent::getURI();
 	}
 
-    public function collectData()
+	public function collectData() {
-    {
+
-        $html = getSimpleHTMLDOM($this->getURI());
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('No response for ' . $this->getURI());
 
 		$html = defaultLinkTo($html, $this->getURI());
 
 		foreach($html->find('ul.resultlist li') as $study) {
-            $item = [];
+			$item = array();
 
 			$item['uri'] = $study->find('.teasable__link', 0)->href;
 
@@ -77,12 +74,14 @@ class BundesbankBridge extends BridgeAbstract
 
 			// Downloads and older studies don't have images
 			if($study->find('.teasable__image', 0)) {
-                $item['enclosures'] = [
+				$item['enclosures'] = array(
 					$study->find('.teasable__image img', 0)->src
-                ];
+				);
 			}
 
 			$this->items[] = $item;
 		}
+
 	}
+
 }

bridges/BundestagParteispendenBridge.php

@@ -1,94 +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 = [];
-
-        //              | 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 = [
-            'title' => $party . ': ' . $amount,
-            'content' => $content,
-            'uid' => sha1($content),
-            ];
-
-        // Try to get the link to the official document
-        if ($dip != null) {
-            $item['enclosures'] = [$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,38 +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 = [];
-            $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

@@ -1,18 +1,17 @@
 <?php
+class CNETBridge extends BridgeAbstract {
 
-class CNETBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'ORelio';
 	const NAME = 'CNET News';
 	const URI = 'https://www.cnet.com/';
 	const CACHE_TIMEOUT = 3600; // 1h
 	const DESCRIPTION = 'Returns the newest articles.';
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        [
+		array(
-            'topic' => [
+			'topic' => array(
 				'name' => 'Topic',
 				'type' => 'list',
-                'values' => [
+				'values' => array(
 					'All articles' => '',
 					'Apple' => 'apple',
 					'Google' => 'google',
@@ -23,13 +22,12 @@ class CNETBridge extends BridgeAbstract
 					'Security' => 'topics-security',
 					'Internet' => 'topics-internet',
 					'Tech Industry' => 'topics-tech-industry'
-                ]
+				)
-            ]
+			)
-        ]
+		)
-    ];
+	);
 
-    private function cleanArticle($article_html)
+	private function cleanArticle($article_html) {
-    {
 		$offset_p = strpos($article_html, '<p>');
 		$offset_figure = strpos($article_html, '<figure');
 		$offset = ($offset_figure < $offset_p ? $offset_figure : $offset_p);
@@ -46,20 +44,21 @@ class CNETBridge extends BridgeAbstract
 		return $article_html;
 	}
 
-    public function collectData()
+	public function collectData() {
-    {
+
 		// Retrieve and check user input
 		$topic = str_replace('-', '/', $this->getInput('topic'));
-        if (!empty($topic) && (substr_count($topic, '/') > 1 || !ctype_alpha(str_replace('/', '', $topic)))) {
+		if (!empty($topic) && (substr_count($topic, '/') > 1 || !ctype_alpha(str_replace('/', '', $topic))))
 			returnClientError('Invalid topic: ' . $topic);
-        }
 
 		// 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) {
+
 			if(count($this->items) >= 10) {
 				break;
 			}
@@ -71,41 +70,37 @@ class CNETBridge extends BridgeAbstract
 			$article_author = trim($element->find('a[rel=author], a.name', 0)->plaintext);
 			$article_content = '<p><b>' . trim($element->find('p.dek', 0)->plaintext) . '</b></p>';
 
-            if (is_null($article_thumbnail)) {
+			if (is_null($article_thumbnail))
 				$article_thumbnail = extractFromDelimiters($element->innertext, '<img src="', '"');
-            }
 
 			if (!empty($article_title) && !empty($article_uri) && strpos($article_uri, self::URI . 'news/') !== false) {
+
 				$article_html = getSimpleHTMLDOMCached($article_uri) or $article_html = null;
 
 				if (!is_null($article_html)) {
-                    if (empty($article_thumbnail)) {
+
+					if (empty($article_thumbnail))
 						$article_thumbnail = $article_html->find('div.originalImage', 0);
-                    }
+					if (empty($article_thumbnail))
-                    if (empty($article_thumbnail)) {
 						$article_thumbnail = $article_html->find('span.imageContainer', 0);
-                    }
+					if (is_object($article_thumbnail))
-                    if (is_object($article_thumbnail)) {
 						$article_thumbnail = $article_thumbnail->find('img', 0)->src;
-                    }
 
 					$article_content .= trim(
 						$this->cleanArticle(
 							extractFromDelimiters(
-                                $article_html,
+								$article_html, '<article', '<footer'
-                                '<article',
-                                '<footer'
 							)
 						)
 					);
 				}
 
-                $item = [];
+				$item = array();
 				$item['uri'] = $article_uri;
 				$item['title'] = $article_title;
 				$item['author'] = $article_author;
 				$item['timestamp'] = $article_timestamp;
-                $item['enclosures'] = [$article_thumbnail];
+				$item['enclosures'] = array($article_thumbnail);
 				$item['content'] = $article_content;
 				$this->items[] = $item;
 			}

bridges/CNETFranceBridge.php

@@ -1,64 +0,0 @@
-<?php
-
-class CNETFranceBridge extends FeedExpander
-{
-    const MAINTAINER = 'leomaradan';
-    const NAME = 'CNET France';
-    const URI = 'https://www.cnetfrance.fr/';
-    const CACHE_TIMEOUT = 3600; // 1h
-    const DESCRIPTION = 'CNET France RSS with filters';
-    const PARAMETERS = [
-        'filters' => [
-            'title' => [
-                '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'
-            ],
-            'url' => [
-                'name' => 'Exclude by url',
-                'required' => false,
-                'title' => 'URL term, separated by semicolon (;)',
-                'exampleValue' => 'bon-plan;bons-plans'
-            ]
-        ]
-    ];
-
-    private $bannedTitle = [];
-    private $bannedURL = [];
-
-    public function collectData()
-    {
-        $title = $this->getInput('title');
-        $url = $this->getInput('url');
-
-        if ($title !== null) {
-            $this->bannedTitle = explode(';', $title);
-        }
-
-        if ($url !== null) {
-            $this->bannedURL = explode(';', $url);
-        }
-
-        $this->collectExpandableDatas('https://www.cnetfrance.fr/feeds/rss/news/');
-    }
-
-    protected function parseItem($feedItem)
-    {
-        $item = parent::parseItem($feedItem);
-
-        foreach ($this->bannedTitle as $term) {
-            if (preg_match('/' . $term . '/mi', $item['title']) === 1) {
-                return null;
-            }
-        }
-
-        foreach ($this->bannedURL as $term) {
-            if (preg_match('/' . $term . '/mi', $item['uri']) === 1) {
-                return null;
-            }
-        }
-
-        return $item;
-    }
-}

bridges/CVEDetailsBridge.php

@@ -1,145 +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 = [[
-        // The Vendor ID can be taken from the URL
-        'vendor_id' => [
-            'name' => 'Vendor ID',
-            'type' => 'number',
-            'required' => true,
-            'exampleValue' => 74, // PHP
-        ],
-        // The optional Product ID can be taken from the URL as well
-        'product_id' => [
-            '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 = [$this->vendor];
-            $enclosures = [];
-
-            $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[] = [
-                '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/CachetBridge.php

@@ -1,138 +0,0 @@
-<?php
-
-class CachetBridge extends BridgeAbstract
-{
-    const NAME = 'Cachet Bridge';
-    const URI = 'https://cachethq.io/';
-    const DESCRIPTION = 'Returns status updates from any Cachet installation';
-    const MAINTAINER  = 'klimplant';
-    const PARAMETERS = [
-        [
-            'host' => [
-                'name' => 'Cachet installation',
-                'type' => 'text',
-                'required' => true,
-                'title' => 'The URL of the Cachet installation',
-                'exampleValue' => 'https://demo.cachethq.io/',
-            ], 'additional_info' => [
-                'name' => 'Additional Timestamps',
-                'type' => 'checkbox',
-                'title' => 'Whether to include the given timestamps'
-            ]
-        ]
-    ];
-    const CACHE_TIMEOUT = 300;
-
-    private $componentCache = [];
-
-    public function getURI()
-    {
-        return $this->getInput('host') === null ? 'https://cachethq.io/' : $this->getInput('host');
-    }
-
-    /**
-     * Validates the ping request to the cache API
-     *
-     * @param string $ping
-     * @return boolean
-     */
-    private function validatePing($ping)
-    {
-        $ping = json_decode($ping);
-        if ($ping === null) {
-            return false;
-        }
-        return $ping->data === 'Pong!';
-    }
-
-    /**
-     * Returns the component name of a cachat component
-     *
-     * @param integer $id
-     * @return string
-     */
-    private function getComponentName($id)
-    {
-        if ($id === 0) {
-            return '';
-        }
-        if (array_key_exists($id, $this->componentCache)) {
-            return $this->componentCache[$id];
-        }
-
-        $component = getContents($this->getURI() . '/api/v1/components/' . $id);
-        $component = json_decode($component);
-        if ($component === null) {
-            return '';
-        }
-        return $component->data->name;
-    }
-
-    public function collectData()
-    {
-        $ping = getContents(urljoin($this->getURI(), '/api/v1/ping'));
-        if (!$this->validatePing($ping)) {
-            returnClientError('Provided URI is invalid!');
-        }
-
-        $url = urljoin($this->getURI(), '/api/v1/incidents?sort=id&order=desc');
-        $incidents = getContents($url);
-        $incidents = json_decode($incidents);
-        if ($incidents === null) {
-            returnClientError('/api/v1/incidents returned no valid json');
-        }
-
-        usort($incidents->data, function ($a, $b) {
-            $timeA = strtotime($a->updated_at);
-            $timeB = strtotime($b->updated_at);
-            return $timeA > $timeB ? -1 : 1;
-        });
-
-        foreach ($incidents->data as $incident) {
-            if (isset($incident->permalink)) {
-                $permalink = $incident->permalink;
-            } else {
-                $permalink = urljoin($this->getURI(), '/incident/' . $incident->id);
-            }
-
-            $title = $incident->human_status . ': ' . $incident->name;
-            $message = '';
-            if ($this->getInput('additional_info')) {
-                if (isset($incident->occurred_at)) {
-                    $message .= 'Occurred at: ' . $incident->occurred_at . "\r\n";
-                }
-                if (isset($incident->scheduled_at)) {
-                    $message .= 'Scheduled at: ' . $incident->scheduled_at . "\r\n";
-                }
-                if (isset($incident->created_at)) {
-                    $message .= 'Created at: ' . $incident->created_at . "\r\n";
-                }
-                if (isset($incident->updated_at)) {
-                    $message .= 'Updated at: ' . $incident->updated_at . "\r\n\r\n";
-                }
-            }
-
-            $message .= $incident->message;
-            $content = nl2br($message);
-            $componentName = $this->getComponentName($incident->component_id);
-            $uidOrig = $permalink . $incident->created_at;
-            $uid = hash('sha512', $uidOrig);
-            $timestamp = strtotime($incident->created_at);
-            $categories = [];
-            $categories[] = $incident->human_status;
-            if ($componentName !== '') {
-                $categories[] = $componentName;
-            }
-
-            $item = [];
-            $item['uri'] = $permalink;
-            $item['title'] = $title;
-            $item['timestamp'] = $timestamp;
-            $item['content'] = $content;
-            $item['uid'] = $uid;
-            $item['categories'] = $categories;
-
-            $this->items[] = $item;
-        }
-    }
-}

bridges/CarThrottleBridge.php

@@ -1,44 +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/CaschyBridge.php

@@ -1,77 +0,0 @@
-<?php
-
-class CaschyBridge extends FeedExpander
-{
-    const MAINTAINER = 'Tone866';
-    const NAME = 'Caschys Blog Bridge';
-    const URI = 'https://stadt-bremerhaven.de/';
-    const CACHE_TIMEOUT = 1800; // 30min
-    const DESCRIPTION = 'Returns the full articles instead of only the intro';
-    const PARAMETERS = [[
-        'category' => [
-            'name' => 'Category',
-            'type' => 'list',
-            'values' => [
-                'Alle News'
-                => 'https://stadt-bremerhaven.de/feed/'
-            ]
-        ],
-        'limit' => [
-            'name' => 'Limit',
-            'type' => 'number',
-            'required' => false,
-            'title' => 'Specify number of full articles to return',
-            'defaultValue' => 5
-        ]
-    ]];
-    const LIMIT = 5;
-
-    public function collectData()
-    {
-        $this->collectExpandableDatas(
-            $this->getInput('category'),
-            $this->getInput('limit') ?: static::LIMIT
-        );
-    }
-
-    protected function parseItem($feedItem)
-    {
-        $item = parent::parseItem($feedItem);
-
-        if (strpos($item['uri'], 'https://stadt-bremerhaven.de/') !== 0) {
-            return $item;
-        }
-
-        $article = getSimpleHTMLDOMCached($item['uri']);
-
-        if ($article) {
-            $article = defaultLinkTo($article, $item['uri']);
-            $item = $this->addArticleToItem($item, $article);
-        }
-
-        return $item;
-    }
-
-    private function addArticleToItem($item, $article)
-    {
-        // remove unwanted stuff
-        foreach (
-            $article->find('div.video-container, div.aawp, p.aawp-disclaimer, iframe.wp-embedded-content, 
-            div.wp-embed, p.wp-caption-text, script') as $element
-        ) {
-            $element->remove();
-        }
-        // reload html, as remove() is buggy
-        $article = str_get_html($article->outertext);
-
-        $categories = $article->find('div.post-category a');
-        foreach ($categories as $category) {
-            $item['categories'][] = $category->plaintext;
-        }
-
-        $content = $article->find('div.entry-inner', 0);
-        $item['content'] = $content;
-
-        return $item;
-    }
-}

bridges/CastorusBridge.php

@@ -1,69 +1,61 @@
 <?php
-
+class CastorusBridge extends BridgeAbstract {
-class CastorusBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'logmanoriginal';
 	const NAME = 'Castorus Bridge';
-    const URI = 'https://www.castorus.com';
+	const URI = 'http://www.castorus.com';
 	const CACHE_TIMEOUT = 600; // 10min
 	const DESCRIPTION = 'Returns the latest changes';
 
-    const PARAMETERS = [
+	const PARAMETERS = array(
-        'Get latest changes' => [],
+		'Get latest changes' => array(),
-        'Get latest changes via ZIP code' => [
+		'Get latest changes via ZIP code' => array(
-            'zip' => [
+			'zip' => array(
 				'name' => 'ZIP code',
 				'type' => 'text',
 				'required' => true,
-                'exampleValue' => '7',
+				'exampleValue' => '74910, 74',
-                'title' => 'Insert ZIP code (complete or partial). e.g: 78125 OR 781 OR 7'
+				'title' => 'Insert ZIP code (complete or partial)'
-            ]
+			)
-        ],
+		),
-        'Get latest changes via city name' => [
+		'Get latest changes via city name' => array(
-            'city' => [
+			'city' => array(
 				'name' => 'City name',
 				'type' => 'text',
 				'required' => true,
-                'exampleValue' => 'Paris',
+				'exampleValue' => 'Seyssel, Seys',
-                'title' => 'Insert city name (complete or partial). e.g: Paris OR Par OR P'
+				'title' => 'Insert city name (complete or partial)'
-            ]
+			)
-        ]
+		)
-    ];
+	);
 
 	// Extracts the title from an actitiy
-    private function extractActivityTitle($activity)
+	private function extractActivityTitle($activity){
-    {
 		$title = $activity->find('a', 0);
 
-        if (!$title) {
+		if(!$title)
 			returnServerError('Cannot find title!');
-        }
 
-        return trim($title->plaintext);
+		return htmlspecialchars(trim($title->plaintext));
 	}
 
 	// Extracts the url from an actitiy
-    private function extractActivityUrl($activity)
+	private function extractActivityUrl($activity){
-    {
 		$url = $activity->find('a', 0);
 
-        if (!$url) {
+		if(!$url)
 			returnServerError('Cannot find url!');
-        }
 
 		return self::URI . $url->href;
 	}
 
 	// Extracts the time from an activity
-    private function extractActivityTime($activity)
+	private function extractActivityTime($activity){
-    {
 		// Unfortunately the time is part of the parent node,
 		// so we have to clear all child nodes first
 		$nodes = $activity->find('*');
 
-        if (!$nodes) {
+		if(!$nodes)
 			returnServerError('Cannot find nodes!');
-        }
 
 		foreach($nodes as $node) {
 			$node->outertext = '';
@@ -73,36 +65,31 @@ class CastorusBridge extends BridgeAbstract
 	}
 
 	// Extracts the price change
-    private function extractActivityPrice($activity)
+	private function extractActivityPrice($activity){
-    {
 		$price = $activity->find('span', 1);
 
-        if (!$price) {
+		if(!$price)
 			returnServerError('Cannot find price!');
-        }
 
 		return $price->innertext;
 	}
 
-    public function collectData()
+	public function collectData(){
-    {
 		$zip_filter = trim($this->getInput('zip'));
 		$city_filter = trim($this->getInput('city'));
 
 		$html = getSimpleHTMLDOM(self::URI);
 
-        if (!$html) {
+		if(!$html)
 			returnServerError('Could not load data from ' . self::URI . '!');
-        }
 
-        $activities = $html->find('div#activite > li');
+		$activities = $html->find('div#activite/li');
 
-        if (!$activities) {
+		if(!$activities)
 			returnServerError('Failed to find activities!');
-        }
 
 		foreach($activities as $activity) {
-            $item = [];
+			$item = array();
 
 			$item['title'] = $this->extractActivityTitle($activity);
 			$item['uri'] = $this->extractActivityUrl($activity);
@@ -115,17 +102,13 @@ class CastorusBridge extends BridgeAbstract
 			. $this->extractActivityPrice($activity)
 			. '</p>';
 
-            if (
+			if(isset($zip_filter)
-                isset($zip_filter)
+			&& !(substr($item['title'], 0, strlen($zip_filter)) === $zip_filter)) {
-                && !(substr($item['title'], 0, strlen($zip_filter)) === $zip_filter)
-            ) {
 				continue; // Skip this item
 			}
 
-            if (
+			if(isset($city_filter)
-                isset($city_filter)
+			&& !(substr($item['title'], strpos($item['title'], ' ') + 1, strlen($city_filter)) === $city_filter)) {
-                && !(substr($item['title'], strpos($item['title'], ' ') + 1, strlen($city_filter)) === $city_filter)
-            ) {
 				continue; // Skip this item
 			}
 

bridges/CdactionBridge.php

@@ -1,62 +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 = [ [
-        'category' => [
-            'name' => 'Kategoria',
-            'type' => 'list',
-            'values' => [
-                'Najnowsze (wszystkie)' => 'najnowsze',
-                'Newsy' => 'newsy',
-                'Recenzje' => 'recenzje',
-                'Teksty' => [
-                    'Publicystyka' => 'publicystyka',
-                    'Zapowiedzi' => 'zapowiedzi',
-                    'Już graliśmy' => 'juz-gralismy',
-                    'Poradniki' => 'poradniki',
-                ],
-                'Kultura' => 'kultura',
-                'Wideo' => 'wideo',
-                'Czasopismo' => 'czasopismo',
-                'Technologie' => [
-                    'Artykuły' => 'artykuly',
-                    'Testy' => 'testy',
-                ],
-                'Na luzie' => [
-                    '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 = [];
-            $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

@@ -1,88 +0,0 @@
-<?php
-
-class CeskaTelevizeBridge extends BridgeAbstract
-{
-    const NAME = 'Česká televize Bridge';
-    const URI = 'https://www.ceskatelevize.cz';
-    const CACHE_TIMEOUT = 3600;
-    const DESCRIPTION = 'Return newest videos';
-    const MAINTAINER = 'kolarcz';
-
-    const PARAMETERS = [
-        [
-            'url' => [
-                'name' => 'url to the show',
-                'required' => true,
-                'exampleValue' => 'https://www.ceskatelevize.cz/porady/1097181328-udalosti/'
-            ]
-        ]
-    ];
-
-    private function fixChars($text)
-    {
-        return html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-    }
-
-    private function getUploadTimeFromString($string)
-    {
-        if (strpos($string, 'dnes') !== false) {
-            return strtotime('today');
-        } elseif (strpos($string, 'včera') !== false) {
-            return strtotime('yesterday');
-        } elseif (!preg_match('/(\d+).\s(\d+).(\s(\d+))?/', $string, $match)) {
-            returnServerError('Could not get date from Česká televize string');
-        }
-
-        $date = sprintf('%04d-%02d-%02d', $match[3] ?? date('Y'), $match[2], $match[1]);
-        return strtotime($date);
-    }
-
-    public function collectData()
-    {
-        $url = $this->getInput('url');
-
-        $validUrl = '/^(https:\/\/www\.ceskatelevize\.cz\/porady\/\d+-[a-z0-9-]+\/)(bonus\/)?$/';
-        if (!preg_match($validUrl, $url, $match)) {
-            returnServerError('Invalid url');
-        }
-
-        $category = $match[4] ?? 'nove';
-        $fixedUrl = "{$match[1]}dily/{$category}/";
-
-        $html = getSimpleHTMLDOM($fixedUrl);
-
-        $this->feedUri = $fixedUrl;
-        $this->feedName = str_replace('Přehled dílů — ', '', $this->fixChars($html->find('title', 0)->plaintext));
-        if ($category !== 'nove') {
-            $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);
-            $itemThumbnail = $element->find('img', 0);
-            $itemUri = self::URI . $element->getAttribute('href');
-
-            $item = [
-                'title' => $this->fixChars($itemTitle->plaintext),
-                'uri' => $itemUri,
-                'content' => '<img src="' . $itemThumbnail->getAttribute('src') . '" /><br />'
-                    . $this->fixChars($itemContent->plaintext),
-                'timestamp' => $this->getUploadTimeFromString($itemDate->plaintext)
-            ];
-
-            $this->items[] = $item;
-        }
-    }
-
-    public function getURI()
-    {
-        return $this->feedUri ?? parent::getURI();
-    }
-
-    public function getName()
-    {
-        return $this->feedName ?? parent::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,446 +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 = [
-        'Commits' => [
-            'branch' => [
-                'name' => 'branch',
-                'type' => 'text',
-                'exampleValue' => 'main',
-                'required' => false,
-                'title' => 'Optional, main branch is used by default.',
-            ],
-        ],
-        'Issues' => [],
-        'Issue Comments' => [
-            'issueId' => [
-                'name' => 'Issue ID',
-                'type' => 'text',
-                'required' => true,
-                'exampleValue' => '513',
-            ]
-        ],
-        'Pull Requests' => [],
-        'Releases' => [],
-        'Tags' => [],
-        'global' => [
-            'username' => [
-                'name' => 'Username',
-                'type' => 'text',
-                'exampleValue' => 'Codeberg',
-                'title' => 'Username of account that the repository belongs to.',
-                'required' => true,
-            ],
-            'repo' => [
-                'name' => 'Repository',
-                'type' => 'text',
-                'exampleValue' => 'Community',
-                'required' => true,
-            ]
-        ]
-    ];
-
-    const CACHE_TIMEOUT = 1800;
-
-    const TEST_DETECT_PARAMETERS = [
-        'https://codeberg.org/Codeberg/Community/issues/507' => [
-            'context' => 'Issue Comments', 'username' => 'Codeberg', 'repo' => 'Community', 'issueId' => '507'
-        ],
-        'https://codeberg.org/Codeberg/Community/issues' => [
-            'context' => 'Issues', 'username' => 'Codeberg', 'repo' => 'Community'
-        ],
-        'https://codeberg.org/Codeberg/Community/pulls' => [
-            'context' => 'Pull Requests', 'username' => 'Codeberg', 'repo' => 'Community'
-        ],
-        'https://codeberg.org/Codeberg/Community/releases' => [
-            'context' => 'Releases', 'username' => 'Codeberg', 'repo' => 'Community'
-        ],
-        'https://codeberg.org/Codeberg/Community/commits/branch/master' => [
-            'context' => 'Commits', 'username' => 'Codeberg', 'repo' => 'Community', 'branch' => 'master'
-        ],
-        'https://codeberg.org/Codeberg/Community/commits' => [
-            '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 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;
-            case 'Tags':
-                $this->extractTags($html);
-                break;
-            default:
-                throw new \Exception('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;
-            case 'Tags':
-                return $this->getRepo() . ' Tags - ' . 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';
-            case 'Tags':
-                return self::URI . $this->getRepo() . '/tags';
-            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 = [];
-
-            $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 = [];
-
-            $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 = [];
-
-            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 = [];
-
-            $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);
-
-        $lis = $ul->find('li.ui.grid');
-        if ($lis === []) {
-            throw new \Exception('Found zero releases');
-        }
-        foreach ($lis as $li) {
-            $item = [];
-            $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;
-        }
-    }
-
-    private function extractTags($html)
-    {
-        $tags = $html->find('td.tag');
-        if ($tags === []) {
-            throw new \Exception('Found zero tags');
-        }
-        foreach ($tags as $tag) {
-            $this->items[] = [
-                'title' => $tag->find('a', 0)->plaintext,
-                'uri' => $tag->find('a', 0)->href,
-                'content' => $tag->innertext,
-            ];
-        }
-    }
-
-    /**
-     * 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;
-    }
-
-    public function detectParameters($url)
-    {
-        $params = [];
-
-        // 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;
-    }
-}

bridges/CollegeDeFranceBridge.php

@@ -1,16 +1,14 @@
 <?php
+class CollegeDeFranceBridge extends BridgeAbstract {
 
-class CollegeDeFranceBridge extends BridgeAbstract
-{
 	const MAINTAINER = 'pit-fgfjiudghdf';
 	const NAME = 'CollegeDeFrance';
-    const URI = 'https://www.college-de-france.fr/';
+	const URI = 'http://www.college-de-france.fr/';
 	const CACHE_TIMEOUT = 10800; // 3h
 	const DESCRIPTION = 'Returns the latest audio and video from CollegeDeFrance';
 
-    public function collectData()
+	public function collectData(){
-    {
+		$months = array(
-        $months = [
 			'01' => 'janv.',
 			'02' => 'févr.',
 			'03' => 'mars',
@@ -23,7 +21,7 @@ class CollegeDeFranceBridge extends BridgeAbstract
 			'10' => 'oct.',
 			'11' => 'nov.',
 			'12' => 'déc.'
-        ];
+		);
 
 		// The "API" used by the site returns a list of partial HTML in this form
 		/* <li>
@@ -36,10 +34,11 @@ 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 = [];
+			$item = array();
 			$item['title'] = $element->find('.title', 0)->plaintext;
 
 			// Most relative URLs contains an hour in addition to the date, so let's use it

bridges/ComboiosDePortugalBridge.php

@@ -1,28 +0,0 @@
-<?php
-
-class ComboiosDePortugalBridge extends BridgeAbstract
-{
-    const NAME = 'CP | Avisos';
-    const BASE_URI = 'https://www.cp.pt';
-    const URI = self::BASE_URI . '/passageiros/pt';
-    const DESCRIPTION = 'Comboios de Portugal | Avisos';
-    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', [], [
-            CURLOPT_SSL_VERIFYPEER => 0,
-        ]);
-
-        foreach ($html->find('.warnings-table a') as $element) {
-            $item = [];
-
-            $item['title'] = $element->innertext;
-            $item['uri'] = self::BASE_URI . implode('/', array_map('urlencode', explode('/', $element->href)));
-
-            $this->items[] = $item;
-        }
-    }
-}

bridges/ComicsKingdomBridge.php

@@ -1,71 +0,0 @@
-<?php
-
-class ComicsKingdomBridge extends BridgeAbstract
-{
-    const MAINTAINER = 'stjohnjohnson';
-    const NAME = 'Comics Kingdom Unofficial RSS';
-    const URI = 'https://comicskingdom.com/';
-    const CACHE_TIMEOUT = 21600; // 6h
-    const DESCRIPTION = 'Comics Kingdom Unofficial RSS';
-    const PARAMETERS = [ [
-        'comicname' => [
-            '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(), [], [], true, false);
-
-        // Get author from first page
-        $author = $html->find('div.author p', 0);
-        ;
-
-        // Get current date/link
-        $link = $html->find('meta[property=og:url]', -1)->content;
-        for ($i = 0; $i < 3; $i++) {
-            $item = [];
-
-            $page = getSimpleHTMLDOM($link);
-
-            $imagelink = $page->find('meta[property=og:image]', 0)->content;
-
-            $date = explode('/', $link);
-
-            $item['id'] = $imagelink;
-            $item['uri'] = $link;
-            $item['author'] = $author;
-            $item['title'] = 'Comics Kingdom ' . $this->getInput('comicname');
-            $item['timestamp'] = DateTime::createFromFormat('Y-m-d', $date[count($date) - 1])->getTimestamp();
-            $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
-            }
-        }
-    }
-
-    public function getURI()
-    {
-        if (!is_null($this->getInput('comicname'))) {
-            return self::URI . urlencode($this->getInput('comicname'));
-        }
-
-        return parent::getURI();
-    }
-
-    public function getName()
-    {
-        if (!is_null($this->getInput('comicname'))) {
-            return $this->getInput('comicname') . ' - Comics Kingdom';
-        }
-
-        return parent::getName();
-    }
-}

bridges/CommonDreamsBridge.php

@@ -1,31 +1,26 @@
 <?php
+class CommonDreamsBridge extends FeedExpander {
 
-class CommonDreamsBridge extends FeedExpander
-{
 	const MAINTAINER = 'nyutag';
 	const NAME = 'CommonDreams Bridge';
-    const URI = 'https://www.commondreams.org/';
+	const URI = 'http://www.commondreams.org/';
 	const DESCRIPTION = 'Returns the newest articles.';
 
-    public function collectData()
+	public function collectData(){
-    {
 		$this->collectExpandableDatas('http://www.commondreams.org/rss.xml', 10);
 	}
 
-    protected function parseItem($newsItem)
+	protected function parseItem($newsItem){
-    {
 		$item = parent::parseItem($newsItem);
 		$item['content'] = $this->extractContent($item['uri']);
 		return $item;
 	}
 
-    private function extractContent($url)
+	private function extractContent($url){
-    {
+		$html3 = getSimpleHTMLDOMCached($url);
-        $dom = getSimpleHTMLDOMCached($url);
+		$text = $html3->find('div[class=field--type-text-with-summary]', 0)->innertext;
-        $summary = $dom->find('div.node__body', 0);
+		$html3->clear();
-        $text = $summary->innertext;
+		unset ($html3);
-        $dom->clear();
-        unset($dom);
 		return $text;
 	}
 }

bridges/ContainerLinuxReleasesBridge.php

@@ -0,0 +1,97 @@
+<?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 = [
+		[
+			'channel' => [
+				'name' => 'Release Channel',
+				'type' => 'list',
+				'required' => true,
+				'defaultValue' => self::STABLE,
+				'values' => [
+					'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 = [];
+
+			$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();
+	}
+}