From fdef2634de6602aa666126b38b42b41507d057c6 Mon Sep 17 00:00:00 2001 From: Hikari Date: Sat, 9 Apr 2022 12:46:51 +0000 Subject: [PATCH] Fix weird bug with un-translated modules due to invalid `__module__` --- hikka/modules/loader.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hikka/modules/loader.py b/hikka/modules/loader.py index 51eba02..f162f43 100755 --- a/hikka/modules/loader.py +++ b/hikka/modules/loader.py @@ -211,7 +211,10 @@ class LoaderMod(loader.Module): available = "\n".join( f"{i}" for i in sorted( - [utils.escape_html(i) for i in (await self.get_repo_list("full")).values()] + [ + utils.escape_html(i) + for i in (await self.get_repo_list("full")).values() + ] ) ) @@ -429,10 +432,11 @@ class LoaderMod(loader.Module): ).group(1) ver_ = tuple(map(int, ver.split("."))) if main.__version__ < ver_: - await utils.answer( - message, - self.strings("version_incompatible").format(ver), - ) + if isinstance(message, Message): + await utils.answer( + message, + self.strings("version_incompatible").format(ver), + ) return developer = re.search(r"# ?meta developer: ?(.+)", doc) @@ -442,6 +446,9 @@ class LoaderMod(loader.Module): if name is None: uid = "__extmod_" + str(uuid.uuid4()) else: + if name.startswith(self.config["MODULES_REPO"]): + name = name.split("/")[-1].split(".py")[0] + uid = name.replace("%", "%%").replace(".", "%d") module_name = "hikka.modules." + uid