From 79202c71f3161cf4672e22b2fd1fa97f999c2b0d Mon Sep 17 00:00:00 2001
From: Hykilpikonna <me@hydev.org>
Date: Sun, 17 Jan 2021 14:26:17 -0500
Subject: [PATCH] [+] Make sure it repeats on that day

---
 ProjectClock/Models.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift
index 17b13e0..d41f1eb 100644
--- a/ProjectClock/Models.swift
+++ b/ProjectClock/Models.swift
@@ -56,6 +56,9 @@ struct Alarm: Codable
     /// When should the alarm activate next
     var nextActivate: Date?
     {
+        // Make sure it's repeating
+        guard (repeats.contains { $0 }) else { return nil }
+        
         // Get current date
         let now = Date()
         let (y, m, d) = now.getYMD()
@@ -66,6 +69,9 @@ struct Alarm: Codable
         
         // If it will activate tomorrow
         if nh > hour || (nh == hour && nm > minute) { date = date.added(.day, 1) }
+        
+        // If the day is not one of the "repeat" days, keep adding 1 until it is
+        while !repeats[date.get(.weekday)] { date = date.added(.day, 1) }
     
         return date
     }