Merge pull request CloudBotIRC#111 from linuxdaemon/gonzobot+admin-cleanup

Handful of cleanup for admin_channel.py

Author: edwardslabs

plugins/admin_channel.py

@@ -1,95 +1,126 @@
 from cloudbot import hook
 
 
+def check_for_chan_mode(char, conn):
+    serv_info = conn.memory["server_info"]
+    modes = serv_info.get("channel_modes", "")
+    return bool(char in modes)
+
+
 def mode_cmd(mode, text, text_inp, chan, conn, notice, nick, admin_log):
     """ generic mode setting function """
+    if not check_for_chan_mode(mode[1], conn):
+        return False
+
     split = text_inp.split(" ")
     if split[0].startswith("#"):
         channel = split[0]
         target = split[1]
-        notice("Attempting to {} {} in {}...".format(text, target, channel))
-        admin_log("{} used {} to set {} on {} in {}.".format(nick, text, mode, target, channel))
-        conn.send("MODE {} {} {}".format(channel, mode, target))
     else:
         channel = chan
         target = split[0]
-        notice("Attempting to {} {} in {}...".format(text, target, channel))
-        admin_log("{} used {} to set {} on {} in {}.".format(nick, text, mode, target, channel))
-        conn.send("MODE {} {} {}".format(channel, mode, target))
+
+    notice("Attempting to {} {} in {}...".format(text, target, channel))
+    admin_log("{} used {} to set {} on {} in {}.".format(nick, text, mode, target, channel))
+    conn.send("MODE {} {} {}".format(channel, mode, target))
+
+    return True
 
 
 def mode_cmd_no_target(mode, text, text_inp, chan, conn, notice, nick, admin_log):
     """ generic mode setting function without a target"""
+    if not check_for_chan_mode(mode[1], conn):
+        return False
+
     split = text_inp.split(" ")
     if split[0].startswith("#"):
         channel = split[0]
-        notice("Attempting to {} {}...".format(text, channel))
-        admin_log("{} used {} to set {} in {}.".format(nick, text, mode, channel))
-        conn.send("MODE {} {}".format(channel, mode))
     else:
         channel = chan
-        notice("Attempting to {} {}...".format(text, channel))
-        admin_log("{} used {} to set {} in {}.".format(nick, text, mode, channel))
-        conn.send("MODE {} {}".format(channel, mode))
+
+    notice("Attempting to {} {}...".format(text, channel))
+    admin_log("{} used {} to set {} in {}.".format(nick, text, mode, channel))
+    conn.send("MODE {} {}".format(channel, mode))
+    return True
+
+
+def do_extban(char, text, text_inp, chan, conn, notice, nick, admin_log, adding=True):
+    serv_info = conn.memory["server_info"]
+    if char not in serv_info.get("extbans", ""):
+        return False
+
+    extban_pfx = serv_info["extban_prefix"]
+
+    split = text_inp.split(" ")
+    if split[0].startswith("#"):
+        channel = split[0]
+        target = split[1]
+        text_inp = "{} {}{}:{}".format(channel, extban_pfx, char, target)
+    else:
+        target = split[0]
+        text_inp = "{}{}:{}".format(extban_pfx, char, target)
+
+    mode_cmd("+b" if adding else "-b", text, text_inp, chan, conn, notice, nick, admin_log)
+    return True
 
 
-@hook.command(permissions=["op_ban", "op"])
+@hook.command(permissions=["op_ban", "op", "chanop"])
 def ban(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - bans <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("+b", "ban", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_ban", "op"])
+@hook.command(permissions=["op_ban", "op", "chanop"])
 def unban(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - unbans <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("-b", "unban", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_quiet", "op"])
+@hook.command(permissions=["op_quiet", "op", "chanop"])
 def quiet(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - quiets <user> in [channel], or in the caller's channel if no channel is specified"""
-    if conn.name == "snoonet":
-        out = "mode {} +b m:{}".format(chan, text)
-        conn.send(out)
+    if mode_cmd("+q", "quiet", text, chan, conn, notice, nick, admin_log):
         return
-    mode_cmd("+q", "quiet", text, chan, conn, notice, nick, admin_log)
 
+    if not do_extban('m', "quiet", text, chan, conn, notice, nick, admin_log, True):
+        notice("Unable to set +q or a mute extban on this network.")
 
-@hook.command(permissions=["op_quiet", "op"])
+
+@hook.command(permissions=["op_quiet", "op", "chanop"])
 def unquiet(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - unquiets <user> in [channel], or in the caller's channel if no channel is specified"""
-    if conn.name == "snoonet":
-        out = "mode {} -b m:{}".format(chan, text)
-        conn.send(out)
+    if mode_cmd("-q", "unquiet", text, chan, conn, notice, nick, admin_log):
         return
-    mode_cmd("-q", "unquiet", text, chan, conn, notice, nick, admin_log)
+
+    if not do_extban('m', "unquiet", text, chan, conn, notice, nick, admin_log, False):
+        notice("Unable to unset +q or a mute extban on this network.")
 
 
-@hook.command(permissions=["op_voice", "op"])
+@hook.command(permissions=["op_voice", "op", "chanop"])
 def voice(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - voices <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("+v", "voice", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_voice", "op"])
+@hook.command(permissions=["op_voice", "op", "chanop"])
 def devoice(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - devoices <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("-v", "devoice", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_op", "op"])
+@hook.command(permissions=["op_op", "op", "chanop"])
 def op(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - ops <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("+o", "op", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_op", "op"])
+@hook.command(permissions=["op_op", "op", "chanop"])
 def deop(text, conn, chan, notice, nick, admin_log):
     """[channel] <user> - deops <user> in [channel], or in the caller's channel if no channel is specified"""
     mode_cmd("-o", "deop", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_topic", "op"])
+@hook.command(permissions=["op_topic", "op", "chanop"])
 def topic(text, conn, chan, nick, admin_log):
     """[channel] <topic> - changes the topic to <topic> in [channel], or in the caller's channel
      if no channel is specified"""
@@ -104,7 +135,7 @@ def topic(text, conn, chan, nick, admin_log):
     conn.send("TOPIC {} :{}".format(chan, msg))
 
 
-@hook.command(permissions=["op_kick", "op"])
+@hook.command(permissions=["op_kick", "op", "chanop"])
 def kick(text, chan, conn, notice, nick, admin_log):
     """[channel] <user> - kicks <user> from [channel], or from the caller's channel if no channel is specified"""
     split = text.split(" ")
@@ -131,7 +162,7 @@ def kick(text, chan, conn, notice, nick, admin_log):
     conn.send(out)
 
 
-@hook.command(permissions=["op_rem", "op"])
+@hook.command(permissions=["op_rem", "op", "chanop"])
 def remove(text, chan, conn, nick, admin_log):
     """<user> - force removes <user> from the caller's channel."""
     split = text.split(" ")
@@ -145,25 +176,25 @@ def remove(text, chan, conn, nick, admin_log):
     conn.send(out)
 
 
-@hook.command(permissions=["op_mute", "op"], autohelp=False)
+@hook.command(permissions=["op_mute", "op", "chanop"], autohelp=False)
 def mute(text, conn, chan, notice, nick, admin_log):
     """[channel] - mutes [channel], or in the caller's channel if no channel is specified"""
     mode_cmd_no_target("+m", "mute", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_mute", "op"], autohelp=False)
+@hook.command(permissions=["op_mute", "op", "chanop"], autohelp=False)
 def unmute(text, conn, chan, notice, nick, admin_log):
     """[channel] - unmutes [channel], or in the caller's channel if no channel is specified"""
     mode_cmd_no_target("-m", "unmute", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_lock", "op"], autohelp=False)
+@hook.command(permissions=["op_lock", "op", "chanop"], autohelp=False)
 def lock(text, conn, chan, notice, nick, admin_log):
     """[channel] - locks [channel], or in the caller's channel if no channel is specified"""
     mode_cmd_no_target("+i", "lock", text, chan, conn, notice, nick, admin_log)
 
 
-@hook.command(permissions=["op_lock", "op"], autohelp=False)
+@hook.command(permissions=["op_lock", "op", "chanop"], autohelp=False)
 def unlock(text, conn, chan, notice, nick, admin_log):
     """[channel] - unlocks [channel], or in the caller's channel if no channel is specified"""
     mode_cmd_no_target("-i", "unlock", text, chan, conn, notice, nick, admin_log)

plugins/server_info.py plugins/core/server_info.pyplugins/server_info.py renamed to plugins/core/server_info.py

@@ -58,6 +58,12 @@ def handle_chan_modes(value, serv_info):
             modelist[mode] = ChanMode(mode, types[i])
 
 
+def handle_extbans(value, serv_info):
+    pfx, extbans = value.split(',', 1)
+    serv_info["extbans"] = extbans
+    serv_info["extban_prefix"] = pfx
+
+
 @hook.irc_raw('005', singlethread=True)
 def on_isupport(conn, irc_paramlist):
     serv_info = conn.memory["server_info"]
@@ -71,3 +77,5 @@ def on_isupport(conn, irc_paramlist):
             handle_prefixes(value, serv_info)
         elif name == "CHANMODES":
             handle_chan_modes(value, serv_info)
+        elif name == "EXTBAN":
+            handle_extbans(value, serv_info)