From 7aecd2b4ca4a2dc05146c49aaa44fffdf16fa5bd Mon Sep 17 00:00:00 2001 From: dngfx Date: Sun, 9 Sep 2018 13:12:06 +0100 Subject: WOOP WOOP THAT'S THE SOUND OF LINKS FOR TWEETS --- modules/tweets.py | 59 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 16 deletions(-) (limited to 'modules/tweets.py') diff --git a/modules/tweets.py b/modules/tweets.py index ff628b6e..93492212 100644 --- a/modules/tweets.py +++ b/modules/tweets.py @@ -1,7 +1,7 @@ -#--require-config twitter-api-key -#--require-config twitter-api-secret -#--require-config twitter-access-token -#--require-config twitter-access-secret +# --require-config twitter-api-key +# --require-config twitter-api-secret +# --require-config twitter-access-token +# --require-config twitter-access-secret import datetime, re, time, traceback import twitter @@ -10,16 +10,23 @@ import Utils REGEX_TWITTERURL = re.compile( "https?://(?:www\.)?twitter.com/[^/]+/status/(\d+)", re.I) + class Module(object): + def __init__(self, bot, events, exports): self.bot = bot + self.bitly_is_enabled = "bitly" in self.bot.modules.modules + events.on("received").on("command").on("tweet", "tw" - ).hook(self.tweet, help="Find a tweet", - usage="[@username/URL/ID]") + ).hook(self.tweet, + help="Find a tweet", + usage="[@username/URL/ID]") def make_timestamp(self, s): - seconds_since = time.time()-datetime.datetime.strptime(s, - "%a %b %d %H:%M:%S %z %Y").timestamp() + seconds_since = time.time() - datetime.datetime.strptime(s, + "%a %b %d " + "%H:%M:%S %z " + "%Y").timestamp() since, unit = Utils.time_unit(seconds_since) return "%s %s ago" % (since, unit) @@ -56,21 +63,41 @@ class Module(object): traceback.print_exc() tweet = None if tweet: + linked_id = tweet["id"] username = "@%s" % tweet["user"]["screen_name"] + + bitly_link = "" + if self.bitly_is_enabled: + bitly = self.bot.modules.modules["bitly"] + chopped_uname = username[1:] + tweet_link = "https://twitter.com/%s/status/%s" % ( + chopped_uname, linked_id) + + bitly_link = " -- " + bitly.shortlink(tweet_link) + if "retweeted_status" in tweet: original_username = "@%s" % tweet["retweeted_status" - ]["user"]["screen_name"] + ]["user"]["screen_name"] original_text = tweet["retweeted_status"]["text"] retweet_timestamp = self.make_timestamp(tweet[ - "created_at"]) + "created_at"]) original_timestamp = self.make_timestamp(tweet[ - "retweeted_status"]["created_at"]) - event["stdout"].write("(%s (%s) retweeted %s (%s)) %s" % ( - username, retweet_timestamp, - original_username, original_timestamp, original_text)) + "retweeted_status"][ + "created_at"]) + event["stdout"].write( + "(%s (%s) retweeted %s (%s)) %s %s" % ( + username, retweet_timestamp, + original_username, original_timestamp, + original_text, + bitly_link)) else: - event["stdout"].write("(%s, %s) %s" % (username, - self.make_timestamp(tweet["created_at"]), tweet["text"])) + event["stdout"].write("(%s, %s) %s %s" % (username, + self.make_timestamp( + tweet[ + "created_at"]), + tweet["text"], + bitly_link) + ) else: event["stderr"].write("Invalid tweet identifiers provided") else: -- cgit v1.3.1-10-gc9f91 From 2d4dbf922f98f5b454e77c0bf8d16aa0ea65310f Mon Sep 17 00:00:00 2001 From: dngfx Date: Sun, 9 Sep 2018 13:20:59 +0100 Subject: h8 everything right now --- modules/bitly.py | 2 +- modules/tweets.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/tweets.py') diff --git a/modules/bitly.py b/modules/bitly.py index cd69bb4e..7736a8c5 100644 --- a/modules/bitly.py +++ b/modules/bitly.py @@ -16,7 +16,7 @@ class Module(object): usage="") def shortlink(self, event): - url = event if type(event) is str else event["url"] + url = event["url"] if not re.match(REGEX_URL, url): url = "http://%s" % url diff --git a/modules/tweets.py b/modules/tweets.py index 93492212..72358899 100644 --- a/modules/tweets.py +++ b/modules/tweets.py @@ -16,6 +16,7 @@ class Module(object): def __init__(self, bot, events, exports): self.bot = bot self.bitly_is_enabled = "bitly" in self.bot.modules.modules + self.events = events events.on("received").on("command").on("tweet", "tw" ).hook(self.tweet, @@ -68,12 +69,12 @@ class Module(object): bitly_link = "" if self.bitly_is_enabled: - bitly = self.bot.modules.modules["bitly"] chopped_uname = username[1:] tweet_link = "https://twitter.com/%s/status/%s" % ( chopped_uname, linked_id) - bitly_link = " -- " + bitly.shortlink(tweet_link) + bitly_link = " -- " + self.events.call("get.shortlink", + url=tweet_link) if "retweeted_status" in tweet: original_username = "@%s" % tweet["retweeted_status" -- cgit v1.3.1-10-gc9f91 From a5ff20fca32b73a6f403be98547fd47f785ba12b Mon Sep 17 00:00:00 2001 From: dngfx Date: Sun, 9 Sep 2018 13:34:32 +0100 Subject: i dun fixed it! --- modules/tweets.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/tweets.py') diff --git a/modules/tweets.py b/modules/tweets.py index 72358899..8b0ebd76 100644 --- a/modules/tweets.py +++ b/modules/tweets.py @@ -73,8 +73,9 @@ class Module(object): tweet_link = "https://twitter.com/%s/status/%s" % ( chopped_uname, linked_id) - bitly_link = " -- " + self.events.call("get.shortlink", - url=tweet_link) + bitly_link = " -- " + self.events.on("get").on( + "shortlink").call( + url=tweet_link)[0] if "retweeted_status" in tweet: original_username = "@%s" % tweet["retweeted_status" -- cgit v1.3.1-10-gc9f91 From 23fbc2cb952811f7bc7cf3fe91d0102363ac7eb5 Mon Sep 17 00:00:00 2001 From: dngfx Date: Sun, 9 Sep 2018 15:37:44 +0100 Subject: Make URL shortening generic in tweets.py --- modules/tweets.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/tweets.py') diff --git a/modules/tweets.py b/modules/tweets.py index 8b0ebd76..bd097664 100644 --- a/modules/tweets.py +++ b/modules/tweets.py @@ -15,7 +15,7 @@ class Module(object): def __init__(self, bot, events, exports): self.bot = bot - self.bitly_is_enabled = "bitly" in self.bot.modules.modules + self.url_shortener_enabled = "bitly" in self.bot.modules.modules self.events = events events.on("received").on("command").on("tweet", "tw" @@ -67,13 +67,13 @@ class Module(object): linked_id = tweet["id"] username = "@%s" % tweet["user"]["screen_name"] - bitly_link = "" - if self.bitly_is_enabled: + url_shortener_link = "" + if self.url_shortener_enabled: chopped_uname = username[1:] tweet_link = "https://twitter.com/%s/status/%s" % ( chopped_uname, linked_id) - bitly_link = " -- " + self.events.on("get").on( + url_shortener_link = " -- " + self.events.on("get").on( "shortlink").call( url=tweet_link)[0] @@ -91,14 +91,14 @@ class Module(object): username, retweet_timestamp, original_username, original_timestamp, original_text, - bitly_link)) + url_shortener_link)) else: event["stdout"].write("(%s, %s) %s %s" % (username, self.make_timestamp( tweet[ "created_at"]), tweet["text"], - bitly_link) + url_shortener_link) ) else: event["stderr"].write("Invalid tweet identifiers provided") -- cgit v1.3.1-10-gc9f91 From a9e49fd36bb519e2257e812bd1fa109c32d3e8e3 Mon Sep 17 00:00:00 2001 From: dngfx Date: Sun, 9 Sep 2018 15:50:05 +0100 Subject: Fix up tweets.py --- modules/tweets.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'modules/tweets.py') diff --git a/modules/tweets.py b/modules/tweets.py index bd097664..76f99d05 100644 --- a/modules/tweets.py +++ b/modules/tweets.py @@ -15,7 +15,6 @@ class Module(object): def __init__(self, bot, events, exports): self.bot = bot - self.url_shortener_enabled = "bitly" in self.bot.modules.modules self.events = events events.on("received").on("command").on("tweet", "tw" @@ -67,16 +66,19 @@ class Module(object): linked_id = tweet["id"] username = "@%s" % tweet["user"]["screen_name"] - url_shortener_link = "" - if self.url_shortener_enabled: - chopped_uname = username[1:] - tweet_link = "https://twitter.com/%s/status/%s" % ( + url_shortener_link = False + chopped_uname = username[1:] + tweet_link = "https://twitter.com/%s/status/%s" % ( chopped_uname, linked_id) - url_shortener_link = " -- " + self.events.on("get").on( + 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 + + if "retweeted_status" in tweet: original_username = "@%s" % tweet["retweeted_status" ]["user"]["screen_name"] @@ -93,12 +95,13 @@ class Module(object): original_text, url_shortener_link)) else: - event["stdout"].write("(%s, %s) %s %s" % (username, - self.make_timestamp( - tweet[ - "created_at"]), - tweet["text"], - url_shortener_link) + event["stdout"].write("(%s, %s) %s %s" % + (username, + self.make_timestamp( + tweet["created_at"] + ), + tweet["text"], + url_shortener_link) ) else: event["stderr"].write("Invalid tweet identifiers provided") -- cgit v1.3.1-10-gc9f91