From d2cffe65d87e452bee4d5e9370cd5ab66bba0890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Sun, 8 Feb 2015 05:48:40 -0600 Subject: [PATCH] Don't load unallowed tweets --- src/twitter/buffers/indibidual.py | 4 ++-- src/twitter/buffers/stream.py | 2 +- src/twitter/utils.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py index 55ce6a2f..2e3fa899 100644 --- a/src/twitter/buffers/indibidual.py +++ b/src/twitter/buffers/indibidual.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from twitter import compose +from twitter import compose, utils from twython import TwythonStreamer from pubsub import pub import logging as original_logger @@ -26,7 +26,7 @@ class timelinesStreamer(TwythonStreamer): def on_success(self, data): # try: - if "text" in data: + if "text" in data and utils.is_allowed(data, self.session.settings["twitter"]["ignored_clients"]) == True: self.check_tls(data) # except: # pass diff --git a/src/twitter/buffers/stream.py b/src/twitter/buffers/stream.py index 018e8ff7..c79645eb 100644 --- a/src/twitter/buffers/stream.py +++ b/src/twitter/buffers/stream.py @@ -94,7 +94,7 @@ class streamer(TwythonStreamer): self.process_dm(data) elif "friends" in data: self.friends = data["friends"] - elif "text" in data: + elif "text" in data and utils.is_allowed(data, self.session.settings["twitter"]["ignored_clients"]) == True: if data["user"]["id"] in self.muted_users: return self.check_mentions(data) self.check_send(data) diff --git a/src/twitter/utils.py b/src/twitter/utils.py index a115149b..274b518a 100644 --- a/src/twitter/utils.py +++ b/src/twitter/utils.py @@ -99,6 +99,7 @@ def api_call(parent=None, call_name=None, preexec_message="", success="", succes return val def is_allowed(tweet, clients): + if tweet.has_key("sender"): return True allowed = True if tweet.has_key("retweeted_status"): tweet = tweet["retweeted_status"] source = re.sub(r"(?s)<.*?>", "", tweet["source"])