.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,42 @@
+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 test
+    - name: Assembly
+      run: sbt assembly
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: gitbucket-notifications-plugin-java${{ matrix.java }}-${{ github.sha }}
+        path: ./target/scala-2.13/*.jar

.gitignore

@@ -8,6 +8,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+.bsp/
 
 # Scala-IDE specific
 .scala_dependencies
@@ -25,5 +26,7 @@ project/plugins/project/
 .ensime_cache/
 
 # Metals
-.bloop
-.metals
+.bloop/
+.metals/
+.vscode/
+**/metals.sbt

README.md

@@ -1,17 +1,20 @@
-# gitbucket-notifications-plugin [![Build Status](https://travis-ci.org/gitbucket/gitbucket-notifications-plugin.svg)](https://travis-ci.org/gitbucket/gitbucket-notifications-plugin)
+# gitbucket-notifications-plugin [![build](https://github.com/gitbucket/gitbucket-notifications-plugin/workflows/build/badge.svg?branch=master)](https://github.com/gitbucket/gitbucket-notifications-plugin/actions?query=workflow%3Abuild+branch%3Amaster)
 
 This plug-in provides notifications feature on GitBucket.
 
-Plugin version | GitBucket version
-:--------------|:--------------------
-1.8.x          | 4.32.x
-1.7.x          | 4.30.x
-1.6.x          | 4.26.x
-1.5.x          | 4.23.x - 4.25.x
-1.4.x          | 4.19.x - 4.22.x
-1.2.x, 1.3.x   | 4.17.x - 4.18.x
-1.1.x          | 4.16.x
-1.0.x          | 4.15.x
+| Plugin version | GitBucket version |
+|:---------------|:------------------|
+| 1.11.x         | 4.37.x            |
+| 1.10.x         | 4.35.x            |
+| 1.9.x          | 4.34.x            |
+| 1.8.x          | 4.32.x - 4.33.x   |
+| 1.7.x          | 4.30.x - 4.31.x   |
+| 1.6.x          | 4.26.x - 4.29.x   |
+| 1.5.x          | 4.23.x - 4.25.x   |
+| 1.4.x          | 4.19.x - 4.22.x   |
+| 1.2.x, 1.3.x   | 4.17.x - 4.18.x   |
+| 1.1.x          | 4.16.x            |
+| 1.0.x          | 4.15.x            |
 
 ## Features
 

build.sbt

@@ -1,5 +1,6 @@
 name := "gitbucket-notifications-plugin"
 organization := "io.github.gitbucket"
-version := "1.8.0"
-scalaVersion := "2.13.0"
-gitbucketVersion := "4.32.0"
+version := "1.11.0"
+scalaVersion := "2.13.16"
+gitbucketVersion := "4.43.0"
+scalacOptions := Seq("-deprecation", "-language:postfixOps", "-feature")

project/build.properties

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

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.5.0")
+addSbtPlugin("io.github.gitbucket" % "sbt-gitbucket-plugin" % "1.6.0")

src/main/scala/Plugin.scala

@@ -33,7 +33,10 @@ 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"),
+    new Version("1.11.0")
   )
 
   override val controllers = Seq(

src/main/scala/gitbucket/notifications/controller/NotificationsController.scala

@@ -47,7 +47,7 @@ trait NotificationsControllerBase extends ControllerBase {
     val userName = params("userName")
     val disable = params.getAs[Boolean]("disable").getOrElse(false)
     updateEmailNotification(userName, disable)
-    flash += "info" -> "Notification setting has been updated."
+    flash.update("info", "Notification setting has been updated.")
     redirect(s"/${userName}/_notifications")
   })
 

src/main/scala/gitbucket/notifications/model/IssueNotification.scala

@@ -11,7 +11,7 @@ trait IssueNotificationComponent { self: gitbucket.core.model.Profile =>
     val issueId              = column[Int]("ISSUE_ID")
     val notificationUserName = column[String]("NOTIFICATION_USER_NAME")
     val subscribed           = column[Boolean]("SUBSCRIBED")
-    def * = (userName, repositoryName, issueId, notificationUserName, subscribed) <> (IssueNotification.tupled, IssueNotification.unapply)
+    def * = (userName, repositoryName, issueId, notificationUserName, subscribed).<>(IssueNotification.tupled, IssueNotification.unapply)
   }
 }
 

src/main/scala/gitbucket/notifications/model/NotificationsAccount.scala

@@ -8,7 +8,7 @@ trait NotificationsAccountComponent { self: gitbucket.core.model.Profile =>
   class NotificationsAccounts(tag: Tag) extends Table[NotificationsAccount](tag, "NOTIFICATIONS_ACCOUNT") {
     val userName     = column[String]("USER_NAME")
     val disableEmail = column[Boolean]("DISABLE_EMAIL")
-    def * = (userName, disableEmail) <> (NotificationsAccount.tupled, NotificationsAccount.unapply)
+    def * = (userName, disableEmail).<>(NotificationsAccount.tupled, NotificationsAccount.unapply)
   }
 }
 

src/main/scala/gitbucket/notifications/model/Watch.scala

@@ -12,7 +12,7 @@ trait WatchComponent { self: gitbucket.core.model.Profile =>
     val repositoryName       = column[String]("REPOSITORY_NAME")
     val notificationUserName = column[String]("NOTIFICATION_USER_NAME")
     val notification         = column[Watch.Notification]("NOTIFICATION")
-    def * = (userName, repositoryName, notificationUserName, notification) <> ((Watch.apply _).tupled, Watch.unapply)
+    def * = (userName, repositoryName, notificationUserName, notification).<>((Watch.apply _).tupled, Watch.unapply)
   }
 }
 

src/main/scala/gitbucket/notifications/service/NotificationsHook.scala

@@ -179,8 +179,12 @@ class IssueHook extends gitbucket.core.plugin.IssueHook
         .filterNot (_.isGroupAccount)
         .filterNot (LDAPUtil.isDummyMailAddress)
         .filterNot (isDisableEmailNotification)
-        .map (_.mailAddress)
-    )
+        .map (account =>
+          account.mailAddress :: getAccountExtraMailAddresses(account.userName)
+        )
+      )
+      .flatten
+      .distinct
   }
 
 }