20 files changed, 5 insertions, 39 deletions
diff --git a/vendor/andreskrey/Readability/Configuration.php b/plugins/af_readability/vendor/andreskrey/Readability/Configuration.php
index 6c17bc757..6c17bc757 100644
--- a/vendor/andreskrey/Readability/Configuration.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Configuration.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMAttr.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMAttr.php
index 91729f3b1..91729f3b1 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMAttr.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMAttr.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMCdataSection.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMCdataSection.php
index 4535e4e99..4535e4e99 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMCdataSection.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMCdataSection.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMCharacterData.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMCharacterData.php
index e4db11a06..e4db11a06 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMCharacterData.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMCharacterData.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMComment.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMComment.php
index 13b004aff..13b004aff 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMComment.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMComment.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocument.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocument.php
index 81e9c7de6..81e9c7de6 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocument.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocument.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentFragment.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentFragment.php
index bcb89468d..bcb89468d 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentFragment.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentFragment.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentType.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentType.php
index 18705a7a7..18705a7a7 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentType.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMDocumentType.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMElement.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMElement.php
index c07670bf7..c07670bf7 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMElement.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMElement.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMEntity.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMEntity.php
index 8493e7319..8493e7319 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMEntity.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMEntity.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMEntityReference.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMEntityReference.php
index 32cecb75c..32cecb75c 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMEntityReference.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMEntityReference.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMNode.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMNode.php
index 7c3c4f3a2..7c3c4f3a2 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMNode.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMNode.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMNotation.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMNotation.php
index 2e888ce00..2e888ce00 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMNotation.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMNotation.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMProcessingInstruction.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMProcessingInstruction.php
index 9dd4c5c70..9dd4c5c70 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMProcessingInstruction.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMProcessingInstruction.php
diff --git a/vendor/andreskrey/Readability/Nodes/DOM/DOMText.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMText.php
index 42c575b49..42c575b49 100644
--- a/vendor/andreskrey/Readability/Nodes/DOM/DOMText.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/DOM/DOMText.php
diff --git a/vendor/andreskrey/Readability/Nodes/NodeTrait.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeTrait.php
index d7060ccbb..d7060ccbb 100644
--- a/vendor/andreskrey/Readability/Nodes/NodeTrait.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeTrait.php
diff --git a/vendor/andreskrey/Readability/Nodes/NodeUtility.php b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeUtility.php
index 7a1f18ee4..7a1f18ee4 100644
--- a/vendor/andreskrey/Readability/Nodes/NodeUtility.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeUtility.php
diff --git a/vendor/andreskrey/Readability/ParseException.php b/plugins/af_readability/vendor/andreskrey/Readability/ParseException.php
index 646c04a37..646c04a37 100644
--- a/vendor/andreskrey/Readability/ParseException.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/ParseException.php
diff --git a/vendor/andreskrey/Readability/Readability.php b/plugins/af_readability/vendor/andreskrey/Readability/Readability.php
index 7b7eed6bf..7b7eed6bf 100644
--- a/vendor/andreskrey/Readability/Readability.php
+++ b/plugins/af_readability/vendor/andreskrey/Readability/Readability.php
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 9ab2e7968..403db888a 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -1,7 +1,4 @@
 <?php
-use andreskrey\Readability\Readability;
-use andreskrey\Readability\Configuration;
-
 class Af_RedditImgur extends Plugin {
 
 	/* @var PluginHost $host */
@@ -551,47 +548,16 @@ class Af_RedditImgur extends Plugin {
 				parse it which p much requires curl */
 
 				$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
-
 				$content_type = $this->get_content_type($url, $useragent_compat);
 
 				if ($content_type && strpos($content_type, "text/html") !== FALSE) {
 
-					$tmp = fetch_file_contents(["url" => $url,
-						"useragent" => $useragent_compat,
-						"http_accept" => "text/html"]);
-
-					Debug::log("tmplen: " . mb_strlen($tmp), Debug::$LOG_VERBOSE);
-
-					if ($tmp && mb_strlen($tmp) < 1024 * 500) {
-
-						$r = new Readability(new Configuration());
-
-						try {
-							if ($r->parse($tmp)) {
-
-								$tmpxpath = new DOMXPath($r->getDOMDocument());
-
-								$entries = $tmpxpath->query('(//a[@href]|//img[@src])');
-
-								foreach ($entries as $entry) {
-									if ($entry->hasAttribute("href")) {
-										$entry->setAttribute("href",
-											rewrite_relative_url($url, $entry->getAttribute("href")));
+					foreach ($this->host->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
+						$extracted_content = $p->hook_get_full_text($url);
 
-									}
-
-									if ($entry->hasAttribute("src")) {
-										$entry->setAttribute("src",
-											rewrite_relative_url($url, $entry->getAttribute("src")));
-
-									}
-
-								}
-
-								$article["content"] = $r->getContent() . "<hr/>" . $article["content"];
-							}
-						} catch (Exception $e) {
-							//
+						if ($extracted_content) {
+							$article["content"] = $extracted_content;
+							break;
 						}
 					}
 				}