Merge branch 'master' into #33_match-by-email

Conflicts: src/main/scala/util/JGitUtil.scala src/main/scala/view/helpers.scala src/main/twirl/repo/blob.scala.html src/main/twirl/repo/commit.scala.html src/main/twirl/repo/commits.scala.html src/main/twirl/repo/files.scala.html
2025-11-10 15:35:59 +01:00 · 2013-07-18 15:49:56 +09:00
parent 828688ddd0 323e25951f
commit 000afa1ed6
35 changed files with 546 additions and 176 deletions
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -58,7 +58,10 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
    getAccountByUserName(userName).flatMap(_.image).map { image =>
      contentType = FileUtil.getMimeType(image)
      new java.io.File(getUserUploadDir(userName), image)
-    } getOrElse NotFound
+    } getOrElse {
+      contentType = "image/png"
+      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+    }
  }

  get("/:userName/_edit")(oneselfOnly {
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -128,11 +128,15 @@ trait IssuesControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, Some(form.content), repository)
+    handleComment(form.issueId, Some(form.content), repository)() map { id =>
+      redirect("/%s/%s/issues/%d#comment-%d".format(repository.owner, repository.name, form.issueId, id))
+    } getOrElse NotFound
  })

  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, form.content, repository)
+    handleComment(form.issueId, form.content, repository)() map { id =>
+      redirect("/%s/%s/issues/%d#comment-%d".format(repository.owner, repository.name, form.issueId, id))
+    } getOrElse NotFound
  })

  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -158,7 +162,7 @@ trait IssuesControllerBase extends ControllerBase {
          org.json4s.jackson.Serialization.write(
              Map("title"   -> x.title,
                  "content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
-                      repository, false, true, true)
+                      repository, false, true)
              ))
        }
      } else Unauthorized
@@ -175,7 +179,7 @@ trait IssuesControllerBase extends ControllerBase {
          contentType = formats("json")
          org.json4s.jackson.Serialization.write(
              Map("content" -> view.Markdown.toHtml(x.content,
-                  repository, false, true, true)
+                  repository, false, true)
              ))
        }
      } else Unauthorized
@@ -197,79 +201,76 @@ trait IssuesControllerBase extends ControllerBase {
  })

  ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt,
-        params.get("assignedUserName") filter (_.trim != ""))
+    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
    Ok("updated")
  })

  ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt,
-        params.get("milestoneId") collect { case x if x.trim != "" => x.toInt })
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
    Ok("updated")
  })

  post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
-    val owner = repository.owner
-    val name = repository.name
-    val userName = context.loginAccount.get.userName
+    val action = params.get("value")

-    params.get("value") collect {
-      case s if s == "close"  => (s.capitalize, Some(s), true)
-      case s if s == "reopen" => (s.capitalize, Some(s), false)
-    } map { case (content, action, closed) =>
-      params("checked").split(',') foreach { issueId =>
-        createComment(owner, name, userName, issueId.toInt, content, action)
-        updateClosed(owner, name, issueId.toInt, closed)
-      }
-      redirect("/%s/%s/issues".format(owner, name))
-    } getOrElse NotFound
+    executeBatch(repository) {
+      handleComment(_, None, repository)( _ => action)
+    }
  })

  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    val owner = repository.owner
-    val name = repository.name
+    val labelId = params("value").toInt

-    params.get("value").map(_.toInt) map { labelId =>
-      params("checked").split(',') foreach { issueId =>
-        getIssueLabel(owner, name, issueId.toInt, labelId) getOrElse {
-          registerIssueLabel(owner, name, issueId.toInt, labelId)
-        }
+    executeBatch(repository) { issueId =>
+      getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
+        registerIssueLabel(repository.owner, repository.name, issueId, labelId)
      }
-      redirect("/%s/%s/issues".format(owner, name))
-    } getOrElse NotFound
+    }
  })

  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
-    params("checked").split(',') foreach { issueId =>
-      updateAssignedUserName(repository.owner, repository.name, issueId.toInt,
-          params.get("value") filter (_.trim != ""))
+    val value = assignedUserName("value")
+
+    executeBatch(repository) {
+      updateAssignedUserName(repository.owner, repository.name, _, value)
    }
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
  })

  post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
-    params("checked").split(',') foreach { issueId =>
-      updateMilestoneId(repository.owner, repository.name, issueId.toInt,
-          params.get("value") collect { case x if x.trim != "" => x.toInt })
+    val value = milestoneId("value")
+
+    executeBatch(repository) {
+      updateMilestoneId(repository.owner, repository.name, _, value)
    }
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
  })

+  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
+  val milestoneId      = (key: String) => params.get(key) collect { case x if x.trim != "" => x.toInt }
+
  private def isEditable(owner: String, repository: String, author: String)(implicit context: app.Context): Boolean =
    hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName

-  private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo) = {
+  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
+    params("checked").split(',') map(_.toInt) foreach execute
+    redirect("/%s/%s/issues".format(repository.owner, repository.name))
+  }
+
+  /**
+   * @see 
+   */
+  private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo)
+      (getAction: model.Issue => Option[String] =
+           p1 => params.get("action").filter(_ => isEditable(p1.userName, p1.repositoryName, p1.openedUserName))) = {
    val owner    = repository.owner
    val name     = repository.name
    val userName = context.loginAccount.get.userName

    getIssue(owner, name, issueId.toString) map { issue =>
      val (action, recordActivity) =
-        params.get("action")
-          .filter(_ => isEditable(owner, name, issue.openedUserName))
+        getAction(issue)
          .collect {
-            case s if s == "close"  => true  -> (Some(s) -> Some(recordCloseIssueActivity _))
-            case s if s == "reopen" => false -> (Some(s) -> Some(recordReopenIssueActivity _))
+            case "close"  => true  -> (Some("close")  -> Some(recordCloseIssueActivity _))
+            case "reopen" => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
          }
          .map { case (closed, t) =>
            updateClosed(owner, name, issueId, closed)
@@ -277,14 +278,19 @@ trait IssuesControllerBase extends ControllerBase {
          }
          .getOrElse(None -> None)

-      val commentId = createComment(owner, name, userName, issueId, content.getOrElse(action.get.capitalize), action)
+      val commentId = content
+          .map       ( _ -> action.map( _ + "_comment" ).getOrElse("comment") )
+          .getOrElse ( action.get.capitalize -> action.get )
+          match {
+            case (content, action) => createComment(owner, name, userName, issueId, content, action)
+          }

      // record activity
      content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) )
      recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )

-      redirect("/%s/%s/issues/%d#comment-%d".format(owner, name, issueId, commentId))
-    } getOrElse NotFound
+      commentId
+    }
  }

  private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -27,8 +27,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    contentType = "text/html"
    view.helpers.markdown(params("content"), repository,
      params("enableWikiLink").toBoolean,
-      params("enableCommitLink").toBoolean,
-      params("enableIssueLink").toBoolean)
+      params("enableRefsLink").toBoolean)
  })

  /**
--- a/src/main/scala/model/IssueComment.scala
+++ b/src/main/scala/model/IssueComment.scala
@@ -9,9 +9,9 @@ object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemp
  def content = column[String]("CONTENT")
  def registeredDate = column[java.util.Date]("REGISTERED_DATE")
  def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
+  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)

-  def autoInc = userName ~ repositoryName ~ issueId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
+  def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
  def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
 }

@@ -20,7 +20,7 @@ case class IssueComment(
    repositoryName: String,
    issueId: Int,
    commentId: Int,
-    action: Option[String],
+    action: String,
    commentedUserName: String,
    content: String,
    registeredDate: java.util.Date,
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -102,7 +102,10 @@ trait IssuesService {
    // get issues and comment count
    val issues = searchIssueQuery(owner, repository, condition, filter, userName)
      .leftJoin(Query(IssueComments)
-        .filter  { _.byRepository(owner, repository) }
+        .filter  { t =>
+          (t.byRepository(owner, repository)) &&
+          (t.action inSetBind Seq("comment", "close_comment", "reopen_comment"))
+        }
        .groupBy { _.issueId }
        .map     { case (issueId, t) => issueId ~ t.length }).on((t1, t2) => t1.issueId is t2._1)
      .sortBy { case (t1, t2) =>
@@ -192,7 +195,7 @@ trait IssuesService {
    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete

  def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: Option[String]) =
+      issueId: Int, content: String, action: String) =
    IssueComments.autoInc insert (
        owner,
        repository,
--- a/src/main/scala/service/RequestCache.scala
+++ b/src/main/scala/service/RequestCache.scala
@@ -0,0 +1,26 @@
+package service
+
+import model._
+
+/**
+ * This service is used for a view helper mainly.
+ *
+ * It may be called many times in one request, so each method stores
+ * its result into the cache which available during a request.
+ */
+trait RequestCache {
+
+  def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
+    context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
+      new IssuesService {}.getIssue(userName, repositoryName, issueId)
+    }
+  }
+
+  def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
+    context.cache(s"account.${userName}"){
+      new AccountService {}.getAccountByUserName(userName)
+    }
+  }
+
+}
+
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -85,7 +85,7 @@ class CommitLogHook(owner: String, repository: String, userName: String) extends
            "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
              val issueId = matchData.group(2)
              if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
-                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, Some("commit"))
+                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit")
              }
            }
            Some(commit)
--- a/src/main/scala/util/Implicits.scala
+++ b/src/main/scala/util/Implicits.scala
@@ -1,7 +1,7 @@
 package util

-import twirl.api.Html
 import scala.slick.driver.H2Driver.simple._
+import scala.util.matching.Regex

 /**
 * Provides some usable implicit conversions.
@@ -30,4 +30,23 @@ object Implicits {
    def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
  }

+  implicit class RichString(value: String){
+    def replaceBy(regex: Regex)(replace: Regex.MatchData => Option[String]): String = {
+      val sb = new StringBuilder()
+      var i = 0
+      regex.findAllIn(value).matchData.foreach { m =>
+        sb.append(value.substring(i, m.start))
+        i = m.end
+        replace(m) match {
+          case Some(s) => sb.append(s)
+          case None    => sb.append(m.matched)
+        }
+      }
+      if(i < value.length){
+        sb.append(value.substring(i))
+      }
+      sb.toString
+    }
+  }
+
 }
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -54,7 +54,7 @@ object JGitUtil {
   * @param id the commit id
   * @param time the commit time
   * @param committer  the committer name
-   * @param mailAddress the committer's mail address
+   * @param mailAddress the mail address of the committer
   * @param shortMessage the short message
   * @param fullMessage the full message
   * @param parents the list of parent commit id
@@ -63,9 +63,12 @@ object JGitUtil {
                        shortMessage: String, fullMessage: String, parents: List[String]){
    
    def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
-        rev.getName, rev.getCommitterIdent.getWhen,
-        rev.getCommitterIdent.getName, rev.getCommitterIdent.getEmailAddress,
-        rev.getShortMessage, rev.getFullMessage,
+        rev.getName,
+        rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress,
+        rev.getShortMessage,
+        rev.getFullMessage,
        rev.getParents().map(_.name).toList)

    val summary = {
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -0,0 +1,31 @@
+package view
+
+import service.RequestCache
+import twirl.api.Html
+import util.StringUtil
+
+trait AvatarImageProvider { self: RequestCache =>
+
+  /**
+   * Returns &lt;img&gt; which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  protected def getAvatarImageHtml(userName: String, size: Int,
+      mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
+    val src = getAccountByUserName(userName).collect { case account if(account.image.isEmpty) =>
+      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+    } getOrElse {
+      if(mailAddress.nonEmpty){
+        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
+      } else {
+        s"""${context.path}/${userName}/_avatar"""
+      }
+    }
+    if(tooltip){
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
+    } else {
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" />""")
+    }
+  }
+
+}
--- a/src/main/scala/view/LinkConverter.scala
+++ b/src/main/scala/view/LinkConverter.scala
@@ -0,0 +1,33 @@
+package view
+
+import service.RequestCache
+import util.Implicits.RichString
+
+trait LinkConverter { self: RequestCache =>
+
+  /**
+   * Converts issue id, username and commit id to link.
+   */
+  protected def convertRefsLinks(value: String, repository: service.RepositoryService.RepositoryInfo,
+                                 issueIdPrefix: String =  "#")(implicit context: app.Context): String = {
+    value
+      // escape HTML tags
+      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+      // convert issue id to link
+      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
+          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+        } else {
+          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+        }
+      }
+      // convert @username to link
+      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+        getAccountByUserName(m.group(2)).map { _ =>
+          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+        }
+      }
+      // convert commit id to link
+      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+  }
+}
--- a/src/main/scala/view/Markdown.scala
+++ b/src/main/scala/view/Markdown.scala
@@ -6,6 +6,7 @@ import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
 import scala.collection.JavaConverters._
+import service.RequestCache

 object Markdown {

@@ -13,12 +14,17 @@ object Markdown {
   * Converts Markdown of Wiki pages to HTML.
   */
  def toHtml(markdown: String, repository: service.RepositoryService.RepositoryInfo,
-             enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): String = {
+             enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
+    // escape issue id
+    val source = if(enableRefsLink){
+      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+    } else markdown
+
    val rootNode = new PegDownProcessor(
      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
-    ).parseMarkdown(markdown.toCharArray)
+    ).parseMarkdown(source.toCharArray)

-    new GitBucketHtmlSerializer(markdown, context, repository, enableWikiLink, enableCommitLink, enableIssueLink).toHtml(rootNode)
+    new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
  }
 }

@@ -64,15 +70,13 @@ class GitBucketVerbatimSerializer extends VerbatimSerializer {

 class GitBucketHtmlSerializer(
    markdown: String,
-    context: app.Context,
    repository: service.RepositoryService.RepositoryInfo,
    enableWikiLink: Boolean,
-    enableCommitLink: Boolean,
-    enableIssueLink: Boolean
-  ) extends ToHtmlSerializer(
+    enableRefsLink: Boolean
+  )(implicit val context: app.Context) extends ToHtmlSerializer(
    new GitBucketLinkRender(context, repository, enableWikiLink),
    Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava
-  ) {
+  ) with LinkConverter with RequestCache {

  override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
    printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
@@ -100,10 +104,7 @@ class GitBucketHtmlSerializer(

  override def visit(node: TextNode) {
    // convert commit id and username to link.
-    val text = if(enableCommitLink) node.getText
-      .replaceAll("(^|\\W)([0-9a-f]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
-      .replaceAll("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)", s"""$$1<a href="${context.path}/$$2">@$$2</a>$$3""")
-    else node.getText
+    val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText

    if (abbreviations.isEmpty) {
      printer.print(text)
@@ -112,15 +113,4 @@ class GitBucketHtmlSerializer(
    }
  }

-  override def visit(node: HeaderNode) {
-    val text = markdown.substring(node.getStartIndex, node.getEndIndex - 1).trim
-    if(enableIssueLink && text.matches("#[\\d]+")){
-      // convert issue id to link
-      val issueId = text.substring(1).toInt
-      printer.print(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${issueId}">#${issueId}</a>""")
-    } else {
-      printTag(node, "h" + node.getLevel)
-    }
-  }
-
 }
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -4,11 +4,12 @@ import java.text.SimpleDateFormat
 import twirl.api.Html
 import util.StringUtil
 import service.AccountService
+import service.RequestCache

 /**
 * Provides helper methods for Twirl templates.
 */
-object helpers {
+object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
  
  /**
   * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
@@ -31,10 +32,26 @@ object helpers {
   * Converts Markdown of Wiki pages to HTML.
   */
  def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): Html = {
-    Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
  }

+  /**
+   * Returns &lt;img&gt; which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
+    getAvatarImageHtml(userName, size, "", tooltip)
+
+  def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
+    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+
+  /**
+   * Converts commit id, issue id and username to the link.
+   */
+  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
+    Html(convertRefsLinks(value, repository))
+
  def activityMessage(message: String)(implicit context: app.Context): Html =
    Html(message
      .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
@@ -66,19 +83,6 @@ object helpers {
  def assets(implicit context: app.Context): String =
    s"${context.path}/assets"

-  /**
-   * Converts issue id and commit id to link.
-   */
-  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
-    Html(value
-      // escape HTML tags
-      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
-      // convert issue id to link
-      .replaceAll("(^|\\W)#(\\d+)(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/issues/$$2">#$$2</a>$$3""")
-      // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3"""))
-
-
  def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
    val account = context.cache(s"account.${mailAddress}"){
      new AccountService {}.getAccountByMailAddress(mailAddress)
@@ -88,30 +92,6 @@ object helpers {
    } getOrElse Html(userName)
  }

-  /**
-   * Returns &lt;img&gt; which displays the avatar icon.
-   * Looks up Gravatar if avatar icon has not been configured in user settings.
-   */
-  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = {
-    val account = context.cache(s"account.${userName}"){
-      if(userName.contains("@")){
-        new AccountService {}.getAccountByMailAddress(userName)
-      } else {
-        new AccountService {}.getAccountByUserName(userName)
-      }
-    }
-    val src = account.collect { case account if(account.image.isEmpty) =>
-      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
-    } getOrElse {
-      s"""${context.path}/${userName}/_avatar"""
-    }
-    if(tooltip){
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
-    } else {
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" />""")
-    }
-  }
-
  /**
   * Implicit conversion to add mkHtml() to Seq[Html].
   */