Rewrite audio (multivoice) (#249)

This commit is contained in:
Twentysix 2016-05-13 02:28:21 +02:00
parent de5710082e
commit eb6451a317
2 changed files with 1611 additions and 947 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,8 +5,6 @@ from .utils import checks
from __main__ import send_cmd_help, settings from __main__ import send_cmd_help, settings
import os import os
import logging import logging
import json
import asyncio
class Mod: class Mod:
"""Moderation tools.""" """Moderation tools."""
@ -19,9 +17,9 @@ class Mod:
self.filter = fileIO("data/mod/filter.json", "load") self.filter = fileIO("data/mod/filter.json", "load")
self.past_names = fileIO("data/mod/past_names.json", "load") self.past_names = fileIO("data/mod/past_names.json", "load")
@commands.group(pass_context=True,no_pm=True) @commands.group(pass_context=True, no_pm=True)
@checks.serverowner_or_permissions(manage_server=True) @checks.serverowner_or_permissions(manage_server=True)
async def modset(self,ctx): async def modset(self, ctx):
"""Manages server administration settings.""" """Manages server administration settings."""
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await send_cmd_help(ctx) await send_cmd_help(ctx)
@ -31,32 +29,33 @@ class Mod:
msg += "```" msg += "```"
await self.bot.say(msg) await self.bot.say(msg)
@modset.command(name="adminrole",pass_context=True,no_pm=True) @modset.command(name="adminrole", pass_context=True, no_pm=True)
async def _modset_adminrole(self,ctx,role_name : str): async def _modset_adminrole(self, ctx, role_name: str):
"""Sets the admin role for this server, case insensitive.""" """Sets the admin role for this server, case insensitive."""
server = ctx.message.server server = ctx.message.server
if server.id not in settings.servers: if server.id not in settings.servers:
await self.bot.say("Remember to set modrole too.") await self.bot.say("Remember to set modrole too.")
settings.set_server_admin(server,role_name) settings.set_server_admin(server, role_name)
await self.bot.say("Admin role set to '{}'".format(role_name)) await self.bot.say("Admin role set to '{}'".format(role_name))
@modset.command(name="modrole",pass_context=True,no_pm=True) @modset.command(name="modrole", pass_context=True, no_pm=True)
async def _modset_modrole(self,ctx,role_name : str): async def _modset_modrole(self, ctx, role_name: str):
"""Sets the mod role for this server, case insensitive.""" """Sets the mod role for this server, case insensitive."""
server = ctx.message.server server = ctx.message.server
if server.id not in settings.servers: if server.id not in settings.servers:
await self.bot.say("Remember to set adminrole too.") await self.bot.say("Remember to set adminrole too.")
settings.set_server_mod(server,role_name) settings.set_server_mod(server, role_name)
await self.bot.say("Mod role set to '{}'".format(role_name)) await self.bot.say("Mod role set to '{}'".format(role_name))
@commands.command(no_pm=True, pass_context=True) @commands.command(no_pm=True, pass_context=True)
@checks.admin_or_permissions(kick_members=True) @checks.admin_or_permissions(kick_members=True)
async def kick(self, ctx, user : discord.Member): async def kick(self, ctx, user: discord.Member):
"""Kicks user.""" """Kicks user."""
author = ctx.message.author author = ctx.message.author
try: try:
await self.bot.kick(user) await self.bot.kick(user)
logger.info("{}({}) kicked {}({})".format(author.name, author.id, user.name, user.id)) logger.info("{}({}) kicked {}({})".format(
author.name, author.id, user.name, user.id))
await self.bot.say("Done. That felt good.") await self.bot.say("Done. That felt good.")
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I'm not allowed to do that.") await self.bot.say("I'm not allowed to do that.")
@ -65,7 +64,7 @@ class Mod:
@commands.command(no_pm=True, pass_context=True) @commands.command(no_pm=True, pass_context=True)
@checks.admin_or_permissions(ban_members=True) @checks.admin_or_permissions(ban_members=True)
async def ban(self, ctx, user : discord.Member, days : int=0): async def ban(self, ctx, user: discord.Member, days: int=0):
"""Bans user and deletes last X days worth of messages. """Bans user and deletes last X days worth of messages.
Minimum 0 days, maximum 7. Defaults to 0.""" Minimum 0 days, maximum 7. Defaults to 0."""
@ -75,7 +74,8 @@ class Mod:
return return
try: try:
await self.bot.ban(user, days) await self.bot.ban(user, days)
logger.info("{}({}) banned {}({}), deleting {} days worth of messages".format(author.name, author.id, user.name, user.id, str(days))) logger.info("{}({}) banned {}({}), deleting {} days worth of messages".format(
author.name, author.id, user.name, user.id, str(days)))
await self.bot.say("Done. It was about time.") await self.bot.say("Done. It was about time.")
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I'm not allowed to do that.") await self.bot.say("I'm not allowed to do that.")
@ -110,7 +110,7 @@ class Mod:
await send_cmd_help(ctx) await send_cmd_help(ctx)
@cleanup.command(pass_context=True, no_pm=True) @cleanup.command(pass_context=True, no_pm=True)
async def text(self, ctx, text : str, number : int): async def text(self, ctx, text: str, number: int):
"""Deletes last X messages matching the specified text. """Deletes last X messages matching the specified text.
Example: Example:
@ -120,31 +120,32 @@ class Mod:
author = ctx.message.author author = ctx.message.author
message = ctx.message message = ctx.message
cmdmsg = message cmdmsg = message
logger.info("{}({}) deleted {} messages containing '{}' in channel {}".format(author.name, author.id, str(number), text, message.channel.name)) logger.info("{}({}) deleted {} messages containing '{}' in channel {}".format(
author.name, author.id, str(number), text, message.channel.name))
try: try:
if number > 0 and number < 10000: if number > 0 and number < 10000:
while True: while True:
new = False new = False
async for x in self.bot.logs_from(message.channel, limit=100, before=message): async for x in self.bot.logs_from(message.channel, limit=100, before=message):
if number == 0: if number == 0:
await self.bot.delete_message(cmdmsg) await self._delete_message(cmdmsg)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
return return
if text in x.content: if text in x.content:
await self.bot.delete_message(x) await self._delete_message(x)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
number -= 1 number -= 1
new = True new = True
message = x message = x
if not new or number == 0: if not new or number == 0:
await self.bot.delete_message(cmdmsg) await self._delete_message(cmdmsg)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
break break
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")
@cleanup.command(pass_context=True, no_pm=True) @cleanup.command(pass_context=True, no_pm=True)
async def user(self, ctx, user : discord.Member, number : int): async def user(self, ctx, user: discord.Member, number: int):
"""Deletes last X messages from specified user. """Deletes last X messages from specified user.
Examples: Examples:
@ -153,42 +154,44 @@ class Mod:
author = ctx.message.author author = ctx.message.author
message = ctx.message message = ctx.message
cmdmsg = message cmdmsg = message
logger.info("{}({}) deleted {} messages made by {}({}) in channel {}".format(author.name, author.id, str(number), user.name, user.id, message.channel.name)) logger.info("{}({}) deleted {} messages made by {}({}) in channel {}".format(
author.name, author.id, str(number), user.name, user.id, message.channel.name))
try: try:
if number > 0 and number < 10000: if number > 0 and number < 10000:
while True: while True:
new = False new = False
async for x in self.bot.logs_from(message.channel, limit=100, before=message): async for x in self.bot.logs_from(message.channel, limit=100, before=message):
if number == 0: if number == 0:
await self.bot.delete_message(cmdmsg) await self._delete_message(cmdmsg)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
return return
if x.author.id == user.id: if x.author.id == user.id:
await self.bot.delete_message(x) await self._delete_message(x)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
number -= 1 number -= 1
new = True new = True
message = x message = x
if not new or number == 0: if not new or number == 0:
await self.bot.delete_message(cmdmsg) await self._delete_message(cmdmsg)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
break break
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")
@cleanup.command(pass_context=True, no_pm=True) @cleanup.command(pass_context=True, no_pm=True)
async def messages(self, ctx, number : int): async def messages(self, ctx, number: int):
"""Deletes last X messages. """Deletes last X messages.
Example: Example:
cleanup messages 26""" cleanup messages 26"""
author = ctx.message.author author = ctx.message.author
channel = ctx.message.channel channel = ctx.message.channel
logger.info("{}({}) deleted {} messages in channel {}".format(author.name, author.id, str(number), channel.name)) logger.info("{}({}) deleted {} messages in channel {}".format(
author.name, author.id, str(number), channel.name))
try: try:
if number > 0 and number < 10000: if number > 0 and number < 10000:
async for x in self.bot.logs_from(channel, limit=number+1): async for x in self.bot.logs_from(channel, limit=number + 1):
await self.bot.delete_message(x) await self._delete_message(x)
await asyncio.sleep(0.25) await asyncio.sleep(0.25)
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")
@ -201,7 +204,7 @@ class Mod:
await send_cmd_help(ctx) await send_cmd_help(ctx)
@blacklist.command(name="add") @blacklist.command(name="add")
async def _blacklist_add(self, user : discord.Member): async def _blacklist_add(self, user: discord.Member):
"""Adds user to bot's blacklist""" """Adds user to bot's blacklist"""
if user.id not in self.blacklist_list: if user.id not in self.blacklist_list:
self.blacklist_list.append(user.id) self.blacklist_list.append(user.id)
@ -211,7 +214,7 @@ class Mod:
await self.bot.say("User is already blacklisted.") await self.bot.say("User is already blacklisted.")
@blacklist.command(name="remove") @blacklist.command(name="remove")
async def _blacklist_remove(self, user : discord.Member): async def _blacklist_remove(self, user: discord.Member):
"""Removes user to bot's blacklist""" """Removes user to bot's blacklist"""
if user.id in self.blacklist_list: if user.id in self.blacklist_list:
self.blacklist_list.remove(user.id) self.blacklist_list.remove(user.id)
@ -220,7 +223,6 @@ class Mod:
else: else:
await self.bot.say("User is not in blacklist.") await self.bot.say("User is not in blacklist.")
@commands.group(pass_context=True) @commands.group(pass_context=True)
@checks.is_owner() @checks.is_owner()
async def whitelist(self, ctx): async def whitelist(self, ctx):
@ -229,10 +231,10 @@ class Mod:
await send_cmd_help(ctx) await send_cmd_help(ctx)
@whitelist.command(name="add") @whitelist.command(name="add")
async def _whitelist_add(self, user : discord.Member): async def _whitelist_add(self, user: discord.Member):
"""Adds user to bot's whitelist""" """Adds user to bot's whitelist"""
if user.id not in self.whitelist_list: if user.id not in self.whitelist_list:
if not self.whitelist_list: if not self.whitelist_list:
msg = "\nAll users not in whitelist will be ignored (owner, admins and mods excluded)" msg = "\nAll users not in whitelist will be ignored (owner, admins and mods excluded)"
else: else:
msg = "" msg = ""
@ -243,7 +245,7 @@ class Mod:
await self.bot.say("User is already whitelisted.") await self.bot.say("User is already whitelisted.")
@whitelist.command(name="remove") @whitelist.command(name="remove")
async def _whitelist_remove(self, user : discord.Member): async def _whitelist_remove(self, user: discord.Member):
"""Removes user to bot's whitelist""" """Removes user to bot's whitelist"""
if user.id in self.whitelist_list: if user.id in self.whitelist_list:
self.whitelist_list.remove(user.id) self.whitelist_list.remove(user.id)
@ -261,7 +263,7 @@ class Mod:
await self.bot.say(self.count_ignored()) await self.bot.say(self.count_ignored())
@ignore.command(name="channel", pass_context=True) @ignore.command(name="channel", pass_context=True)
async def ignore_channel(self, ctx, channel : discord.Channel=None): async def ignore_channel(self, ctx, channel: discord.Channel=None):
"""Ignores channel """Ignores channel
Defaults to current one""" Defaults to current one"""
@ -281,7 +283,6 @@ class Mod:
else: else:
await self.bot.say("Channel already in ignore list.") await self.bot.say("Channel already in ignore list.")
@ignore.command(name="server", pass_context=True) @ignore.command(name="server", pass_context=True)
async def ignore_server(self, ctx): async def ignore_server(self, ctx):
"""Ignores current server""" """Ignores current server"""
@ -302,7 +303,7 @@ class Mod:
await self.bot.say(self.count_ignored()) await self.bot.say(self.count_ignored())
@unignore.command(name="channel", pass_context=True) @unignore.command(name="channel", pass_context=True)
async def unignore_channel(self, ctx, channel : discord.Channel=None): async def unignore_channel(self, ctx, channel: discord.Channel=None):
"""Removes channel from ignore list """Removes channel from ignore list
Defaults to current one""" Defaults to current one"""
@ -322,7 +323,6 @@ class Mod:
else: else:
await self.bot.say("That channel is not in the ignore list.") await self.bot.say("That channel is not in the ignore list.")
@unignore.command(name="server", pass_context=True) @unignore.command(name="server", pass_context=True)
async def unignore_server(self, ctx): async def unignore_server(self, ctx):
"""Removes current server from ignore list""" """Removes current server from ignore list"""
@ -361,7 +361,7 @@ class Mod:
await self.bot.send_message(author, "Words filtered in this server: " + msg) await self.bot.send_message(author, "Words filtered in this server: " + msg)
@_filter.command(name="add", pass_context=True) @_filter.command(name="add", pass_context=True)
async def filter_add(self, ctx, *words : str): async def filter_add(self, ctx, *words: str):
"""Adds words to the filter """Adds words to the filter
Use double quotes to add sentences Use double quotes to add sentences
@ -386,7 +386,7 @@ class Mod:
await self.bot.say("Words already in the filter.") await self.bot.say("Words already in the filter.")
@_filter.command(name="remove", pass_context=True) @_filter.command(name="remove", pass_context=True)
async def filter_remove(self, ctx, *words : str): async def filter_remove(self, ctx, *words: str):
"""Remove words from the filter """Remove words from the filter
Use double quotes to remove sentences Use double quotes to remove sentences
@ -419,7 +419,7 @@ class Mod:
await send_cmd_help(ctx) await send_cmd_help(ctx)
@editrole.command(aliases=["color"], pass_context=True) @editrole.command(aliases=["color"], pass_context=True)
async def colour(self, ctx, role : discord.Role, value : discord.Colour): async def colour(self, ctx, role: discord.Role, value: discord.Colour):
"""Edits a role's colour """Edits a role's colour
Use double quotes if the role contains spaces. Use double quotes if the role contains spaces.
@ -432,7 +432,8 @@ class Mod:
author = ctx.message.author author = ctx.message.author
try: try:
await self.bot.edit_role(ctx.message.server, role, color=value) await self.bot.edit_role(ctx.message.server, role, color=value)
logger.info("{}({}) changed the colour of role '{}'".format(author.name, author.id, role.name)) logger.info("{}({}) changed the colour of role '{}'".format(
author.name, author.id, role.name))
await self.bot.say("Done.") await self.bot.say("Done.")
except discord.Forbidden: except discord.Forbidden:
await self.bot.say("I need permissions to manage roles first.") await self.bot.say("I need permissions to manage roles first.")
@ -441,7 +442,7 @@ class Mod:
await self.bot.say("Something went wrong.") await self.bot.say("Something went wrong.")
@editrole.command(name="name", pass_context=True) @editrole.command(name="name", pass_context=True)
async def edit_role_name(self, ctx, role : discord.Role, name : str): async def edit_role_name(self, ctx, role: discord.Role, name: str):
"""Edits a role's name """Edits a role's name
Use double quotes if the role or the name contain spaces. Use double quotes if the role or the name contain spaces.
@ -452,9 +453,10 @@ class Mod:
return return
try: try:
author = ctx.message.author author = ctx.message.author
old_name = role.name # probably not necessary? old_name = role.name # probably not necessary?
await self.bot.edit_role(ctx.message.server, role, name=name) await self.bot.edit_role(ctx.message.server, role, name=name)
logger.info("{}({}) changed the name of role '{}' to '{}'".format(author.name, author.id, old_name, name)) logger.info("{}({}) changed the name of role '{}' to '{}'".format(
author.name, author.id, old_name, name))
await self.bot.say("Done.") await self.bot.say("Done.")
except discord.Forbidden: except discord.Forbidden:
await self.bot.say("I need permissions to manage roles first.") await self.bot.say("I need permissions to manage roles first.")
@ -476,6 +478,14 @@ class Mod:
else: else:
await self.bot.say("That user doesn't have any recorded name change.") await self.bot.say("That user doesn't have any recorded name change.")
async def _delete_message(self, message):
try:
await self.bot.delete_message(message)
except discord.errors.NotFound:
pass
except:
raise
def immune_from_filter(self, message): def immune_from_filter(self, message):
user = message.author user = message.author
server = message.server server = message.server
@ -497,17 +507,21 @@ class Mod:
server = message.server server = message.server
can_delete = message.channel.permissions_for(server.me).manage_messages can_delete = message.channel.permissions_for(server.me).manage_messages
if message.author.id == self.bot.user.id or self.immune_from_filter(message) or not can_delete: # Owner, admins and mods are immune to the filter # Owner, admins and mods are immune to the filter
if message.author.id == self.bot.user.id or self.immune_from_filter(message) or not can_delete:
return return
if server.id in self.filter.keys(): if server.id in self.filter.keys():
for w in self.filter[server.id]: for w in self.filter[server.id]:
if w in message.content.lower(): if w in message.content.lower():
try: # Something else in discord.py is throwing a 404 error after deletion # Something else in discord.py is throwing a 404 error
await self.bot.delete_message(message) # after deletion
try:
await self._delete_message(message)
except: except:
pass pass
print("Message deleted. Filtered: " + w ) print("Message deleted. Filtered: " + w)
async def check_names(self, before, after): async def check_names(self, before, after):
if before.name != after.name: if before.name != after.name:
@ -525,8 +539,9 @@ def check_folders():
print("Creating " + folder + " folder...") print("Creating " + folder + " folder...")
os.makedirs(folder) os.makedirs(folder)
def check_files(): def check_files():
ignore_list = {"SERVERS" : [], "CHANNELS" : []} ignore_list = {"SERVERS": [], "CHANNELS": []}
if not os.path.isfile("data/mod/blacklist.json"): if not os.path.isfile("data/mod/blacklist.json"):
print("Creating empty blacklist.json...") print("Creating empty blacklist.json...")
@ -548,15 +563,20 @@ def check_files():
print("Creating empty past_names.json...") print("Creating empty past_names.json...")
fileIO("data/mod/past_names.json", "save", {}) fileIO("data/mod/past_names.json", "save", {})
def setup(bot): def setup(bot):
global logger global logger
check_folders() check_folders()
check_files() check_files()
logger = logging.getLogger("mod") logger = logging.getLogger("mod")
if logger.level == 0: # Prevents the logger from being loaded again in case of module reload # Prevents the logger from being loaded again in case of module reload
if logger.level == 0:
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
handler = logging.FileHandler(filename='data/mod/mod.log', encoding='utf-8', mode='a') handler = logging.FileHandler(
handler.setFormatter(logging.Formatter('%(asctime)s %(message)s', datefmt="[%d/%m/%Y %H:%M]")) filename='data/mod/mod.log', encoding='utf-8', mode='a')
handler.setFormatter(
logging.Formatter('%(asctime)s %(message)s', datefmt="[%d/%m/%Y %H:%M]"))
logger.addHandler(handler) logger.addHandler(handler)
n = Mod(bot) n = Mod(bot)
bot.add_listener(n.check_filter, "on_message") bot.add_listener(n.check_filter, "on_message")