revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-27 17:22:42 +01:00
Code Issues Releases Wiki Activity

Pick better GitHub URIs for comment events

Browse source 
Summary: Ref T10538. Boundless joy.

Test Plan: Unit tests.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10538

Differential Revision: https://secure.phabricator.com/D15510
This commit is contained in:
epriestley 2016-03-22 15:20:33 -07:00
parent 1885c4e03b
commit dac07921f7
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/applications/nuance/github/NuanceGitHubRawEvent.php
View file

@ -93,15 +93,7 @@ final class NuanceGitHubRawEvent extends Phobject {
public function getURI() { public function getURI() {
$raw = $this->raw; $raw = $this->raw;
if ($this->isIssueEvent()) { if ($this->isIssueEvent() || $this->isPullRequestEvent()) {
if ($this->type == self::TYPE_ISSUE) {
$uri = idxv($raw, array('issue', 'html_url'));
$uri = $uri.'#event-'.$this->getID();
} else {
$uri = idxv($raw, array('payload', 'issue', 'html_url'));
$uri = $uri.'#event-'.$this->getID();
}
} else if ($this->isPullRequestEvent()) {
if ($this->type == self::TYPE_ISSUE) { if ($this->type == self::TYPE_ISSUE) {
$uri = idxv($raw, array('issue', 'html_url')); $uri = idxv($raw, array('issue', 'html_url'));
$uri = $uri.'#event-'.$this->getID(); $uri = $uri.'#event-'.$this->getID();
@ -109,11 +101,24 @@ final class NuanceGitHubRawEvent extends Phobject {
// The format of pull request events varies so we need to fish around // The format of pull request events varies so we need to fish around
// a bit to find the correct URI. // a bit to find the correct URI.
$uri = idxv($raw, array('payload', 'pull_request', 'html_url')); $uri = idxv($raw, array('payload', 'pull_request', 'html_url'));
$need_anchor = true;
// For comments, we get a different anchor to link to the comment. In
// this case, the URI comes with an anchor already.
if (!$uri) {
$uri = idxv($raw, array('payload', 'comment', 'html_url'));
$need_anchor = false;
}
if (!$uri) { if (!$uri) {
$uri = idxv($raw, array('payload', 'issue', 'html_url')); $uri = idxv($raw, array('payload', 'issue', 'html_url'));
$need_anchor = true;
} }
if ($need_anchor) {
$uri = $uri.'#event-'.$this->getID(); $uri = $uri.'#event-'.$this->getID();
} }
}
} else { } else {
switch ($this->getIssueRawKind()) { switch ($this->getIssueRawKind()) {
case 'PushEvent': case 'PushEvent':

2
src/applications/nuance/github/__tests__/repositoryevents/IssueCommentEvent.created.pull.txt
View file

@ -159,5 +159,5 @@
"issue.number": null, "issue.number": null,
"pull.number": 2, "pull.number": 2,
"id": 3740938746, "id": 3740938746,
"uri": "https://github.com/epriestley/poems/pull/2#event-3740938746" "uri": "https://github.com/epriestley/poems/pull/2#issuecomment-194282800"
} }

2
src/applications/nuance/github/__tests__/repositoryevents/IssueCommentEvent.created.txt
View file

@ -96,5 +96,5 @@
"is.pull": false, "is.pull": false,
"issue.number": 1, "issue.number": 1,
"id": 3733510485, "id": 3733510485,
"uri": "https://github.com/epriestley/poems/issues/1#event-3733510485" "uri": "https://github.com/epriestley/poems/issues/1#issuecomment-193528669"
} }