Merge pull request #2055 from nanaya/less_false_hope

Fixes user hype
ppy · Dec 20, 2017 · dab9487 · dab9487
2 parents a02b749 + f0d6f51
commit dab9487
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/Models/BeatmapDiscussion.php b/app/Models/BeatmapDiscussion.php
@@ -225,7 +225,7 @@ public function hasValidMessageType()
         if ($this->user_id === $this->beatmapset->user_id) {
             $validTypes[] = 'mapper_note';
         } else {
-            if ($this->beatmap_id === null && $this->beatmapset->canBeHyped() && $this->beatmapset->validateHypeBy($this->user)) {
+            if ($this->beatmap_id === null && $this->beatmapset->canBeHyped() && $this->beatmapset->validateHypeBy($this->user)['result']) {
                 $validTypes[] = 'hype';
             }
         }

diff --git a/app/Models/Beatmapset.php b/app/Models/Beatmapset.php
@@ -924,7 +924,7 @@ public function validateHypeBy($user)
 
                 if ($hyped) {
                     $message = 'hyped';
-                } elseif ($user->remainingHype() === 0) {
+                } elseif ($user->remainingHype() <= 0) {
                     $message = 'limit_exceeded';
                 }
             }

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -1075,7 +1075,7 @@ public function remainingHype()
                 ->where('created_at', '>', Carbon::now()->subWeek())
                 ->count();
 
-            $this->memoized[__FUNCTION__] = max(0, config('osu.beatmapset.user_weekly_hype') - $hyped);
+            $this->memoized[__FUNCTION__] = config('osu.beatmapset.user_weekly_hype') - $hyped;
         }
 
         return $this->memoized[__FUNCTION__];

diff --git a/resources/assets/coffee/react/beatmap-discussions/new-discussion.coffee b/resources/assets/coffee/react/beatmap-discussions/new-discussion.coffee
@@ -142,7 +142,7 @@ class BeatmapDiscussions.NewDiscussion extends React.PureComponent
                     else
                       @props.beatmapset.current_user_attributes.can_hype_reason
 
-                  if @props.beatmapset.current_user_attributes.can_hype || @props.beatmapset.current_user_attributes.remaining_hype == 0
+                  if @props.beatmapset.current_user_attributes.can_hype || @props.beatmapset.current_user_attributes.remaining_hype <= 0
                     message += " #{osu.trans 'beatmaps.hype.remaining', remaining: @props.beatmapset.current_user_attributes.remaining_hype}"
                     if @props.beatmapset.current_user_attributes.new_hype_time?
                       message += " #{osu.trans 'beatmaps.hype.new_time', new_time: osu.timeago(@props.beatmapset.current_user_attributes.new_hype_time)}"