Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2025-11-04 07:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check shard command and sharding support for fetch msg script

Browse Source
This commit is contained in:
Jeremy Zhang
2018-03-24 17:04:09 +00:00
parent 200947e78f
commit da8ef6cdd1
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
discordbot/fetch_last_messages.py
View File

@@ -20,8 +20,8 @@ logging.getLogger('sqlalchemy')
########################### ###########################
class Titan(discord.Client): class Titan(discord.Client):
def __init__(self): def __init__(self, shard_id=None, shard_count=None):
super().__init__() super().__init__(shard_id=shard_id, shard_count=shard_count)
self.aiosession = aiohttp.ClientSession(loop=self.loop) self.aiosession = aiohttp.ClientSession(loop=self.loop)
self.http.user_agent += ' TitanEmbeds-Bot' self.http.user_agent += ' TitanEmbeds-Bot'
self.database = DatabaseInterface(self) self.database = DatabaseInterface(self)
@@ -71,11 +71,11 @@ class Titan(discord.Client):
print("working on this...") print("working on this...")
all_channels = [] all_channels = []
if len(sys.argv) < 2: if len(sys.argv) < 2:
print("fetch_last_messages.py <server/all> [server_id]") print("fetch_last_messages.py <server/all> [server_id] [shard_id] [shard_count]")
await self.logout() await self.logout()
return return
if "server" == sys.argv[1]: if "server" == sys.argv[1]:
server_id = sys.argv[2] server_id = int(sys.argv[2])
server = self.get_guild(server_id) server = self.get_guild(server_id)
if not server: if not server:
print("Server not found") print("Server not found")
@@ -87,12 +87,12 @@ class Titan(discord.Client):
print("Getting all channels") print("Getting all channels")
all_channels = list(self.get_all_channels()) all_channels = list(self.get_all_channels())
else: else:
print("fetch_last_messages.py <server/all> [server_id]") print("fetch_last_messages.py <server/all> [server_id] [shard_id] [shard_count]")
await self.logout() await self.logout()
return return
for channel in all_channels: for channel in all_channels:
try: try:
if str(channel.type) == "text": if isinstance(channel, discord.channel.TextChannel):
print("Processing channel: ID-{} Name-'{}' ServerID-{} Server-'{}'".format(channel.id, channel.name, channel.guild.id, channel.guild.name)) print("Processing channel: ID-{} Name-'{}' ServerID-{} Server-'{}'".format(channel.id, channel.name, channel.guild.id, channel.guild.name))
await self.database.delete_all_messages_from_channel(channel.id) await self.database.delete_all_messages_from_channel(channel.id)
async for message in self.logs_from(channel, limit=50, reverse=True): async for message in self.logs_from(channel, limit=50, reverse=True):
@@ -104,7 +104,15 @@ class Titan(discord.Client):
def main(): def main():
print("Starting...") print("Starting...")
te = Titan() try:
shard_id = sys.argv[3]
shard_count = sys.argv[4]
print("Running on shard {} of total {} shards.".format(shard_id, shard_count))
except:
shard_id = None
shard_count = None
print("Running on no sharding support.")
te = Titan(shard_id, shard_count)
te.run() te.run()
gc.collect() gc.collect()

2
discordbot/titanembeds/commands.py
View File

@@ -39,3 +39,5 @@ class Commands():
async def server(self, message): async def server(self, message):
await message.channel.send("Join the Titan Embeds Discord server! https://discord.gg/pFDDtcN") await message.channel.send("Join the Titan Embeds Discord server! https://discord.gg/pFDDtcN")
async def shard(self, message):
await message.channel.send("This instance of Titan Embeds Discord Bot is running on shard **{}**. There are **{}** shards in total.".format(self.client.shard_id, self.client.shard_count))