diff --git a/config/config.example.yaml b/config/config.example.yaml index e9edd88..0edd53f 100644 --- a/config/config.example.yaml +++ b/config/config.example.yaml @@ -162,7 +162,7 @@ regex: jirasorting: "(?i:)" jirastatus: "(?i:)" jiratime: "(?i:)" - jiraoffsettime: "(?i:)" + jiraoffsettime: "(?i:)" jiraoffsetfield: "(?i:)" replycolor: "(?i:)" replylayout: "(?i:)" diff --git a/utils/jira_query.go b/utils/jira_query.go index 02215d3..01da193 100644 --- 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