diff --git a/plugins/dice.py b/plugins/dice.py index b32bb2d..d5aff31 100755 --- a/plugins/dice.py +++ b/plugins/dice.py @@ -9,7 +9,7 @@ from util import hook whitespace_re = re.compile(r'\s+') -valid_diceroll = r'^([+-]?(?:\d+|\d*d(?:\d+|F))(?:[+-](?:\d+|\d*d(?:\d+|' +valid_diceroll = r'^([+-]?(?:\d+|\d*d(?:\d+|F))(?:[+-](?:\d+|\d*d(?:\d+|' \ 'F)))*)( .+)?$' valid_diceroll_re = re.compile(valid_diceroll, re.I) sign_re = re.compile(r'[+-]?(?:\d*d)?(?:\d+|F)', re.I) diff --git a/plugins/twitter.py b/plugins/twitter.py index 076de72..7acaa19 100755 --- a/plugins/twitter.py +++ b/plugins/twitter.py @@ -159,4 +159,4 @@ def twitter(inp): text = unescape_xml(tweet.find(text).text.replace('\n', '')) screen_name = tweet.find(screen_name).text - return "\x02@%s\x02: %s [ %s ago ]" % (screen_name, text, time_pretty) + return "\x02@%s\x02: %s (%s ago)" % (screen_name, text, time_pretty)