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

Make contrib.rpsystem's recogs protected from empty strings in the same way as sdescs

Browse source
This commit is contained in:
Griatch 2016-08-31 23:24:47 +02:00
parent 6730e990b2
commit 164a28308c
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/contrib/rpsystem.py
View file

@ -574,11 +574,12 @@ class SdescHandler(object):
_RE_LANGUAGE.sub(r"", _RE_LANGUAGE.sub(r"",
_RE_OBJ_REF_START.sub(r"", sdesc))))) _RE_OBJ_REF_START.sub(r"", sdesc)))))
if not sdesc:
raise SdescError("Short desc cannot be empty.")
# make an sdesc clean of ANSI codes # make an sdesc clean of ANSI codes
cleaned_sdesc = ansi.strip_ansi(sdesc) cleaned_sdesc = ansi.strip_ansi(sdesc)
if not cleaned_sdesc:
raise SdescError("Short desc cannot be empty.")
if len(cleaned_sdesc) > max_length: if len(cleaned_sdesc) > max_length:
raise SdescError("Short desc can max be %i chars long (was %i chars)." % (max_length, len(cleaned_sdesc))) raise SdescError("Short desc can max be %i chars long (was %i chars)." % (max_length, len(cleaned_sdesc)))
@ -680,8 +681,12 @@ class RecogHandler(object):
# make an recog clean of ANSI codes # make an recog clean of ANSI codes
cleaned_recog = ansi.strip_ansi(recog) cleaned_recog = ansi.strip_ansi(recog)
if not cleaned_recog:
raise SdescError("Recog string cannot be empty.")
if len(cleaned_recog) > max_length: if len(cleaned_recog) > max_length:
raise RecogError("Too long recog") raise RecogError("Recog string cannot be longer than %i chars (was %i chars)" % (max_length, len(cleaned_recog)))
# mapping #dbref:obj # mapping #dbref:obj
key = "#%i" % obj.id key = "#%i" % obj.id
@ -1020,7 +1025,11 @@ class CmdRecog(RPCommand): # assign personal alias to object in room
caller.msg("%s will know only '%s'." % (caller.key, obj.recog.get(obj))) caller.msg("%s will know only '%s'." % (caller.key, obj.recog.get(obj)))
else: else:
sdesc = obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key sdesc = obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key
alias = caller.recog.add(obj, alias) try:
alias = caller.recog.add(obj, alias)
except RecogError, err:
caller.msg(err)
return
caller.msg("%s will now remember {w%s{n as {w%s{n." % (caller.key, sdesc, alias)) caller.msg("%s will now remember {w%s{n as {w%s{n." % (caller.key, sdesc, alias))