X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=twitter_renderer.py;h=40a3385d92fd4746461e067f595c70486ad1f7b3;hb=55bcd1ba1b9d481e0d0dc604932bcc0f7f4fa127;hp=f2859f138ac3fd6b4e06c73132db469ece4f58dd;hpb=c06bfef53f70551e7920bc4facce27f47b89e2ba;p=kiosk.git

diff --git a/twitter_renderer.py b/twitter_renderer.py
index f2859f1..40a3385 100644
--- a/twitter_renderer.py
+++ b/twitter_renderer.py
@@ -2,22 +2,23 @@
 
 import random
 import re
-import tweepy
 from typing import Dict, List
 
+import tweepy  # type: ignore
+
 import file_writer
 import renderer
 import profanity_filter
-import secrets
+import kiosk_secrets as secrets
 
 
-class twitter_renderer(renderer.debuggable_abstaining_renderer):
+class twitter_renderer(renderer.abstaining_renderer):
     def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
-        super(twitter_renderer, self).__init__(name_to_timeout_dict, False)
+        super().__init__(name_to_timeout_dict)
         self.debug = True
-        self.tweets_by_author = {}
-        self.handles_by_author = {}
-        self.filter = profanity_filter.profanity_filter()
+        self.tweets_by_author: Dict[str, List[tweepy.models.Status]] = {}
+        self.handles_by_author: Dict[str, str] = {}
+        self.filter = profanity_filter.ProfanityFilter()
         self.urlfinder = re.compile(
             "((http|https)://[\-A-Za-z0-9\\.]+/[\?\&\-A-Za-z0-9_\\.]+)"
         )
@@ -54,7 +55,7 @@ class twitter_renderer(renderer.debuggable_abstaining_renderer):
         elif key == "Shuffle Tweets":
             return self.shuffle_tweets()
         else:
-            raise error("Unexpected operation")
+            raise Exception("Unexpected operation")
 
     def fetch_tweets(self) -> bool:
         try:
@@ -89,7 +90,7 @@ class twitter_renderer(renderer.debuggable_abstaining_renderer):
             for tweet in tweets:
                 text = tweet.full_text
                 if (text not in already_seen) and (
-                    not self.filter.contains_bad_words(text)
+                    not self.filter.contains_bad_word(text)
                 ):
                     already_seen.add(text)
                     text = self.linkify(text)
@@ -104,12 +105,12 @@ class twitter_renderer(renderer.debuggable_abstaining_renderer):
 
 # Test
 # t = twitter_renderer(
-#    {"Fetch Tweets" : 1,
-#     "Shuffle Tweets" : 1})
+#     {"Fetch Tweets" : 1,
+#      "Shuffle Tweets" : 1})
 # x = "bla bla bla https://t.co/EjWnT3UA9U bla bla"
 # x = t.linkify(x)
-# print x
+# print(x)
 # if t.fetch_tweets() == 0:
-#    print("Error fetching tweets, none fetched.")
+#     print("Error fetching tweets, none fetched.")
 # else:
-#    t.shuffle_tweets()
+#     t.shuffle_tweets()