1 files changed, 45 insertions, 12 deletions

diff --git a/plugins/af_pennyarcade/init.php b/plugins/af_pennyarcade/init.php
index 26d19bc01..8ad02e14c 100644
--- a/plugins/af_pennyarcade/init.php
+++ b/plugins/af_pennyarcade/init.php
@@ -1,17 +1,15 @@
 <?php
 class Af_PennyArcade extends Plugin {
 
-	private $link;
 	private $host;
 
 	function about() {
-		return array(1.0,
+		return array(1.1,
 			"Strip unnecessary stuff from PA feeds",
 			"fox");
 	}
 
 	function init($host) {
-		$this->link = $host->get_link();
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
@@ -23,27 +21,57 @@ class Af_PennyArcade extends Plugin {
 		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
 			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
 
+				if ($debug_enabled) {
+					_debug("af_pennyarcade: Processing comic");
+				}
+
 				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
+				$doc->loadHTML(fetch_file_contents($article["link"]));
 
 				$basenode = false;
 
 				if ($doc) {
 					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess...
-
-					$matches = array();
+					$entries = $xpath->query('(//div[@class="post comic"])');
 
 					foreach ($entries as $entry) {
+						$basenode = $entry;
+					}
+
+					if ($basenode) {
+						$article["content"] = $doc->saveXML($basenode);
+						$article["plugin_data"] = "pennyarcade,$owner_uid:" . $article["plugin_data"];
+					}
+				}
+			} else if (isset($article["stored"]["content"])) {
+				$article["content"] = $article["stored"]["content"];
+			}
+		}
 
-						if (preg_match("/(http:\/\/art.penny-arcade.com\/.*)/i", $entry->getAttribute("src"), $matches)) {
+		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
+			if (strpos($article["plugin_data"], "pennyarcade,$owner_uid:") === FALSE) {
+				if ($debug_enabled) {
+					_debug("af_pennyarcade: Processing news post");
+				}
+				$doc = new DOMDocument();
+				$doc->loadHTML(fetch_file_contents($article["link"]));
+
+				if ($doc) {
+					$xpath = new DOMXPath($doc);
+					$entries = $xpath->query('(//div[@class="post"])');
+
+					$basenode = false;
 
-							$basenode = $entry;
-							break;
-						}
+					foreach ($entries as $entry) {
+						$basenode = $entry;
 					}
 
-					if ($basenode) {
+					$uninteresting = $xpath->query('(//div[@class="heading"])');
+					foreach ($uninteresting as $i) {
+						$i->parentNode->removeChild($i);
+					}
+
+					if ($basenode){
 						$article["content"] = $doc->saveXML($basenode);
 						$article["plugin_data"] = "pennyarcade,$owner_uid:" . $article["plugin_data"];
 					}
@@ -55,5 +83,10 @@ class Af_PennyArcade extends Plugin {
 
 		return $article;
 	}
+
+	function api_version() {
+		return 2;
+	}
+
 }
 ?>