Skip to content

Commit 40dff61

Browse files
authored
Merge branch 'master' into development
2 parents d891ad1 + 389dfb6 commit 40dff61

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ however, insignificant breaking changes do not guarantee a major version bump, s
3333
### Internal
3434
- Renamed `Bot.log_file_name` to `Bot.log_file_path`. Log files are now created at `temp/logs/modmail.log`. ([PR #3216](https://github.com/modmail-dev/Modmail/pull/3216))
3535

36+
### Internal
37+
- `ConfigManager.get` no longer accepts two positional arguments: the `convert` argument is now keyword-only.
38+
3639
# v4.0.2
3740

3841
### Breaking

cogs/plugins.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,10 @@ async def parse_user_input(self, ctx, plugin_name, check_version=False):
313313
plugin = Plugin(user, repo, plugin_name, branch)
314314

315315
else:
316-
if not self.bot.config.get("registry_plugins_only", False):
316+
if self.bot.config.get("registry_plugins_only"):
317317
embed = discord.Embed(
318-
description="This plugin is not in the registry. "
319-
"To install it, you must set `REGISTRY_PLUGINS_ONLY=false` in your .env file or config settings.",
318+
description="This plugin is not in the registry. To install this plugin, "
319+
"you must set `REGISTRY_PLUGINS_ONLY=no` or remove this key in your .env file.",
320320
color=self.bot.error_color,
321321
)
322322
await ctx.send(embed=embed)

core/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def __getitem__(self, key: str) -> typing.Any:
302302
def __delitem__(self, key: str) -> None:
303303
return self.remove(key)
304304

305-
def get(self, key: str, convert=True) -> typing.Any:
305+
def get(self, key: str, *, convert: bool = True) -> typing.Any:
306306
key = key.lower()
307307
if key not in self.all_keys:
308308
raise InvalidConfigError(f'Configuration "{key}" is invalid.')

0 commit comments

Comments
 (0)