diff options
author | AnInternetTroll <lucafulger@gmail.com> | 2020-05-27 12:01:25 +0000 |
---|---|---|
committer | AnInternetTroll <lucafulger@gmail.com> | 2020-05-27 12:01:25 +0000 |
commit | 3c12f56459b3bff65a0697b46ad09b1a86d29ebf (patch) | |
tree | 044f4c630f10f8dfad0fd29c47792a24d333c17e | |
parent | 1c29f6f62a303f530c452fd9e8cf2df8df27c8bb (diff) | |
download | steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar.gz steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar.bz2 steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar.lz steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar.xz steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.tar.zst steve-bot-3c12f56459b3bff65a0697b46ad09b1a86d29ebf.zip |
modified: bot.py
modified: cogs/src.py
modified: custom_commands.json
-rwxr-xr-x | bot.py | 2 | ||||
-rwxr-xr-x | cogs/src.py | 8 | ||||
-rwxr-xr-x | custom_commands.json | 29 |
3 files changed, 37 insertions, 2 deletions
@@ -15,7 +15,7 @@ extensions = [ def get_prefix(bot, message): """A callable Prefix for our bot. This could be edited to allow per server prefixes.""" - prefixes = ['/', '!', 'steve '] + prefixes = ['/', '!', 'steve ', 'Steve ', 'STEVE '] # Check to see if we are outside of a guild. e.g DM's etc. #if not message.guild: diff --git a/cogs/src.py b/cogs/src.py index 4b84610..11992bb 100755 --- a/cogs/src.py +++ b/cogs/src.py @@ -156,6 +156,7 @@ class Src(commands.Cog): async def is_mod(ctx): return ctx.author.guild_permissions.manage_channels + @commands.cooldown(1, 30, commands.BucketType.guild) @commands.command(description="Posts all pending runs to #pending-runs") @commands.guild_only() async def pending(self, ctx): @@ -163,6 +164,13 @@ class Src(commands.Cog): await clear(self) await pendingRuns(self, ctx) + @pending.error + async def pending_handler(self,ctx,error): + if isinstance(error, commands.CommandOnCooldown): + await ctx.send('this annoys me more') + else: + await ctx.send('Something is fucked up please help AAAAAAAAAA') + @commands.command() async def verify(self, ctx, apiKey=None): if apiKey == None: diff --git a/custom_commands.json b/custom_commands.json index a393fb0..df541d2 100755 --- a/custom_commands.json +++ b/custom_commands.json @@ -1 +1,28 @@ -{"/src": "https://www.speedrun.com/mcbe", "/launcher": "https://github.com/MCMrARM/mc-w10-version-launcher/releases/tag/0.1.0", "/locate": "head north", "/boards": "https://www.speedrun.com/mcbe", "/leaderboards": "https://www.speedrun.com/mcbe", "/ban": "shut up", "/ssg": "https://www.speedrun.com/mcbe#Any_Glitchless", "/hoes": "stop asking for this shit", "/Make": "Troll Supermod", "/Don't": "Buy The Sun Newspaper", "/Troll": "is Super at his job", "/troll": "The greatest mod this game has", "/welcome": "Welcome! <:Cake:619552132298964993>", "/pending": "this annoys me", "!murray": "the irishest of the Irish", "!HereWeGo": "10 in a Row!", "!GlasgowRangers": "You Let Your Club Die!", "!hwg": "10 iar", "!When-you-walk-through-a-storm": "hold your head up high", "!At-the-end-of-a-Storm": "there's a golden sky and the sweet silver song of the lark", "!Walk-On": "Walk On with hope in your hearts and You'll Never Walk Alone", "!Walk-On-through-the-Wind": "Walk On through the rain", "!For-your-dreams": "be tossed and blown", "!When-you-walk": "through a storm hold your head up high and don't be afraid of the dark\nAt the end of a Storm there's a golden sky and the sweet silver song of the lark\nWalk on through the wind\nWalk on through the rain, for your dreams be tossed and blown\nWalk On, Walk On with hope in your hearts and You'll Never Walk Alone, **YOU'LL NEVER WALK ALONE**\nWalk On, Walk On with hope in your hearts and You'll Never Walk Alone, **YOU'LL NEVER WALK ALONE**", "!Scotland'sNo1": "Celtic"}
\ No newline at end of file +{ + "/src": "https://www.speedrun.com/mcbe", + "/launcher": "https://github.com/MCMrARM/mc-w10-version-launcher/releases/tag/0.1.0", + "/locate": "head north", + "/boards": "https://www.speedrun.com/mcbe", + "/leaderboards": "https://www.speedrun.com/mcbe", + "/ban": "shut up", + "/ssg": "https://www.speedrun.com/mcbe#Any_Glitchless", + "/hoes": "stop asking for this shit", + "/Make": "Troll Supermod", + "/Don't": "Buy The Sun Newspaper", + "/Troll": "is Super at his job", + "/troll": "The greatest mod this game has", + "/welcome": "Welcome! <:Cake:619552132298964993>", + "/pending": "this annoys me", + "!murray": "the irishest of the Irish", + "!HereWeGo": "10 in a Row!", + "!GlasgowRangers": "You Let Your Club Die!", + "!hwg": "10 iar", + "!When-you-walk-through-a-storm": "hold your head up high", + "!At-the-end-of-a-Storm": "there's a golden sky and the sweet silver song of the lark", + "!Walk-On": "Walk On with hope in your hearts and You'll Never Walk Alone", + "!Walk-On-through-the-Wind": "Walk On through the rain", + "!For-your-dreams": "be tossed and blown", + "!When-you-walk": "through a storm hold your head up high and don't be afraid of the dark\nAt the end of a Storm there's a golden sky and the sweet silver song of the lark\nWalk on through the wind\nWalk on through the rain, for your dreams be tossed and blown\nWalk On, Walk On with hope in your hearts and You'll Never Walk Alone, **YOU'LL NEVER WALK ALONE**\nWalk On, Walk On with hope in your hearts and You'll Never Walk Alone, **YOU'LL NEVER WALK ALONE**", + "!Scotland'sNo1": "Celtic", + "/swipe": "not an alt" +}
\ No newline at end of file |