Merge branch 'dev'

izdwuut · Feb 21, 2020 · fae9e72 · fae9e72
2 parents 943c68e + 263e5bd
commit fae9e72
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/backend/app/cache/cache.py b/backend/app/cache/cache.py
@@ -122,8 +122,9 @@ def scrap_steam_profile(self, comment, reddit_comment):
             steam_user.level = None
             steam_user.games_count = 0
             if not steam_user.id:
-                logging.info('Steam user already exists. Updating.')
                 db.session.add(steam_user)
+            else:
+                logging.info('Steam user already exists. Updating.')
             db.session.commit()
             db.session.flush()
             if steam_user.id:
@@ -134,7 +135,7 @@ def scrap_steam_profile(self, comment, reddit_comment):
 
         logging.info('Getting Steam user summary.')
         summary = self.steam.get_player_summary(steam_user.steam_id)
-        if summary is None:
+        if not summary:
             self.commit_not_scrapped_steam_user(steam_user)
             return
         else:

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

diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html
@@ -16,7 +16,7 @@
             </mat-hint>
 
         </mat-form-field>
-        <button mat-button mat-stroked-button class="send-button" (click)="send()">SEND</button>
+        <button mat-button mat-stroked-button class="send-button" (click)="send()">Pick</button>
     </div>
     <div class="disclaimer">*Only Steam giveaways are supported.</div>
 </div>
diff --git a/frontend/src/app/home/home.component.scss b/frontend/src/app/home/home.component.scss
@@ -27,6 +27,10 @@
       width: 100%;
       margin: 0
     }
+
+    .n-input {
+      margin: 0
+    }
   }
 }
 

diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts
@@ -48,10 +48,10 @@ export class HomeComponent implements OnInit, OnDestroy {
 
   onNChange(): void {
     if (this.n < 1) {
-      if (!this.n) {
+      if (this.n === null) {
         this.nInputHint = 'Required.'
       } else {
-        this.nInputHint = 'N must be positive.'
+        this.nInputHint = 'Must be positive.'
       }
       this.hasNErrors = true
     } else {

diff --git a/frontend/src/app/thread/thread.component.ts b/frontend/src/app/thread/thread.component.ts
@@ -83,7 +83,7 @@ export class ThreadComponent implements OnInit, OnDestroy {
       if (comment.author.karma < environment.minKarma) {
         errors.push('not enough karma')
       }
-      if (comment.steamProfile) {
+      if (comment.steamProfile && comment.steamProfile.steamId) {
         if (comment.steamProfile.existent) {
           if (comment.steamProfile.publicProfile) {
             if (comment.steamProfile.level < environment.minLevel) {
@@ -100,8 +100,8 @@ export class ThreadComponent implements OnInit, OnDestroy {
         }
       }
 
-      if(comment.author.age) {
-        if(!this.isAgeValid(comment.author.age)) {
+      if (comment.author.age) {
+        if (!this.isAgeValid(comment.author.age)) {
           errors.push('age too low')
         }
       }
@@ -118,7 +118,7 @@ export class ThreadComponent implements OnInit, OnDestroy {
     if (comment.steamProfile == null) {
       return ''
     }
-    if(comment.steamProfile.notScrapped) {
+    if (comment.steamProfile.notScrapped) {
       return ''
     }
     if (comment.steamProfile.existent) {
@@ -150,11 +150,11 @@ export class ThreadComponent implements OnInit, OnDestroy {
   getWarnings(comment: RedditComment): String[] {
     let warnings = Array<String>()
     if (!this.canScrapSteamProfile(comment)) {
-      warnings.push("couldn't scrap comment")
+      warnings.push("couldn't scrap comment/nonexistent Steam profile")
       return warnings
     }
-    if (!comment.steamProfile) {
-      warnings.push('no Steam profile detected')
+    if (!comment.steamProfile.steamId) {
+      warnings.push('no Steam profile detected/nonexistent profile')
     }
     if (comment.steamProfile && comment.steamProfile.gamesCount >= environment.hoarderNumber) {
       warnings.push('potential hoarder (' + comment.steamProfile.gamesCount + ' games)')
@@ -173,7 +173,7 @@ export class ThreadComponent implements OnInit, OnDestroy {
       if (item.checked) {
         winners.push(new ResultsComment(item.value, item._elementRef.nativeElement.getAttribute('data-comment-id')))
       } else {
-        if(item._elementRef.nativeElement.getAttribute('data-has-warnings')) {
+        if (item._elementRef.nativeElement.getAttribute('data-has-warnings')) {
           violators.push(new ResultsComment(item.value, item._elementRef.nativeElement.getAttribute('data-comment-id')))
         }
       }
@@ -213,7 +213,7 @@ export class ThreadComponent implements OnInit, OnDestroy {
   }
 
   getAge(age) {
-    if(age === null) {
+    if (age === null) {
       return ''
     }
     let dateFrom = new Date(age)

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