diff --git a/Plugins/WPSGardenSystem/garden_plugin_base.py b/Plugins/WPSGardenSystem/garden_plugin_base.py index 3d9a009..7f6ed7e 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_base.py +++ b/Plugins/WPSGardenSystem/garden_plugin_base.py @@ -201,15 +201,6 @@ class WPSGardenBase(WPSAPI): cls._service.recover_overdue_plots() return cls._service - @override - def get_webhook_url(self, message: str, chat_id: int, user_id: int) -> str: - config : WPSConfigAPI = Architecture.Get(WPSConfigAPI) - url = config.get_user_url(user_id) - if url: - return url - else: - return super().get_webhook_url(message, chat_id, user_id) - def dependencies(self) -> List[Type]: return [ WPSConfigAPI, diff --git a/Plugins/WPSGardenSystem/garden_plugin_place_trap.py b/Plugins/WPSGardenSystem/garden_plugin_place_trap.py index c59b555..af1dd8c 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_place_trap.py +++ b/Plugins/WPSGardenSystem/garden_plugin_place_trap.py @@ -4,8 +4,9 @@ from __future__ import annotations from typing import Optional, Sequence -from PWF.Convention.Runtime.Architecture import Architecture +from PWF.Convention.Runtime.Architecture import * +from Plugins.WPSConfigSystem import WPSConfigAPI from Plugins.WPSAPI import GuideEntry from Plugins.WPSBackpackSystem import WPSBackpackSystem @@ -14,6 +15,15 @@ from .garden_models import GARDEN_TRAPS_DICT class WPSGardenPlaceTrap(WPSGardenBase): + #@override + #def get_webhook_url(self, message: str, chat_id: int, user_id: int) -> str: + # config : WPSConfigAPI = Architecture.Get(WPSConfigAPI) + # url = config.get_user_url(user_id) + # if url: + # return url + # else: + # return super().get_webhook_url(message, chat_id, user_id) + def get_guide_subtitle(self) -> str: return "在地块上放置防护陷阱" diff --git a/Plugins/WPSGardenSystem/garden_plugin_plant.py b/Plugins/WPSGardenSystem/garden_plugin_plant.py index 9d1a3e0..a2221a6 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_plant.py +++ b/Plugins/WPSGardenSystem/garden_plugin_plant.py @@ -4,15 +4,24 @@ from __future__ import annotations from typing import Optional, Sequence -from PWF.Convention.Runtime.Architecture import Architecture +from PWF.Convention.Runtime.Architecture import * from Plugins.WPSAPI import GuideEntry from Plugins.WPSBackpackSystem import WPSBackpackSystem - +from Plugins.WPSConfigSystem import WPSConfigAPI from .garden_plugin_base import WPSGardenBase class WPSGardenPlant(WPSGardenBase): + #@override + #def get_webhook_url(self, message: str, chat_id: int, user_id: int) -> str: + # config : WPSConfigAPI = Architecture.Get(WPSConfigAPI) + # url = config.get_user_url(user_id) + # if url: + # return url + # else: + # return super().get_webhook_url(message, chat_id, user_id) + def get_guide_subtitle(self) -> str: return "种植作物并分配地块" diff --git a/Plugins/WPSGardenSystem/garden_plugin_remove.py b/Plugins/WPSGardenSystem/garden_plugin_remove.py index 57dcb4e..eceec0b 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_remove.py +++ b/Plugins/WPSGardenSystem/garden_plugin_remove.py @@ -4,11 +4,22 @@ from __future__ import annotations from typing import Optional, Sequence +from PWF.Convention.Runtime.Architecture import * from Plugins.WPSAPI import GuideEntry +from Plugins.WPSConfigSystem import WPSConfigAPI from .garden_plugin_base import WPSGardenBase class WPSGardenRemove(WPSGardenBase): + #@override + #def get_webhook_url(self, message: str, chat_id: int, user_id: int) -> str: + # config : WPSConfigAPI = Architecture.Get(WPSConfigAPI) + # url = config.get_user_url(user_id) + # if url: + # return url + # else: + # return super().get_webhook_url(message, chat_id, user_id) + def get_guide_subtitle(self) -> str: return "清理地块以重新种植" diff --git a/Plugins/WPSGardenSystem/garden_plugin_remove_trap.py b/Plugins/WPSGardenSystem/garden_plugin_remove_trap.py index 765eeb1..43afff6 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_remove_trap.py +++ b/Plugins/WPSGardenSystem/garden_plugin_remove_trap.py @@ -3,13 +3,23 @@ from __future__ import annotations from typing import Optional, Sequence +from PWF.Convention.Runtime.Architecture import * from Plugins.WPSAPI import GuideEntry - +from Plugins.WPSConfigSystem import WPSConfigAPI from .garden_plugin_base import WPSGardenBase class WPSGardenRemoveTrap(WPSGardenBase): + #@override + #def get_webhook_url(self, message: str, chat_id: int, user_id: int) -> str: + # config : WPSConfigAPI = Architecture.Get(WPSConfigAPI) + # url = config.get_user_url(user_id) + # if url: + # return url + # else: + # return super().get_webhook_url(message, chat_id, user_id) + def get_guide_subtitle(self) -> str: return "移除地块上的防护陷阱"