From 6ae3040aac2d4fe004370b98d44689cf7ecdd2b4 Mon Sep 17 00:00:00 2001
From: Michael H <michael@michaelhall.tech>
Date: Sun, 23 Jun 2019 02:39:24 -0400
Subject: [PATCH] [Filter] Make name filtering behavior consistent (#2794)

- Uses the updated filter check
  - This is also a performance gain on large servers with filter names
  enabled.
---
 redbot/cogs/filter/filter.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/redbot/cogs/filter/filter.py b/redbot/cogs/filter/filter.py
index 841d42e42..fae8cab8e 100644
--- a/redbot/cogs/filter/filter.py
+++ b/redbot/cogs/filter/filter.py
@@ -448,13 +448,12 @@ class Filter(commands.Cog):
         if not await self.settings.guild(member.guild).filter_names():
             return
 
-        word_list = await self.settings.guild(member.guild).filter()
-        for w in word_list:
-            if w in member.display_name.lower():
-                name_to_use = await self.settings.guild(member.guild).filter_default_name()
-                reason = _("Filtered nickname") if member.nick else _("Filtered name")
-                try:
-                    await member.edit(nick=name_to_use, reason=reason)
-                except discord.HTTPException:
-                    pass
-                return
+        if await self.filter_hits(member.display_name, member.guild):
+
+            name_to_use = await self.settings.guild(member.guild).filter_default_name()
+            reason = _("Filtered nickname") if member.nick else _("Filtered name")
+            try:
+                await member.edit(nick=name_to_use, reason=reason)
+            except discord.HTTPException:
+                pass
+            return