Merge pull request #68 from Hyleus/estimated-ratio

Improve the estimated ratio for freeleech torrents
HDInnovations · Dec 22, 2017 · ceabd43 · ceabd43
2 parents d62338e + 3cd4e6d
commit ceabd43
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/Torrent.php b/app/Torrent.php
@@ -229,4 +229,10 @@ public function featured()
     {
         return $this->hasMany(\App\FeaturedTorrent::class);
     }
+
+    public function isFreeleech($user = null)
+    {
+        $pfree = $user ? $user->group->is_freeleech || UserFreeleech::where('user_id', '=', $user->id)->first() : false;
+        return $this->free || config('other.freeleech') || $pfree;
+    }
 }
diff --git a/app/User.php b/app/User.php
@@ -373,7 +373,7 @@ public function ratioAfterSize($size)
     public function ratioAfterSizeString($size, $freeleech = false)
     {
         if ($freeleech) {
-            return $this->getRatioString();
+            return $this->getRatioString() . " (Freeleech)";
         }
 
         $ratio = $this->ratioAfterSize($size);

diff --git a/resources/views/torrent/torrent.blade.php b/resources/views/torrent/torrent.blade.php
@@ -212,7 +212,7 @@
 
         <tr>
           <td class="col-sm-2"><strong>Estimated Ratio after Download</strong></td>
-          <td>{{ $user->ratioAfterSizeString($torrent->size, $torrent->free == "1") }}</td>
+          <td>{{ $user->ratioAfterSizeString($torrent->size, $torrent->isFreeleech(Auth::user())) }}</td>
         </tr>
 
         <tr>