Chooses next next instead of next week. Issue #78

scottleedavis · May 1, 2019 · c82106b · c82106b
1 parent e695021
commit c82106b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/server/occurrence.go b/server/occurrence.go
@@ -806,8 +806,10 @@ func (p *Plugin) onEN(when string, user *model.User) (times []time.Time, err err
 
 		if weekDayNum < todayWeekDayNum {
 			day = 7 - (todayWeekDayNum - weekDayNum)
-		} else if weekDayNum >= todayWeekDayNum {
+		} else if weekDayNum == todayWeekDayNum {
 			day = 7 + (weekDayNum - todayWeekDayNum)
+		} else {
+			day = (weekDayNum - todayWeekDayNum)
 		}
 
 		timeUnitSplit := strings.Split(timeUnit, ":")
@@ -972,8 +974,10 @@ func (p *Plugin) everyEN(when string, user *model.User) (times []time.Time, err
 
 			if weekDayNum < todayWeekDayNum {
 				day = 7 - (todayWeekDayNum - weekDayNum)
-			} else if weekDayNum >= todayWeekDayNum {
+			} else if weekDayNum == todayWeekDayNum {
 				day = 7 + (weekDayNum - todayWeekDayNum)
+			} else {
+				day = (weekDayNum - todayWeekDayNum)
 			}
 
 			timeUnitSplit := strings.Split(timeUnit, ":")