.github/CODEOWNERS

@@ -0,0 +1 @@
+* @takezoe @xuwei-k

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [11]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Cache
+      uses: actions/cache@v4
+      env:
+        cache-name: cache-sbt-libs
+      with:
+        path: |
+          ~/.ivy2/cache
+          ~/.sbt
+          ~/.coursier
+        key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}    
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: ${{ matrix.java }}
+    - uses: sbt/setup-sbt@v1
+    - name: Run tests
+      run: |
+        git clone https://github.com/gitbucket/gitbucket.git
+        cd gitbucket
+        sbt publishLocal
+        cd ../
+        sbt scalafmtSbtCheck scalafmtCheckAll test
+    - name: Assembly
+      run: sbt assembly
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: gitbucket-pages-plugin-java${{ matrix.java }}-${{ github.sha }}
+        path: ./target/scala-2.13/*.jar
+

.gitignore

@@ -1,3 +1,32 @@
-*.iml
-.idea/
+*.class
+*.log
+
+# sbt specific
+dist/*
 target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+
+# Scala-IDE specific
+.scala_dependencies
+.classpath
+.project
+.cache
+.settings
+
+# IntelliJ specific
+.idea/
+.idea_modules/
+
+# Ensime
+.ensime
+.ensime_cache/
+
+# Metals
+.bloop/
+.metals/
+.vscode/
+**/metals.sbt
+.bsp

.scalafmt.conf

@@ -1,11 +1,12 @@
+version = "3.9.4"
 project.git = true
 
 maxColumn = 120
-docstrings = JavaDoc
 
 align.tokens = ["%", "%%", {code = "=>", owner = "Case"}]
 align.openParenCallSite = false
 align.openParenDefnSite = false
 continuationIndent.callSite = 2
 continuationIndent.defnSite = 2
-danglingParentheses = true
+danglingParentheses.preset = true
+runner.dialect = scala213source3

README.md

@@ -1,5 +1,5 @@
 
-# Gitbucket-Pages-Plugin [![Gitter](https://img.shields.io/gitter/room/gitbucket/gitbucket.js.svg?style=flat-square)](https://gitter.im/gitbucket/gitbucket) [![Travis](https://img.shields.io/travis/gitbucket/gitbucket-pages-plugin.svg?style=flat-square)](https://travis-ci.org/gitbucket/gitbucket-pages-plugin)
+# Gitbucket-Pages-Plugin [![Gitter](https://img.shields.io/gitter/room/gitbucket/gitbucket.js.svg)](https://gitter.im/gitbucket/gitbucket) [![build](https://github.com/gitbucket/gitbucket-pages-plugin/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket-pages-plugin/actions?query=workflow%3Abuild+branch%3Amaster)
 
 This plugin provides *Project Pages* functionality for
 [GitBucket](https://github.com/gitbucket/gitbucket) based repositories.
@@ -38,6 +38,8 @@ version please follow the instruction below**
 
 | pages version | gitbucket version |
 |     :---:     |       :---:       |
+| 1.10.0        | 4.36.0            |
+| 1.9.0         | 4.35.0            |
 | 1.8.0         | 4.32.0            |
 | 1.7.0         | 4.23.0            |
 | 1.6.0         | 4.19.0            |
@@ -92,5 +94,4 @@ server {
 
 ## CI
 
-- build by [travis-ci](https://travis-ci.org/gitbucket/gitbucket-pages-plugin)
-
+- build by [GitHub Actions](https://github.com/gitbucket/gitbucket-pages-plugin/actions)

build.sbt

@@ -1,8 +1,8 @@
 organization := "gitbucket"
 name := "gitbucket-pages-plugin"
-scalaVersion := "2.13.0"
-version := "1.8.0"
-gitbucketVersion := "4.32.0"
+scalaVersion := "2.13.16"
+version := "1.10.0"
+gitbucketVersion := "4.42.1"
 scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8", "-feature")
 
 scalafmtOnCompile := true

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.10.11

project/plugins.sbt

@@ -1,3 +1,2 @@
-addSbtPlugin("com.geirsson"        % "sbt-scalafmt"         % "1.5.0")
-addSbtPlugin("net.virtual-void"    % "sbt-dependency-graph" % "0.9.0")
-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.5.4")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.6.0")

src/main/scala/Plugin.scala

@@ -33,14 +33,15 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("1.6.0"),
     new Version("1.7.0"),
     new Version("1.7.1"),
-    new Version("1.8.0")
+    new Version("1.8.0"),
+    new Version("1.9.0"),
+    new Version("1.10.0")
   )
 
   override val controllers: Seq[(String, ControllerBase)] = Seq("/*" -> new PagesController)
 
-  override val repositorySettingTabs = Seq(
-    (repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages"))
-  )
+  override val repositorySettingTabs =
+    Seq((repository: RepositoryInfo, context: Context) => Some(Link("pages", "Pages", s"settings/pages")))
 
   override val repositoryHooks = Seq(new PagesHook)
 }

src/main/scala/gitbucket/plugin/model/Pages.scala

@@ -12,7 +12,7 @@ trait PagesComponent { self: gitbucket.core.model.Profile =>
     val userName = column[String]("USER_NAME")
     val repositoryName = column[String]("REPOSITORY_NAME")
     val source = column[PageSourceType]("SOURCE")
-    def * = (userName, repositoryName, source) <> ((Page.apply _).tupled, Page.unapply)
+    def * = (userName, repositoryName, source).<>((Page.apply _).tupled, Page.unapply)
   }
 }
 

src/main/scala/gitbucket/plugin/pages/pages.scala

@@ -13,8 +13,9 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.ObjectId
 import org.eclipse.jgit.revwalk.RevCommit
 import org.scalatra.i18n.Messages
-import scala.util.Using
 
+import javax.servlet.http.HttpServletRequest
+import scala.util.Using
 import scala.annotation.tailrec
 import scala.language.implicitConversions
 
@@ -30,29 +31,36 @@ trait PagesControllerBase extends ControllerBase {
   self: AccountService with RepositoryService with PagesService with ReferrerAuthenticator with OwnerAuthenticator =>
   import PagesControllerBase._
 
-  val optionsForm = mapping("source" -> trim(label("Pages Source", text(required, pagesOption))))(
-    (source) => OptionsForm(PageSourceType.valueOf(source))
-  )
+  val optionsForm: MappingValueType[OptionsForm] = mapping(
+    "source" -> trim(label("Pages Source", text(required, pagesOption)))
+  )(source => OptionsForm(PageSourceType.valueOf(source)))
 
   val PAGES_BRANCHES = List("gb-pages", "gh-pages")
 
+  def endsWithSlash(): Boolean = request.getServletPath.endsWith("/")
+
   get("/:owner/:repository/pages/*")(referrersOnly { repository =>
     renderPage(repository, params("splat"))
   })
 
   get("/:owner/:repository/pages")(referrersOnly { repository =>
-    renderPage(repository, "")
+    if (endsWithSlash()) {
+      renderPage(repository, "")
+    } else {
+      redirect(s"/${repository.owner}/${repository.name}/pages/")
+    }
   })
 
   private def renderPage(repository: RepositoryInfo, path: String) = {
+    val defaultBranch = repository.repository.defaultBranch
     Using.resource(Git.open(Directory.getRepositoryDir(repository.owner, repository.name))) { git =>
       getPageSource(repository.owner, repository.name) match {
         case PageSourceType.GH_PAGES =>
-          renderFromBranch(repository, git, path, PAGES_BRANCHES.collectFirstOpt(resolveBranch(git, _)))
+          renderFromBranch(repository, git, path, PAGES_BRANCHES.collectFirst(Function.unlift(resolveBranch(git, _))))
         case PageSourceType.MASTER =>
-          renderFromBranch(repository, git, path, resolveBranch(git, "master"))
+          renderFromBranch(repository, git, path, resolveBranch(git, defaultBranch))
         case PageSourceType.MASTER_DOCS =>
-          renderFromBranch(repository, git, joinPath("docs", path), resolveBranch(git, "master"))
+          renderFromBranch(repository, git, joinPath("docs", path), resolveBranch(git, defaultBranch))
         case PageSourceType.NONE =>
           NotFound()
       }
@@ -61,7 +69,8 @@ trait PagesControllerBase extends ControllerBase {
 
   get("/:owner/:repository/settings/pages")(ownerOnly { repository =>
     val source = getPageSource(repository.owner, repository.name)
-    html.options(repository, source, flash.get("info"))
+    val defaultBranch = repository.repository.defaultBranch
+    html.options(repository, source, defaultBranch, flash.get("info"))
   })
 
   post("/:owner/:repository/settings/pages", optionsForm)(ownerOnly { (form, repository) =>
@@ -98,14 +107,14 @@ trait PagesControllerBase extends ControllerBase {
     }
   }
 
-  def resolveBranch(git: Git, name: String) = Option(git.getRepository.resolve(name))
+  def resolveBranch(git: Git, name: String): Option[ObjectId] = Option(git.getRepository.resolve(name))
 
   // redirect [owner/repo/pages/path] -> [owner/repo/pages/path/]
   def shouldRedirect(path: String, path0: String): Boolean =
-    !isRoot(path) && path0 != path && path0.startsWith(path) && !path.endsWith("/")
+    !isRoot(path) && path0 != path && path0.startsWith(path) && !endsWithSlash()
 
   def getPageObjectId(git: Git, path: String, revCommit: RevCommit): Option[(String, ObjectId)] = {
-    listProbablePages(path).collectFirstOpt(getPathObjectIdPair(git, _, revCommit))
+    listProbablePages(path).collectFirst(Function.unlift(getPathObjectIdPair(git, _, revCommit)))
   }
 
   def listProbablePages(path: String): List[String] = {
@@ -133,20 +142,6 @@ trait PagesControllerBase extends ControllerBase {
 object PagesControllerBase {
   case class OptionsForm(source: PageSourceType)
 
-  implicit class listCollectFirst[A](private val lst: List[A]) extends AnyVal {
-    @tailrec
-    final def collectFirstOpt[B](f: A => Option[B]): Option[B] = {
-      lst match {
-        case head :: tail =>
-          f(head) match {
-            case Some(x) => Some(x)
-            case None    => tail.collectFirstOpt(f)
-          }
-        case Nil => None
-      }
-    }
-  }
-
   def pagesOption: Constraint = new Constraint() {
     override def validate(name: String, value: String, messages: Messages): Option[String] =
       PageSourceType.valueOpt(value) match {

src/main/scala/gitbucket/plugin/service/PagesService.scala

@@ -21,8 +21,8 @@ trait PagesService {
       .map(t => t.source)
       .update(source)
 
-  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(
-    implicit s: Session
+  def renameRepository(userName: String, oldRepositoryName: String, newRepositoryName: String)(implicit
+    s: Session
   ): Unit =
     Pages
       .filter(t => (t.userName === userName.bind) && (t.repositoryName === oldRepositoryName.bind))

src/main/twirl/gitbucket/pages/options.scala.html

@@ -1,6 +1,7 @@
 @import gitbucket.plugin.model.PageSourceType
 @(repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
     source: PageSourceType,
+    defaultBranch: String,
     info: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.main("Pages", Some(repository)){
@@ -24,16 +25,16 @@
                             <div class="radio">
                                 <label>
                                     <input type="radio" name="source" value="@PageSourceType.MASTER.code" @if(source == PageSourceType.MASTER) { checked="checked" }>
-                                    <span class="strong">master branch</span><br>
+                                    <span class="strong">default branch</span><br>
                                     <div class="normal muted">
-                                      Use the <code>master</code> branch for Pages.
+                                      Use the <code>@defaultBranch</code> branch for Pages.
                                     </div>
                                 </label>
                             </div>
                             <div class="radio">
                                 <label>
                                     <input type="radio" name="source" value="@PageSourceType.MASTER_DOCS.code" @if(source == PageSourceType.MASTER_DOCS) { checked="checked" }>
-                                    <span class="strong">master branch /docs folder</span><br>
+                                    <span class="strong">default branch /docs folder</span><br>
                                     <div class="normal muted">
                                       Use only the <code>/docs</code> folder for Pages.
                                     </div>