Merge remote-tracking branch 'refs/remotes/origin/cleanup'

Author: Motoko11

motobot/core_plugins/disable_module.py

@@ -3,7 +3,7 @@
 
 @request('GET_PLUGINS')
 def disabled_request(bot, context, channel):
-    disabled = context.database.get({}).get(channel.lower(), set())
+    disabled = context.database.get({}).get(channel.lower(), [])
     return filter_plugins(bot.plugins, disabled)
 
 
@@ -15,7 +15,31 @@ def filter_plugins(plugins, disabled):
     )
 
 
-@command('module', priority=Priority.max, level=IRCLevel.op)
+def get_modules(bot):
+    return [module for module in bot.modules if not module.startswith('motobot.core_plugins')]
+
+
+def user_module_command(bot, context, message, args):
+    try:
+        arg = args[1].lower()
+
+        if arg == ('enable', 'disable', 'show'):
+            response = "Error: You do not have the privileges to use this argument."
+        elif arg == 'list':
+            module = ' '.join(args[2:])
+            response = list_module(get_modules(bot), module)
+        elif arg == 'get':
+            module = ' '.join(args[2:])
+            response = get_module(get_modules(bot), module)
+        else:
+            response = "Error: Invalid argument."
+    except IndexError:
+        response = "Error: Too few arguments supplied."
+
+    return response, Notice(context.nick)
+
+
+@command('module', priority=Priority.max, level=IRCLevel.op, alt=user_module_command)
 def module_command(bot, context, message, args):
     """ Command to enable or disable modules in the bot.
 
@@ -33,15 +57,15 @@ def module_command(bot, context, message, args):
             response = enable_module(context.database, context.channel, module)
         elif arg == 'disable':
             module = ' '.join(args[2:])
-            response = disable_module(bot, context.database, context.channel, module)
+            response = disable_module(get_modules(bot), context.database, context.channel, module)
         elif arg == 'show':
             response = show_disabled_modules(context.database, context.channel)
         elif arg == 'list':
             module = ' '.join(args[2:])
-            response = list_module(bot, module)
+            response = list_module(get_modules(bot), module)
         elif arg == 'get':
             module = ' '.join(args[2:])
-            response = get_module(bot, module)
+            response = get_module(get_modules(bot), module)
         else:
             response = "Error: Invalid argument."
     except IndexError:
@@ -51,25 +75,57 @@ def module_command(bot, context, message, args):
 
 
 def enable_module(database, channel, module):
-    return "Error: Not yet implemented."
+    channel = channel.lower()
+    disabled_modules = database.get({})
+    disabled_channel_modules = disabled_modules.get(channel, [])
 
+    try:
+        disabled_channel_modules.remove(module)
+        disabled_modules[channel] = disabled_channel_modules
+        database.set(disabled_modules)
+        response = "{} is now enabled in {}.".format(module, channel)
+    except ValueError:
+        response = "{} was not disabled in {}.".format(module, channel)
+    return response
 
-def disable_module(bot, database, channel, module):
-    return "Error: Not yet implemented."
+
+def disable_module(modules, database, channel, module):
+    if module in modules:
+        channel = channel.lower()
+        disabled_modules = database.get({})
+        disabled_channel_modules = disabled_modules.get(channel, [])
+
+        if module in disabled_channel_modules:
+            response = "{} is already disabled in {}.".format(module, channel)
+        else:
+            disabled_channel_modules.append(module)
+            disabled_modules[channel] = disabled_channel_modules
+            database.set(disabled_modules)
+            response = "{} successfully disabled in {}.".format(module, channel)
+    else:
+        response = "{} is not a valid module.".format(module)
+
+    return response
 
 
 def show_disabled_modules(database, channel):
-    return "Error: Not yet implemented."
+    disabled_channel_modules = database.get({}).get(channel.lower(), [])
+    if disabled_channel_modules:
+        response = split_response(disabled_channel_modules,
+                                  "Disabled modules in {}: {};".format(channel, '{}'))
+    else:
+        response = "I have no modules disabled in {}.".format(channel)
+    return response
 
 
-def list_module(bot, module):
+def list_module(modules, module):
     if module:
-        pass
+        response = None  # TODO
     else:
-        response = split_response(bot.modules, "Modules: {};")
+        response = split_response(modules, "Modules: {};")
 
     return response
 
 
-def get_module(bot, module):
+def get_module(modules, module):
     return "Error: Not yet implemented."

motobot/core_plugins/ignore.py

@@ -1,58 +1,71 @@
-from motobot import command, sink, Priority, IRCLevel, Eat, Notice, split_response
+from motobot import command, sink, Priority, IRCLevel, Eat, Notice, split_response, hostmask_check
 
 
 @command('ignore', priority=Priority.max, level=IRCLevel.hop)
 def ignore_command(bot, context, message, args):
-    """ Manage ignores in a channel.
-
-    Valid arguments are: 'add', 'del', 'all, and 'show'.
-    'add' and 'del' require a nick argument.
-    'all' will toggle ignoring for the entire channel on and off.
-    'show' will show the currently ignored nicks in the channel.
-    """
-    response = ''
+    """ Ignore a nick or host mask in the current channel. """
     try:
-        arg = args[1].lower()
-        if arg == 'add':
-            response = add_ignore(context.database, context.channel, args[2])
-        elif arg == 'del' or arg == 'rem':
-            response = del_ignore(context.database, context.channel, args[2])
-        elif arg == 'all':
-            response = ignoreall(context.channel)
-        elif arg == 'show':
-            response = show_ignores(context.database, context.channel)
-        else:
-            response = 'Error: Invalid argument;'
+        response = add_ignore(context.database, context.channel, args[1])
     except IndexError:
-        response = "Not enough arguments provided."
+        response = "Error: Please provide a mask or nick to ignore."
     return response, Notice(context.nick)
 
 
+@command('unignore', priority=Priority.max, level=IRCLevel.hop)
+def unignore_command(bot, context, message, args):
+    """ Unignore a nick or host mask in the current channel. """
+    try:
+        response = del_ignore(context.database, context.channel, args[1])
+    except IndexError:
+        response = "Error: Please provide a mask or nick to unignore."
+    return response, Notice(context.nick)
+
+
+@command('ignorelist', priority=Priority.max, level=IRCLevel.hop)
+def ignorelist_command(bot, context, message, args):
+    """ List the ignored host masks in the current channel. """
+    return show_ignores(context.database, context.channel), Notice(context.nick)
+
+
+@command('ignoreall', priority=Priority.max, level=IRCLevel.hop)
+def ignoreall_command(bot, context, message, args):
+    """ Toggle on or off ignoring everyone in the current channel. """
+    return ignoreall(context.channel)
+
+
+def nick_to_mask(mask):
+    if '!' not in mask and '@' not in mask:
+        mask += '!*@*'
+    return mask.lower()
+
+
 def add_ignore(database, channel, nick):
     ignores = database.get({})
     channel_ignores = ignores.get(channel, [])
+    mask = nick_to_mask(nick)
 
-    if nick.lower() in channel_ignores:
+    if mask in channel_ignores:
         response = "I'm already ignoring {} on {}.".format(nick, channel)
     else:
-        channel_ignores.append(nick.lower())
+        channel_ignores.append(mask)
         ignores[channel] = channel_ignores
         database.set(ignores)
-        response = "I'm now ignoring {} on {}.".format(nick, channel)
+        response = "I'm now ignoring {} on {}.".format(mask, channel)
     return response
 
 
 def del_ignore(database, channel, nick):
     ignores = database.get({})
     channel_ignores = ignores.get(channel, [])
+    mask = nick_to_mask(nick)
 
     try:
-        channel_ignores.remove(nick.lower())
+        channel_ignores.remove(mask)
         ignores[channel] = channel_ignores
         database.set(ignores)
-        response = "I'm no longer ignoring {} on {}.".format(nick, channel)
-    except KeyError:
-        response = "I'm not ignoring {} on {}.".format(nick, channel)
+        response = "I'm no longer ignoring {} on {}.".format(mask, channel)
+    except ValueError:
+        response = "I'm not ignoring {} on {}.".format(mask, channel)
     return response
 
 
@@ -85,8 +98,9 @@ def ignoreall(channel):
 
 def ignore_sink(bot, context, message):
     channel_ignores = context.database.get({}).get(context.channel, [])
-    if context.nick.lower() in channel_ignores:
-        return Eat
+    for mask in channel_ignores:
+        if hostmask_check(context.nick, context.host, mask):
+            return Eat
 
 
 @sink(priority=Priority.max, level=IRCLevel.hop, alt=ignore_sink)

motobot/core_plugins/master_verification.py

@@ -2,7 +2,7 @@
 
 
 @request('IS_MASTER')
-def is_master_request(bot, context, nick, host=None):
+def is_master_request(bot, context, nick, host):
     recognised = context.session.get(set())
     admin_masks = context.database.get([])
     return nick.lower() in recognised or \

motobot/core_plugins/userlist_handlers.py

@@ -1,25 +1,6 @@
 from motobot import hook, request, command, IRCLevel, Notice
 
 
-@command('levelprobe')
-def levelprobe_command(bot, context, message, args):
-    try:
-        nick = args[1]
-        mapping = {
-            IRCLevel.user: "Regular User",
-            IRCLevel.voice: "Voice",
-            IRCLevel.hop: "Half-op",
-            IRCLevel.aop: "Op",
-            IRCLevel.sop: "Protected Op",
-            IRCLevel.owner: "Owner",
-            IRCLevel.master: "Bot Admin",
-        }
-        level = bot.request('USERLEVEL', context.channel, nick)
-        return "{} is a {} ({}) on {}.".format(nick, mapping.get(level, "Unknown"), level, context.channel)
-    except IndexError:
-        return "Please provide a nick argument.", Notice(context.nick)
-
-
 @request('USERLIST')
 def userlist_request(bot, context, channel):
     return [x[1] for x in context.session.get({}) if x[0].lower() == channel.lower()]
@@ -29,7 +10,7 @@ def userlist_request(bot, context, channel):
 def userlevel_request(bot, context, channel, nick, host=None):
     userlevel_data = context.session.get({})
     level = IRCLevel.user
-    if bot.request('IS_MASTER', nick, host):
+    if host is not None and bot.request('IS_MASTER', nick, host):
         level = IRCLevel.master
     elif channel.lower() == bot.nick.lower():
         level = IRCLevel.owner