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

Remove debug leftovers and fix anniversary configs
Friends-of-Monika · Sep 24, 2022 · e361267 · e361267
2 parents 97d2fd3 + 8815ef7
commit e361267
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/config/default/configs/events/anni-milestone-day.conf b/config/default/configs/events/anni-milestone-day.conf
@@ -6,7 +6,7 @@
 # Author: Herman S. <[email protected]>
 
 [Presence]
-Condition = (eve_key_1w.startswith("anni_1week") or
+Condition = eve_key_1w is not None and (eve_key_1w.startswith("anni_1week") or
     eve_key_1w.startswith("anni_1month") or
     eve_key_1w.startswith("anni_3month") or
     eve_key_1w.startswith("anni_6month")) and eve_days_1w == 0

diff --git a/config/default/configs/events/anni-milestone.conf b/config/default/configs/events/anni-milestone.conf
@@ -6,7 +6,7 @@
 # Author: Herman S. <[email protected]>
 
 [Presence]
-Condition = (eve_key_1w.startswith("anni_1week") or
+Condition = eve_key_1w is not None and (eve_key_1w.startswith("anni_1week") or
     eve_key_1w.startswith("anni_1month") or
     eve_key_1w.startswith("anni_3month") or
     eve_key_1w.startswith("anni_6month"))

diff --git a/config/default/configs/events/anni-year-day.conf b/config/default/configs/events/anni-year-day.conf
@@ -4,7 +4,8 @@
 # Author: Herman S. <[email protected]>
 
 [Presence]
-Condition = eve_key_1w.startswith("anni_") and eve_days_1w == 0
+Condition = (eve_key_1w is not None and eve_key_1w.startswith("anni_")
+    and eve_days_1w == 0)
 Priority = -90
 Dynamic = True
 

diff --git a/config/default/configs/events/anni-year.conf b/config/default/configs/events/anni-year.conf
@@ -4,7 +4,7 @@
 # Author: Herman S. <[email protected]>
 
 [Presence]
-Condition = eve_key_1w.startswith("anni_")
+Condition = eve_key_1w is not None and eve_key_1w.startswith("anni_")
 Priority = -100
 Dynamic = True
 

diff --git a/mod/config.rpy b/mod/config.rpy
@@ -153,7 +153,6 @@ init 90 python in fom_presence:
                     _configs.append((_file, Config.load_file(os.path.join(_dir, _file))))
 
                 except Exception as e:
-                    _debug("Fail.")
                     _presence.ectx.report(
                         _ERR_CFG,
                         "Some (or all) Presence Configs are invalid and could not "

diff --git a/mod/header.rpy b/mod/header.rpy
@@ -8,7 +8,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.0.2",
+        version="0.0.3",
         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"