mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-14 14:52:15 +00:00
Only check if we have a value
This commit is contained in:
@@ -45,13 +45,13 @@ def blacklist_values(user):
|
|||||||
evechars = EVEPlayerCharacter.objects.filter(eveaccount__user=user).select_related('corporation', 'corporation__alliance')
|
evechars = EVEPlayerCharacter.objects.filter(eveaccount__user=user).select_related('corporation', 'corporation__alliance')
|
||||||
|
|
||||||
# Check Character blacklists
|
# Check Character blacklists
|
||||||
characters = [re.escape(x) for x in evechars.values_list('name', flat=True)]
|
characters = [re.escape(x) for x in evechars.values_list('name', flat=True) if x]
|
||||||
if len(characters):
|
if len(characters):
|
||||||
objs = bl_items.filter(type=BLACKLIST_TYPE_CHARACTER, value__iregex=r'(' + '|'.join(characters) + ')')
|
objs = bl_items.filter(type=BLACKLIST_TYPE_CHARACTER, value__iregex=r'(' + '|'.join(characters) + ')')
|
||||||
blacklist.extend(objs)
|
blacklist.extend(objs)
|
||||||
|
|
||||||
# Check Corporation blacklists
|
# Check Corporation blacklists
|
||||||
corporations = [re.escape(x) for x in evechars.values_list('corporation__name', flat=True)]
|
corporations = [re.escape(x) for x in evechars.values_list('corporation__name', flat=True) if x]
|
||||||
if len(corporations):
|
if len(corporations):
|
||||||
objs = bl_items.filter(type=BLACKLIST_TYPE_CORPORATION, value__iregex=r'(' + '|'.join(corporations) + ')')
|
objs = bl_items.filter(type=BLACKLIST_TYPE_CORPORATION, value__iregex=r'(' + '|'.join(corporations) + ')')
|
||||||
blacklist.extend(objs)
|
blacklist.extend(objs)
|
||||||
|
|||||||
Reference in New Issue
Block a user