From d84ff8ff852679648e90e53ba23b34b4740df647 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 26 Oct 2021 22:06:58 +0200 Subject: [PATCH 1/3] Fix DefaultObject.search. Resolve #2264. --- evennia/objects/objects.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 660dc4de01..0f7bfa7ced 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -386,13 +386,16 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase): searchdata (str or obj): Primary search criterion. Will be matched against `object.key` (with `object.aliases` second) unless the keyword attribute_name specifies otherwise. - **Special strings:** + + Special strings: + - `#`: search by unique dbref. This is always a global search. - `me,self`: self-reference to this object - `-` - can be used to differentiate between multiple same-named matches. The exact form of this input is given by `settings.SEARCH_MULTIMATCH_REGEX`. + global_search (bool): Search all objects globally. This overrules 'location' data. use_nicks (bool): Use nickname-replace (nicktype "object") on `searchdata`. typeclass (str or Typeclass, or list of either): Limit search only @@ -432,8 +435,9 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase): otherwise. Returns: - match (Object, None or list): will return an Object/None if `quiet=False`, - otherwise it will return a list of 0, 1 or more matches. + Object, None or list: Will return an `Object` or `None` if `quiet=False`. Will return a + list with 0, 1 or more matches if `quiet=True`. If `stacked` is a positive integer, this + list may contain all stacked identical matches. Notes: To find Accounts, use eg. `evennia.account_search`. If From 419f96e3de5915af4ed4adf30093cfb3416d1552 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 26 Oct 2021 22:33:25 +0200 Subject: [PATCH 2/3] Fix version number in build file --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index de24e9e56d..9fd56749d7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -19,7 +19,7 @@ author = "The Evennia developer community" # The full Evennia version covered by these docs, including alpha/beta/rc tags # This will be used for multi-version selection options. -release = "0.95" +release = "0.9.5" # -- General configuration --------------------------------------------------- From 9c210b3a50a290af65e22c942e2aa39143a425d3 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 31 Oct 2021 20:18:20 +0100 Subject: [PATCH 3/3] Add GMCP Client.GUI inputfunc to avoid issues with Mudlet --- evennia/server/inputfuncs.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py index 47c36f9816..7a57d97ecd 100644 --- a/evennia/server/inputfuncs.py +++ b/evennia/server/inputfuncs.py @@ -610,9 +610,18 @@ def msdp_send(session, *args, **kwargs): # client specific -def external_discord_hello(session, *args, **kwargs): +def _not_implemented(session, *args, **kwargs): """ - Sent by Mudlet as a greeting; added here to avoid - logging a missing inputfunc for it. + Dummy used to swallow missing-inputfunc errors for + common clients. """ pass + + +# GMCP External.Discord.Hello is sent by Mudlet as a greeting +# (see https://wiki.mudlet.org/w/Manual:Technical_Manual) +external_discord_hello = _not_implemented + + +# GMCP Client.Gui is sent by Mudlet for gui setup. +client_gui = _not_implemented