From 817eda537b622d8b860542dfc6f4ffd4ed210072 Mon Sep 17 00:00:00 2001 From: "hikari.ftg" Date: Thu, 7 Apr 2022 16:41:15 +0000 Subject: [PATCH] Okteto fixes --- hikka/modules/help.py | 4 ++-- hikka/modules/okteto.py | 8 ++++---- hikka/web/root.py | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hikka/modules/help.py b/hikka/modules/help.py index debf6df..395186c 100755 --- a/hikka/modules/help.py +++ b/hikka/modules/help.py @@ -28,12 +28,12 @@ class HelpMod(loader.Module): "single_mod_header": "šŸ“¼ {}:", "single_cmd": "\nā–«ļø {}{} šŸ‘‰šŸ» ", "undoc_cmd": "🦄 No docs", - "all_header": "šŸ‘“ {} mods available, {} hidden:", + "all_header": "🌘 {} mods available, {} hidden:", "mod_tmpl": "\n{} {}", "first_cmd_tmpl": ": ( {}", "cmd_tmpl": " | {}", "no_mod": "🚫 Specify module to hide", - "hidden_shown": "🌘 {} modules hidden, {} module shown:\n{}\n{}", + "hidden_shown": "🌘 {} modules hidden, {} modules shown:\n{}\n{}", "ihandler": "\nšŸŽ¹ {} šŸ‘‰šŸ» ", "undoc_ihandler": "🦄 No docs", "joined": "🌘 Joined the support chat", diff --git a/hikka/modules/okteto.py b/hikka/modules/okteto.py index ae7b45b..f6302e3 100644 --- a/hikka/modules/okteto.py +++ b/hikka/modules/okteto.py @@ -48,11 +48,11 @@ class OktetoMod(loader.Module): """Creates queue to Webpage bot to reset Okteto polling after app goes to sleep""" while True: try: - if "OKTETO_URI" not in os.environ: + if not self._db.get("hikka", "okteto_uri", False): await asyncio.sleep(self._env_wait_interval) continue - uri = os.environ["OKTETO_URI"] + uri = self._db.get("hikka", "okteto_uri") current_queue = ( await self._client( GetScheduledHistoryRequest( @@ -87,8 +87,8 @@ class OktetoMod(loader.Module): async def watcher(self, message: Message) -> None: if ( not getattr(message, "raw_text", False) - or "OKTETO_URI" not in os.environ - or os.environ["OKTETO_URI"] not in message.raw_text + or not self._db.get("hikka", "okteto_uri", False) + or self._db.get("hikka", "okteto_uri") not in message.raw_text and "Link previews was updated successfully" not in message.raw_text or utils.get_chat_id(message) != 169642392 ): diff --git a/hikka/web/root.py b/hikka/web/root.py index 5a6ab2c..7c9518d 100644 --- a/hikka/web/root.py +++ b/hikka/web/root.py @@ -153,11 +153,14 @@ class Web: return web.Response() async def okteto(self, request): - if "OKTETO_URI" in os.environ: + if any(cl[2].get("hikka", "okteto_uri", False) for cl in self.client_data.values()): return web.Response(status=418) text = await request.text() - os.environ["OKTETO_URI"] = text + + for client_uid in self.client_data: + self.client_data[client_uid][2].set("hikka", "okteto_uri", text) + return web.Response(body="URI_SAVED") async def tg_code(self, request):