diff --git a/apiserver/feed.py b/apiserver/feed.py index dac359b..eb57cac 100644 --- a/apiserver/feed.py +++ b/apiserver/feed.py @@ -9,6 +9,7 @@ from bs4 import BeautifulSoup import settings from feeds import hackernews, reddit, tildes, manual, lobsters +import utils INVALID_DOMAINS = ['youtube.com', 'bloomberg.com', 'wsj.com', 'sec.gov'] TWO_DAYS = 60*60*24*2 diff --git a/apiserver/feeds/lobsters.py b/apiserver/feeds/lobsters.py index b2e1548..96e69b8 100644 --- a/apiserver/feeds/lobsters.py +++ b/apiserver/feeds/lobsters.py @@ -50,7 +50,7 @@ def unix(date_str): def make_comment(i): c = {} try: - c['author'] = i['commenting_user']['username'] + c['author'] = i['commenting_user'] except KeyError: c['author'] = '' c['score'] = i.get('score', 0) diff --git a/apiserver/utils.py b/apiserver/utils.py index 7bf2bae..a0073a3 100644 --- a/apiserver/utils.py +++ b/apiserver/utils.py @@ -10,11 +10,11 @@ from bleach.sanitizer import Cleaner def alert_tanner(message): try: - logger.info('Alerting Tanner: ' + message) + logging.info('Alerting Tanner: ' + message) params = dict(qotnews=message) requests.get('https://tbot.tannercollin.com/message', params=params, timeout=4) except BaseException as e: - logger.error('Problem alerting Tanner: ' + str(e)) + logging.error('Problem alerting Tanner: ' + str(e)) def gen_rand_id(): return ''.join(random.choice(string.ascii_uppercase) for _ in range(4))