Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-22 07:46:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter direct-match search by candidates

Browse source
This commit is contained in:
InspectorCaracal 2024-12-02 18:13:40 -07:00 • committed by GitHub
parent 1ad1cf9fc1
commit 989deafb92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
evennia/objects/objects.py
View file

@ -549,11 +549,12 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
"""
if isinstance(searchdata, str):
candidates = kwargs.get("candidates", [])
match searchdata.lower():
case "me" | "self":
return True, self
return self in candidates, self
case "here":
return True, self.location
return self.location in candidates, self.location
return False, searchdata
def get_search_candidates(self, searchdata, **kwargs):
@ -833,8 +834,14 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
# replace incoming searchdata string with a potentially modified version
searchdata = self.get_search_query_replacement(searchdata, **input_kwargs)
# get candidates
candidates = self.get_search_candidates(searchdata, **input_kwargs)
# handle special input strings, like "me" or "here".
should_return, searchdata = self.get_search_direct_match(searchdata, **input_kwargs)
# we also want to include the identified candidates here instead of input, to account for defaults
should_return, searchdata = self.get_search_direct_match(
searchdata, **(input_kwargs | {"candidates": candidates})
)
if should_return:
# we got an actual result, return it immediately
return [searchdata] if quiet else searchdata
@ -854,9 +861,6 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
# always use exact match for dbref/global searches
exact = True if global_search or dbref(searchdata) else exact
# get candidates
candidates = self.get_search_candidates(searchdata, **input_kwargs)
# do the actual search
results = self.get_search_result(
searchdata,