From 885829a9303c03bd8564a5565af070349e8a0a47 Mon Sep 17 00:00:00 2001 From: Bill Dengler Date: Sat, 17 Jun 2017 00:58:38 +0000 Subject: [PATCH] Fix name changes from automatic conversion. --- src/long_tweets/twishort.py | 11 +++++------ src/sessionmanager/session.py | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/long_tweets/twishort.py b/src/long_tweets/twishort.py index 91a4037e..72d7c794 100644 --- a/src/long_tweets/twishort.py +++ b/src/long_tweets/twishort.py @@ -32,18 +32,18 @@ def get_twishort_uri(url): return False def is_long(tweet): - long = False + longtw = False for url in range(0, len(tweet["entities"]["urls"])): try: if tweet["entities"]["urls"][url] != None and "twishort.com" in tweet["entities"]["urls"][url]["expanded_url"]: - long = get_twishort_uri(tweet["entities"]["urls"][url]["expanded_url"]) + longtw = get_twishort_uri(tweet["entities"]["urls"][url]["expanded_url"]) except IndexError: pass # sometimes Twitter returns URL's with None objects, so let's take it. # see https://github.com/manuelcortez/TWBlue/issues/103 except TypeError: pass - if int == False and "retweeted_status" in tweet: + if not longtw and "retweeted_status" in tweet: for url in range(0, len(tweet["retweeted_status"]["entities"]["urls"])): try: if tweet["retweeted_status"]["entities"]["urls"][url] != None and "twishort.com" in tweet["retweeted_status"]["entities"]["urls"][url]["expanded_url"]: @@ -52,7 +52,7 @@ def is_long(tweet): pass except TypeError: pass - return int + return longtw def get_full_text(uri): try: @@ -85,5 +85,4 @@ def create_tweet(user_token, user_secret, text, media=0): try: return response.json()["text_to_tweet"] except: - print("There was a problem creating a long tweet") - return 0 + log.exception("There was a problem creating a long tweet.") \ No newline at end of file diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py index b69f9f89..70d50dd9 100644 --- a/src/sessionmanager/session.py +++ b/src/sessionmanager/session.py @@ -475,9 +475,9 @@ class Session(object): return compose.compose_quoted_tweet(quoted_tweet, original_tweet) def check_long_tweet(self, tweet): - long = twishort.is_long(tweet) - if int != False and config.app["app-settings"]["handle_longtweets"]: - tweet["message"] = twishort.get_full_text(int) + longtw = twishort.is_long(tweet) + if longtw and config.app["app-settings"]["handle_longtweets"]: + tweet["message"] = twishort.get_full_text(longtw) if tweet["message"] == False: return False tweet["twishort"] = True for i in tweet["entities"]["user_mentions"]: