Taledo/yetAnotherIdaBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Taledo:bc25ae71b3b8edc9a09d153a72dcff69a9ae2a3f
Branches Tags
Taledo:main
Taledo:dev-prodId
Taledo:dev
..
compare: Taledo:18a00901940b4ed61988271184773f3d52f48e4c
Branches Tags
Taledo:main
Taledo:dev-prodId
Taledo:dev

No commits in common. "bc25ae71b3b8edc9a09d153a72dcff69a9ae2a3f" and "18a00901940b4ed61988271184773f3d52f48e4c" have entirely different histories.
bc25ae71b3 ... 18a0090194

1 changed files with 71 additions and 81 deletions
Show Stats Expand all files Collapse all files

152
cogs/IdaCogs.py
View File

@ -3,7 +3,6 @@ from discord import option
from discord.ext import commands, tasks from discord.ext import commands, tasks
import aiohttp import aiohttp
import helpers import helpers
import traceback
from datetime import datetime from datetime import datetime
class IdaCogs(commands.Cog): class IdaCogs(commands.Cog):
@ -113,9 +112,7 @@ class IdaCogs(commands.Cog):
else: else:
await ctx.followup.send(f"Failed to log delivery (HTTP {response}). Please contact the yellow people if that keeps happening") await ctx.followup.send(f"Failed to log delivery (HTTP {response}). Please contact the yellow people if that keeps happening")
except Exception as e: except Exception as e:
await ctx.followup.send(f"Something broke. Why do you keep breaking the bot, uh? :(") await ctx.followup.send(f"help : Error: {e}")
channel = self.bot.get_channel(self.debugChannel)
await channel.send(f"{author} generated the following exception : {traceback.format_exc()}")
@ -159,7 +156,6 @@ class IdaCogs(commands.Cog):
@discord.slash_command( @discord.slash_command(
name="last", name="last",
# guild_ids=[401372086746087425], # guild_ids=[401372086746087425],
@ -290,121 +286,115 @@ class IdaCogs(commands.Cog):
#writes to the whats left to haul channel ever 60 seconds about.. the stuff left to haul. #writes to the whats left to haul channel ever 60 seconds about.. the stuff left to haul.
#also updates the current commodity List #also updates the current commodity List
@tasks.loop(seconds=120) @tasks.loop(seconds=60)
async def writeToWhatsLeftToHaul(self): async def writeToWhatsLeftToHaul(self):
try:
response = await helpers.getFromSheet(self.session, self.gsheetToken, "commodity")
print(response) response = await helpers.getFromSheet(self.session, self.gsheetToken, "commodity")
commodity, values, initial = response.split("|")
commodity = commodity.split(",") print(response)
values = values.split(",") commodity, values, initial = response.split("|")
initial = initial.split(",")
commodity = commodity.split(",")
values = values.split(",")
initial = initial.split(",")
values = [int(i) for i in values] values = [int(i) for i in values]
initial = [int (i) for i in initial] initial = [int (i) for i in initial]
finalDict = {} finalDict = {}
progressDict = {} progressDict = {}
neededCommodity = [] neededCommodity = []
for i in range(len(commodity)): for i in range(len(commodity)):
finalDict[commodity[i]] = values[i] finalDict[commodity[i]] = values[i]
if initial[i] > 0: if initial[i] > 0:
progressDict[commodity[i]] = await helpers.createProgressBar(values[i],initial[i]) progressDict[commodity[i]] = await helpers.createProgressBar(values[i],initial[i])
else: else:
progressDict[commodity[i]] = await helpers.createProgressBar(1,1) progressDict[commodity[i]] = await helpers.createProgressBar(1,1)
if values[i] > 0: if values[i] > 0:
neededCommodity.append(commodity[i]) neededCommodity.append(commodity[i])
#finalDict = dict(sorted(finalDict.items(), key=lambda item: item[1], reverse=True)) #finalDict = dict(sorted(finalDict.items(), key=lambda item: item[1], reverse=True))
self.commodities = neededCommodity self.commodities = neededCommodity
embed = discord.Embed(title="Estimated remaining amounts", embed = discord.Embed(title="Estimated remaining amounts",
colour=discord.Colour(0xffdd55), colour=discord.Colour(0xffdd55),
timestamp=datetime.now()) timestamp=datetime.now())
embed.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png") embed.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png")
embed2 = discord.Embed(title="Current progress", embed2 = discord.Embed(title="Current progress",
colour=discord.Colour(0x002f80), colour=discord.Colour(0x002f80),
timestamp=datetime.now()) timestamp=datetime.now())
embed2.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png") embed2.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png")
for key in finalDict: for key in finalDict:
if finalDict[key] > 0: if finalDict[key] > 0:
embed.add_field(name=key, value=finalDict[key], inline=True) embed.add_field(name=key, value=finalDict[key], inline=True)
embed2.add_field(name=key, value=str(progressDict[key]), inline=True) embed2.add_field(name=key, value=str(progressDict[key]), inline=True)
embed2.set_footer(text="This message updates every 120 seconds(ish). Last updated") embed2.set_footer(text="This message updates every 60 seconds(ish). Last updated")
embed.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517', embed.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517',
url=self.stationUrl) url=self.stationUrl)
embed2.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517', embed2.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517',
url=self.stationUrl) url=self.stationUrl)
channel = self.bot.get_channel(self.whatsLeftToHaulChannelId) channel = self.bot.get_channel(self.whatsLeftToHaulChannelId)
found = False found = False
async for oldmsg in channel.history(limit=2): async for oldmsg in channel.history(limit=2):
if oldmsg.author == self.bot.user: if oldmsg.author == self.bot.user:
found = True found = True
await oldmsg.edit(embeds=[embed, embed2]) await oldmsg.edit(embeds=[embed, embed2])
break break
if not found: if not found:
await channel.send(embeds=[embed, embed2]) await channel.send(embeds=[embed, embed2])
except Exception as e:
print("Something bad happened in the whatlefttohaul function :(")
#writes the carriers state to... the carrier state channel. Seriously, who is writing this? #writes the carriers state to... the carrier state channel. Seriously, who is writing this?
@tasks.loop(seconds=120) @tasks.loop(seconds=60)
async def writeTocarrierState(self): async def writeTocarrierState(self):
try: response = await helpers.getInternalCarrierState(self.session, self.gsheetToken)
response = await helpers.getInternalCarrierState(self.session, self.gsheetToken) carrierState = await helpers.parseCarrierState(response)
carrierState = await helpers.parseCarrierState(response)
channel = self.bot.get_channel(self.carrierStatsChannel) channel = self.bot.get_channel(self.carrierStatsChannel)
embed = discord.Embed(title="Carriers State", embed = discord.Embed(title="Carriers State",
colour=discord.Colour(0x29ac08), colour=discord.Colour(0x29ac08),
timestamp=datetime.now()) timestamp=datetime.now())
embed.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png") embed.set_thumbnail(url="https://cdn.discordapp.com/emojis/536647643367997492.png")
embed.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517', embed.set_author(name=u'\U0001F517 ' + self.stationName + u' \U0001F517',
url=self.stationUrl) url=self.stationUrl)
embed.set_footer(text="This message updates every 120 seconds(ish). Last updated") embed.set_footer(text="This message updates every 60 seconds(ish). Last updated")
for carrier, state in carrierState.items(): for carrier, state in carrierState.items():
embed.add_field(name=carrier, value=state, inline=True) embed.add_field(name=carrier, value=state, inline=True)
found = False found = False
async for oldmsg in channel.history(limit=2): async for oldmsg in channel.history(limit=2):
if oldmsg.author == self.bot.user: if oldmsg.author == self.bot.user:
found = True found = True
await oldmsg.edit(embed=embed) await oldmsg.edit(embed=embed)
break break
if not found: if not found:
await channel.send(embed=embed) await channel.send(embed=embed)
except Exception as e:
print("Something bad happened in the carrierState function :(")
def setup(bot): # this is called by Pycord to setup the cog def setup(bot): # this is called by Pycord to setup the cog
bot.add_cog(IdaCogs(bot)) # add the cog to the bot bot.add_cog(IdaCogs(bot)) # add the cog to the bot