Merge branch 'dev'

izdwuut · Feb 29, 2020 · 3dee938 · 3dee938
2 parents e5d2b6f + 21b7f06
commit 3dee938
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/backend/app/cache/cache.py b/backend/app/cache/cache.py
@@ -205,7 +205,7 @@ def delete_comment_from_db(self, comment):
             db.session.flush()
 
     def filter_comment(self, comment):
-        if isinstance(comment, MoreComments) or (comment.author and self.reddit.is_user_special(comment.author.name)):
+        if comment.author and self.reddit.is_user_special(comment.author.name):
             return
         logging.info('Processing comment {}. Thread: {}.'.format(comment.id, comment.submission.url))
         if self.reddit.is_deleted(comment):
@@ -306,7 +306,7 @@ def run_edited_fallback_stream(self):
                     if not self.reddit.has_required_keywords(submission.title):
                         continue
                     logging.info('Processing thread {}.'.format(submission.url))
-                    for comment in submission.comments:
+                    for comment in self.reddit.get_comments(submission):
                         self.filter_comment(comment)
             except ServerError:
                 logging.error(Errors.REDDIT_SERVER_ERROR)

diff --git a/backend/config.py b/backend/config.py
@@ -9,7 +9,7 @@ class RedditConfig:
     CLIENT_SECRET = os.environ['GOG_PICKER_REDDIT_CLIENT_SECRET']
     USERNAME = os.environ['GOG_PICKER_REDDIT_USERNAME']
     PASSWORD = os.environ['GOG_PICKER_REDDIT_PASSWORD']
-    USER_AGENT = 'python:gog-picker:v0.17.1 (by /u/izdwuut)'
+    USER_AGENT = 'python:gog-picker:v0.17.2 (by /u/izdwuut)'
     NOT_ENTERING = 'not entering'
     MIN_KARMA = 300
     SUBMISSIONS_LIMIT = 30

diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -12,7 +12,7 @@
 <body>
   <app-root></app-root>
   <footer class="footer">
-    Gift of Games Picker for Reddit <a href="https://github.com/izdwuut/gog-picker">v0.17.1</a>. 
+    Gift of Games Picker for Reddit <a href="https://github.com/izdwuut/gog-picker">v0.17.2</a>. 
     Scripted by <a href="https://reddit.com/u/izdwuut">u/izdwuut</a> and <a href="https://github.com/izdwuut/gog-picker/pulls">friends</a> in open source.
     Licensed under <a href="https://github.com/izdwuut/gog-picker/blob/dev/LICENSE">MIT Licence</a>
   </footer>