Merge pull request #32 from source-c/master

update plugin to match SystemSettingsService from gitbucket-4.38.0

Author: mrkm4ntr

build.sbt

@@ -1,14 +1,14 @@
 val Organization = "com.github.mrkm4ntr"
 val Name = "gitbucket-network-plugin"
-val Version = "1.9.1"
+val Version = "1.9.2"
 
 lazy val root = (project in file(".")).enablePlugins(SbtTwirl)
 
 organization := Organization
 name := Name
 version := Version
 scalaVersion := "2.13.1"
-gitbucketVersion := "4.35.0"
+gitbucketVersion := "4.38.0"
 
 resolvers ++= Seq(
   Resolver.jcenterRepo

src/main/scala/Plugin.scala

@@ -24,7 +24,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("1.8.0"),
     new Version("1.8.1"),
     new Version("1.9.0"),
-    new Version("1.9.1")
+    new Version("1.9.1"),
+    new Version("1.9.2")
   )
 
   override val description: String = "Provides Network feature on Gitbucket."

src/main/scala/mrkm4ntr/gitbucket/network/controller/NetworkController.scala

@@ -69,7 +69,7 @@ trait NetworkControllerBase extends ControllerBase {
         val revWalk = new PlotWalk(repo)
         revWalk.sort(RevSort.COMMIT_TIME_DESC)
         try {
-          if(allBranches.isDefined) {
+          if (allBranches.isDefined) {
             revWalk.markStart(repository.branchList.map(repo.resolve).map(revWalk.parseCommit(_)).asJava)
           } else {
             revWalk.markStart(revWalk.parseCommit(repo.resolve(currentBranch)))
@@ -107,13 +107,13 @@ trait NetworkControllerBase extends ControllerBase {
 
   def getAvatarUrl(mailAddress: String, size: Int)(implicit context: Context): String = {
     getAccountByMailAddressFromCache(mailAddress).map { account =>
-      if (account.image.isEmpty && context.settings.gravatar) {
+      if (account.image.isEmpty && context.settings.basicBehavior.gravatar) {
         s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=$size&d=retro&r=g"""
       } else {
         s"""${context.path}/${account.userName}/_avatar"""
       }
     } getOrElse {
-      if (context.settings.gravatar) {
+      if (context.settings.basicBehavior.gravatar) {
         s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=$size&d=retro&r=g"""
       } else {
         s"""${context.path}/_unknown/_avatar"""