From d9a9adef1f4a11aa237ba534dfd6ec61eeb040ba Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 5 Dec 2017 10:24:52 -0600 Subject: [PATCH] Code cleanup and a few fixes in streaming API --- src/twitter/buffers/indibidual.py | 7 ++++++- src/twitter/buffers/stream.py | 7 ++++++- src/twitter/compose.py | 4 +--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py index 138605ab..2cb7c760 100644 --- a/src/twitter/buffers/indibidual.py +++ b/src/twitter/buffers/indibidual.py @@ -67,6 +67,11 @@ class timelinesStreamer(TwythonStreamer): if data.has_key("retweeted_status"): if data["retweeted_status"].has_key("extended_tweet"): data["retweeted_status"]["full_text"] = data["retweeted_status"]["extended_tweet"]["full_text"] - data["full_text"] = data["text"] data["retweeted_status"]["entities"] = data["retweeted_status"]["extended_tweet"]["entities"] + data["full_text"] = data["text"] + if data.has_key("quoted_status"): + if data["quoted_status"].has_key("extended_tweet"): + data["quoted_status"]["full_text"] = data["quoted_status"]["extended_tweet"]["full_text"] + data["quoted_status"]["entities"] = data["quoted_status"]["extended_tweet"]["entities"] + data["full_text"] = data["text"] self.check_tls(data) diff --git a/src/twitter/buffers/stream.py b/src/twitter/buffers/stream.py index 25662dc1..83e714ec 100644 --- a/src/twitter/buffers/stream.py +++ b/src/twitter/buffers/stream.py @@ -137,8 +137,13 @@ class streamer(TwythonStreamer): if data.has_key("retweeted_status"): if data["retweeted_status"].has_key("extended_tweet"): data["retweeted_status"]["full_text"] = data["retweeted_status"]["extended_tweet"]["full_text"] - data["full_text"] = data["text"] data["retweeted_status"]["entities"] = data["retweeted_status"]["extended_tweet"]["entities"] + data["full_text"] = data["text"] + if data.has_key("quoted_status"): + if data["quoted_status"].has_key("extended_tweet"): + data["quoted_status"]["full_text"] = data["quoted_status"]["extended_tweet"]["full_text"] + data["quoted_status"]["entities"] = data["quoted_status"]["extended_tweet"]["entities"] + data["full_text"] = data["text"] if data["user"]["id"] in self.muted_users: return self.check_mentions(data) self.check_send(data) diff --git a/src/twitter/compose.py b/src/twitter/compose.py index b77ea625..82ada042 100644 --- a/src/twitter/compose.py +++ b/src/twitter/compose.py @@ -123,9 +123,7 @@ def compose_quoted_tweet(quoted_tweet, original_tweet, show_screen_names=False): 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"): - original_text = StripChars(original_tweet["message"]) - elif original_tweet.has_key("full_text"): + if original_tweet.has_key("full_text"): original_text = StripChars(original_tweet["full_text"]) else: original_text = StripChars(original_tweet["text"])