Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Tidy up indentation in tweets.py

Browse source
This commit is contained in:
jesopo 2018-09-09 16:07:18 +01:00
parent bfdb4a88da
commit 7f647a40c5
1 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
modules/tweets.py
View file

@ -10,23 +10,17 @@ import Utils
REGEX_TWITTERURL = re.compile( REGEX_TWITTERURL = re.compile(
"https?://(?:www\.)?twitter.com/[^/]+/status/(\d+)", re.I) "https?://(?:www\.)?twitter.com/[^/]+/status/(\d+)", re.I)
class Module(object): class Module(object):
def __init__(self, bot, events, exports): def __init__(self, bot, events, exports):
self.bot = bot self.bot = bot
self.events = events self.events = events
events.on("received").on("command").on("tweet", "tw" events.on("received.command").on("tweet", "tw").hook(self.tweet,
).hook(self.tweet, help="Find a tweet", usage="[@username/URL/ID]")
help="Find a tweet",
usage="[@username/URL/ID]")
def make_timestamp(self, s): def make_timestamp(self, s):
seconds_since = time.time() - datetime.datetime.strptime(s, seconds_since = time.time() - datetime.datetime.strptime(s,
"%a %b %d " "%a %b %d %H:%M:%S %z %Y").timestamp()
"%H:%M:%S %z "
"%Y").timestamp()
since, unit = Utils.time_unit(seconds_since) since, unit = Utils.time_unit(seconds_since)
return "%s %s ago" % (since, unit) return "%s %s ago" % (since, unit)
@ -64,20 +58,14 @@ class Module(object):
tweet = None tweet = None
if tweet: if tweet:
linked_id = tweet["id"] linked_id = tweet["id"]
username = "@%s" % tweet["user"]["screen_name"] username = tweet["user"]["screen_name"]
url_shortener_link = False tweet_link = "https://twitter.com/%s/status/%s" % (username,
chopped_uname = username[1:] linked_id)
tweet_link = "https://twitter.com/%s/status/%s" % (
chopped_uname, linked_id)
url_shortener_link = self.events.on("get").on(
"shortlink").call(
url=tweet_link)[0]
url_shortener_link = "" if url_shortener_link == False else \
"-- " + url_shortener_link
short_url = self.events.on("get.shortlink").call_for_result(
url=tweet_link)
short_url = " -- %s" % short_url if short_url else ""
if "retweeted_status" in tweet: if "retweeted_status" in tweet:
original_username = "@%s" % tweet["retweeted_status" original_username = "@%s" % tweet["retweeted_status"
@ -86,23 +74,15 @@ class Module(object):
retweet_timestamp = self.make_timestamp(tweet[ retweet_timestamp = self.make_timestamp(tweet[
"created_at"]) "created_at"])
original_timestamp = self.make_timestamp(tweet[ original_timestamp = self.make_timestamp(tweet[
"retweeted_status"][ "retweeted_status"]["created_at"])
"created_at"])
event["stdout"].write( event["stdout"].write(
"(%s (%s) retweeted %s (%s)) %s %s" % ( "(@%s (%s) retweeted %s (%s)) %s%s" % (
username, retweet_timestamp, username, retweet_timestamp, original_username,
original_username, original_timestamp, original_timestamp, original_text, short_url))
original_text,
url_shortener_link))
else: else:
event["stdout"].write("(%s, %s) %s %s" % event["stdout"].write("(@%s, %s) %s%s" % (username,
(username, self.make_timestamp(tweet["created_at"]),
self.make_timestamp( tweet["text"], short_url))
tweet["created_at"]
),
tweet["text"],
url_shortener_link)
)
else: else:
event["stderr"].write("Invalid tweet identifiers provided") event["stderr"].write("Invalid tweet identifiers provided")
else: else: