From 02538322c685df81bad0a3527f4a1f932e7673f7 Mon Sep 17 00:00:00 2001
From: Manuel Cortez <manuel@manuelcortez.net>
Date: Tue, 5 Dec 2017 09:28:12 -0600
Subject: [PATCH] Important improvements for retweets of long quoted tweets

---
 src/long_tweets/tweets.py | 27 +++++++++++++++------------
 src/twitter/compose.py    | 22 +++++++++++++++-------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/long_tweets/tweets.py b/src/long_tweets/tweets.py
index 1ed12835..8ae0e272 100644
--- a/src/long_tweets/tweets.py
+++ b/src/long_tweets/tweets.py
@@ -26,17 +26,20 @@ def is_long(tweet):
  return False
 
 def clear_url(tweet):
- if tweet.has_key("full_text"):
-  value = "full_text"
+ if tweet.has_key("retweeted_status"):
+  if tweet["retweeted_status"].has_key("full_text"):
+   value = "full_text"
+  else:
+   value = "text"
+  urls = utils.find_urls_in_text(tweet["retweeted_status"][value])
+  try: tweet["message"] = tweet["message"].replace(urls[-1], "")
+  except IndexError: pass
  else:
-  value = "text"
- urls = utils.find_urls_in_text(tweet[value])
- try: tweet["message"] = tweet["message"].replace(urls[-1], "")
- except IndexError: pass
- try:
-  tweet["entities"]["urls"].remove(tweet["entities"]["urls"][-1])
- except IndexError:
-  tweet["retweeted_status"]["entities"]["urls"].remove(tweet["retweeted_status"]["entities"]["urls"][-1])
- else:
-  pass
+  if tweet.has_key("full_text"):
+   value = "full_text"
+  else:
+   value = "text"
+  urls = utils.find_urls_in_text(tweet[value])
+  try: tweet["message"] = tweet["message"].replace(urls[-1], "")
+  except IndexError: pass
  return tweet
\ No newline at end of file
diff --git a/src/twitter/compose.py b/src/twitter/compose.py
index 9d0ede0f..b77ea625 100644
--- a/src/twitter/compose.py
+++ b/src/twitter/compose.py
@@ -101,18 +101,26 @@ def compose_dm(tweet, db, relative_times, show_screen_names=False):
 
 def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False):
  """ It receives a tweet and returns a list with the user, text for the tweet or message, date and the client where user is."""
- if quoted_tweet.has_key("full_text"):
-  value = "full_text"
+ if quoted_tweet.has_key("retweeted_status"):
+  if quoted_tweet["retweeted_status"].has_key("full_text"):
+   value = "full_text"
+   log.error(quoted_tweet["retweeted_status"]["full_text"])
+  else:
+   value = "text"
+  text = StripChars(quoted_tweet["retweeted_status"][value])
  else:
-  value = "text"
- text = StripChars(quoted_tweet[value])
+  if quoted_tweet.has_key("full_text"):
+   value = "full_text"
+  else:
+   value = "text"
+  text = StripChars(quoted_tweet[value])
  if show_screen_names:
   quoting_user = quoted_tweet["user"]["screen_name"]
  else:
   quoting_user = quoted_tweet["user"]["name"]
  source = re.sub(r"(?s)<.*?>", "", quoted_tweet["source"])
- try: text = "rt @%s: %s" % (quoted_tweet["retweeted_status"]["user"]["screen_name"], StripChars(quoted_tweet["retweeted_status"][value]))
- except KeyError: text = "%s" % (StripChars(quoted_tweet[value]))
+ if quoted_tweet.has_key("retweeted_status"):
+  text = "rt @%s: %s" % (quoted_tweet["retweeted_status"]["user"]["screen_name"], text)
  if text[-1] in chars: text=text+"."
  original_user = original_tweet["user"]["screen_name"]
  if original_tweet.has_key("message"):
@@ -121,7 +129,7 @@ def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False):
   original_text = StripChars(original_tweet["full_text"])
  else:
    original_text = StripChars(original_tweet["text"])
- quoted_tweet["message"] = _(u"{0}. Quoted  tweet from @{1}: {2}").format( quoted_tweet[value], original_user, original_text)
+ quoted_tweet["message"] = _(u"{0}. Quoted  tweet from @{1}: {2}").format( text, original_user, original_text)
  quoted_tweet = tweets.clear_url(quoted_tweet)
  quoted_tweet["entities"]["urls"].extend(original_tweet["entities"]["urls"])
  return quoted_tweet