diff --git a/bridges/AskfmBridge.php b/bridges/AskfmBridge.php index e2274618..b76d51b3 100644 --- a/bridges/AskfmBridge.php +++ b/bridges/AskfmBridge.php @@ -1,7 +1,7 @@ getURI()) or returnServerError('Requested username can\'t be found.'); - foreach($html->find('div.streamItem-answer') as $element) { + $html = defaultLinkTo($html, self::URI); + + foreach($html->find('article.streamItem-answer') as $element) { $item = array(); - $item['uri'] = self::URI . $element->find('a.streamItemsAge', 0)->href; - $question = trim($element->find('h1.streamItemContent-question', 0)->innertext); + $item['uri'] = $element->find('a.streamItem_meta', 0)->href; + $question = trim($element->find('header.streamItem_header', 0)->innertext); $item['title'] = trim( - htmlspecialchars_decode($element->find('h1.streamItemContent-question', 0)->plaintext, + htmlspecialchars_decode($element->find('header.streamItem_header', 0)->plaintext, ENT_QUOTES ) ); - $answer = trim($element->find('p.streamItemContent-answer', 0)->innertext); + $item['timestamp'] = strtotime($element->find('time', 0)->datetime); - // Doesn't work, DOM parser doesn't seem to like data-hint, dunno why - #$item['update'] = $element->find('a.streamitemsage',0)->data-hint; + $answer = trim($element->find('div.streamItem_content', 0)->innertext); // This probably should be cleaned up, especially for YouTube embeds - $visual = $element->find('div.streamItemContent-visual', 0)->innertext; - //Fix tracking links, also doesn't work + if($visual = $element->find('div.streamItem_visual', 0)) { + $visual = $visual->innertext; + } + + // Fix tracking links, also doesn't work foreach($element->find('a') as $link) { if(strpos($link->href, 'l.ask.fm') !== false) { - - // Too slow - #$link->href = str_replace('#_=_', '', get_headers($link->href, 1)['Location']); - $link->href = $link->plaintext; } } - $content = '

' . $question . '

' . $answer . '

' . $visual . '

'; - // Fix relative links without breaking // scheme used by YouTube stuff - $content = preg_replace('#href="\/(?!\/)#', 'href="' . self::URI, $content); - $item['content'] = $content; + $item['content'] = '

' . $question + . '

' . $answer + . '

' . $visual . '

'; + $this->items[] = $item; } } @@ -66,7 +66,7 @@ class AskfmBridge extends BridgeAbstract { public function getURI(){ if(!is_null($this->getInput('u'))) { - return self::URI . urlencode($this->getInput('u')) . '/answers/more?page=0'; + return self::URI . urlencode($this->getInput('u')); } return parent::getURI();