From da339fd5cc5c74ad76e16c94f01752aa66862e0c Mon Sep 17 00:00:00 2001
From: logmanoriginal <logmanoriginal@users.noreply.github.com>
Date: Sun, 9 Jun 2019 20:39:45 +0200
Subject: [PATCH] [GithubIssueBridge] Include issue author comment in the feed

- Add function to build an URL to the GitHub issue comment
- Change scope of internal functions from protected to private
- Use IDs instead of classes as comment selectors, to include the
issue author in the output feed.

References #1100
---
 bridges/GithubIssueBridge.php | 52 +++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/bridges/GithubIssueBridge.php b/bridges/GithubIssueBridge.php
index 9889083f..20da69d1 100644
--- a/bridges/GithubIssueBridge.php
+++ b/bridges/GithubIssueBridge.php
@@ -66,10 +66,21 @@ class GithubIssueBridge extends BridgeAbstract {
 		return parent::getURI();
 	}
 
-	protected function extractIssueEvent($issueNbr, $title, $comment){
-		$comment = $comment->firstChild();
-		$uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p')
-			. '/issues/' . $issueNbr . '#' . $comment->getAttribute('id');
+	private function buildGitHubIssueCommentUri($issue_number, $comment_id) {
+		// https://github.com/<user>/<project>/issues/<issue-number>#<id>
+		return static::URI
+		. $this->getInput('u')
+		. '/'
+		. $this->getInput('p')
+		. '/issues/'
+		. $issue_number
+		. '#'
+		. $comment_id;
+	}
+
+	private function extractIssueEvent($issueNbr, $title, $comment){
+
+		$uri = buildGitHubIssueCommentUri($issueNbr, $comment->getAttribute('id'));
 
 		$author = $comment->find('.author', 0)->plaintext;
 
@@ -94,22 +105,21 @@ class GithubIssueBridge extends BridgeAbstract {
 		return $item;
 	}
 
-	protected function extractIssueComment($issueNbr, $title, $comment){
-		$uri = static::URI . $this->getInput('u') . '/'
-			. $this->getInput('p') . '/issues/' . $issueNbr;
+	private function extractIssueComment($issueNbr, $title, $comment){
+
+		$uri = buildGitHubIssueCommentUri($issueNbr, $comment->id);
 
 		$author = $comment->find('.author', 0)->plaintext;
 
 		$title .= ' / ' . trim(
-			$comment->find('.comment .timeline-comment-header-text', 0)->plaintext
+			$comment->find('.timeline-comment-header-text', 0)->plaintext
 		);
 
 		$content = $comment->find('.comment-body', 0)->innertext;
 
 		$item = array();
 		$item['author'] = $author;
-		$item['uri'] = $uri
-			. '#' . $comment->firstChild()->nextSibling()->getAttribute('id');
+		$item['uri'] = $uri;
 		$item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 		$item['timestamp'] = strtotime(
 			$comment->find('relative-time', 0)->getAttribute('datetime')
@@ -118,25 +128,32 @@ class GithubIssueBridge extends BridgeAbstract {
 		return $item;
 	}
 
-	protected function extractIssueComments($issue){
+	private function extractIssueComments($issue){
 		$items = array();
 		$title = $issue->find('.gh-header-title', 0)->plaintext;
 		$issueNbr = trim(
 			substr($issue->find('.gh-header-number', 0)->plaintext, 1)
 		);
-		$comments = $issue->find('.js-discussion', 0);
-		foreach($comments->children() as $comment) {
+
+		$comments = $issue->find('
+			[id^="issue-"] > .comment,
+			[id^="issuecomment-"] > .comment,
+			[id^="event-"],
+			[id^="ref-"]
+			');
+		foreach($comments as $comment) {
+
 			if (!$comment->hasChildNodes()) {
 				continue;
 			}
-			$comment = $comment->firstChild();
-			$classes = explode(' ', $comment->getAttribute('class'));
-			if (in_array('timeline-comment-wrapper', $classes)) {
+
+			if (!$comment->hasClass('discussion-item-header')) {
 				$item = $this->extractIssueComment($issueNbr, $title, $comment);
 				$items[] = $item;
 				continue;
 			}
-			while (in_array('discussion-item', $classes)) {
+
+			while ($comment->hasClass('discussion-item-header')) {
 				$item = $this->extractIssueEvent($issueNbr, $title, $comment);
 				$items[] = $item;
 				$comment = $comment->nextSibling();
@@ -145,6 +162,7 @@ class GithubIssueBridge extends BridgeAbstract {
 				}
 				$classes = explode(' ', $comment->getAttribute('class'));
 			}
+
 		}
 		return $items;
 	}