diff --git a/main.py b/main.py index a0cdd1d..1e6e903 100644 --- a/main.py +++ b/main.py @@ -103,26 +103,32 @@ class Listener(StreamingClient): # Check if the tweet is not a retweet if not tweet.text.startswith("RT @"): # Cancel if author of the first tweet in the conversation is in private - if tweet.conversation_id and tweet.id != tweet.conversation_id: - if keys["VERBOSE"]: - print("Thread...", end=" ") - base_tweet = self.client.get_tweet(id=tweet.conversation_id, tweet_fields="author_id", user_auth=True).data - # Sometimes Twitter don't give what we want - if hasattr(base_tweet, 'author_id'): - base_author = self._get_user(base_tweet.author_id) - # Check if account is in private mode - if base_author.protected: - if keys["VERBOSE"]: - print("Auteur du premier tweet en privé, pas de réponses.") - return - else: - if keys["VERBOSE"]: - print("Auteur du premier tweet en publique...", end=" ") - else: - # Can't check the status of the first tweet in the thread, ignoring for safety + if tweet.conversation_id: + if tweet.id != tweet.conversation_id: if keys["VERBOSE"]: - print("Impossible de vérifier le status de l'auteur du fil.") - return + print("Thread...", end=" ") + base_tweet = self.client.get_tweet(id=tweet.conversation_id, tweet_fields="author_id", user_auth=True).data + # Sometimes Twitter don't give what we want + if hasattr(base_tweet, 'author_id'): + base_author = self._get_user(base_tweet.author_id) + # Check if account is in private mode + if base_author.protected: + if keys["VERBOSE"]: + print("Auteur du premier tweet en privé, pas de réponses.") + return + else: + if keys["VERBOSE"]: + print("Auteur du premier tweet en publique...", end=" ") + else: + # Can't check the status of the first tweet in the thread, ignoring for safety + if keys["VERBOSE"]: + print("Impossible de vérifier le status de l'auteur du fil.") + return + else: + # Can't check if we're in a thread or not + if keys["VERBOSE"]: + print("Impossible de vérifier si le tweet est dans un thread.") + return author = self._get_user(tweet.author_id) # Clean the tweet lastWord = cleanTweet(tweet.text)