Fix offset parsing

tigerteufel85 · Jan 5, 2022 · f43327d · f43327d
1 parent 2a80075
commit f43327d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/config/config.example.yaml b/config/config.example.yaml
@@ -162,7 +162,7 @@ regex:
   jirasorting: "(?i:<sort:)([a-zA-Z]*)(>)"
   jirastatus: "(?i:<status:)([a-zA-Z]*)(>)"
   jiratime: "(?i:<time:)([0-9]*[mhdw])(>)"
-  jiraoffsettime: "(?i:<offset-time:)([0-9]*[mhdw])(>)"
+  jiraoffsettime: "(?i:<offset-time:)([0-9]+[mhdw])(>)"
   jiraoffsetfield: "(?i:<offset-field:)([a-zA-Z ]*)(>)"
   replycolor: "(?i:<color:)([a-zA-Z0-9]*)(>)"
   replylayout: "(?i:<layout:)([a-zA-Z0-9]*)(>)"

diff --git a/utils/jira_query.go b/utils/jira_query.go
@@ -146,9 +146,10 @@ func getStatus(statuses map[string]string, input string) string {
 }
 
 func addTime(startTime time.Time, offset string) time.Time {
-	timeMinutes := regexp.MustCompile(`^[0-9]*m$`)
-	timeHours := regexp.MustCompile(`^[0-9]*h$`)
-	timeDays := regexp.MustCompile(`^[0-9]*d$`)
+	timeMinutes := regexp.MustCompile(`^[0-9]+m$`)
+	timeHours := regexp.MustCompile(`^[0-9]+h$`)
+	timeDays := regexp.MustCompile(`^[0-9]+d$`)
+	timeWeeks := regexp.MustCompile(`^[0-9]+w$`)
 
 	returnTime := startTime
 
@@ -162,6 +163,9 @@ func addTime(startTime time.Time, offset string) time.Time {
 	case timeDays.MatchString(offset):
 		timeOffset, _ := strconv.Atoi(strings.ReplaceAll(offset, "d", ""))
 		returnTime = startTime.Add(time.Hour * 24 * time.Duration(timeOffset))
+	case timeWeeks.MatchString(offset):
+		timeOffset, _ := strconv.Atoi(strings.ReplaceAll(offset, "w", ""))
+		returnTime = startTime.Add(time.Hour * 24 * 7 * time.Duration(timeOffset))
 	}
 
 	return returnTime