X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/a62d0d18bbb5926d22df18db5eba53eb21a10817..193806d55ffc8ca4497a79a03a644f60fa5163ac:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index 572853d..884b82b 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,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):
+	quitmsg = ' '.join(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.")
+		bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
 	sys.exit(0)
 	os._exit(0)
 
@@ -44,7 +43,7 @@ def modload(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Error loading %s: %r" % (args[0], okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
-@lib.help("<mod>", "unloads a module")
+@lib.help("<mod> [FORCE]", "unloads a module", "will refuse to unload a module which is depended on by others", "unless you specify FORCE.")
 @lib.argsGE(1)
 def modunload(bot, user, chan, realtarget, *args):
 	if len(ctlmod.dependents[args[0]]) > 0:
@@ -99,17 +98,21 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 			fmt += " (not a channel user)"
 	return fmt % fillers
 
-@lib.hook(needchan=False)
-@lib.help("<user>", "shows who someone is")
+@lib.hook(needchan=False, wantchan=True)
+@lib.help("<user|#auth>", "shows who someone is")
 @lib.argsEQ(1)
 def whois(bot, user, chan, realtarget, *args):
-	target = bot.parent.user(args[0], create=False)
+	name = args[0]
+	if name.startswith("#"):
+		target = bot.parent.User(name, name[1:])
+	else:
+		target = bot.parent.user(name, create=False)
 	if target is None:
 		bot.msg(user, "I don't know %s." % (args[0]))
 	else:
 		bot.msg(user, "%s is %s" % (args[0], _whois(target, chan, (user.glevel >= 1), (chan is not None and chan.levelof(user.auth) >= 1))))
 
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help(None, "shows who you are")
 def whoami(bot, user, chan, realtarget, *args):
 	bot.msg(user, "You are %s" % (_whois(user, chan)))
@@ -125,7 +128,7 @@ 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.hook(('qclear','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:
@@ -141,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:]))