diff --git a/hikka/main.py b/hikka/main.py
index 4985e35..6c4ccab 100755
--- a/hikka/main.py
+++ b/hikka/main.py
@@ -56,7 +56,7 @@ from .translations.core import Translator
from math import ceil
-__version__ = (1, 0, 2)
+__version__ = (1, 0, 3)
try:
from .web import core
except ImportError:
diff --git a/hikka/modules/corectrl.py b/hikka/modules/corectrl.py
index d2008a8..349bdbb 100755
--- a/hikka/modules/corectrl.py
+++ b/hikka/modules/corectrl.py
@@ -85,8 +85,7 @@ class CoreMod(loader.Module):
await utils.answer(message, self.strings("hikka").format(*ver))
async def blacklistcmd(self, message: Message) -> None:
- """.blacklist [id]
- Blacklist the bot from operating somewhere"""
+ """Blacklist the bot from operating somewhere"""
chatid = await self.blacklistcommon(message)
self._db.set(
@@ -98,8 +97,7 @@ class CoreMod(loader.Module):
await utils.answer(message, self.strings("blacklisted", message).format(chatid))
async def unblacklistcmd(self, message: Message) -> None:
- """.unblacklist [id]
- Unblacklist the bot from operating somewhere"""
+ """Unblacklist the bot from operating somewhere"""
chatid = await self.blacklistcommon(message)
self._db.set(
@@ -130,8 +128,7 @@ class CoreMod(loader.Module):
return
async def blacklistusercmd(self, message: Message) -> None:
- """.blacklistuser [id]
- Prevent this user from running any commands"""
+ """Prevent this user from running any commands"""
user = await self.getuser(message)
self._db.set(
@@ -145,8 +142,7 @@ class CoreMod(loader.Module):
)
async def unblacklistusercmd(self, message: Message) -> None:
- """.unblacklistuser [id]
- Allow this user to run permitted commands"""
+ """Allow this user to run permitted commands"""
user = await self.getuser(message)
self._db.set(
@@ -280,8 +276,6 @@ class CoreMod(loader.Module):
async def setlangcmd(self, message: Message) -> None:
"""Change the preferred language used for translations
- Specify the language as space separated list of ISO 639-1 language codes in order of preference (e.g. fr en)
- With no parameters, all translations are disabled
Restart required after use"""
langs = utils.get_args(message)
self._db.set(main.__name__, "language", langs)
diff --git a/hikka/modules/help.py b/hikka/modules/help.py
index 64fcc8e..c6a3fa7 100755
--- a/hikka/modules/help.py
+++ b/hikka/modules/help.py
@@ -64,7 +64,7 @@ class HelpMod(loader.Module):
*Split modules by spaces"""
modules = utils.get_args(message)
if not modules:
- await utils.answer(message, self.strings("no_mod"))
+ await utils.answer(message, self.strings("no_mod", message))
return
mods = [
@@ -88,7 +88,7 @@ class HelpMod(loader.Module):
await utils.answer(
message,
- self.strings("hidden_shown").format(
+ self.strings("hidden_shown", message).format(
len(hidden),
len(shown),
"\n".join([f"šāšØ {m}" for m in hidden]),
@@ -121,7 +121,7 @@ class HelpMod(loader.Module):
if args in self.allmodules.commands:
module = self.allmodules.commands[args].__self__
else:
- await utils.answer(message, self.strings("bad_module").format(args))
+ await utils.answer(message, self.strings("bad_module", message).format(args))
return
try:
@@ -129,7 +129,7 @@ class HelpMod(loader.Module):
except KeyError:
name = getattr(module, "name", "ERROR")
- reply = self.strings("single_mod_header").format(utils.escape_html(name))
+ reply = self.strings("single_mod_header", message).format(utils.escape_html(name))
if module.__doc__:
reply += (
"\nā¹ļø " + utils.escape_html(inspect.getdoc(module)) + "\n"
@@ -161,11 +161,11 @@ class HelpMod(loader.Module):
reply += self.strings("undoc_ihandler", message)
for name, fun in commands.items():
- reply += self.strings("single_cmd").format(prefix, name)
+ reply += self.strings("single_cmd", message).format(prefix, name)
if fun.__doc__:
reply += utils.escape_html(inspect.getdoc(fun))
else:
- reply += self.strings("undoc_cmd")
+ reply += self.strings("undoc_cmd", message)
await utils.answer(message, reply)
return
@@ -187,7 +187,7 @@ class HelpMod(loader.Module):
hidden = list(filter(lambda module: module in mods, self.get("hide", [])))
self.set("hide", hidden)
- reply = self.strings("all_header").format(count, len(hidden) if not force else 0)
+ reply = self.strings("all_header", message).format(count, len(hidden) if not force else 0)
shown_warn = False
plain_ = []
@@ -231,7 +231,7 @@ class HelpMod(loader.Module):
else:
emoji = self.config['plain_emoji']
- tmp += self.strings("mod_tmpl").format(emoji, name)
+ tmp += self.strings("mod_tmpl", message).format(emoji, name)
first = True
@@ -243,10 +243,10 @@ class HelpMod(loader.Module):
for cmd in commands:
if first:
- tmp += self.strings("first_cmd_tmpl").format(cmd)
+ tmp += self.strings("first_cmd_tmpl", message).format(cmd)
first = False
else:
- tmp += self.strings("cmd_tmpl").format(cmd)
+ tmp += self.strings("cmd_tmpl", message).format(cmd)
icommands = [
name
@@ -256,10 +256,10 @@ class HelpMod(loader.Module):
for cmd in icommands:
if first:
- tmp += self.strings("first_cmd_tmpl").format(f"š¹ {cmd}")
+ tmp += self.strings("first_cmd_tmpl", message).format(f"š¹ {cmd}")
first = False
else:
- tmp += self.strings("cmd_tmpl").format(f"š¹ {cmd}")
+ tmp += self.strings("cmd_tmpl", message).format(f"š¹ {cmd}")
if commands or icommands:
tmp += " )"
diff --git a/hikka/modules/hikka_settings.py b/hikka/modules/hikka_settings.py
index ee5a982..eea10c5 100755
--- a/hikka/modules/hikka_settings.py
+++ b/hikka/modules/hikka_settings.py
@@ -192,6 +192,7 @@ class HikkaSettingsMod(loader.Module):
self._db.set(main.__name__, "nonickusers", nn)
async def nonickcmdcmd(self, message: Message) -> None:
+ """Allow certain command to be executed without nickname"""
args = utils.get_args_raw(message)
if not args:
return await utils.answer(message, self.strings("no_cmd"))
diff --git a/hikka/modules/test.py b/hikka/modules/test.py
index 84e31ce..d11e29d 100755
--- a/hikka/modules/test.py
+++ b/hikka/modules/test.py
@@ -207,8 +207,7 @@ class TestMod(loader.Module):
@loader.owner
async def suspendcmd(self, message: Message) -> None:
- """.suspend