Update the 'PR mail settings' after posting to the mailing list

The settings are changed in two ways:

* The version is incremented in the subject prefix
* The message-id for in-reply-to is set to the id of the just-sent message

Author: rtyley

app/controllers/Application.scala

@@ -98,18 +98,17 @@ object Application extends Controller {
 
       val settings = req.body
 
-      for (patchCommits <- req.patchCommitsF) yield {
-        val patchBomb = PatchBomb(patchCommits, addresses, settings.subjectPrefix, mailType.subjectPrefix, mailType.footer(req.pr))
-        val initialEmail = patchBomb.emails.head
-        val initialEmailWithReply = settings.inReplyTo.fold(initialEmail)(initialEmail.inReplyTo)
-        for (initialMessageId <- ses.send(initialEmailWithReply)) {
-          for (email <- patchBomb.emails.drop(1)) {
-            ses.send(email.inReplyTo(initialMessageId))
-          }
-
-          mailType.afterSending(req.pr, initialMessageId)
+      for {
+        patchCommits <- req.patchCommitsF
+        patchBomb = PatchBomb(patchCommits, addresses, settings.subjectPrefix, mailType.subjectPrefix, mailType.footer(req.pr))
+        initialEmail = patchBomb.emails.head
+        initialMessageId <- ses.send(settings.inReplyTo.fold(initialEmail)(initialEmail.inReplyTo))
+      } yield {
+        for (email <- patchBomb.emails.tail) {
+          ses.send(email.inReplyTo(initialMessageId))
         }
-        Ok(pullRequestSent(req.pr, req.user, mailType)).addingToSession(prId.slug -> toJson(settings).toString)
+        val updatedSettings = mailType.afterSending(req.pr, initialMessageId, settings)
+        Ok(pullRequestSent(req.pr, req.user, mailType)).addingToSession(prId.slug -> toJson(updatedSettings).toString)
       }
   }
 

app/lib/MailType.scala

@@ -3,6 +3,7 @@ package lib
 import com.github.nscala_time.time.Imports._
 import com.madgag.github.Implicits._
 import controllers.routes
+import lib.PRMailSettings
 import lib.actions.Requests._
 import lib.checks.{Check, GHChecks, PRChecks}
 import org.kohsuke.github.{GHMyself, GHPullRequest}
@@ -12,7 +13,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 
 sealed trait MailType {
-  def afterSending(pr: GHPullRequest, messageId: String)
+  def afterSending(pr: GHPullRequest, messageId: String, prMailSettings: PRMailSettings): PRMailSettings
 
   val slug: String
 
@@ -66,8 +67,9 @@ object MailType {
       HasAReasonableNumberOfCommits
     )
 
-    override def afterSending(request: GHPullRequest, messageId: String) {
+    override def afterSending(request: GHPullRequest, messageId: String, prMailSettings: PRMailSettings) = {
       // Nothing for preview
+      prMailSettings
     }
   }
 
@@ -105,11 +107,12 @@ object MailType {
       HasAReasonableNumberOfCommits
     )
 
-    override def afterSending(pr: GHPullRequest, messageId: String) {
+    override def afterSending(pr: GHPullRequest, messageId: String, prMailSettings: PRMailSettings) = {
       val mailingListLinks = Project.byRepoId(pr.id.repo).mailingList.archives.map(a => s"[${a.providerName}](${a.linkFor(messageId)})").mkString(", ")
       pr.comment(
         s"${pr.getUser.atLogin} sent this to the mailing list with [_submitGit_](https://github.com/rtyley/submitgit) - " +
           s"here on $mailingListLinks []($messageId)")
+      prMailSettings.afterBeingUsedToSend(messageId)
     }
   }
 }

app/lib/PRMailSettings.scala

@@ -1,8 +1,15 @@
 package lib
 
+import lib.model.SubjectPrefixParsing
 import play.api.libs.json.Json
 
-case class PRMailSettings(subjectPrefix: String, inReplyTo: Option[String] = None)
+case class PRMailSettings(subjectPrefix: String, inReplyTo: Option[String] = None) {
+  def afterBeingUsedToSend(messageId: String) = copy(
+    subjectPrefix =
+      SubjectPrefixParsing.patchPrefixContent.parse(subjectPrefix).get.value.suggestsNext.toString,
+    inReplyTo = Some(messageId)
+  )
+}
 
 object PRMailSettings {
   implicit val formats = Json.format[PRMailSettings]

app/lib/model/SubjectPrefix.scala

@@ -23,12 +23,14 @@ object SubjectPrefixParsing {
 
   val descriptor: P[String] = P( descriptorWord.rep(1, sep = " ").! )
 
-  val patchPrefix: P[SubjectPrefix] =
-    P( "[" ~ descriptor ~ (" " ~ version).? ~ (" " ~ patchIndexAndBombSize).map(_ => ()).? ~ "]").map(SubjectPrefix.tupled)
+  val patchPrefixContent: P[SubjectPrefix] =
+    P( descriptor ~ (" " ~ version).? ~ (" " ~ patchIndexAndBombSize).map(_ => ()).? ).map(SubjectPrefix.tupled)
 
-  def parse(subjectLine: String): Option[SubjectPrefix] = {
+  val subjectLine: P[SubjectPrefix] =
+    P( "[" ~ patchPrefixContent ~ "]")
 
-    patchPrefix.parse(subjectLine) match {
+  def parse(subjectLineText: String): Option[SubjectPrefix] = {
+    subjectLine.parse(subjectLineText) match {
       case Result.Success(subjectPrefix, _) => Some(subjectPrefix)
       case _ => None
     }