X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/52e1dab311754ecea2966e974507605c69fe321d..cf400e0917f9b214cd7642e410ac0a13a9a8c726:/modules/msg.py?ds=sidebyside

diff --git a/modules/msg.py b/modules/msg.py
index 1df017c..68ca951 100644
--- a/modules/msg.py
+++ b/modules/msg.py
@@ -1,11 +1,12 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,2],
+	'compatible': [0],
 	'depends': [],
 	'softdeps': ['help'],
 }
@@ -19,10 +20,10 @@ modstop = lib.modstop
 # module code
 import time
 
-@lib.hook(clevel=lib.OP)
+@lib.hook(('say','cmsg'), clevel=lib.OP)
 @lib.help('<message>', 'sends message to channel')
 @lib.argsGE(1)
-def cmsg(bot, user, chan, realtarget, *args):
+def say(bot, user, chan, realtarget, *args):
 	chan.msg(' '.join(args))
 
 
@@ -30,7 +31,6 @@ def _getbot(bot, user, chan, realtarget, *args):
 	target = None
 	if args[0].startswith("#"):
 		target = bot.parent.channel(args[0])
-	if target is not None:
 		sendbot = target.bot
 	else:
 		target = args[0]
@@ -54,9 +54,9 @@ def pmsg(bot, user, chan, realtarget, *args):
 @lib.argsEQ(1)
 def moo(bot, user, chan, realtarget, *args):
 	lines= ['          .=     ,        =.', "  _  _   /'/    )\\,/,/(_   \\ \\", '   `//-.|  (  ,\\\\)\\//\\)\\/_  ) |', "   //___\\   `\\\\\\/\\\\/\\/\\\\///'  /", ',-"~`-._ `"--\'_   `"""`  _ \\`\'"~-,_', '\\       `-.  \'_`.      .\'_` \\ ,-"~`/', " `.__.-'`/   (-\\        /-) |-.__,'", '   ||   |     \\O)  /^\\ (O/  |', '   `\\\\  |         /   `\\    /', '     \\\\  \\       /      `\\ /', "      `\\\\ `-.  /' .---.--.\\", "        `\\\\/`~(, '()      ('", '         /(O) \\\\   _,.-.,_)', "        //  \\\\ `\\'`      /", '       / |  ||   `""""~"`', "     /'  |__||", '           `o']
+	bots = list(bot.parent.bots.values())
 	for i in range(len(lines)):
-		sender = bot.parent.bots.values()[i%len(bot.parent.bots.values())]
+		sender = bots[i%len(bots)]
 		mylen = len(sender.nick)
 		padding = 15-mylen
 		sender.fastmsg(args[0], " "*padding + lines[i])
-		time.sleep(0.1)