create migration to remove fleet_end from Fleets table
cleaned up register fleet in FleetsController modified FleetHelper class
This commit is contained in:
@@ -105,32 +105,13 @@ class FleetsController extends Controller
|
||||
$check = DB::table('Fleets')->where('fleet', $fleetUri)->first();
|
||||
//If we do not find the fleet, let's create it.
|
||||
if($check === null) {
|
||||
|
||||
$current = Carbon::now();
|
||||
//If we are between 00:00 and 05:00, we want to set the end time for 0500
|
||||
if($current->hour > 0 && $current->hour < 5) {
|
||||
//Figure out the hours to add to the fleet before purging it.
|
||||
$hour = $current->hour;
|
||||
$endTime = Carbon::now();
|
||||
$endTime->hour = 11 - $hour;
|
||||
} else {
|
||||
//Figure out the hours to add to the fleet before purging it.
|
||||
$endTime = Carbon::now();
|
||||
$endTime->day++;
|
||||
$endTime->hour = 11;
|
||||
$endTime->minute = 0;
|
||||
$endTime->second = 0;
|
||||
}
|
||||
// Insert the fleet into the table
|
||||
DB::table('Fleets')->insert([
|
||||
'character_id' => Auth::user()->character_id,
|
||||
'fleet' => $fleetUri,
|
||||
'description' => $request->description,
|
||||
'creation_time' => $current,
|
||||
'fleet_end' => $endTime,
|
||||
]);
|
||||
//Is this line needed?
|
||||
$fleet->SetFleetEndTime($endTime);
|
||||
}
|
||||
|
||||
return redirect('/fleets/display');
|
||||
|
||||
@@ -17,9 +17,8 @@ use Seat\Eseye\Eseye;
|
||||
|
||||
class FleetHelper {
|
||||
|
||||
private $fleet;
|
||||
private $fleetUri;
|
||||
private $fcId;
|
||||
private $endTime;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
@@ -41,50 +40,15 @@ class FleetHelper {
|
||||
$uris = explode('https://esi.tech.ccp.is/v1/fleets/', $fleetUri);
|
||||
//Trim the right side of the fleet number
|
||||
$fleetUri = rtrim($uris[1], '/?datasource=tranquility');
|
||||
$this->fleet = $fleetUri;
|
||||
$this->fleetUri = $fleetUri;
|
||||
}
|
||||
|
||||
public function GetFleetUri() {
|
||||
return $this->fleet;
|
||||
return $this->fleetUri;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the fleet's end time
|
||||
*
|
||||
* @param endTime
|
||||
*/
|
||||
public function SetFleetEndTime($endTime) {
|
||||
$this->endTime = $endTime;
|
||||
}
|
||||
|
||||
public function UpdateFleet($fleet, $isFreeMove, $motd) {
|
||||
//Get the fcid from the datatable
|
||||
$fc = DB::table('Fleets')->where('fleet', $fleetId)->get();
|
||||
|
||||
//Check if the fc has the right scope
|
||||
if(!$this->HaveEsiScope($fc->character_id, 'esi-fleets.write_fleet.v1')) {
|
||||
return 1;
|
||||
}
|
||||
//Get the FC's refresh token from the table
|
||||
$token = DB::table('EsiTokens')->where('character_id', $fc->character_id)->first();
|
||||
//Create the esi authentication container
|
||||
$config = config('esi');
|
||||
$authentication = new EsiAuthentication([
|
||||
'client_id' => $config['client_id'],
|
||||
'secret' => $config['secret'],
|
||||
'refresh_token' => $token->refresh_token,
|
||||
]);
|
||||
//Create the esi class
|
||||
$esi = new Eseye($authentication);
|
||||
$error = $esi->invoke('put', '/fleets/{fleet_id}/', [
|
||||
'fleet_id' => $fleet,
|
||||
'new_settings' => [
|
||||
'is_free_move' => $isFreeMove,
|
||||
'motd' => $motd,
|
||||
],
|
||||
]);
|
||||
|
||||
return $error;
|
||||
public function UpdateFleet() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public function AddPilot($fc, $charId, $fleetId) {
|
||||
@@ -119,10 +83,6 @@ class FleetHelper {
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public function RenderFleetDisplay() {
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user