Merge branch 'master' of gitlab.tt-rss.org:tt-rss/plugins/ttrss-af-readabilityHEADmaster

2 files changed, 29 insertions, 4 deletions

diff --git a/vendor/fivefilters/readability.php/src/Configuration.php b/vendor/fivefilters/readability.php/src/Configuration.php
index 6d1f03f..0659a82 100644
--- a/vendor/fivefilters/readability.php/src/Configuration.php
+++ b/vendor/fivefilters/readability.php/src/Configuration.php
@@ -84,6 +84,11 @@ class Configuration
     protected $disableJSONLD = false;
 
     /**
+     * @var array<string>
+     */
+    protected $extraIgnoredElements = [];
+
+    /**
      * Configuration constructor.
      *
      * @param array $params
@@ -420,4 +425,24 @@ class Configuration
 
         return $this;
     }
+
+    /**
+     * @return array<string>
+     */
+    public function getExtraIgnoredElements()
+    {
+        return $this->extraIgnoredElements;
+    }
+
+    /**
+     * @param array<string>
+     *
+     * @return $this
+     */
+    public function setExtraIgnoredElements($extraIgnoredElements)
+    {
+        $this->extraIgnoredElements = $extraIgnoredElements;
+
+        return $this;
+    }
 }
diff --git a/vendor/fivefilters/readability.php/src/Readability.php b/vendor/fivefilters/readability.php/src/Readability.php
index 6407a92..c5318a4 100644
--- a/vendor/fivefilters/readability.php/src/Readability.php
+++ b/vendor/fivefilters/readability.php/src/Readability.php
@@ -342,7 +342,7 @@ class Readability
         // Extract JSON-LD metadata before removing scripts
         $this->jsonld = $this->configuration->getDisableJSONLD() ? [] : $this->getJSONLD($dom);
 
-        $this->removeScripts($dom);
+        $this->removeIgnoredElements($dom);
 
         $this->prepDocument($dom);
 
@@ -1188,13 +1188,13 @@ class Readability
     }
 
     /**
-     * Removes all the scripts of the html.
+     * Removes elements that should be ignored.
      *
      * @param DOMDocument $dom
      */
-    private function removeScripts(DOMDocument $dom)
+    private function removeIgnoredElements(DOMDocument $dom)
     {
-        foreach (['script', 'noscript'] as $tag) {
+        foreach (['noscript', 'script', ...$this->configuration->getExtraIgnoredElements()] as $tag) {
             $nodes = $dom->getElementsByTagName($tag);
             foreach (iterator_to_array($nodes) as $node) {
                 NodeUtility::removeNode($node);