From cbe4ff91b8dc4db8bae36132a304771e4e0bd747 Mon Sep 17 00:00:00 2001 From: dreamscached Date: Sat, 24 Sep 2022 14:51:01 +0200 Subject: [PATCH 1/3] Fix milestone condition bugs --- config/default/configs/events/anni-milestone-day.conf | 2 +- config/default/configs/events/anni-milestone.conf | 2 +- config/default/configs/events/anni-year-day.conf | 3 ++- config/default/configs/events/anni-year.conf | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/default/configs/events/anni-milestone-day.conf b/config/default/configs/events/anni-milestone-day.conf index a85c5de..22834d5 100644 --- 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. [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 index 0522b6e..7a96e16 100644 --- a/config/default/configs/events/anni-milestone.conf +++ b/config/default/configs/events/anni-milestone.conf @@ -6,7 +6,7 @@ # Author: Herman S. [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 index 05ef8d5..2ee4523 100644 --- 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. [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 index a16e534..43a081a 100644 --- a/config/default/configs/events/anni-year.conf +++ b/config/default/configs/events/anni-year.conf @@ -4,7 +4,7 @@ # Author: Herman S. [Presence] -Condition = eve_key_1w.startswith("anni_") +Condition = eve_key_1w is not None and eve_key_1w.startswith("anni_") Priority = -100 Dynamic = True From 81093aa5225ce4b499d1d19020e2dd9afb629f64 Mon Sep 17 00:00:00 2001 From: dreamscached Date: Sat, 24 Sep 2022 14:53:49 +0200 Subject: [PATCH 2/3] Remove debug leftover --- mod/config.rpy | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/config.rpy b/mod/config.rpy index 3d0fc9f..50e892c 100644 --- 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 " From 8815ef706fe77d20f6ac9df7ac7b029930ba651e Mon Sep 17 00:00:00 2001 From: dreamscached Date: Sat, 24 Sep 2022 14:51:35 +0200 Subject: [PATCH 3/3] Bump version --- mod/header.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/header.rpy b/mod/header.rpy index b8849a6..720e728 100644 --- 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"