Merge branch 'dev'

izdwuut · Mar 16, 2020 · fa24e48 · fa24e48
2 parents d524cdb + fb5c01f
commit fa24e48
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/backend/app/extensions.py b/backend/app/extensions.py
@@ -4,7 +4,7 @@
 import logging
 from app._errors import Errors
 from time import sleep
-from requests.exceptions import HTTPError, ConnectionError
+from requests.exceptions import HTTPError, ConnectionError, ReadTimeout
 
 db = SQLAlchemy()
 
@@ -15,7 +15,8 @@ def wrapper(*args, **kwargs):
             try:
                 result = func(*args, **kwargs)
             except (PrawcoreException, WebAuthException, HTTPError,
-                    ConnectionError, ResponseException, KeyError, TypeError):
+                    ConnectionError, ResponseException, KeyError, TypeError,
+                    ReadTimeout):
                 counter += 1
                 logging.error(Errors.RETRY_REQUEST.format(str(counter)))
                 sleep(0.1)

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.19.2 (by /u/izdwuut)'
+    USER_AGENT = 'python:gog-picker:v0.19.3 (by /u/izdwuut)'
     NOT_ENTERING = 'not entering'
     MIN_KARMA = 300
     SUBMISSIONS_LIMIT = 100

diff --git a/frontend/src/app/thread/thread.component.html b/frontend/src/app/thread/thread.component.html
@@ -15,6 +15,7 @@ <h1>Scrapped comments</h1>
             <li><span class="yellow-highlight">warning</span></li>
             <li><span class="gray-highlight">not entering</span></li>
             <li><span class="red-highlight">violator</span></li>
+            <li><span class="white-highlight">participating</span></li>
         </ul>
     </div>
     <div class="actions" *ngIf='comments && comments.length > 0'>

diff --git a/frontend/src/app/thread/thread.component.scss b/frontend/src/app/thread/thread.component.scss
@@ -81,6 +81,11 @@
   padding: 5px;
 }
 
+.white-highlight {
+  border: 1px solid black;
+  padding: 5px;
+}
+
 .legend li {
   padding: 6px;
 }
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.19.2</a>. 
+    Gift of Games Picker for Reddit <a href="https://github.com/izdwuut/gog-picker">v0.19.3</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>