From 78388397db3bf0d16c779112cedcede96436f498 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Fri, 28 Jun 2019 23:37:05 -0700 Subject: [PATCH] tweak defaults & fix `manual` command --- README.md | 4 ++-- bot.py | 6 +++--- config.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f9287dc..a462939 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Karl Marx 2 takes a somewhat different spin on moderation for smaller servers (~
-I didn't have as much time as I would have liked to work on this, but even after Hack Week, I intend to progressively flesh out its functionality beyond just moderation and further improve it. +I didn't have as much time as I would have liked to work on this, but even after Hack Week, I intend to progressively improve its abilities/scalability and even flesh out its functionality beyond just moderation and further improve it. Made with love. [Enjoy!](https://discordapp.com/oauth2/authorize?client_id=592852914553487370&permissions=8&scope=bot) :) @@ -19,6 +19,6 @@ Commands - `>>manual` - Get ye some help - `>>mute` - Hold a 30-second vote to mute a user for 10 minutes (minimum voters: 4, over 50% majority required). You can set different requirements in `config.json`. - `>>kick` - Kick a user. The vote is up for 5 minutes, and requires that a minimum of 6 users and >50% approve. -- `>>exile` - Euphamism for banning a user, I guess. By default, the vote lasts 3 hours, and requires that there be at least 10 votes and a 50% majority. Like the `>>mute` command, you can also tweak settings in `config.json`. +- `>>exile` - Euphamism for banning a user, I guess. By default, the vote lasts 20 minutes, and requires that there be at least 8 votes and a 50% majority. Like the `>>mute` command, you can also tweak settings in `config.json`. - `>>anthem` - First verse of the Soviet National Anthem. Might need that at some point to show your communist pride. - `>>ping` - Fun leftovers from when I was first setting up the bot. :P diff --git a/bot.py b/bot.py index 54ae479..2cbcd6f 100644 --- a/bot.py +++ b/bot.py @@ -42,17 +42,17 @@ async def manual(ctx): embed = discord.Embed(title="How 2 Comrade") embed.add_field( name=">>mute", - value="Hold a 30-second vote to mute a user for 10 minutes (minimum voters: 4, over 50% majority required). You can set different requirements in `config.json`." + value="Hold a {0}-second vote to mute a user for {1} minutes (minimum voters: {2}, over 50% majority required). You can set different requirements in `config.json`.".format(MUTE_VOTE_TIME, int(MUTE_TIME/60), MIN_MUTE_VOTERS) ) embed.add_field( name=">>kick", - value="Kick user. The vote is up for 5 minutes, and requires that a minimum of 6 users and >50% approve." + value="Kick user. The vote is up for {0} minutes, and requires that a minimum of {1} users and >50% approve.".format(int(KICK_VOTE_TIME/60), MIN_KICK_VOTERS) ) embed.add_field( name=">>exile", - value="Ban user. By default, the vote lasts 3 hours, and requires that there be at least 10 votes and a 50% majority. Like the `>>mute`/`>>kick` commands, you can also tweak settings in `config.json`." + value="Ban user. By default, the vote lasts {0} minutes, and requires that there be at least {1} votes and a 50% majority. Like the `>>mute`/`>>kick` commands, you can also tweak settings in `config.json`.".format(int(BAN_VOTE_TIME/60), MIN_BAN_VOTERS) ) await ctx.send(embed=embed) diff --git a/config.json b/config.json index f907099..8207534 100644 --- a/config.json +++ b/config.json @@ -6,6 +6,6 @@ "KICK_VOTE_TIME" : 300, "MIN_KICK_VOTERS" : 6, - "BAN_VOTE_TIME" : 600, + "BAN_VOTE_TIME" : 1200, "MIN_BAN_VOTERS" : 8 }