ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
This commit is contained in:
Luke Rogers 2013-11-27 16:55:04 +13:00
commit aa8ab33ccb
31 changed files with 113 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/kill.py
View file

@ -22,11 +22,11 @@ def kill(inp, action=None, nick=None, conn=None, notice=None):
target = nick
variables = {
"user": target
"user": target
}
with open("./data/kills.json") as f:
generator = get_generator(f.read(), variables)
# act out the message
action(generator.generate_string())
action(generator.generate_string())