aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jesopo2016-04-04 12:36:23 +0100
committerGravatar jesopo2016-04-04 12:36:23 +0100
commit9567ad478475b729e72c7873373f9f895cdb54e3 (patch)
tree6da2d2627e39cd64edadfa693281e6e6d3dc3323
parentfixed some dumb typos (diff)
added some more mode event firing and removed unneeded debug printing.
-rw-r--r--IRCLineHandler.py10
-rw-r--r--IRCServer.py2
2 files changed, 5 insertions, 7 deletions
diff --git a/IRCLineHandler.py b/IRCLineHandler.py
index df06cba0..e5ad807c 100644
--- a/IRCLineHandler.py
+++ b/IRCLineHandler.py
@@ -196,7 +196,8 @@ def handle_MODE():
channel = server.get_channel(target)
remove = False
args = line_split[4:]
- for i, char in enumerate(line_split[3]):
+ modes = line_split[3]
+ for i, char in enumerate(modes):
if char == "+":
remove = False
elif char == "-":
@@ -216,8 +217,8 @@ def handle_MODE():
else:
args.pop(0)
bot.events.on("received").on("mode").call(
- line=line, line_split=line_split, server=server, bot=bot,
- modes=modes, args=args, channel=channel)
+ line=line, line_split=line_split, server=server, modes=modes,
+ args=args, channel=channel)
elif server.is_own_nickname(target):
modes = Utils.remove_colon(line_split[3])
remove = False
@@ -232,8 +233,7 @@ def handle_MODE():
else:
server.add_own_mode(char)
bot.events.on("self").on("mode").call(
- line=line, line_split=line_split, server=server, bot=bot,
- modes=modes)
+ line=line, line_split=line_split, server=server, modes=modes)
@handler(description="I've been invited somewhere")
def handle_INVITE():
nickname, username, hostname = Utils.seperate_hostmask(line_split[0])
diff --git a/IRCServer.py b/IRCServer.py
index 04d0695a..054eb86c 100644
--- a/IRCServer.py
+++ b/IRCServer.py
@@ -193,8 +193,6 @@ class Server(object):
if action:
message = message.split("\01ACTION ", 1)[1][:-1]
if self.has_channel(target):
- print("logging line:")
- print("channel: %s" % target)
self.get_channel(target).log.add_line(None, message, action, True)
else:
self.get_user(target).log.add_line(None, message, action, True)