refactor: remove unnecessary ternary expression

This commit is contained in:
HDVinnie
2020-02-14 13:08:04 -05:00
parent 6eaeb07fc1
commit 0eb606aa51
6 changed files with 28 additions and 38 deletions
+12 -12
View File
@@ -181,11 +181,11 @@ class AnnounceController extends Controller
//Extra Information Fields
$tracker_id = $request->has('trackerid') ? bin2hex($request->input('tracker_id')) : null;
$compact = ($request->has('compact') && $request->input('compact') == 1) ? true : false;
$compact = $request->has('compact') && $request->input('compact') == 1;
$key = $request->has('key') ? bin2hex($request->input('key')) : null;
$corrupt = $request->has('corrupt') ? $request->input('corrupt') : null;
$ipv6 = $request->has('ipv6') ? bin2hex($request->input('ipv6')) : null;
$no_peer_id = ($request->has('no_peer_id') && $request->input('no_peer_id') == 1) ? true : false;
$no_peer_id = $request->has('no_peer_id') && $request->input('no_peer_id') == 1;
// If User Download Rights Are Disabled Return Error to Client
if ($user->can_download == 0 && $left != 0) {
@@ -307,7 +307,7 @@ class AnnounceController extends Controller
$peer->agent = $agent;
$peer->uploaded = $real_uploaded;
$peer->downloaded = $real_downloaded;
$peer->seeder = ($left == 0) ? true : false;
$peer->seeder = $left == 0;
$peer->left = $left;
$peer->torrent_id = $torrent->id;
$peer->user_id = $user->id;
@@ -317,8 +317,8 @@ class AnnounceController extends Controller
// History Update
$history->agent = $agent;
$history->active = 1;
$history->seeder = ($left == 0) ? true : false;
$history->immune = ($user->group->is_immune == 1) ? true : false;
$history->seeder = $left == 0;
$history->immune = $user->group->is_immune == 1;
$history->uploaded += 0;
$history->actual_uploaded += 0;
$history->client_uploaded = $real_uploaded;
@@ -349,8 +349,8 @@ class AnnounceController extends Controller
// History Update
$history->agent = $agent;
$history->active = 1;
$history->seeder = ($left == 0) ? true : false;
$history->immune = ($user->group->is_immune == 1) ? true : false;
$history->seeder = $left == 0;
$history->immune = $user->group->is_immune == 1;
$history->uploaded += $mod_uploaded;
$history->actual_uploaded += $uploaded;
$history->client_uploaded = $real_uploaded;
@@ -386,7 +386,7 @@ class AnnounceController extends Controller
$peer->agent = $agent;
$peer->uploaded = $real_uploaded;
$peer->downloaded = $real_downloaded;
$peer->seeder = ($left == 0) ? true : false;
$peer->seeder = $left == 0;
$peer->left = $left;
$peer->torrent_id = $torrent->id;
$peer->user_id = $user->id;
@@ -396,8 +396,8 @@ class AnnounceController extends Controller
// History Update
$history->agent = $agent;
$history->active = 0;
$history->seeder = ($left == 0) ? true : false;
$history->immune = ($user->group->is_immune == 1) ? true : false;
$history->seeder = $left == 0;
$history->immune = $user->group->is_immune == 1;
$history->uploaded += $mod_uploaded;
$history->actual_uploaded += $uploaded;
$history->client_uploaded = 0;
@@ -432,7 +432,7 @@ class AnnounceController extends Controller
$peer->agent = $agent;
$peer->uploaded = $real_uploaded;
$peer->downloaded = $real_downloaded;
$peer->seeder = ($left == 0) ? true : false;
$peer->seeder = $left == 0;
$peer->left = $left;
$peer->torrent_id = $torrent->id;
$peer->user_id = $user->id;
@@ -442,7 +442,7 @@ class AnnounceController extends Controller
// History Update
$history->agent = $agent;
$history->active = 1;
$history->seeder = ($left == 0) ? true : false;
$history->seeder = $left == 0;
$history->uploaded += $mod_uploaded;
$history->actual_uploaded += $uploaded;
$history->client_uploaded = $real_uploaded;
@@ -55,7 +55,7 @@ class BackupController extends Controller
'file_size' => $disk->size($f),
'last_modified' => $disk->lastModified($f),
'disk' => $disk_name,
'download' => ($adapter instanceof Local) ? true : false,
'download' => $adapter instanceof Local,
];
}
}
@@ -75,10 +75,10 @@ class ForumController extends Controller
$perm->forum_id = $forum->id;
$perm->group_id = $group->id;
if (array_key_exists($group->id, $request->input('permissions'))) {
$perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->show_forum = isset($request->input('permissions')[$group->id]['show_forum']);
$perm->read_topic = isset($request->input('permissions')[$group->id]['read_topic']);
$perm->reply_topic = isset($request->input('permissions')[$group->id]['reply_topic']);
$perm->start_topic = isset($request->input('permissions')[$group->id]['start_topic']);
} else {
$perm->show_forum = false;
$perm->read_topic = false;
@@ -141,10 +141,10 @@ class ForumController extends Controller
$perm->forum_id = $forum->id;
$perm->group_id = $group->id;
if (array_key_exists($group->id, $request->input('permissions'))) {
$perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->show_forum = isset($request->input('permissions')[$group->id]['show_forum']);
$perm->read_topic = isset($request->input('permissions')[$group->id]['read_topic']);
$perm->reply_topic = isset($request->input('permissions')[$group->id]['reply_topic']);
$perm->start_topic = isset($request->input('permissions')[$group->id]['start_topic']);
} else {
$perm->show_forum = false;
$perm->read_topic = false;
@@ -40,7 +40,7 @@ class VersionController extends Controller
$lastestVersion = $response[0]->tag_name;
return response([
'updated' => version_compare($this->version, $lastestVersion, '<') ? false : true,
'updated' => !version_compare($this->version, $lastestVersion, '<'),
'latestversion' => $lastestVersion,
]);
}
+2 -12
View File
@@ -203,16 +203,6 @@ class Torrent extends Model
return $this->belongsTo(Type::class);
}
/**
* Belongs To A Resolution.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function resolution()
{
return $this->belongsTo(Resolution::class);
}
/**
* Torrent Has Been Moderated By.
*
@@ -407,9 +397,9 @@ class Torrent extends Model
*/
public function bookmarked()
{
return Bookmark::where('user_id', '=', auth()->user()->id)
return (bool) Bookmark::where('user_id', '=', auth()->user()->id)
->where('torrent_id', '=', $this->id)
->first() ? true : false;
->first();
}
/**
+4 -4
View File
@@ -105,10 +105,10 @@ class WishRepository implements WishInterface
*/
public function exists($uid, $id)
{
return $this->user->find($uid)
return (bool) $this->user->find($uid)
->wishes()
->where('imdb', '=', $id)
->first() ? true : false;
->first();
}
/**
@@ -120,11 +120,11 @@ class WishRepository implements WishInterface
{
$id = str_replace('tt', '', $id);
return $this->torrent
return (bool) $this->torrent
->where('imdb', '=', $id)
->where('seeders', '>', 0)
->where('status', '=', 1)
->first() ? true : false;
->first();
}
/**