diff options
| author |  kosayoda <[email protected]> | 2020-10-01 12:55:00 +0800 |
|---|---|---|
| committer | kosayoda <[email protected]> | 2020-10-01 12:55:00 +0800 |
| commit | 929e8352553bbe90a196548c9afabd0ef63bd98e (patch) | |
| tree | efb3d6bca4bfb1a83329863e04bdf245a73b429c | |
| parent | PR #1191 Verification: broaden 50_007 error handling (diff) | |
Fuzzy match roles for `!role` command.
An arbitrary cutoff score of 80 is chosen because it works. A bug in
the test for the same command is also fixed.
| -rw-r--r-- | bot/exts/info/information.py | 10 | ||||
| -rw-r--r-- | tests/bot/exts/info/test_information.py | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py index f6ed176f1..0386a2909 100644 --- a/bot/exts/info/information.py +++ b/bot/exts/info/information.py @@ -6,7 +6,8 @@ from collections import Counter, defaultdict from string import Template from typing import Any, Mapping, Optional, Tuple, Union -from discord import ChannelType, Colour, CustomActivity, Embed, Guild, Member, Message, Role, Status, utils +import fuzzywuzzy +from discord import ChannelType, Colour, CustomActivity, Embed, Guild, Member, Message, Role, Status from discord.abc import GuildChannel from discord.ext.commands import BucketType, Cog, Context, Paginator, command, group, has_any_role from discord.utils import escape_markdown @@ -108,18 +109,21 @@ class Information(Cog): parsed_roles = [] failed_roles = [] + all_roles = {role.id: role.name for role in ctx.guild.roles} for role_name in roles: if isinstance(role_name, Role): # Role conversion has already succeeded parsed_roles.append(role_name) continue - role = utils.find(lambda r: r.name.lower() == role_name.lower(), ctx.guild.roles) + match = fuzzywuzzy.process.extractOne(role_name, all_roles, score_cutoff=80) - if not role: + if not match: failed_roles.append(role_name) continue + # `match` is a (role name, score, role id) tuple + role = ctx.guild.get_role(match[2]) parsed_roles.append(role) if failed_roles: diff --git a/tests/bot/exts/info/test_information.py b/tests/bot/exts/info/test_information.py index d3f2995fb..7bc7dbb5d 100644 --- a/tests/bot/exts/info/test_information.py +++ b/tests/bot/exts/info/test_information.py @@ -68,7 +68,7 @@ class InformationCogTests(unittest.TestCase): permissions=discord.Permissions(0), ) - self.ctx.guild.roles.append([dummy_role, admin_role]) + self.ctx.guild.roles.extend([dummy_role, admin_role]) self.cog.role_info.can_run = unittest.mock.AsyncMock() self.cog.role_info.can_run.return_value = True |