Merge branch 'find-old-message-ids-for-in-reply-to'

Author: rtyley

app/controllers/Application.scala

@@ -10,6 +10,7 @@ import lib.actions.Actions._
 import lib.actions.Requests._
 import lib.aws.SES._
 import lib.aws.SesAsyncHelpers._
+import lib.model.PRMessageIdFinder.messageIdsByMostRecentUsageIn
 import lib.model.PatchBomb
 import org.eclipse.jgit.lib.ObjectId
 import org.kohsuke.github._
@@ -25,7 +26,6 @@ import views.html.pullRequestSent
 import scala.collection.convert.wrapAll._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
-import scala.util.Try
 
 object Application extends Controller {
 
@@ -50,9 +50,8 @@ object Application extends Controller {
     val settings = (for {
       data <- req.session.get(prId.slug)
       s <- Json.parse(data).validate[PRMailSettings].asOpt
-    } yield s).getOrElse(PRMailSettings("PATCH"))
+    } yield s).getOrElse(PRMailSettings("PATCH", messageIdsByMostRecentUsageIn(req.pr).headOption))
 
-    req.session.get(prId.slug).map(Json.parse).map(fromJson[PRMailSettings](_).asOpt)
     implicit val form = mailSettingsForm.fill(settings)
     for (proposedMailByType <- proposedMailByTypeFor(req)) yield {
       Ok(views.html.reviewPullRequest(req.pr, myself, proposedMailByType))

app/lib/MarkdownParsing.scala

@@ -0,0 +1,9 @@
+package lib
+
+object MarkdownParsing {
+
+  val hiddenLinkRegex = """\[\]\((.+?)\)""".r
+
+  def parseHiddenLinksOutOf(markdown: String): Seq[String] =
+    (for (m <- hiddenLinkRegex.findAllMatchIn(markdown)) yield m.group(1)).toSeq
+}

app/lib/model/PRMessageIdFinder.scala

@@ -0,0 +1,22 @@
+package lib.model
+
+import java.time.Instant
+
+import lib.MarkdownParsing
+import org.kohsuke.github.{GHIssueComment, GHPullRequest}
+
+import scala.collection.convert.wrapAll._
+
+object PRMessageIdFinder {
+
+  def messageIdsByMostRecentUsageIn(pr: GHPullRequest): Seq[String] = {
+    val messageIdAndCreationTime = for {
+      comment: GHIssueComment <- pr.listComments()
+      messageId <- MarkdownParsing.parseHiddenLinksOutOf(comment.getBody)
+    } yield messageId -> comment.getCreatedAt.toInstant
+
+    val messageIdsWithMostRecentUsageTime: Map[String, Instant] = messageIdAndCreationTime.groupBy(_._1).mapValues(_.map(_._2).max)
+
+    messageIdsWithMostRecentUsageTime.toSeq.sortBy(_._2).map(_._1).reverse
+  }
+}

app/views/fragments/sendTabContent.scala.html

@@ -1,5 +1,7 @@
 @import lib.Email.Addresses
 @import lib.model.MessageSummary
+@import lib.model.PRMessageIdFinder.messageIdsByMostRecentUsageIn
+@import play.api.libs.json.JsString
 @(mailType: lib.MailType, proposedMail: lib.ProposedMail, isDefault: Boolean, btnClass: String
         )(implicit req: GHPRRequest[_], prMailSettings: Form[lib.PRMailSettings], messages: Messages)
 @import helper._
@@ -50,31 +52,41 @@
         @fragments.mailIdent(MessageSummary("{{id}}", "{{subject}}", java.time.ZonedDateTime.now, Addresses("{{addresses.from}}"), "{{groupLink}}"))
     </script>
     <script>
-        var inReplyToFieldContainer = jQuery("#@mailType.slug-in-reply-to");
-        inReplyToFieldContainer.messageIdPicker({
-            hint: true,
-            highlight: true,
-            minLength: 3,
-            classNames: {menu: 'tt-dropdown-menu'}
-        }, {
-            name: 'messageIds',
-            source: new Bloodhound({
+        jQuery(function() {
+            var inReplyToFieldContainer = jQuery("#@mailType.slug-in-reply-to");
+            var messageSuggestions = new Bloodhound({
                 datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
                 queryTokenizer: Bloodhound.tokenizers.whitespace,
                 remote: {
                     url: '@routes.Api.messageLookup(req.repo.id, "QUERY_STRING")',
                     wildcard: 'QUERY_STRING'
                 }
-            }),
-            display: 'id',
-            templates: {
-                empty: '<div class="empty-message">Unable to find any Messages that match that Id</div>',
-                suggestion: Handlebars.compile(jQuery("#entry-template").html())
-            }
-        });
-        inReplyToFieldContainer.find(".input-group .typeahead").bind('typeahead:select', function (ev, suggestion) {
-            jQuery("#@mailType.slug-subject-prefix input").changeVal(suggestion.suggestsPrefix);
+            });
+
+            var messageSuggestionsWithDefaults = function(q, sync, async) {
+              var fallback = @Html(JsString(messageIdsByMostRecentUsageIn(req.pr).headOption.getOrElse("")).toString) ;
+              messageSuggestions.search( q === '' ? fallback : q, sync, async);
+            };
+
+            inReplyToFieldContainer.messageIdPicker({
+                hint: true,
+                highlight: true,
+                minLength: 0, // To allow default suggestions
+                classNames: {menu: 'tt-dropdown-menu'}
+            }, {
+                name: 'messageIds',
+                source: messageSuggestionsWithDefaults,
+                display: 'id',
+                templates: {
+                    empty: '<div class="empty-message">Unable to find any Messages that match that Id</div>',
+                    suggestion: Handlebars.compile(jQuery("#entry-template").html())
+                }
+            });
+            inReplyToFieldContainer.find(".input-group .typeahead").bind('typeahead:select', function (ev, suggestion) {
+                jQuery("#@mailType.slug-subject-prefix input").changeVal(suggestion.suggestsPrefix);
+            });
         });
+
     </script>
 
     @b3.submit('class -> s"btn $btnClass btn-lg", 'disabled -> proposedMail.errors.nonEmpty) {

test/lib/MarkdownParsingSpec.scala

@@ -0,0 +1,27 @@
+package lib
+
+import org.scalatestplus.play.PlaySpec
+
+class MarkdownParsingSpec extends PlaySpec {
+
+  val prComment =
+    """
+      |@rtyley sent this to the mailing list with [_submitGit_](https://github.com/rtyley/submitgit) - here on [Google Groups](https://groups.google.com/d/msgid/submitgit-test/0000014e6f0b65e9-e3f67cd3-6679-41ed-b2e2-819766dbe2a0-000000@eu-west-1.amazonses.com) [](0000014e6f0b65e9-e3f67cd3-6679-41ed-b2e2-819766dbe2a0-000000@eu-west-1.amazonses.com)
+    """.stripMargin
+
+  "Markdown parsing" should {
+    "get hidden message ids" in {
+      val links = MarkdownParsing.parseHiddenLinksOutOf(
+        "[](0000014e69391015-5de3c8c6-458f-4eb6-b222-14cfc8a6b055-000000@eu-west-1.amazonses.com)"
+      )
+
+      links mustEqual Seq("0000014e69391015-5de3c8c6-458f-4eb6-b222-14cfc8a6b055-000000@eu-west-1.amazonses.com")
+    }
+    "get hidden message id in real message" in {
+      val links = MarkdownParsing.parseHiddenLinksOutOf(prComment)
+
+      links mustEqual Seq("0000014e6f0b65e9-e3f67cd3-6679-41ed-b2e2-819766dbe2a0-000000@eu-west-1.amazonses.com")
+    }
+  }
+}
+