Merge pull request #31 from Friends-of-Monika/dev

Release v0.4.1
Friends-of-Monika · Apr 30, 2023 · 5bd6a4c · 5bd6a4c
2 parents 222a19d + e50a6d9
commit 5bd6a4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/config/default/extensions/timestamps.rpy b/config/default/extensions/timestamps.rpy
@@ -43,6 +43,8 @@ init 190 python in fom_presence_extensions:
 
         events = list()
 
+        _fom_presence_logging = store._fom_presence_logging
+
         cur = datetime.date.today()
         for i in range(n_days):
             ev_dict = mas_calendar.calendar_database[cur.month][cur.day]
@@ -56,13 +58,13 @@ init 190 python in fom_presence_extensions:
                     years = ev.years
                     sd = ev.start_date
 
-                    if sd is not None and sd < datetime.datetime.now():
-                        continue
-
                 else:
                     prompt = ev_tup[1]
-                    years = ev_tup[2]
-                    sd = datetime.datetime.min
+                    years = ev_tup[2] or [cur.year]
+                    sd = datetime.datetime.combine(datetime.date(min(years), cur.month, cur.day), datetime.time())
+
+                if sd is not None and sd.date() < cur:
+                    continue
 
                 if years is None or len(years) == 0 or cur.year in years:
                     events.append((cur - datetime.date.today(), prompt, ev_key, sd))

diff --git a/mod/header.rpy b/mod/header.rpy
@@ -9,7 +9,7 @@ init -990 python in mas_submod_utils:
         author="Friends of Monika",
         name="Discord Presence Submod",
         description="Show everyone who's the person you're spending your time with~",
-        version="0.4.0",
+        version="0.4.1",
         settings_pane="fom_presence_settings_pane",
         version_updates={
             "friends_of_monika_discord_presence_submod_v0_0_1": "friends_of_monika_discord_presence_submod_v0_0_2",