handle missing 'at' for freeform day time (#131)

scottleedavis · Jun 28, 2019 · 3dee5e1 · 3dee5e1
1 parent c403345
commit 3dee5e1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/server/occurrence.go b/server/occurrence.go
@@ -1104,9 +1104,15 @@ func (p *Plugin) freeFormEN(when string, user *model.User) (times []time.Time, e
 			chronoTime = dateTimeSplit[1]
 		}
 	} else {
-		_, ntErr := p.normalizeTime(chronoDate, user)
-		if ntErr == nil {
-			return p.at(T("at")+" "+chronoDate, user)
+		dateTimeSplit := strings.Split(chronoDate, " ")
+		if len(dateTimeSplit) == 2 {
+			chronoDate = dateTimeSplit[0]
+			chronoTime = dateTimeSplit[1]
+		} else {
+			_, ntErr := p.normalizeTime(chronoDate, user)
+			if ntErr == nil {
+				return p.at(T("at")+" "+chronoDate, user)
+			}
 		}
 	}
 

diff --git a/server/occurrence_test.go b/server/occurrence_test.go
@@ -686,6 +686,13 @@ func TestFreeForm(t *testing.T) {
 				times[0].In(location).Hour() == 16)
 		}
 
+		times, err = p.freeFormEN("tomorrow 8:00", user)
+		assert.Nil(t, err)
+		if err == nil {
+			assert.True(t, times[0].In(location).Weekday().String() == time.Now().In(location).AddDate(0, 0, 1).Weekday().String() &&
+				(times[0].In(location).Hour() == 8 || times[0].In(location).Hour() == 20))
+		}
+
 		times, err = p.freeFormEN("everyday", user)
 		assert.Nil(t, err)
 		if err == nil {