AutoShard Titan bot with dpy rewrite, Closes #71

This commit is contained in:
Jeremy Zhang
2018-03-22 22:55:09 +00:00
parent 9c2b0990a7
commit f7b3e4e65e
7 changed files with 178 additions and 150 deletions

View File

@ -10,21 +10,25 @@ import asyncio
import sys
import logging
import json
import zlib
logging.basicConfig(filename='titanbot.log',level=logging.INFO,format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
handler = logging.FileHandler(config.get("logging-location", "titanbot.log"))
logging.getLogger('TitanBot')
logging.getLogger('sqlalchemy')
class Titan(discord.Client):
class Titan(discord.AutoShardedClient):
def __init__(self):
super().__init__(max_messages=20000)
game = discord.Game(name="Embed your Discord server! Visit https://TitanEmbeds.com/")
super().__init__(max_messages=20000, game=game)
self.aiosession = aiohttp.ClientSession(loop=self.loop)
self.http.user_agent += ' TitanEmbeds-Bot'
self.database = DatabaseInterface(self)
self.command = Commands(self, self.database)
self.socketio = SocketIOInterface(self, config["redis-uri"])
self.delete_list = [] # List of msg ids to prevent duplicate delete
self.delete_list = deque(maxlen=100) # List of msg ids to prevent duplicate delete
self.zlib_obj = zlib.decompressobj()
self.buffer_arr = bytearray()
self.discordBotsOrg = None
self.botsDiscordPw = None
@ -61,10 +65,8 @@ class Titan(discord.Client):
print(self.user.name)
print(self.user.id)
print('------')
await self.change_presence(
game=discord.Game(name="Embed your Discord server! Visit https://TitanEmbeds.com/"), status=discord.Status.online
)
print("Shard count: " + str(self.shard_count))
print("------")
try:
await self.database.connect(config["database-uri"])
@ -78,34 +80,12 @@ class Titan(discord.Client):
self.botsDiscordPw = BotsDiscordPw(self.user.id, config.get("bots-discord-pw-token", None))
await self.postStats()
# 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)
# if server.me.server_permissions.ban_members:
# server_bans = await self.get_bans(server)
# else:
# server_bans = []
# 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):
await self.socketio.on_message(message)
await self.database.push_message(message)
msg_arr = message.content.split() # split the message
if len(message.content.split()) > 1 and message.server: #making sure there is actually stuff in the message and have arguments and check if it is sent in server (not PM)
if len(message.content.split()) > 1 and message.guild: #making sure there is actually stuff in the message and have arguments and check if it is sent in server (not PM)
if msg_arr[0] == "<@{}>".format(self.user.id) or msg_arr[0] == "<@!{}>".format(self.user.id): #make sure it is mention
msg_cmd = msg_arr[1].lower() # get command
cmd = getattr(self.command, msg_cmd, None) #check if cmd exist, if not its none
@ -122,12 +102,12 @@ class Titan(discord.Client):
await self.database.delete_message(message)
await self.socketio.on_message_delete(message)
async def on_server_join(self, guild):
async def on_guild_join(self, guild):
await self.database.update_guild(guild)
for member in guild.members:
await self.database.update_guild_member(member, True, False)
if guild.me.server_permissions.ban_members:
banned = await self.get_bans(guild)
if guild.me.guild_permissions.ban_members:
banned = await guild.bans()
for ban in banned:
member = discord.Member(user={
"username": ban.name,
@ -138,52 +118,52 @@ class Titan(discord.Client):
})
await self.database.update_guild_member(member, False, True)
for channel in list(guild.channels):
chanperm = channel.permissions_for(channel.server.me)
if not chanperm.read_messages or not chanperm.read_message_history:
chanperm = channel.permissions_for(channel.guild.me)
if not chanperm.read_messages or not chanperm.read_message_history or not isinstance(channel, discord.channel.TextChannel):
continue
async for message in self.logs_from(channel, limit=50, reverse=True):
async for message in channel.history(limit=50, reverse=True):
try:
await self.database.push_message(message)
except:
pass
await self.postStats()
async def on_server_remove(self, guild):
async def on_guild_remove(self, guild):
await self.database.remove_guild(guild)
await self.postStats()
async def on_server_update(self, guildbefore, guildafter):
async def on_guild_update(self, guildbefore, guildafter):
await self.database.update_guild(guildafter)
await self.socketio.on_guild_update(guildafter)
async def on_server_role_create(self, role):
async def on_guild_role_create(self, role):
if role.name == self.user.name and role.managed:
await asyncio.sleep(2)
await self.database.update_guild(role.server)
await self.database.update_guild(role.guild)
await self.socketio.on_guild_role_create(role)
async def on_server_role_delete(self, role):
if role.server.me not in role.server.members:
async def on_guild_role_delete(self, role):
if role.guild.me not in role.guild.members:
return
await self.database.update_guild(role.server)
await self.database.update_guild(role.guild)
await self.socketio.on_guild_role_delete(role)
async def on_server_role_update(self, rolebefore, roleafter):
await self.database.update_guild(roleafter.server)
async def on_guild_role_update(self, rolebefore, roleafter):
await self.database.update_guild(roleafter.guild)
await self.socketio.on_guild_role_update(roleafter)
async def on_channel_delete(self, channel):
if channel.server:
await self.database.update_guild(channel.server)
if channel.guild:
await self.database.update_guild(channel.guild)
await self.socketio.on_channel_delete(channel)
async def on_channel_create(self, channel):
if channel.server:
await self.database.update_guild(channel.server)
if channel.guild:
await self.database.update_guild(channel.guild)
await self.socketio.on_channel_create(channel)
async def on_channel_update(self, channelbefore, channelafter):
await self.database.update_guild(channelafter.server)
await self.database.update_guild(channelafter.guild)
await self.socketio.on_channel_update(channelafter)
async def on_member_join(self, member):
@ -205,23 +185,34 @@ class Titan(discord.Client):
return
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)
async def on_member_unban(self, guild, user):
await self.database.unban_server_user(user, guild)
async def on_server_emojis_update(self, before, after):
async def on_guild_emojis_update(self, guild, before, after):
if len(after) == 0:
await self.database.update_guild(before[0].server)
await self.database.update_guild(guild)
await self.socketio.on_guild_emojis_update(before)
else:
await self.database.update_guild(after[0].server)
await self.database.update_guild(guild)
await self.socketio.on_guild_emojis_update(after)
async def on_webhooks_update(self, server):
await self.database.update_guild(server)
async def on_webhooks_update(self, guild, channel):
await self.database.update_guild(guild)
async def on_socket_raw_receive(self, msg):
if type(msg) is not str:
return
if isinstance(msg, bytes):
self.buffer_arr.extend(msg)
if len(msg) >= 4:
if msg[-4:] == b'\x00\x00\xff\xff':
msg = self.zlib_obj.decompress(self.buffer_arr)
msg = msg.decode('utf-8')
self.buffer_arr = bytearray()
else:
return
else:
return
msg = json.loads(msg)
if msg["op"] != 0:
return
@ -245,17 +236,20 @@ class Titan(discord.Client):
if msg_id in self.delete_list:
self.delete_list.remove(msg_id)
return
channel = self.get_channel(channel_id)
msg = discord.Message(channel=channel, reactions=[], id=msg_id, type=0, timestamp="2017-01-15T02:59:58", content="What fun is there in making sense?") # Procreate a fake message object
channel = self.get_channel(int(channel_id))
data = {'content': "What fun is there in making sense?", 'type': 0, 'edited_timestamp': None, 'id': msg_id, 'channel_id': channel_id, 'timestamp': '2017-01-15T02:59:58+00:00'}
msg = discord.Message(channel=channel, state=self._connection, data=data) # Procreate a fake message object
await self.on_message_delete(msg)
def in_messages_cache(self, msg_id):
for msg in self.messages:
for msg in self._connection._messages:
if msg.id == msg_id:
return True
return False
async def postStats(self):
count = len(self.servers)
await self.discordBotsOrg.post(count)
await self.botsDiscordPw.post(count)
count = len(self.guilds)
shard_count = self.shard_count
shard_id = self.shard_id
await self.discordBotsOrg.post(count, shard_count, shard_id)
await self.botsDiscordPw.post(count, shard_count, shard_id)