From a49f2c3ed7a5129a6b1b177a46df366bbb829888 Mon Sep 17 00:00:00 2001
From: kitty <macminim1@192.168.1.7>
Date: Wed, 10 Nov 2021 20:37:45 +0700
Subject: [PATCH 1/3] [GH-174] Add Jira Autolink With Comment (#174)

---
 server/autolink/lib_jira_test.go | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/server/autolink/lib_jira_test.go b/server/autolink/lib_jira_test.go
index 296fc123..55b47006 100644
--- a/server/autolink/lib_jira_test.go
+++ b/server/autolink/lib_jira_test.go
@@ -118,6 +118,42 @@ var jiraTests = []linkTest{
 		"Welcome https://mattermost.atlassian.net/browse/MM-12345",
 		"Welcome [MM-12345](https://mattermost.atlassian.net/browse/MM-12345)",
 	},
+	{
+		"Jump To Comment With Jira Cloud",
+		autolink.Autolink{
+			Pattern:  "(https://mmtest.atlassian.net/browse/)(DP)(-)(?P<jira_id>\\d+)[?](focusedCommentId)(=)(?P<comment_id>\\d+)",
+			Template: "[DP-${jira_id} With Focused Comment($comment_id)](https://mmtest.atlassian.net/browse/DP-${jira_id}?focusedCommentId=$comment_id)",
+		},
+		"https://mmtest.atlassian.net/browse/DP-454?focusedCommentId=11347",
+		"[DP-454 With Focused Comment(11347)](https://mmtest.atlassian.net/browse/DP-454?focusedCommentId=11347)",
+	},
+	{
+		"Jump To Comment With Jira Ecc",
+		autolink.Autolink{
+			Pattern:  "(http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/)(DKHPROJ)(-)(?P<jira_id>\\d+)[?](focusedCommentId)(=)(?P<comment_id>\\d+)",
+			Template: "[DKHPROJ-${jira_id} With Focused Comment($comment_id)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-${jira_id}?focusedCommentId=$comment_id)",
+		},
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200",
+		"[DKHPROJ-5 With Focused Comment(10200)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200)",
+	},
+	{
+		"Jump To Comment With Jira Ecc Long Link",
+		autolink.Autolink{
+			Pattern:  "(http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/)(DKHPROJ)(-)(?P<jira_id>\\d+)[?](focusedCommentId)(=)(?P<comment_id>\\d+)",
+			Template: "[DKHPROJ-${jira_id} With Focused Comment($comment_id)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-${jira_id}?focusedCommentId=$comment_id)",
+		},
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-10200",
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-10200",
+	},
+	{
+		"Jump To Comment With Jira Ecc Long Short",
+		autolink.Autolink{
+			Pattern:  "(http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/)(DKHPROJ)(-)(?P<jira_id>\\d+)[?](focusedCommentId)(=)(?P<comment_id>\\d+)",
+			Template: "[DKHPROJ-${jira_id} With Focused Comment($comment_id)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-${jira_id}?focusedCommentId=$comment_id)",
+		},
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5",
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5",
+	},
 }
 
 func TestJira(t *testing.T) {

From 4b94f18d17b814be9886b2f36ff3ac1e278910d8 Mon Sep 17 00:00:00 2001
From: jupriano <jupri@ip-172-31-33-5.ap-south-1.compute.internal>
Date: Thu, 25 Nov 2021 14:51:37 +0000
Subject: [PATCH 2/3] [GH-174] Add Trial Regex For Example

---
 server/autolink/lib_jira_test.go | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/server/autolink/lib_jira_test.go b/server/autolink/lib_jira_test.go
index 55b47006..01cda860 100644
--- a/server/autolink/lib_jira_test.go
+++ b/server/autolink/lib_jira_test.go
@@ -154,6 +154,52 @@ var jiraTests = []linkTest{
 		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5",
 		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5",
 	},
+	{
+		"Jump To Comment With Jira Cloud Failed",
+		autolink.Autolink{
+			Pattern:  "(https://mmtest.atlassian.net/browse/)(DP)(-)(?P<jira_id>\\d+)[?](focusedCommentId)(=)(?P<comment_id>\\d+)",
+			Template: "[DP-${jira_id} With Focused Comment($comment_id)](https://mmtest.atlassian.net/browse/DP-${jira_id}",
+		},
+		"https://mmtest.atlassian.net/browse/DP-454",
+		"https://mmtest.atlassian.net/browse/DP-454",
+	},
+	// Trials Linker
+	{
+		"Trial With Jira Cloud",
+		autolink.Autolink{
+			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
+			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",
+		},
+		"https://mmtest.atlassian.net/browse/DP-454?focusedCommentId=11347",
+		"[DP-454 FocusedComment(11347)](https://mmtest.atlassian.net/browse/DP-454?focusedCommentId=11347)",
+	},
+	{
+		"Trial With Jira Server #1",
+		autolink.Autolink{
+			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
+			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",
+		},
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200",
+		"[DKHPROJ-5 FocusedComment(10200)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200)",
+	},
+	{
+		"Trial With Jira Server #2", //Not Worked here ?
+		autolink.Autolink{
+			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
+			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",
+		},
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-10200",
+		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-10200",
+	},
+	{
+		"Trial With Jira Cloud Without Focused Comment ID", //Not Worked here ?
+		autolink.Autolink{
+			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
+			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",
+		},
+		"https://mmtest.atlassian.net/browse/DP-454",
+		"https://mmtest.atlassian.net/browse/DP-454",
+	},
 }
 
 func TestJira(t *testing.T) {

From 6a837f41e3d5e488f08587e06f44cb99dabd4387 Mon Sep 17 00:00:00 2001
From: jupriano <jupri@ip-172-31-33-5.ap-south-1.compute.internal>
Date: Wed, 1 Dec 2021 10:06:30 +0000
Subject: [PATCH 3/3] [GH-174] Add Trial Regex For Example

---
 server/autolink/lib_jira_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/autolink/lib_jira_test.go b/server/autolink/lib_jira_test.go
index 01cda860..7bbe5136 100644
--- a/server/autolink/lib_jira_test.go
+++ b/server/autolink/lib_jira_test.go
@@ -183,7 +183,7 @@ var jiraTests = []linkTest{
 		"[DKHPROJ-5 FocusedComment(10200)](http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200)",
 	},
 	{
-		"Trial With Jira Server #2", //Not Worked here ?
+		"Trial With Jira Server #2", // Not Worked here ?
 		autolink.Autolink{
 			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
 			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",
@@ -192,7 +192,7 @@ var jiraTests = []linkTest{
 		"http://ec2-54-157-116-101.compute-1.amazonaws.com/browse/DKHPROJ-5?focusedCommentId=10200&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-10200",
 	},
 	{
-		"Trial With Jira Cloud Without Focused Comment ID", //Not Worked here ?
+		"Trial With Jira Cloud Without Focused Comment ID", // Not Worked here ?
 		autolink.Autolink{
 			Pattern:  "(?P<URI>.*/)(?P<IssueKey>[A-Za-z]+-[0-9]+)[?](focusedCommentId=*(?P<FocusedCommentId>[^\\s&]+))",
 			Template: "[${IssueKey} FocusedComment(${FocusedCommentId})](${URI}${IssueKey}?focusedCommentId=${FocusedCommentId})",