Skip to content

FODL fix output on errors #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malkaroy-vrrp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FODL fix output on errors #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34cce5f
Fix Output on errors
malkaroy-vrrp Jun 29, 2021
e3766ab
Update main.py
malkaroy-vrrp Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ async def puplist(ctx):
@client.command()
async def fodl(ctx, *, username):
message = ctx.message
clickerStr = "<:arrow_right:856238567713800222> Click here for: "
#hard-coding mining channel in here for now. no one else should need this command...
#could allow this in private message, but don't want to pollute the global with everyones chat id's
if message.channel.id != 566268199210057728: # and not is_private(message.channel):
Expand Down Expand Up @@ -643,14 +644,13 @@ async def fodl(ctx, *, username):
await message.add_reaction('\U000026D4')

if (isCorrect):
clickerStr = "<:arrow_right:856238567713800222> Click here for: "
if "last" in banTeam: #might need to investigate further but sometimes fah api doesn't have data...
output+="<:white_check_mark:835347973503451176> " + str(banTeam["last"])+" UTC : Last Completed Banano WU\n"
output+="<:white_check_mark:835347973503451176> "+str(banTeam["wus"])+" work units completed so far.\n"
output+="<:white_check_mark:835347973503451176> "+str(banTeam["score"])+" points received so far.\n"
await message.add_reaction('\U0001F6F0')
if len(bMinerJSON["payments"]) == 0:
output+="<:grey_exclamation:835357988432642049> No payments sent yet. First payment is within 24-36 hours of completing first Work Unit as long as you complete at least 2 work units (progress bar going to 100%) with at least one in each 12 hour period.\n"
output+="<:grey_exclamation:859296229941968946> No payments sent yet. First payment is within 24-36 hours of completing first Work Unit as long as you complete at least 2 work units (progress bar going to 100%) with at least one in each 12 hour period.\n"
output+="<:banana:838483242113957898>Work Units Pending Payment: "+str(banTeam["wus"])+"\n"
output+="<:banana:838483242113957898>Points Pending Payment: "+str(banTeam["score"])+"\n"
await message.add_reaction('\U0001F6F0')
Expand All @@ -666,19 +666,19 @@ async def fodl(ctx, *, username):
progresso = True
if cpu["active"]==1:
bonus = True
output += "<:white_check_mark:835347973503451176> Passkey Bonus Active\n"
output += "<:closed_lock_with_key:856254383729016883> Passkey Bonus Active\n"
await message.add_reaction('\U0001F510')#lock/key
break
if bonus ==False and progresso == True: #passkey in porgress
output += "<:grey_exclamation:835357988432642049> Passkey Bonus Not Active, but appears to be in progress\n"+clickerStr+ "[Passkey Bonus Info](https://foldingathome.org/support/faq/points/?lng=en-US#what-are-the-qualifications-for-the-qrb)\nPasskey Requires 10 work units completed after adding to client to activate."
output += "<:children_crossing:856246670193983528> Passkey Bonus Not Active, but appears to be in progress\n"+clickerStr+ "[Passkey Bonus Info](https://foldingathome.org/support/faq/points/?lng=en-US#what-are-the-qualifications-for-the-qrb)\nPasskey Requires 10 work units completed after adding to client to activate."
await message.add_reaction('\U0001F6B8')#caution sign?
elif bonus ==False: #if there is no bonus entries, passkey is not entered (the issue here is a timeout could happen and not be deteceted...)
output += "<:grey_exclamation:835357988432642049> Passkey Bonus Not Active and does not appear to be entered \n <:arrow_right:856238567713800222> Click here to: [Get a Passkey](https://apps.foldingathome.org/getpasskey)\n"+clickerStr+ "[Passkey Bonus Info](https://foldingathome.org/support/faq/points/?lng=en-US#what-are-the-qualifications-for-the-qrb)\nPasskey Requires 10 work units completed after adding to client to activate."
output += "<:grey_exclamation:859296229941968946> Passkey Bonus Not Active and does not appear to be entered \n <:arrow_right:856238567713800222> Click here to: [Get a Passkey](https://apps.foldingathome.org/getpasskey)\n"+clickerStr+ "[Passkey Bonus Info](https://foldingathome.org/support/faq/points/?lng=en-US#what-are-the-qualifications-for-the-qrb)\nPasskey Requires 10 work units completed after adding to client to activate."
await message.add_reaction('\U00002755')#exclamation mark
#add reaction to message
#This is not explicitly an issue, but calling it out in summary may hep in identifying wrong team issues, calling out the date(s) might also be helpful?
if nonBanWU > 0:
output+="<:grey_exclamation:835357988432642049> "+username + " has completed "+ str(nonBanWU) + " number of Work Units for teams other than Banano\n"
output+="<:grey_exclamation:859296229941968946> "+username + " has completed "+ str(nonBanWU) + " number of Work Units for teams other than Banano\n"
if (isCorrect==False):
output+="\nPlease review above errors. After updating client and completing another Work Unit: this test can be ran again to verify your client is set up to track points correctly.\n"

Expand Down