moar PEP8
This commit is contained in:
parent
9f0bcbbac5
commit
715f926846
5 changed files with 69 additions and 66 deletions
|
@ -123,7 +123,8 @@ def kick(inp, input=None, notice=None):
|
||||||
@hook.command
|
@hook.command
|
||||||
def say(inp, input=None, notice=None):
|
def say(inp, input=None, notice=None):
|
||||||
".say [channel] <message> -- Makes the bot say <message> in [channel]. "\
|
".say [channel] <message> -- Makes the bot say <message> in [channel]. "\
|
||||||
"If [channel] is blank the bot will say the <message> in the channel the command was used in."
|
"If [channel] is blank the bot will say the <message> in "\
|
||||||
|
"the channel the command was used in."
|
||||||
if not input.nick in input.bot.config["admins"]:
|
if not input.nick in input.bot.config["admins"]:
|
||||||
notice("Only bot admins can use this command!")
|
notice("Only bot admins can use this command!")
|
||||||
return
|
return
|
||||||
|
@ -146,8 +147,9 @@ def say(inp, input=None, notice=None):
|
||||||
@hook.command("me")
|
@hook.command("me")
|
||||||
@hook.command
|
@hook.command
|
||||||
def act(inp, input=None, notice=None):
|
def act(inp, input=None, notice=None):
|
||||||
".act [channel] <action> -- Makes the bot act out <action> in [channel]. "
|
".act [channel] <action> -- Makes the bot act out <action> in [channel] "\
|
||||||
\"If [channel] is blank the bot will act the <action> in the channel the command was used in."
|
"If [channel] is blank the bot will act the <action> in "\
|
||||||
|
"the channel the command was used in."
|
||||||
if not input.nick in input.bot.config["admins"]:
|
if not input.nick in input.bot.config["admins"]:
|
||||||
notice("Only bot admins can use this command!")
|
notice("Only bot admins can use this command!")
|
||||||
return
|
return
|
||||||
|
|
|
@ -6,7 +6,8 @@ from util import hook
|
||||||
|
|
||||||
@hook.command
|
@hook.command
|
||||||
def choose(inp):
|
def choose(inp):
|
||||||
".choose <choice1>, [choice2], [choice3], [choice4], ... -- Randomly picks one of the given choices."
|
".choose <choice1>, [choice2], [choice3], [choice4], ... -- "\
|
||||||
|
"Randomly picks one of the given choices."
|
||||||
|
|
||||||
c = re.findall(r'([^,]+)', inp)
|
c = re.findall(r'([^,]+)', inp)
|
||||||
if len(c) == 1:
|
if len(c) == 1:
|
||||||
|
|
|
@ -2,24 +2,25 @@
|
||||||
from util import hook
|
from util import hook
|
||||||
import random
|
import random
|
||||||
|
|
||||||
|
|
||||||
# used for tails: x heads: y
|
# used for tails: x heads: y
|
||||||
def flip_simple(count):
|
def flip_simple(count):
|
||||||
heads = 0
|
heads = 0
|
||||||
tails = 0
|
tails = 0
|
||||||
for x in range(count):
|
for x in range(count):
|
||||||
c = random.randint(0,1)
|
c = random.randint(0, 1)
|
||||||
if c == 0:
|
if c == 0:
|
||||||
heads += 1
|
heads += 1
|
||||||
else:
|
else:
|
||||||
tails += 1
|
tails += 1
|
||||||
return [heads,tails]
|
return [heads, tails]
|
||||||
|
|
||||||
|
|
||||||
@hook.command(autohelp=False)
|
@hook.command(autohelp=False)
|
||||||
def coin(inp):
|
def coin(inp):
|
||||||
".coin [amount] -- Flips [amount] of coins."
|
".coin [amount] -- Flips [amount] of coins."
|
||||||
|
# checking for valid input. if valid input [count=inp],
|
||||||
# checking for valid input. if valid input [count=inp], if invalid [return error], if no input [count=1]
|
# if invalid [return error], if no input [count=1]
|
||||||
if inp.isdigit():
|
if inp.isdigit():
|
||||||
count = int(inp)
|
count = int(inp)
|
||||||
else:
|
else:
|
||||||
|
@ -32,13 +33,13 @@ def coin(inp):
|
||||||
return "Too many coins! Maximum is 200."
|
return "Too many coins! Maximum is 200."
|
||||||
# depending on the count, we use two different methods to get the output
|
# depending on the count, we use two different methods to get the output
|
||||||
if count == 1:
|
if count == 1:
|
||||||
flip = random.randint(0,1)
|
flip = random.randint(0, 1)
|
||||||
if flip == 1:
|
if flip == 1:
|
||||||
sidename = "heads"
|
sidename = "heads"
|
||||||
else:
|
else:
|
||||||
sidename = "tails"
|
sidename = "tails"
|
||||||
return "You flip a coin and get "+sidename+"."
|
return "You flip a coin and get " + sidename + "."
|
||||||
else:
|
else:
|
||||||
flips = flip_simple(count)
|
flips = flip_simple(count)
|
||||||
return "You flip %s coins and get %s heads and %s tails." % (str(count), str(flips[0]), str(flips[1]))
|
return "You flip %s coins and get "\
|
||||||
|
"%s heads and %s tails." % (str(count), str(flips[0]), str(flips[1]))
|
||||||
|
|
|
@ -1,19 +1,22 @@
|
||||||
from util import hook
|
from util import hook
|
||||||
|
|
||||||
|
|
||||||
# CTCP responses
|
# CTCP responses
|
||||||
@hook.regex(r'^\x01VERSION\x01$')
|
@hook.regex(r'^\x01VERSION\x01$')
|
||||||
def ctcpversion(inp, notice=None):
|
def ctcpversion(inp, notice=None):
|
||||||
notice('\x01VERSION: CloudBot - http://git.io/cloudbot')
|
notice('\x01VERSION: CloudBot - http://git.io/cloudbot')
|
||||||
|
|
||||||
|
|
||||||
@hook.regex(r'^\x01PING\x01$')
|
@hook.regex(r'^\x01PING\x01$')
|
||||||
def ctcpping(inp, notice=None):
|
def ctcpping(inp, notice=None):
|
||||||
notice('\x01PING: PONG')
|
notice('\x01PING: PONG')
|
||||||
|
|
||||||
|
|
||||||
@hook.regex(r'^\x01TIME\x01$')
|
@hook.regex(r'^\x01TIME\x01$')
|
||||||
def ctcptime(inp, notice=None):
|
def ctcptime(inp, notice=None):
|
||||||
notice('\x01TIME: GET A WATCH')
|
notice('\x01TIME: GET A WATCH')
|
||||||
|
|
||||||
|
|
||||||
@hook.regex(r'^\x01FINGER\x01$')
|
@hook.regex(r'^\x01FINGER\x01$')
|
||||||
def ctcpfinger(inp, notice=None):
|
def ctcpfinger(inp, notice=None):
|
||||||
notice('\x01FINGER: WHERE ARE YOU PUTTING THAT')
|
notice('\x01FINGER: WHERE ARE YOU PUTTING THAT')
|
||||||
|
|
||||||
|
|
|
@ -1,78 +1,74 @@
|
||||||
'''
|
'''
|
||||||
Plugin which (de)cyphers a string
|
Plugin which (de)cyphers a string
|
||||||
|
|
||||||
Doesn't cypher non-alphanumeric strings yet.
|
Doesn't cypher non-alphanumeric strings yet.
|
||||||
|
|
||||||
by instanceoftom
|
by instanceoftom
|
||||||
'''
|
'''
|
||||||
|
|
||||||
from util import hook
|
from util import hook
|
||||||
chars="abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ "
|
chars = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ "
|
||||||
len_chars = len(chars)
|
len_chars = len(chars)
|
||||||
|
|
||||||
|
|
||||||
@hook.command
|
@hook.command
|
||||||
def cypher(inp):
|
def cypher(inp):
|
||||||
".cypher <pass> <string> -- Cyphers <string> with <password>."
|
".cypher <pass> <string> -- Cyphers <string> with <password>."
|
||||||
|
|
||||||
passwd = inp.split(" ")[0]
|
passwd = inp.split(" ")[0]
|
||||||
len_passwd = len(passwd)
|
len_passwd = len(passwd)
|
||||||
inp = " ".join(inp.split(" ")[1:])
|
inp = " ".join(inp.split(" ")[1:])
|
||||||
|
|
||||||
out =""
|
out = ""
|
||||||
passwd_index=0
|
passwd_index = 0
|
||||||
for character in inp:
|
for character in inp:
|
||||||
try:
|
try:
|
||||||
chr_index = chars.index(character)
|
chr_index = chars.index(character)
|
||||||
passwd_chr_index = chars.index(passwd[passwd_index])
|
passwd_chr_index = chars.index(passwd[passwd_index])
|
||||||
|
|
||||||
out_chr_index = (chr_index + passwd_chr_index) % len_chars
|
out_chr_index = (chr_index + passwd_chr_index) % len_chars
|
||||||
out_chr = chars[out_chr_index]
|
out_chr = chars[out_chr_index]
|
||||||
|
|
||||||
out += out_chr
|
out += out_chr
|
||||||
|
|
||||||
passwd_index = ( passwd_index + 1) % len_passwd
|
passwd_index = (passwd_index + 1) % len_passwd
|
||||||
except ValueError:
|
except ValueError:
|
||||||
out += character
|
out += character
|
||||||
continue
|
continue
|
||||||
|
return out
|
||||||
|
|
||||||
return out
|
|
||||||
|
|
||||||
@hook.command
|
@hook.command
|
||||||
def decypher(inp):
|
def decypher(inp):
|
||||||
".decypher <pass> <string> -- Decyphers <string> with <password>."
|
".decypher <pass> <string> -- Decyphers <string> with <password>."
|
||||||
|
|
||||||
passwd = inp.split(" ")[0]
|
passwd = inp.split(" ")[0]
|
||||||
len_passwd = len(passwd)
|
len_passwd = len(passwd)
|
||||||
inp = " ".join(inp.split(" ")[1:])
|
inp = " ".join(inp.split(" ")[1:])
|
||||||
|
|
||||||
|
passwd_index = 0
|
||||||
|
for character in inp:
|
||||||
|
try:
|
||||||
|
chr_index = chars.index(character)
|
||||||
|
passwd_index = (passwd_index + 1) % len_passwd
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
|
||||||
passwd_index=0
|
passwd_index = passwd_index - 1
|
||||||
#I am lazy and I could do the math to get the passwd_index
|
reversed_message = inp[::-1]
|
||||||
#for this inp, but meh thats for a later day so lets loop.
|
|
||||||
for character in inp:
|
|
||||||
try:
|
|
||||||
chr_index = chars.index(character)
|
|
||||||
passwd_index = ( passwd_index + 1) % len_passwd
|
|
||||||
except ValueError:
|
|
||||||
continue
|
|
||||||
|
|
||||||
passwd_index = passwd_index-1
|
out = ""
|
||||||
reversed_message = inp[::-1]
|
for character in reversed_message:
|
||||||
|
try:
|
||||||
|
chr_index = chars.index(character)
|
||||||
|
passwd_chr_index = chars.index(passwd[passwd_index])
|
||||||
|
|
||||||
out =""
|
out_chr_index = (chr_index - passwd_chr_index) % len_chars
|
||||||
for character in reversed_message:
|
out_chr = chars[out_chr_index]
|
||||||
try:
|
|
||||||
chr_index = chars.index(character)
|
|
||||||
passwd_chr_index = chars.index(passwd[passwd_index])
|
|
||||||
|
|
||||||
out_chr_index = (chr_index - passwd_chr_index) % len_chars
|
out += out_chr
|
||||||
out_chr = chars[out_chr_index]
|
|
||||||
|
|
||||||
out += out_chr
|
passwd_index = (passwd_index - 1) % len_passwd
|
||||||
|
except ValueError:
|
||||||
|
out += character
|
||||||
|
continue
|
||||||
|
|
||||||
passwd_index = ( passwd_index - 1) % len_passwd
|
return out[::-1]
|
||||||
except ValueError:
|
|
||||||
out += character
|
|
||||||
continue
|
|
||||||
|
|
||||||
return out[::-1]
|
|
||||||
|
|
Reference in a new issue