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

Cleaned up all commands of the player type to correctly relay their msg-data only to their assigned session.

Browse source
This commit is contained in:
Griatch 2013-04-12 13:59:15 +02:00
parent a6544f2848
commit b58a464409
4 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/commands/default/cmdset_player.py
View file

@ -4,6 +4,9 @@ This is the cmdset for Player (OOC) commands. These are
stored on the Player object and should thus be able to handle getting stored on the Player object and should thus be able to handle getting
a Player object as caller rather than a Character. a Player object as caller rather than a Character.
Note - in order for session-rerouting (in MULTISESSION_MODE=2) to
function, all commands in this cmdset should use the self.msg()
command method rather than caller.msg().
""" """
from src.commands.cmdset import CmdSet from src.commands.cmdset import CmdSet
@ -26,11 +29,12 @@ class PlayerCmdSet(CmdSet):
self.add(player.CmdIC()) self.add(player.CmdIC())
self.add(player.CmdOOC()) self.add(player.CmdOOC())
self.add(player.CmdCharCreate()) self.add(player.CmdCharCreate())
self.add(player.CmdSessions())
self.add(player.CmdWho())
self.add(player.CmdEncoding()) self.add(player.CmdEncoding())
self.add(player.CmdQuit()) self.add(player.CmdQuit())
self.add(player.CmdPassword()) self.add(player.CmdPassword())
self.add(player.CmdColorTest()) self.add(player.CmdColorTest())
self.add(player.CmdSessions())
# testing # testing
self.add(building.CmdExamine()) self.add(building.CmdExamine())

71
src/commands/default/player.py
View file

@ -11,6 +11,10 @@ access the character when these commands are triggered with
a connected character (such as the case of the @ooc command), it a connected character (such as the case of the @ooc command), it
is None if we are OOC. is None if we are OOC.
Note that under MULTISESSION_MODE=2, Player- commands should use
self.msg() and similar methods to reroute returns to the correct
method. Otherwise all text will be returned to all connected sessions.
""" """
import time import time
from django.conf import settings from django.conf import settings
@ -301,12 +305,9 @@ class CmdSessions(MuxPlayerCommand):
# make sure we work on the player, not on the character # make sure we work on the player, not on the character
player = self.caller player = self.caller
if hasattr(player, "player"):
player = player.player
sessions = player.get_all_sessions() sessions = player.get_all_sessions()
table = [["sessid"], ["host"], ["character"], ["location"]] table = [["sessid"], ["host"], ["puppet/character"], ["location"]]
for sess in sorted(sessions, key=lambda x:x.sessid): for sess in sorted(sessions, key=lambda x:x.sessid):
sessid = sess.sessid sessid = sess.sessid
char = player.get_puppet(sessid) char = player.get_puppet(sessid)
@ -315,7 +316,7 @@ class CmdSessions(MuxPlayerCommand):
table[2].append(char and str(char) or "None") table[2].append(char and str(char) or "None")
table[3].append(char and str(char.location) or "N/A") table[3].append(char and str(char.location) or "N/A")
ftable = utils.format_table(table, 5) ftable = utils.format_table(table, 5)
string = "" string = "{wYour current session(s):{n"
for ir, row in enumerate(ftable): for ir, row in enumerate(ftable):
if ir == 0: if ir == 0:
string += "\n" + "{w%s{n" % ("".join(row)) string += "\n" + "{w%s{n" % ("".join(row))
@ -344,13 +345,13 @@ class CmdWho(MuxPlayerCommand):
Get all connected players by polling session. Get all connected players by polling session.
""" """
caller = self.caller player = self.caller
session_list = SESSIONS.get_sessions() session_list = SESSIONS.get_sessions()
if self.cmdstring == "doing": if self.cmdstring == "doing":
show_session_data = False show_session_data = False
else: else:
show_session_data = caller.check_permstring("Immortals") or caller.check_permstring("Wizards") show_session_data = player.check_permstring("Immortals") or player.check_permstring("Wizards")
if show_session_data: if show_session_data:
table = [["Player Name"], ["On for"], ["Idle"], ["Room"], ["Cmds"], ["Host"]] table = [["Player Name"], ["On for"], ["Idle"], ["Room"], ["Cmds"], ["Host"]]
@ -396,7 +397,7 @@ class CmdWho(MuxPlayerCommand):
else: else:
string += '\n%d players logged in.' % nplayers string += '\n%d players logged in.' % nplayers
caller.msg(string) self.msg(string)
class CmdEncoding(MuxPlayerCommand): class CmdEncoding(MuxPlayerCommand):
""" """
@ -427,21 +428,19 @@ class CmdEncoding(MuxPlayerCommand):
""" """
Sets the encoding. Sets the encoding.
""" """
caller = self.caller player = self.caller
if hasattr(caller, 'player'):
caller = caller.player
if 'clear' in self.switches: if 'clear' in self.switches:
# remove customization # remove customization
old_encoding = caller.db.encoding old_encoding = player.db.encoding
if old_encoding: if old_encoding:
string = "Your custom text encoding ('%s') was cleared." % old_encoding string = "Your custom text encoding ('%s') was cleared." % old_encoding
else: else:
string = "No custom encoding was set." string = "No custom encoding was set."
del caller.db.encoding del player.db.encoding
elif not self.args: elif not self.args:
# just list the encodings supported # just list the encodings supported
pencoding = caller.db.encoding pencoding = player.db.encoding
string = "" string = ""
if pencoding: if pencoding:
string += "Default encoding: {g%s{n (change with {w@encoding <encoding>{n)" % pencoding string += "Default encoding: {g%s{n (change with {w@encoding <encoding>{n)" % pencoding
@ -452,11 +451,11 @@ class CmdEncoding(MuxPlayerCommand):
string = "No encodings found." string = "No encodings found."
else: else:
# change encoding # change encoding
old_encoding = caller.db.encoding old_encoding = player.db.encoding
encoding = self.args encoding = self.args
caller.db.encoding = encoding player.db.encoding = encoding
string = "Your custom text encoding was changed from '%s' to '%s'." % (old_encoding, encoding) string = "Your custom text encoding was changed from '%s' to '%s'." % (old_encoding, encoding)
caller.msg(string.strip()) self.msg(string.strip())
class CmdPassword(MuxPlayerCommand): class CmdPassword(MuxPlayerCommand):
""" """
@ -473,28 +472,25 @@ class CmdPassword(MuxPlayerCommand):
def func(self): def func(self):
"hook function." "hook function."
caller = self.caller player = self.caller
if hasattr(caller, "player"):
caller = caller.player
if not self.rhs: if not self.rhs:
caller.msg("Usage: @password <oldpass> = <newpass>") self.msg("Usage: @password <oldpass> = <newpass>")
return return
oldpass = self.lhslist[0] # this is already stripped by parse() oldpass = self.lhslist[0] # this is already stripped by parse()
newpass = self.rhslist[0] # '' newpass = self.rhslist[0] # ''
try: try:
uaccount = caller.user uaccount = player.user
except AttributeError: except AttributeError:
caller.msg("This is only applicable for players.") self.msg("This is only applicable for players.")
return return
if not uaccount.check_password(oldpass): if not uaccount.check_password(oldpass):
caller.msg("The specified old password isn't correct.") self.msg("The specified old password isn't correct.")
elif len(newpass) < 3: elif len(newpass) < 3:
caller.msg("Passwords must be at least three characters long.") self.msg("Passwords must be at least three characters long.")
else: else:
uaccount.set_password(newpass) uaccount.set_password(newpass)
uaccount.save() uaccount.save()
caller.msg("Password changed.") self.msg("Password changed.")
class CmdQuit(MuxPlayerCommand): class CmdQuit(MuxPlayerCommand):
""" """
@ -514,10 +510,6 @@ class CmdQuit(MuxPlayerCommand):
def func(self): def func(self):
"hook function" "hook function"
# always operate on the player
if hasattr(self.caller, "player"):
player = self.caller.player
else:
player = self.caller player = self.caller
if 'all' in self.switches: if 'all' in self.switches:
@ -556,8 +548,9 @@ class CmdColorTest(MuxPlayerCommand):
def func(self): def func(self):
"Show color tables" "Show color tables"
player = self.caller
if not self.args or not self.args in ("ansi", "xterm256"): if not self.args or not self.args in ("ansi", "xterm256"):
self.caller.msg("Usage: @color ansi|xterm256") self.msg("Usage: @color ansi|xterm256")
return return
if self.args == "ansi": if self.args == "ansi":
@ -567,15 +560,15 @@ class CmdColorTest(MuxPlayerCommand):
# show all ansi color-related codes # show all ansi color-related codes
col1 = ["%s%s{n" % (code, code.replace("{","{{")) for code, _ in ap.ext_ansi_map[:-1]] col1 = ["%s%s{n" % (code, code.replace("{","{{")) for code, _ in ap.ext_ansi_map[:-1]]
hi = "%ch" hi = "%ch"
col2 = ["%s%s{n" % (code, code.replace("%", "%%")) for code, _ in ap.mux_ansi_map[:-2]] col2 = ["%s%s{n" % (code, code.replace("%", "%%")) for code, _ in ap.mux_ansi_map[3:-2]]
col3 = ["%s%s{n" % (hi+code, (hi+code).replace("%", "%%")) for code, _ in ap.mux_ansi_map[:-2]] col3 = ["%s%s{n" % (hi+code, (hi+code).replace("%", "%%")) for code, _ in ap.mux_ansi_map[3:-2]]
table = utils.format_table([col1, col2, col3], extra_space=1) table = utils.format_table([col1, col2, col3], extra_space=1)
string = "ANSI colors:" string = "ANSI colors:"
for row in table: for row in table:
string += "\n" + "".join(row) string += "\n" + "".join(row)
#print string #print string
self.caller.msg(string) self.msg(string)
self.caller.msg("{{X and %%cx are black-on-black)") self.msg("({{X and %%cx are black-on-black\n %%r - return, %%t - tab, %%b - space)")
elif self.args == "xterm256": elif self.args == "xterm256":
table = [[],[],[],[],[],[],[],[],[],[],[],[]] table = [[],[],[],[],[],[],[],[],[],[],[],[]]
for ir in range(6): for ir in range(6):
@ -588,10 +581,10 @@ class CmdColorTest(MuxPlayerCommand):
5-ir,5-ig,5-ib, 5-ir,5-ig,5-ib,
"{{b%i%i%i" % (ir,ig,ib))) "{{b%i%i%i" % (ir,ig,ib)))
table = utils.format_table(table) table = utils.format_table(table)
string = "Xterm256 colors:" string = "Xterm256 colors (if not all hues show, your client might not report that it can handle xterm256):"
for row in table: for row in table:
string += "\n" + "".join(row) string += "\n" + "".join(row)
self.caller.msg(string) self.msg(string)
self.caller.msg("(e.g. %%c123 and %%cb123 also work)") self.msg("(e.g. %%c123 and %%cb123 also work)")

6
src/typeclasses/models.py
View file

@ -1657,8 +1657,10 @@ class TypedObject(SharedMemoryModel):
This explicitly checks if we hold particular permission without involving This explicitly checks if we hold particular permission without involving
any locks. any locks.
""" """
if self.player and self.player.is_superuser: if hasattr(self, "player"):
return True if self.player and self.player.is_superuser: return True
else:
if self.is_superuser: return True
if not permstring: if not permstring:
return False return False

2
src/typeclasses/typeclass.py
View file

@ -25,7 +25,7 @@ _DA = object.__delattr__
# to *in-game* safety (if you can edit typeclasses you have # to *in-game* safety (if you can edit typeclasses you have
# full access anyway), so no protection against changing # full access anyway), so no protection against changing
# e.g. 'locks' or 'permissions' should go here. # e.g. 'locks' or 'permissions' should go here.
PROTECTED = ('id', 'dbobj', 'db', 'ndb', 'objects', 'typeclass', PROTECTED = ('id', 'dbobj', 'db', 'ndb', 'objects', 'typeclass', 'db_player', 'player',
'attr', 'save', 'delete', 'db_model_name','attribute_class', 'attr', 'save', 'delete', 'db_model_name','attribute_class',
'typeclass_paths') 'typeclass_paths')