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

Resolve conflicts against master.

Browse source
This commit is contained in:
Griatch 2017-02-11 18:17:04 +01:00
parent 91ffde5eaf
commit 831b1567ae
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/server/inputfuncs.py
View file

@ -105,7 +105,7 @@ def bot_data_in(session, *args, **kwargs):
return
kwargs.pop("options", None)
# Trigger the execute_cmd method of the corresponding bot.
session.player.execute_cmd(text=txt, session=session)
session.player.execute_cmd(session=session, text=txt, **kwargs)
session.update_session_counters()

6
evennia/server/portal/irc.py
View file

@ -178,7 +178,7 @@ class IRCBot(irc.IRCClient, Session):
if not msg.startswith('***'):
user = user.split('!', 1)[0]
user = ansi.raw(user)
self.data_in("%s@%s: %s" % (user, channel, msg))
self.data_in(text=msg, type="msg", user=user, channel=channel)
def action(self, user, channel, msg):
"""
@ -192,7 +192,7 @@ class IRCBot(irc.IRCClient, Session):
"""
if not msg.startswith('**'):
user = user.split('!', 1)[0]
self.data_in("%s@%s %s" % (user, channel, msg))
self.data_in(text=msg, type="action", user=user, channel=channel)
def data_in(self, text=None, **kwargs):
"""
@ -204,7 +204,7 @@ class IRCBot(irc.IRCClient, Session):
"""
self.sessionhandler.data_in(self, bot_data_in=text, **kwargs)
self.sessionhandler.data_in(self, bot_data_in=text)
def send_text(self, *args, **kwargs):
"""