Merge branch 'dev'

izdwuut · Feb 29, 2020 · 634e025 · 634e025
2 parents 6a29c68 + 047bcec
commit 634e025
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/backend/app/cache/cache.py b/backend/app/cache/cache.py
@@ -9,6 +9,7 @@
 from flask_cors import cross_origin
 from prawcore.exceptions import ServerError
 from time import sleep
+from tqdm import tqdm
 
 cache = Blueprint('cache', __name__, url_prefix='/cache')
 
@@ -310,7 +311,10 @@ def run_edited_fallback_stream(self):
                 logging.error(Errors.REDDIT_SERVER_ERROR)
                 sleep(30)
                 continue
-            sleep(2 * 60 * 60)
+            hours = 2
+            logging.info('Sleeping for {} hours.'.format(hours))
+            for i in tqdm(range(hours * 60 * 60)):
+                sleep(1)
 
     def __init__(self):
         self.steam = Steam(current_app.config['STEAM'])

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

diff --git a/backend/requirements.txt b/backend/requirements.txt
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  apiUrl: "http://159.203.105.68:5000/",
+  apiUrl: "http://gogpicker.com:5000/",
   minKarma: 300,
   hoarderNumber: 500,
   minLevel: 2,

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.16.0</a>. 
+    Gift of Games Picker for Reddit <a href="https://github.com/izdwuut/gog-picker">v0.17.0</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>