diff options
| author |  Leon Sandøy <[email protected]> | 2018-11-16 13:23:44 +0000 |
|---|---|---|
| committer | Leon Sandøy <[email protected]> | 2018-11-16 13:23:44 +0000 |
| commit | 6e49e334d2a1fece41f29b6da660d1314f6cdb5a (patch) | |
| tree | bbcd92b4ccd65c890c0c9c5d24f434face49996a | |
| parent | Merge branch 'bugfix/eval-typing' into 'master' (diff) | |
| parent | Fix bot:prefix config and usage (diff) | |
Merge branch 'prefix_fix' into 'master'
Fix bot:prefix config and usage
See merge request python-discord/projects/bot!95
| -rw-r--r-- | bot/__main__.py | 2 | ||||
| -rw-r--r-- | bot/cogs/help.py | 2 | ||||
| -rw-r--r-- | bot/constants.py | 2 | ||||
| -rw-r--r-- | config-default.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index 5e6c7f603..3c40a3243 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -12,7 +12,7 @@ from bot.utils.service_discovery import wait_for_rmq log = logging.getLogger(__name__) bot = Bot( - command_prefix=when_mentioned_or("!"), + command_prefix=when_mentioned_or(BotConfig.prefix), activity=Game(name="Commands: !help"), case_insensitive=True, max_messages=10_000 diff --git a/bot/cogs/help.py b/bot/cogs/help.py index f229fa00b..144286c56 100644 --- a/bot/cogs/help.py +++ b/bot/cogs/help.py @@ -424,7 +424,7 @@ class HelpSession: strikeout = '~~' signature = self._get_command_params(command) - prefix = constants.Bot.help_prefix + prefix = constants.Bot.prefix info = f"{strikeout}**`{prefix}{signature}`**{strikeout}" # handle if the command has no docstring diff --git a/bot/constants.py b/bot/constants.py index e2303efb2..266bd5eee 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -191,7 +191,7 @@ class YAMLGetter(type): class Bot(metaclass=YAMLGetter): section = "bot" - help_prefix: str + prefix: str token: str diff --git a/config-default.yml b/config-default.yml index 4fb8884e8..3598caa45 100644 --- a/config-default.yml +++ b/config-default.yml @@ -1,5 +1,5 @@ bot: - help_prefix: "bot." + prefix: "!" token: !ENV "BOT_TOKEN" cooldowns: |