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

Fix up tweets.py

Browse source
This commit is contained in:
dngfx 2018-09-09 15:50:05 +01:00 committed by dongfix
parent 23fbc2cb95
commit a9e49fd36b
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/tweets.py
View file

@ -15,7 +15,6 @@ class Module(object):
def __init__(self, bot, events, exports): def __init__(self, bot, events, exports):
self.bot = bot self.bot = bot
self.url_shortener_enabled = "bitly" in self.bot.modules.modules
self.events = events self.events = events
events.on("received").on("command").on("tweet", "tw" events.on("received").on("command").on("tweet", "tw"
@ -67,16 +66,19 @@ class Module(object):
linked_id = tweet["id"] linked_id = tweet["id"]
username = "@%s" % tweet["user"]["screen_name"] username = "@%s" % tweet["user"]["screen_name"]
url_shortener_link = "" url_shortener_link = False
if self.url_shortener_enabled: chopped_uname = username[1:]
chopped_uname = username[1:] tweet_link = "https://twitter.com/%s/status/%s" % (
tweet_link = "https://twitter.com/%s/status/%s" % (
chopped_uname, linked_id) chopped_uname, linked_id)
url_shortener_link = " -- " + self.events.on("get").on( url_shortener_link = self.events.on("get").on(
"shortlink").call( "shortlink").call(
url=tweet_link)[0] url=tweet_link)[0]
url_shortener_link = "" if url_shortener_link == False else \
"-- " + url_shortener_link
if "retweeted_status" in tweet: if "retweeted_status" in tweet:
original_username = "@%s" % tweet["retweeted_status" original_username = "@%s" % tweet["retweeted_status"
]["user"]["screen_name"] ]["user"]["screen_name"]
@ -93,12 +95,13 @@ class Module(object):
original_text, original_text,
url_shortener_link)) url_shortener_link))
else: else:
event["stdout"].write("(%s, %s) %s %s" % (username, event["stdout"].write("(%s, %s) %s %s" %
self.make_timestamp( (username,
tweet[ self.make_timestamp(
"created_at"]), tweet["created_at"]
tweet["text"], ),
url_shortener_link) tweet["text"],
url_shortener_link)
) )
else: else:
event["stderr"].write("Invalid tweet identifiers provided") event["stderr"].write("Invalid tweet identifiers provided")