diff options
Diffstat (limited to 'modules/tweets')
| -rw-r--r-- | modules/tweets/__init__.py | 3 | ||||
| -rw-r--r-- | modules/tweets/format.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/tweets/__init__.py b/modules/tweets/__init__.py index afe9ea4c..16f179d8 100644 --- a/modules/tweets/__init__.py +++ b/modules/tweets/__init__.py @@ -1,5 +1,6 @@ #--depends-on commands #--depends-on permissions +#--depends-on shorturl #--require-config twitter-api-key #--require-config twitter-api-secret #--require-config twitter-access-token @@ -34,8 +35,8 @@ class BitBotStreamListener(tweepy.StreamListener): if server and channel_name in server.channels: follows.append([server, server.channels.get(channel_name)]) - tweet = format._tweet(_exports, status) for server, channel in follows: + tweet = format._tweet(_exports, server, status) _events.on("send.stdout").call(target=channel, module_name="Tweets", server=server, message=tweet) diff --git a/modules/tweets/format.py b/modules/tweets/format.py index c41fde17..090ec6cd 100644 --- a/modules/tweets/format.py +++ b/modules/tweets/format.py @@ -6,7 +6,7 @@ def _timestamp(dt): since, unit = utils.time_unit(seconds_since) return "%s %s ago" % (since, unit) -def _tweet(exports, tweet): +def _tweet(exports, server, tweet): linked_id = tweet.id username = tweet.user.screen_name @@ -17,7 +17,7 @@ def _tweet(exports, tweet): tweet_link = "https://twitter.com/%s/status/%s" % (username, linked_id) - short_url = exports.get_one("shortlink")(tweet_link) + short_url = exports.get_one("shorturl")(server, tweet_link) short_url = " - %s" % short_url if short_url else "" created_at = _timestamp(tweet.created_at) |