X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/f5aec86546a7762dd0202f3983de22fe1c3814e9..74feb80e6c7ec874de2b7a32d4d7b727b0fb808d:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index e00d013..85160c1 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [2],
+	'compatible': [0],
 	'depends': [],
 	'softdeps': ['help'],
 }
@@ -26,10 +26,9 @@ from collections import deque
 @lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
 @lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
-	for botitem in bot.parent.bots.itervalues():
-		for chan in botitem.chans:
-			chan.fastmsg("Bot is restarting! %s" % ' '.join(args))
-		bot.conn.send("QUIT :Restarting.")
+	quitmsg = ' '.join(args)
+	for botitem in bot.parent.bots.values():
+		bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
 	sys.exit(0)
 	os._exit(0)
 
@@ -72,7 +71,7 @@ def modreload(bot, user, chan, realtarget, *args):
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
 	mods = ctlmod.modules
-	for modname, mod in mods.iteritems():
+	for modname, mod in mods.items():
 		bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
 	bot.msg(user, "Done.")
 
@@ -129,8 +128,8 @@ def auth(bot, user, chan, realtarget, *args):
 def qstat(bot, user, chan, realtarget, *args):
 	bot.fastmsg(user, "Regular: %d -- Slow: %d" % (len(bot.msgqueue), len(bot.slowmsgqueue)))
 
-@lib.hook(needchan=False, glevel=lib.ADMIN)
-@lib.help(('qclear','clearq','clearqueue'), "[regular|slow]", "clears both or a specific msgqueue")
+@lib.hook(('qclear','cq','clearq','clearqueue'), needchan=False, glevel=lib.ADMIN)
+@lib.help("[regular|slow]", "clears both or a specific msgqueue")
 def qclear(bot, user, chan, realtarget, *args):
 	if len(args) == 0:
 		bot.msgqueue = deque()
@@ -145,3 +144,19 @@ def qclear(bot, user, chan, realtarget, *args):
 			bot.fastmsg(user, "Syntax: QCLEAR [regular|slow]")
 			return #short-circuit
 		bot.fastmsg(user, "Cleared that msgqueue.")
+
+@lib.hook(needchan=False, wantchan=True, glevel=lib.ADMIN)
+@lib.help("<nick> <message>", "inject a line as though it came from <nick>", "note that this injects lines, not commands", "ex: INJECT DimeCadmium !WHOAMI")
+def inject(bot, user, chan, realtarget, *args):
+	targetuser = bot.parent.user(args[0], create=False)
+	if targetuser is None:
+		bot.msg(user, "User is unknown.")
+		return
+	if targetuser.glevel > user.glevel:
+		bot.msg(user, "That user has a higher access level than you.")
+		return
+
+	if chan is not None:
+		bot.parsemsg(bot.parent.user(args[0], create=False), str(chan), ' '.join(args[1:]))
+	else:
+		bot.parsemsg(bot.parent.user(args[0], create=False), str(bot), ' '.join(args[1:]))