bss/dr.botzo
1
0
Fork 0
Code Issues 3 Pull Requests Releases 2 Wiki Activity

Twitter: add a flag to getstatus/getuserstatus that suppresses the printing of the source

Browse Source
This commit is contained in:
Brian S. Stephan 2012-07-14 09:59:45 -05:00
parent a8fe6da14f
commit 8f5b6d96c2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/Twitter.py
View File

@ -39,8 +39,8 @@ class Twitter(Module):
Module.__init__(self, irc, config, server) Module.__init__(self, irc, config, server)
# setup regexes # setup regexes
getstatuspattern = "^!twitter\s+getstatus(\s+noid)?\s+(\S+)$" getstatuspattern = "^!twitter\s+getstatus(\s+nosource)?(\s+noid)?\s+(\S+)$"
getuserstatuspattern = "^!twitter\s+getuserstatus(\s+noid)?\s+(\S+)(\s+.*|$)" getuserstatuspattern = "^!twitter\s+getuserstatus(\s+nosource)?(\s+noid)?\s+(\S+)(\s+.*|$)"
tweetpattern = "^!twitter\s+tweet\s+(.*)" tweetpattern = "^!twitter\s+tweet\s+(.*)"
gettokenpattern = "^!twitter\s+gettoken$" gettokenpattern = "^!twitter\s+gettoken$"
authpattern = "^!twitter\s+auth\s+(\S+)$" authpattern = "^!twitter\s+auth\s+(\S+)$"
@ -165,13 +165,16 @@ class Twitter(Module):
match = self.getstatusre.search(what) match = self.getstatusre.search(what)
if match: if match:
print_source = True
print_id = True print_id = True
if match.group(1): if match.group(1):
print_source = False
if match.group(2):
print_id = False print_id = False
status = match.group(2) status = match.group(3)
try: try:
tweet = self.twit.GetStatus(status) tweet = self.twit.GetStatus(status)
return self._return_tweet_or_retweet_text(tweet=tweet, print_source=True, print_id=print_id) return self._return_tweet_or_retweet_text(tweet=tweet, print_source=print_source, print_id=print_id)
except twitter.TwitterError as e: except twitter.TwitterError as e:
return "Couldn't obtain status: " + str(e) return "Couldn't obtain status: " + str(e)
@ -180,11 +183,14 @@ class Twitter(Module):
match = self.getuserstatusre.search(what) match = self.getuserstatusre.search(what)
if match: if match:
print_source = True
print_id = True print_id = True
if match.group(1): if match.group(1):
print_source = False
if match.group(2):
print_id = False print_id = False
user = match.group(2) user = match.group(3)
index = match.group(3) index = match.group(4)
try: try:
if index: if index:
@ -203,7 +209,7 @@ class Twitter(Module):
tweets = self.twit.GetUserTimeline(screen_name=user, count=count, include_rts=True) tweets = self.twit.GetUserTimeline(screen_name=user, count=count, include_rts=True)
if tweets: if tweets:
tweet = tweets[-1*index] tweet = tweets[-1*index]
return self._return_tweet_or_retweet_text(tweet=tweet, print_id=print_id) return self._return_tweet_or_retweet_text(tweet=tweet, print_source=print_source, print_id=print_id)
except twitter.TwitterError as e: except twitter.TwitterError as e:
return "Couldn't obtain status: " + str(e) return "Couldn't obtain status: " + str(e)
except ValueError as e: except ValueError as e: