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

Tweaked a few things

Browse source
This commit is contained in:
Luke Rogers 2012-05-17 11:45:07 +12:00
parent a822b4f61a
commit a2bfaf6ca5
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/twitter.py
View file

@ -1,13 +1,12 @@
# written by Scaevolus, modified by Lukeroge # written by Scaevolus, modified by Lukeroge
from util import hook, http
import random import random
import re import re
from time import strftime from time import strftime, strptime
from time import strptime
from datetime import datetime from datetime import datetime
from util import hook from util.timesince import timesince
from util import http
from util import timesince
def unescape_xml(string): def unescape_xml(string):
@ -109,7 +108,7 @@ def twitter(inp):
try: try:
tweet = http.get_xml(url) tweet = http.get_xml(url)
except http.HTTPError, e: except http.HTTPError as e:
errors = {400: 'bad request (ratelimited?)', errors = {400: 'bad request (ratelimited?)',
401: 'tweet is private', 401: 'tweet is private',
403: 'tweet is private', 403: 'tweet is private',
@ -122,7 +121,7 @@ def twitter(inp):
if e.code in errors: if e.code in errors:
return 'error: ' + errors[e.code] return 'error: ' + errors[e.code]
return 'error: unknown %s' % e.code return 'error: unknown %s' % e.code
except http.URLError, e: except http.URLError as e:
return 'error: timeout' return 'error: timeout'
if searching_hashtag: if searching_hashtag:
@ -153,7 +152,7 @@ def twitter(inp):
strptime(time.text, strptime(time.text,
'%a %b %d %H:%M:%S +0000 %Y')) '%a %b %d %H:%M:%S +0000 %Y'))
time_nice = timesince.timesince(parseDateTime(time_raw), datetime.utcnow()) time_nice = timesince(parseDateTime(time_raw), datetime.utcnow())
if tweet.find(retweeted_text) is not None: if tweet.find(retweeted_text) is not None:
text = 'RT @%s:' % tweet.find(retweeted_screen_name).text text = 'RT @%s:' % tweet.find(retweeted_screen_name).text