Dev #54

Merged
Rich merged 12 commits from dev into master 2020-02-28 18:45:12 +00:00
3 changed files with 16 additions and 2 deletions

No files matched your search

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

+16 -2
View File
@@ -95,6 +95,15 @@ async def holyshit(ctx):
###
#
# Image Commands
#
@bot.command()
async def smudge(ctx):
print(" - Uploading Smudge to chat channel")
file = discord.File("./images/smudge.png", filename="smudge.png")
await ctx.send(file=file)
#
# Voice Commands
#
@@ -417,12 +426,17 @@ async def updateStatus():
# Try to get the % of Completion
print_completion = round(octoapi.get_completion(), 2)
except:
print_completion = "Unknown"
print_completion = 999
unknowns += 1
#Set the activity to the new percent complete value
activity = discord.Activity(name=f"3D Print @ {str(print_completion)}%",type=discord.ActivityType.watching)
if print_completion != 999:
activity = discord.Activity(name=f"3D Print @ {str(print_completion)}%",type=discord.ActivityType.watching)
else:
activity = discord.Activity(name=f"3D Print @ ERROR",type=discord.ActivityType.watching)
await bot.change_presence(activity=activity)
if (unknowns >= 5):
break
await asyncio.sleep(30)
Binary file not shown.