From ad2e0ce0be7163a1cbd3696a2016439257e32959 Mon Sep 17 00:00:00 2001 From: Griatch Date: Wed, 4 Sep 2019 20:57:44 +0200 Subject: [PATCH] Make search_account also search by account alias. Resolve #1910 --- evennia/accounts/manager.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/evennia/accounts/manager.py b/evennia/accounts/manager.py index e8be5e41a7..25f93ffddc 100644 --- a/evennia/accounts/manager.py +++ b/evennia/accounts/manager.py @@ -169,9 +169,16 @@ class AccountDBManager(TypedObjectManager, UserManager): typeclass = "%s" % typeclass query["db_typeclass_path"] = typeclass if exact: - return self.filter(**query) + matches = self.filter(**query) else: - return self.filter(**query) + matches = self.filter(**query) + if not matches: + # try alias match + matches = self.filter( + db_tags__db_tagtype__iexact="alias", + **{"db_tags__db_key__iexact" if exact else "db_tags__db_key__icontains": ostring}) + return matches + # back-compatibility alias account_search = search_account