From 94bbc7e883ea70b08d82ae185c4a2e8e98d5c3ea Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Sun, 16 Nov 2014 19:22:40 +0000 Subject: [PATCH 1/2] Update Namecheck.py --- bot/Namecheck.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bot/Namecheck.py b/bot/Namecheck.py index 347ff7ff476..95cbaac2b43 100644 --- a/bot/Namecheck.py +++ b/bot/Namecheck.py @@ -1,5 +1,23 @@ + +def Namecheck_allinone(name, against, sender=None): + __doc__ = "False = No match, True = Match" + if not isinstance(against, iterable): + return False + + if isinstance(against, dict): + for key, value in against.iteritems(): + if i.lower() in name.lower() and (sender and sender.lower() not in name.lower()): + return True + for item in against: + if i.lower() in name.lower() and sender.lower() not in name.lower(): + return True + + return False + def Namecheck(name,against,sender): __doc__ = "False = No match, True = Match" + for item in against: + for i in against: if i.lower() in name.lower() and sender.lower() not in name.lower(): return True From 339a0a536c345a92fafa0e379859ddea55e39819 Mon Sep 17 00:00:00 2001 From: Matt Smith Date: Tue, 18 Nov 2014 17:51:26 +0000 Subject: [PATCH 2/2] Update Namecheck.py --- bot/Namecheck.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bot/Namecheck.py b/bot/Namecheck.py index 95cbaac2b43..18c67cc4c30 100644 --- a/bot/Namecheck.py +++ b/bot/Namecheck.py @@ -6,18 +6,16 @@ def Namecheck_allinone(name, against, sender=None): if isinstance(against, dict): for key, value in against.iteritems(): - if i.lower() in name.lower() and (sender and sender.lower() not in name.lower()): - return True + if value.lower() in name.lower() and (sender and sender.lower() not in name.lower()): + return True, key # Not sure why you need the index with the result. for item in against: - if i.lower() in name.lower() and sender.lower() not in name.lower(): + if item.lower() in name.lower() and sender.lower() not in name.lower(): return True return False def Namecheck(name,against,sender): __doc__ = "False = No match, True = Match" - for item in against: - for i in against: if i.lower() in name.lower() and sender.lower() not in name.lower(): return True