diff --git a/plugins/admin.py b/plugins/admin.py index 4f0b3a9..0568abd 100755 --- a/plugins/admin.py +++ b/plugins/admin.py @@ -91,16 +91,16 @@ def say(inp, conn=None, chan=None, notice=None): ".say [channel] -- Makes the bot say in [channel]. "\ "If [channel] is blank the bot will say the in "\ "the channel the command was used in." - split = inp.split(" ") - if split[0][0] == "#": + inp = inp.split(" ") + if inp[0][0] == "#": message = "" - for x in split[1:]: + for x in inp[1:]: message = message + x + " " message = message[:-1] - out = "PRIVMSG %s :%s" % (split[0], message) + out = "PRIVMSG %s :%s" % (inp[0], message) else: message = "" - for x in split[0:]: + for x in inp[0:]: message = message + x + " " message = message[:-1] out = "PRIVMSG %s :%s" % (chan, message) @@ -113,16 +113,16 @@ def me(inp, conn=None, chan=None, notice=None): ".me [channel] -- Makes the bot act out in [channel] "\ "If [channel] is blank the bot will act the in "\ "the channel the command was used in." - split = inp.split(" ") - if split[0][0] == "#": + inp = inp.split(" ") + if inp[0][0] == "#": message = "" - for x in split[1:]: + for x in inp[1:]: message = message + x + " " message = message[:-1] - out = "PRIVMSG %s :\x01ACTION %s\x01" % (split[0], message) + out = "PRIVMSG %s :\x01ACTION %s\x01" % (inp[0], message) else: message = "" - for x in split[0:]: + for x in inp[0:]: message = message + x + " " message = message[:-1] out = "PRIVMSG %s :\x01ACTION %s\x01" % (chan, message) diff --git a/plugins/op.py b/plugins/op.py index e7a7e67..c11be31 100644 --- a/plugins/op.py +++ b/plugins/op.py @@ -1,28 +1,29 @@ -# Plugin made by iloveportalz0r, TheNoodle, Lukeroge and neersighted +# Plugin made by Lukeroge and neersighted from util import hook + @hook.command(adminonly=True) def kick(inp, chan=None, conn=None, notice=None): ".kick [channel] [reason] -- Makes the bot kick in [channel] "\ "If [channel] is blank the bot will kick the in "\ "the channel the command was used in." - split = inp.split(" ") - if split[0][0] == "#": - chan = split[0] - user = split[1] + inp = inp.split(" ") + if inp[0][0] == "#": + chan = inp[0] + user = inp[1] out = "KICK %s %s" % (chan, user) - if len(split) > 2: + if len(inp) > 2: reason = "" - for x in split[2:]: + for x in inp[2:]: reason = reason + x + " " reason = reason[:-1] out = out + " :" + reason else: - user = split[0] - out = "KICK %s %s" % (chan, split[0]) - if len(split) > 1: + user = inp[0] + out = "KICK %s %s" % (chan, user) + if len(inp) > 1: reason = "" - for x in split[1:]: + for x in inp[1:]: reason = reason + x + " " reason = reason[:-1] out = out + " :" + reason @@ -30,12 +31,78 @@ def kick(inp, chan=None, conn=None, notice=None): notice("Attempting to kick %s from %s..." % (user, chan)) conn.send(out) + +@hook.command(adminonly=True) +def ban(inp, conn=None, chan=None, notice=None): + ".ban [channel] -- Makes the bot ban in [channel]. "\ + "If [channel] is blank the bot will ban in "\ + "the channel the command was used in." + inp = inp.split(" ") + if inp[0][0] == "#": + chan = inp[0] + user = inp[1] + out = "MODE %s +b %s" % (chan, user) + else: + user = inp[0] + out = "MODE %s +b %s" % (chan, user) + notice("Attempting to ban %s from %s..." % (user, chan)) + conn.send(out) + + +@hook.command(adminonly=True) +def unban(inp, conn=None, chan=None, notice=None): + ".unban [channel] -- Makes the bot unban in [channel]. "\ + "If [channel] is blank the bot will unban in "\ + "the channel the command was used in." + inp = inp.split(" ") + if inp[0][0] == "#": + chan = inp[0] + user = inp[1] + out = "MODE %s -b %s" % (chan, user) + else: + user = inp[0] + out = "MODE %s -b %s" % (chan, user) + notice("Attempting to unban %s from %s..." % (user, chan)) + conn.send(out) + +@hook.command(adminonly=True) +def kickban(inp, chan=None, conn=None, notice=None): + ".kickban [channel] [reason] -- Makes the bot kickban in [channel] "\ + "If [channel] is blank the bot will kickban the in "\ + "the channel the command was used in." + inp = inp.split(" ") + if inp[0][0] == "#": + chan = inp[0] + user = inp[1] + out1 = "MODE %s +b %s" % (chan, user) + out2 = "KICK %s %s" % (chan, user) + if len(inp) > 2: + reason = "" + for x in inp[2:]: + reason = reason + x + " " + reason = reason[:-1] + out = out + " :" + reason + else: + user = inp[0] + out1 = "MODE %s +b %s" % (chan, user) + out2 = "KICK %s %s" % (chan, user) + if len(inp) > 1: + reason = "" + for x in inp[1:]: + reason = reason + x + " " + reason = reason[:-1] + out = out + " :" + reason + + notice("Attempting to kickban %s from %s..." % (user, chan)) + conn.send(out1) + conn.send(out2) + @hook.command(adminonly=True) def topic(inp, conn=None, chan=None, notice=None): ".topic [channel] -- Change the topic of a channel." - split = inp.split(" ") - if split[0][0] == "#": - out = "PRIVMSG %s :%s" % (split[0], message) + inp = inp.split(" ") + if inp[0][0] == "#": + out = "PRIVMSG %s :%s" % (inp[0], message) else: out = "TOPIC %s :%s" % (chan, message) conn.send(out)