mentions search: don't search for blacklisted domains. for #456, #490

snarfed · snarfed · commit 1ebfe1cf0d3c · 2015-09-25T08:36:32.000-07:00
diff --git a/tasks.py b/tasks.py
@@ -150,7 +150,8 @@ def poll(self, source):
           #
           # https://dev.twitter.com/rest/public/search
           # https://developers.google.com/+/api/latest/activities/search
-          query = ' OR '.join('"%s"' % domain for domain in source.domains)
+          query = ' OR '.join('"%s"' % domain for domain in source.domains
+                              if not util.in_webmention_blacklist(domain))
           mentions = source.get_activities_response(
             search_query=query, group_id=gr_source.SEARCH, **kwargs
           ).get('items', [])
diff --git a/test/test_tasks.py b/test/test_tasks.py
@@ -555,6 +555,13 @@ def test_search_for_mentions_skips_redirected_posse_post(self):
       original_posts=['http://or.ig/post'],
     )])
 
+  def test_search_for_mentions_skips_blacklisted_domains(self):
+    """https://github.com/snarfed/bridgy/issues/490"""
+    self.sources[0].domains = ['good', 't.co']
+    self.sources[0].put()
+    self.post_task()
+    self.assertEquals('"good"', self.sources[0].last_search_query)
+
   def test_wrong_last_polled(self):
     """If the source doesn't have our last polled value, we should quit.
     """
