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

More refactoring! Break everything!

Browse source
This commit is contained in:
Luke Rogers 2013-10-01 16:55:18 +13:00
parent 51c866de6d
commit 42a72f068e
6 changed files with 36 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/factoids.py
View file

@ -105,7 +105,7 @@ def info(inp, notice=None, db=None):
@hook.regex(r'^\? ?(.+)')
def factoid(inp, say=None, db=None, bot=None, action=None, conn=None, input=None):
def factoid(inp, message=None, db=None, bot=None, action=None, conn=None, input=None):
"?<word> -- Shows what data is associated with <word>."
try:
prefix_on = bot.config["plugins"]["factoids"].get("prefix", False)
@ -145,11 +145,11 @@ def factoid(inp, say=None, db=None, bot=None, action=None, conn=None, input=None
elif result.startswith("<url>"):
url = result[5:].strip()
try:
say(http.get(url))
message(http.get(url))
except http.HttpError:
say("Could not fetch URL.")
message("Could not fetch URL.")
else:
if prefix_on:
say("\x02[{}]:\x02 {}".format(factoid_id, result))
message("\x02[{}]:\x02 {}".format(factoid_id, result))
else:
say(result)
message(result)