Merge branch 'develop' into refresh

This commit is contained in:
Luke Rogers 2013-10-08 11:33:36 +13:00
commit cda19bc1e3
2 changed files with 5 additions and 5 deletions

View file

@ -20,11 +20,11 @@ def correction(inp, message=None, input=None, notice=None, db=None):
message = last_message[1].replace("\x01ACTION ", "/me ").replace("\x01", "")
else:
message = last_message[1]
message("{} meant to say: {}".format(nick, message.replace(find, "\x02" + replace + "\x02")))
message(u"{} meant to say: {}".format(message.replace(find, "\x02" + replace + "\x02"), nick))
else:
notice("{} can't be found in your last message".format(find))
notice(u"{} can't be found in your last message".format(find))
else:
if nick == input.nick:
notice("I haven't seen you say anything here yet")
notice(u"I haven't seen you say anything here yet")
else:
notice("I haven't seen {} say anything here yet".format(nick))
notice(u"I haven't seen {} say anything here yet".format(nick))

View file

@ -20,7 +20,7 @@ def reddit_url(match):
timeago = thread.xpath("//div[@id='siteTable']//p[@class='tagline']/time/text()")[0]
comments = thread.xpath("//div[@id='siteTable']//a[@class='comments']/text()")[0]
return '\x02{}\x02 - posted by \x02{}\x02 {} ago - {} upvotes, {} downvotes - {}'.format(
return u'\x02{}\x02 - posted by \x02{}\x02 {} ago - {} upvotes, {} downvotes - {}'.format(
title, author, timeago, upvotes, downvotes, comments)