Support GitBucket 4.35.0

Author: takezoe

build.sbt

@@ -1,8 +1,8 @@
 organization := "io.github.gitbucket"
 name := "gitbucket-gist-plugin"
-version := "4.19.0"
+version := "4.20.0"
 scalaVersion := "2.13.3"
-gitbucketVersion := "4.34.0"
+gitbucketVersion := "4.35.0"
 
 scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")

src/main/scala/Plugin.scala

@@ -41,7 +41,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("4.16.0"),
     new Version("4.17.0"),
     new Version("4.18.0"),
-    new Version("4.19.0")
+    new Version("4.19.0"),
+    new Version("4.20.0")
   )
 
   override def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -211,7 +211,7 @@ trait GistControllerBase extends ControllerBase {
             commits
           )
         }
-        case Left(_) => NotFound
+        case Left(_) => NotFound()
       }
     }
   }
@@ -231,10 +231,10 @@ trait GistControllerBase extends ControllerBase {
             defining(JGitUtil.getContentFromId(git, file.id, false).get){ bytes =>
               RawData(FileUtil.getMimeType(file.name, bytes), bytes)
             }
-          } getOrElse NotFound
-        } else Unauthorized
+          } getOrElse NotFound()
+        } else Unauthorized()
       }
-    } else NotFound
+    } else NotFound()
   }
 
   get("/gist/:userName/:repoName/download/*"){
@@ -283,7 +283,7 @@ trait GistControllerBase extends ControllerBase {
         gists              = result._1,
         createSnippet      = createSnippet
       )
-    } getOrElse NotFound
+    } getOrElse NotFound()
   }
 
   get("/gist/:userName"){
@@ -333,7 +333,7 @@ trait GistControllerBase extends ControllerBase {
 
         redirect(s"/gist/${loginAccount.userName}/${repoName}")
 
-      } getOrElse NotFound
+      } getOrElse NotFound()
     }
   })
 
@@ -349,7 +349,7 @@ trait GistControllerBase extends ControllerBase {
         getForkedGists(userName, repoName),
         isEditable(userName, loginUserGroups)
       )
-    } getOrElse NotFound
+    } getOrElse NotFound()
   }
 
   ////////////////////////////////////////////////////////////////////////////////
@@ -366,15 +366,16 @@ trait GistControllerBase extends ControllerBase {
     helpers.markdown(
       markdown   = params("content"),
       repository = RepositoryInfo(
-        owner       = userName,
-        name        = repoName,
-        repository  = null,
-        issueCount  = 0,
-        pullCount   = 0,
-        forkedCount = 0,
-        branchList  = Nil,
-        tags        = Nil,
-        managers    = Nil
+        owner          = userName,
+        name           = repoName,
+        repository     = null,
+        issueCount     = 0,
+        pullCount      = 0,
+        forkedCount    = 0,
+        milestoneCount = 0,
+        branchList     = Nil,
+        tags           = Nil,
+        managers       = Nil
       ),
       branch           = "master",
       enableWikiLink   = false,
@@ -393,7 +394,7 @@ trait GistControllerBase extends ControllerBase {
     getGist(userName, repoName).map { gist =>
       registerGistComment(userName, repoName, form.content, loginAccount.userName)
       redirect(s"/gist/${userName}/${repoName}")
-    } getOrElse NotFound
+    } getOrElse NotFound()
   })
 
   ajaxPost("/gist/:userName/:repoName/_comments/:commentId/_delete")(usersOnly {
@@ -431,7 +432,7 @@ trait GistControllerBase extends ControllerBase {
           )
         }
       }
-    } getOrElse NotFound
+    } getOrElse NotFound()
   })
 
   ajaxPost("/gist/:userName/:repoName/_comments/:commentId/_update", commentForm)(usersOnly { form =>

src/main/scala/gitbucket/gist/model/Gist.scala

@@ -1,5 +1,7 @@
 package gitbucket.gist.model
 
+import gitbucket.core.issues.milestones.html.milestone
+
 trait GistComponent { self: gitbucket.core.model.Profile =>
   import profile.api._
   import self._
@@ -16,7 +18,7 @@ trait GistComponent { self: gitbucket.core.model.Profile =>
     val originUserName       = column[String]("ORIGIN_USER_NAME")
     val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
     val mode                 = column[String]("MODE")
-    def * = (userName, repositoryName, title, description, registeredDate, updatedDate, originUserName.?, originRepositoryName.?, mode) <> (Gist.tupled, Gist.unapply)
+    def * = (userName, repositoryName, title, description, registeredDate, updatedDate, originUserName.?, originRepositoryName.?, mode).<>(Gist.tupled, Gist.unapply)
   }
 }
 
@@ -33,15 +35,16 @@ case class Gist(
 ){
   def toRepositoryInfo = {
     gitbucket.core.service.RepositoryService.RepositoryInfo(
-      owner       = userName,
-      name        = repositoryName,
-      repository  = null,
-      issueCount  = 0,
-      pullCount   = 0,
-      forkedCount = 0,
-      branchList  = Nil,
-      tags        = Nil,
-      managers    = Nil
+      owner          = userName,
+      name           = repositoryName,
+      repository     = null,
+      issueCount     = 0,
+      pullCount      = 0,
+      forkedCount    = 0,
+      milestoneCount = 0,
+      branchList     = Nil,
+      tags           = Nil,
+      managers       = Nil
     )
   }
 }

src/main/scala/gitbucket/gist/model/GistComment.scala

@@ -16,7 +16,7 @@ trait GistCommentComponent { self: gitbucket.core.model.Profile =>
     val content           = column[String]("CONTENT")
     val registeredDate    = column[java.util.Date]("REGISTERED_DATE")
     val updatedDate       = column[java.util.Date]("UPDATED_DATE")
-    def * = (userName, repositoryName, commentId, commentedUserName, content, registeredDate, updatedDate) <> (GistComment.tupled, GistComment.unapply)
+    def * = (userName, repositoryName, commentId, commentedUserName, content, registeredDate, updatedDate).<>(GistComment.tupled, GistComment.unapply)
   }
 }