From bf64f6b4f4f232da9c5b21bac4e47a946a135880 Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Fri, 2 Oct 2015 00:33:23 +0900
Subject: [PATCH] api url is only `issues`

---
 src/main/scala/gitbucket/core/api/ApiComment.scala         | 2 +-
 src/main/scala/gitbucket/core/api/ApiIssue.scala           | 4 ++--
 src/main/scala/gitbucket/core/api/IssueOrPullRequest.scala | 2 +-
 src/test/scala/gitbucket/core/api/JsonFormatSpec.scala     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/gitbucket/core/api/ApiComment.scala b/src/main/scala/gitbucket/core/api/ApiComment.scala
index ba558f147..9e00e90a0 100644
--- a/src/main/scala/gitbucket/core/api/ApiComment.scala
+++ b/src/main/scala/gitbucket/core/api/ApiComment.scala
@@ -15,7 +15,7 @@ case class ApiComment(
   body: String,
   created_at: Date,
   updated_at: Date)(repositoryName: RepositoryName, issueId: Int, issueOrPullRequest: IssueOrPullRequest){
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${issueOrPullRequest.html}/${issueId}#comment-${id}")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${issueOrPullRequest.path}/${issueId}#comment-${id}")
 }
 
 object ApiComment{
diff --git a/src/main/scala/gitbucket/core/api/ApiIssue.scala b/src/main/scala/gitbucket/core/api/ApiIssue.scala
index 629e0a947..38c7496e3 100644
--- a/src/main/scala/gitbucket/core/api/ApiIssue.scala
+++ b/src/main/scala/gitbucket/core/api/ApiIssue.scala
@@ -18,8 +18,8 @@ case class ApiIssue(
   created_at: Date,
   updated_at: Date,
   body: String)(repositoryName: RepositoryName, issueOrPullRequest: IssueOrPullRequest){
-  val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/${issueOrPullRequest.api}/${number}/comments")
-  val html_url = ApiPath(s"/${repositoryName.fullName}/${issueOrPullRequest.html}/${number}")
+  val comments_url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/issues/${number}/comments")
+  val html_url = ApiPath(s"/${repositoryName.fullName}/${issueOrPullRequest.path}/${number}")
 }
 
 object ApiIssue{
diff --git a/src/main/scala/gitbucket/core/api/IssueOrPullRequest.scala b/src/main/scala/gitbucket/core/api/IssueOrPullRequest.scala
index 7f05f53a3..316ceab30 100644
--- a/src/main/scala/gitbucket/core/api/IssueOrPullRequest.scala
+++ b/src/main/scala/gitbucket/core/api/IssueOrPullRequest.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.api
 
 case class IssueOrPullRequest(isPullRequest:Boolean){
-  val (html, api) = if(isPullRequest){ ("pull","pulls") }else{ ("issues","issues") }
+  val path = if(isPullRequest){ "pull" }else{ "issues" }
 }
\ No newline at end of file
diff --git a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
index 631da5421..c3364160d 100644
--- a/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
+++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
@@ -200,7 +200,7 @@ class JsonFormatSpec extends Specification {
     "title": "Found a bug",
     "body": "I'm having a problem with this.",
     "user": $apiUserJson,
-    "comments_url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/pulls/1347/comments",
+    "comments_url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/issues/1347/comments",
     "html_url": "${context.baseUrl}/octocat/Hello-World/pull/1347",
     "created_at": "2011-04-14T16:00:49Z",
     "updated_at": "2011-04-14T16:00:49Z"