Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2849 from CloudKeeper/patch-2

Browse source 
Add 'search' lock for obj.search() and obj.get_visible_contents()
This commit is contained in:
Griatch 2022-09-11 11:25:03 +02:00 • committed by GitHub
commit 626e076d97
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/objects/objects.py
View file

@ -387,6 +387,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
quiet=False, quiet=False,
exact=False, exact=False,
candidates=None, candidates=None,
use_locks=True,
nofound_string=None, nofound_string=None,
multimatch_string=None, multimatch_string=None,
use_dbref=None, use_dbref=None,
@ -444,6 +445,8 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
is given. If not set, this list will automatically be defined is given. If not set, this list will automatically be defined
to include the location, the contents of location and the to include the location, the contents of location and the
caller's contents (inventory). caller's contents (inventory).
use_locks (bool): If True (default) - removes search results which
fail the "search" lock.
nofound_string (str): optional custom string for not-found error message. nofound_string (str): optional custom string for not-found error message.
multimatch_string (str): optional custom string for multimatch error header. multimatch_string (str): optional custom string for multimatch error header.
use_dbref (bool or None, optional): If `True`, allow to enter e.g. a query "#123" use_dbref (bool or None, optional): If `True`, allow to enter e.g. a query "#123"
@ -529,6 +532,9 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
use_dbref=use_dbref, use_dbref=use_dbref,
) )
if use_locks:
results = [x for x in list(results) if x.access(self, "search", default=True)]
nresults = len(results) nresults = len(results)
if stacked > 0 and nresults > 1: if stacked > 0 and nresults > 1:
# handle stacks, disable multimatch errors # handle stacks, disable multimatch errors
@ -1797,7 +1803,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
def get_visible_contents(self, looker, **kwargs): def get_visible_contents(self, looker, **kwargs):
""" """
Get all contents of this object that a looker can see (whatever that means, by default it Get all contents of this object that a looker can see (whatever that means, by default it
checks the 'view' lock), grouped by type. Helper method to return_appearance. checks the 'view' and 'search' locks), grouped by type. Helper method to return_appearance.
Args: Args:
looker (Object): The entity looking. looker (Object): The entity looking.
@ -1811,7 +1817,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
""" """
def filter_visible(obj_list): def filter_visible(obj_list):
return [obj for obj in obj_list if obj != looker and obj.access(looker, "view")] return [obj for obj in obj_list if obj != looker and obj.access(looker, "view") and obj.access(looker, "search", default=True)]
return { return {
"exits": filter_visible(self.contents_get(content_type="exit")), "exits": filter_visible(self.contents_get(content_type="exit")),