From 7656aecea0334eb9a17985a656eae997e5b401cb Mon Sep 17 00:00:00 2001 From: Semjon Kerner Date: Fri, 26 Mar 2021 12:18:29 +0100 Subject: [PATCH 1/2] add notification dead,fighting --- fishy/engine/common/window.py | 1 - fishy/engine/semifisher/fishing_event.py | 8 ++++++-- fishy/web/web.py | 7 +++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fishy/engine/common/window.py b/fishy/engine/common/window.py index e28310d..53409a7 100644 --- a/fishy/engine/common/window.py +++ b/fishy/engine/common/window.py @@ -33,7 +33,6 @@ class WindowClient: WindowClient.clients.remove(self) if len(WindowClient.clients) == 0: window_server.stop() - logging.info("window server stopped") @staticmethod def running(): diff --git a/fishy/engine/semifisher/fishing_event.py b/fishy/engine/semifisher/fishing_event.py index 0381a19..2f2263b 100644 --- a/fishy/engine/semifisher/fishing_event.py +++ b/fishy/engine/semifisher/fishing_event.py @@ -162,8 +162,12 @@ def on_loot(): def on_fight(): - logging.info("FIGHTING") + msg = "FIGHTING!" + logging.info(msg) + web.send_notification(msg) def on_dead(): - logging.info("DEAD or INVENTORY FULL or NO BAIT EQUIPPED") + msg = "DEAD or INVENTORY FULL or NO BAIT EQUIPPED" + logging.info(msg) + web.send_notification(msg) diff --git a/fishy/web/web.py b/fishy/web/web.py index a6b30e6..42b7fc3 100644 --- a/fishy/web/web.py +++ b/fishy/web/web.py @@ -51,12 +51,11 @@ def register_user(new_uid): @fallback(None) -def send_notification(uid, message): - # todo clean dead code - if not is_subbed(uid): +def send_notification(message): + if not is_subbed(): return False - body = {"uid": uid, "message": message, "apiversion":apiversion} + body = {"uid": config.get("uid"), "message": message, "apiversion":apiversion} requests.post(urls.notify, json=body) From 79445b33f04af81da2ccd6da1c66eab4d1b64902 Mon Sep 17 00:00:00 2001 From: Semjon Kerner Date: Fri, 26 Mar 2021 12:19:09 +0100 Subject: [PATCH 2/2] fix is_subbed: call without uid --- fishy/gui/config_top.py | 2 +- fishy/web/web.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fishy/gui/config_top.py b/fishy/gui/config_top.py index 51ede8b..c5ebcbf 100644 --- a/fishy/gui/config_top.py +++ b/fishy/gui/config_top.py @@ -58,7 +58,7 @@ def start_semifisher_config(gui: 'GUI'): gui.config.save_config() def toggle_sub(): - if web.is_subbed(config.get("uid"))[0]: + if web.is_subbed()[0]: if web.unsub(): gui._notify.set(0) else: diff --git a/fishy/web/web.py b/fishy/web/web.py index 42b7fc3..a3982a9 100644 --- a/fishy/web/web.py +++ b/fishy/web/web.py @@ -62,6 +62,9 @@ def send_notification(message): @uses_session @fallback(None) def send_hole_deplete(fish_caught, hole_time, fish_times): + if not is_subbed(): + return False + hole_data = { "fish_caught": fish_caught, "hole_time": hole_time,