Added commands I think

This commit is contained in:
JustMaffie 2017-05-27 23:38:28 +02:00
parent 27f5b2407d
commit 691625f6a8

View File

@ -10,183 +10,194 @@ logging.basicConfig(filename='titanbot.log',level=logging.INFO,format='%(asctime
logging.getLogger('TitanBot') logging.getLogger('TitanBot')
logging.getLogger('sqlalchemy') logging.getLogger('sqlalchemy')
bot = commands.Bot(command_prefix=config['command-prefix'])
self.aiosession = aiohttp.ClientSession(loop=self.loop)
self.http.user_agent += ' TitanEmbeds-Bot'
self.database = DatabaseInterface(self)
class Titan(commands.Bot): def run(self):
def __init__(self, *args, **kwargs): try:
super().__init__(command_prefix = config['command-prefix']) self.loop.run_until_complete(self.start(config["bot-token"]))
self.aiosession = aiohttp.ClientSession(loop=self.loop) except discord.errors.LoginFailure:
self.http.user_agent += ' TitanEmbeds-Bot' print("Invalid bot token in config!")
self.database = DatabaseInterface(self) finally:
def _cleanup(self):
try: try:
self.loop.run_until_complete(self.logout()) self._cleanup()
except: # Can be ignored except Exception as e:
pass print("Error in cleanup:", e)
pending = asyncio.Task.all_tasks() self.loop.close()
gathered = asyncio.gather(*pending)
try:
gathered.cancel()
self.loop.run_until_complete(gathered)
gathered.exception()
except: # Can be ignored
pass
def run(self): def _cleanup(self):
try: try:
self.loop.run_until_complete(self.start(config["bot-token"])) self.loop.run_until_complete(self.logout())
except discord.errors.LoginFailure: except: # Can be ignored
print("Invalid bot token in config!") pass
finally: pending = asyncio.Task.all_tasks()
try: gathered = asyncio.gather(*pending)
self._cleanup() try:
except Exception as e: gathered.cancel()
print("Error in cleanup:", e) self.loop.run_until_complete(gathered)
self.loop.close() gathered.exception()
except: # Can be ignored
pass
async def on_ready(self):
print('Titan [DiscordBot]')
print('Logged in as the following user:')
print(self.user.name)
print(self.user.id)
print('------')
await self.change_presence( @bot.event
game=discord.Game(name="Embed your Discord server! Visit https://TitanEmbeds.tk/"), status=discord.Status.online async def on_ready(self):
) print('Titan [DiscordBot]')
print('Logged in as the following user:')
print(self.user.name)
print(self.user.id)
print('------')
await self.change_presence(
game=discord.Game(name="Embed your Discord server! Visit https://TitanEmbeds.tk/"), status=discord.Status.online
)
try:
await self.database.connect(config["database-uri"] + "?charset=utf8mb4")
except Exception:
self.logger.error("Unable to connect to specified database!")
traceback.print_exc()
await self.logout()
return
if "no-init" not in sys.argv:
for server in self.servers:
await self.database.update_guild(server)
if server.large:
await self.request_offline_members(server)
server_bans = await self.get_bans(server)
for member in server.members:
banned = member.id in [u.id for u in server_bans]
await self.database.update_guild_member(
member,
True,
banned
)
await self.database.flag_unactive_guild_members(server.id, server.members)
await self.database.flag_unactive_bans(server.id, server_bans)
await self.database.remove_unused_guilds(self.servers)
else:
print("Skipping indexing server due to no-init flag")
try: @bot.event
await self.database.connect(config["database-uri"] + "?charset=utf8mb4") async def on_message(self, message):
except Exception: await self.database.push_message(message)
self.logger.error("Unable to connect to specified database!") if message.server:
traceback.print_exc() await self.process_commands(message)
await self.logout()
return
if "no-init" not in sys.argv: @bot.event
for server in self.servers: async def on_message_edit(self, message_before, message_after):
await self.database.update_guild(server) await self.database.update_message(message_after)
if server.large:
await self.request_offline_members(server)
server_bans = await self.get_bans(server)
for member in server.members:
banned = member.id in [u.id for u in server_bans]
await self.database.update_guild_member(
member,
True,
banned
)
await self.database.flag_unactive_guild_members(server.id, server.members)
await self.database.flag_unactive_bans(server.id, server_bans)
await self.database.remove_unused_guilds(self.servers)
else:
print("Skipping indexing server due to no-init flag")
async def on_message(self, message): @bot.event
await self.database.push_message(message) async def on_message_delete(self, message):
await self.database.delete_message(message)
if message.server: @bot.event
await self.process_commands(message) async def on_server_join(self, guild):
await asyncio.sleep(1)
async def on_message_edit(self, message_before, message_after): if not guild.me.server_permissions.administrator:
await self.database.update_message(message_after)
async def on_message_delete(self, message):
await self.database.delete_message(message)
async def on_server_join(self, guild):
await asyncio.sleep(1) await asyncio.sleep(1)
if not guild.me.server_permissions.administrator: await self.leave_server(guild)
await asyncio.sleep(1) return
await self.leave_server(guild) await self.database.update_guild(guild)
return for channel in guild.channels:
async for message in self.logs_from(channel, limit=50, reverse=True):
await self.database.push_message(message)
for member in guild.members:
await self.database.update_guild_member(member, True, False)
banned = await self.get_bans(guild)
for ban in banned:
await self.database.update_guild_member(ban, False, True)
await self.database.update_guild(guild) @bot.event
for channel in guild.channels: async def on_server_remove(self, guild):
async for message in self.logs_from(channel, limit=50, reverse=True): await self.database.remove_guild(guild)
await self.database.push_message(message)
for member in guild.members:
await self.database.update_guild_member(member, True, False)
banned = await self.get_bans(guild)
for ban in banned:
await self.database.update_guild_member(ban, False, True)
async def on_server_remove(self, guild): @bot.event
await self.database.remove_guild(guild) async def on_server_update(self, guildbefore, guildafter):
await self.database.update_guild(guildafter)
async def on_server_update(self, guildbefore, guildafter): @bot.event
await self.database.update_guild(guildafter) async def on_server_role_create(self, role):
if role.name == self.user.name and role.managed:
await asyncio.sleep(2)
await self.database.update_guild(role.server)
async def on_server_role_create(self, role): @bot.event
if role.name == self.user.name and role.managed: async def on_server_role_delete(self, role):
await asyncio.sleep(2) if role.server.me not in role.server.members:
await self.database.update_guild(role.server) return
await self.database.update_guild(role.server)
async def on_server_role_delete(self, role): @bot.event
if role.server.me not in role.server.members: async def on_server_role_update(self, rolebefore, roleafter):
return await self.database.update_guild(roleafter.server)
await self.database.update_guild(role.server)
async def on_server_role_update(self, rolebefore, roleafter): @bot.event
await self.database.update_guild(roleafter.server) async def on_channel_delete(self, channel):
await self.database.update_guild(channel.server)
async def on_channel_delete(self, channel): @bot.event
await self.database.update_guild(channel.server) async def on_channel_create(self, channel):
await self.database.update_guild(channel.server)
async def on_channel_create(self, channel): @bot.event
await self.database.update_guild(channel.server) async def on_channel_update(self, channelbefore, channelafter):
await self.database.update_guild(channelafter.server)
async def on_channel_update(self, channelbefore, channelafter): @bot.event
await self.database.update_guild(channelafter.server) async def on_member_join(self, member):
await self.database.update_guild_member(member, active=True, banned=False)
async def on_member_join(self, member): @bot.event
await self.database.update_guild_member(member, active=True, banned=False) async def on_member_remove(self, member):
await self.database.update_guild_member(member, active=False, banned=False)
async def on_member_remove(self, member): @bot.event
await self.database.update_guild_member(member, active=False, banned=False) async def on_member_update(self, memberbefore, memberafter):
await self.database.update_guild_member(memberafter)
async def on_member_update(self, memberbefore, memberafter): @bot.event
await self.database.update_guild_member(memberafter) async def on_member_ban(self, member):
if self.user.id == member.id:
return
await self.database.update_guild_member(member, active=False, banned=True)
async def on_member_ban(self, member): @bot.event
if self.user.id == member.id: async def on_member_unban(self, server, user):
return await self.database.unban_server_user(user, server)
await self.database.update_guild_member(member, active=False, banned=True)
async def on_member_unban(self, server, user):
await self.database.unban_server_user(user, server)
@commands.command(pass_context=True) @commands.command(pass_context=True)
async def ban(ctx, self): async def ban(ctx, self):
message = ctx.message message = ctx.message
if not message.author.server_permissions.ban_members: if not message.author.server_permissions.ban_members:
await self.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to ban guest members.") await self.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to ban guest members.")
return return
serverid = message.server.id serverid = message.server.id
content = message.content.strip() content = message.content.strip()
if len(content.split()) == 2: if len(content.split()) == 2:
await self.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to ban a guest user.\nExample: `ban Titan#0001`") await self.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to ban a guest user.\nExample: `ban Titan#0001`")
return return
content = content.split() content = content.split()
username = content[2][:content[2].find("#")] if "#" in content[2] else content[2] username = content[2][:content[2].find("#")] if "#" in content[2] else content[2]
discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None
reason = await self.database.ban_unauth_user_by_query(message.server.id, message.author.id, username, discriminator) reason = await self.database.ban_unauth_user_by_query(message.server.id, message.author.id, username, discriminator)
await self.send_message(message.channel, message.author.mention + " " + reason) await self.send_message(message.channel, message.author.mention + " " + reason)
@commands.command(pass_context=True) @commands.command(pass_context=True)
async def kick(ctx, self): async def kick(ctx, self):
message = ctx.message message = ctx.message
if not message.author.server_permissions.kick_members: if not message.author.server_permissions.kick_members:
await self.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to kick guest members.") await self.send_message(message.channel, message.author.mention + " I'm sorry, but you do not have permissions to kick guest members.")
return return
serverid = message.server.id serverid = message.server.id
content = message.content.strip() content = message.content.strip()
if len(content.split()) == 2: if len(content.split()) == 2:
await self.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to kick a guest user.\nExample: `kick Titan#0001`") await self.send_message(message.channel, message.author.mention + " Please provide a username-query (or optionally a discriminator) to kick a guest user.\nExample: `kick Titan#0001`")
return return
content = content.split() content = content.split()
username = content[2][:content[2].find("#")] if "#" in content[2] else content[2] username = content[2][:content[2].find("#")] if "#" in content[2] else content[2]
discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None discriminator = int(content[2][content[2].find("#") + 1:]) if "#" in content[2] else None
reason = await self.database.revoke_unauth_user_by_query(message.server.id, username, discriminator) reason = await self.database.revoke_unauth_user_by_query(message.server.id, username, discriminator)
await self.send_message(message.channel, message.author.mention + " " + reason) await self.send_message(message.channel, message.author.mention + " " + reason)