X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/68dff4aa28dc38d341c65b3f9a055d395f9fb5c7..2564f20844e0fdd2354f0cb94599eddc93d6e41a:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index aac0257..5afae81 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -99,7 +99,7 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 	else:
 		fmt += " (not staff)"
 
-	if showclevel and chan is not None:
+	if (showclevel or showglevel) and chan is not None:
 		clev = chan.levelof(user.auth)
 		if clev >= 1:
 			fillers['clevel'] = (lib.clevs[clev] if clev < len(lib.clevs) else clev)
@@ -154,19 +154,3 @@ 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:]))