Skip to content

Commit 67ac36f

Browse files
DaneEverittDaneEveritt
committed
Refactor obscure service names to be clearer
1 parent a91d84e commit 67ac36f

25 files changed

+96
-341
lines changed

‎app/Http/Controllers/Admin/NodesController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
use Pterodactyl\Models\Node;
3030
use Prologue\Alerts\AlertsMessageBag;
3131
use Pterodactyl\Http\Controllers\Controller;
32-
use Pterodactyl\Services\Nodes\UpdateService;
33-
use Pterodactyl\Services\Nodes\CreationService;
34-
use Pterodactyl\Services\Nodes\DeletionService;
32+
use Pterodactyl\Services\Nodes\NodeUpdateService;
33+
use Pterodactyl\Services\Nodes\NodeCreationService;
34+
use Pterodactyl\Services\Nodes\NodeDeletionService;
3535
use Illuminate\Cache\Repository as CacheRepository;
3636
use Pterodactyl\Services\Allocations\AssignmentService;
3737
use Pterodactyl\Http\Requests\Admin\Node\NodeFormRequest;
@@ -64,12 +64,12 @@ class NodesController extends Controller
6464
protected $cache;
6565

6666
/**
67-
* @var \Pterodactyl\Services\Nodes\CreationService
67+
* @var \Pterodactyl\Services\Nodes\NodeCreationService
6868
*/
6969
protected $creationService;
7070

7171
/**
72-
* @var \Pterodactyl\Services\Nodes\DeletionService
72+
* @var \Pterodactyl\Services\Nodes\NodeDeletionService
7373
*/
7474
protected $deletionService;
7575

@@ -84,7 +84,7 @@ class NodesController extends Controller
8484
protected $repository;
8585

8686
/**
87-
* @var \Pterodactyl\Services\Nodes\UpdateService
87+
* @var \Pterodactyl\Services\Nodes\NodeUpdateService
8888
*/
8989
protected $updateService;
9090

@@ -95,22 +95,22 @@ class NodesController extends Controller
9595
* @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
9696
* @param \Pterodactyl\Services\Allocations\AssignmentService $assignmentService
9797
* @param \Illuminate\Cache\Repository $cache
98-
* @param \Pterodactyl\Services\Nodes\CreationService $creationService
99-
* @param \Pterodactyl\Services\Nodes\DeletionService $deletionService
98+
* @param \Pterodactyl\Services\Nodes\NodeCreationService $creationService
99+
* @param \Pterodactyl\Services\Nodes\NodeDeletionService $deletionService
100100
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository
101101
* @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $repository
102-
* @param \Pterodactyl\Services\Nodes\UpdateService $updateService
102+
* @param \Pterodactyl\Services\Nodes\NodeUpdateService $updateService
103103
*/
104104
public function __construct(
105105
AlertsMessageBag $alert,
106106
AllocationRepositoryInterface $allocationRepository,
107107
AssignmentService $assignmentService,
108108
CacheRepository $cache,
109-
CreationService $creationService,
110-
DeletionService $deletionService,
109+
NodeCreationService $creationService,
110+
NodeDeletionService $deletionService,
111111
LocationRepositoryInterface $locationRepository,
112112
NodeRepositoryInterface $repository,
113-
UpdateService $updateService
113+
NodeUpdateService $updateService
114114
) {
115115
$this->alert = $alert;
116116
$this->allocationRepository = $allocationRepository;

‎app/Http/Controllers/Admin/ServersController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
use Prologue\Alerts\AlertsMessageBag;
3131
use Pterodactyl\Exceptions\DisplayException;
3232
use Pterodactyl\Http\Controllers\Controller;
33-
use Pterodactyl\Services\Servers\CreationService;
34-
use Pterodactyl\Services\Servers\DeletionService;
35-
use Pterodactyl\Services\Servers\ReinstallService;
33+
use Pterodactyl\Services\Servers\ServerCreationService;
34+
use Pterodactyl\Services\Servers\ServerDeletionService;
35+
use Pterodactyl\Services\Servers\ReinstallServerService;
3636
use Pterodactyl\Services\Servers\SuspensionService;
3737
use Pterodactyl\Http\Requests\Admin\ServerFormRequest;
3838
use Pterodactyl\Services\Servers\ContainerRebuildService;
@@ -92,7 +92,7 @@ class ServersController extends Controller
9292
protected $databaseHostRepository;
9393

9494
/**
95-
* @var \Pterodactyl\Services\Servers\DeletionService
95+
* @var \Pterodactyl\Services\Servers\ServerDeletionService
9696
*/
9797
protected $deletionService;
9898

@@ -112,7 +112,7 @@ class ServersController extends Controller
112112
protected $nodeRepository;
113113

114114
/**
115-
* @var \Pterodactyl\Services\Servers\ReinstallService
115+
* @var \Pterodactyl\Services\Servers\ReinstallServerService
116116
*/
117117
protected $reinstallService;
118118

@@ -122,7 +122,7 @@ class ServersController extends Controller
122122
protected $repository;
123123

124124
/**
125-
* @var \Pterodactyl\Services\Servers\CreationService
125+
* @var \Pterodactyl\Services\Servers\ServerCreationService
126126
*/
127127
protected $service;
128128

@@ -149,15 +149,15 @@ class ServersController extends Controller
149149
* @param \Pterodactyl\Services\Servers\BuildModificationService $buildModificationService
150150
* @param \Illuminate\Contracts\Config\Repository $config
151151
* @param \Pterodactyl\Services\Servers\ContainerRebuildService $containerRebuildService
152-
* @param \Pterodactyl\Services\Servers\CreationService $service
152+
* @param \Pterodactyl\Services\Servers\ServerCreationService $service
153153
* @param \Pterodactyl\Services\Database\DatabaseManagementService $databaseManagementService
154154
* @param \Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface $databaseRepository
155155
* @param \Pterodactyl\Repositories\Eloquent\DatabaseHostRepository $databaseHostRepository
156-
* @param \Pterodactyl\Services\Servers\DeletionService $deletionService
156+
* @param \Pterodactyl\Services\Servers\ServerDeletionService $deletionService
157157
* @param \Pterodactyl\Services\Servers\DetailsModificationService $detailsModificationService
158158
* @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $locationRepository
159159
* @param \Pterodactyl\Contracts\Repository\NodeRepositoryInterface $nodeRepository
160-
* @param \Pterodactyl\Services\Servers\ReinstallService $reinstallService
160+
* @param \Pterodactyl\Services\Servers\ReinstallServerService $reinstallService
161161
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
162162
* @param \Pterodactyl\Contracts\Repository\ServiceRepositoryInterface $serviceRepository
163163
* @param \Pterodactyl\Services\Servers\StartupModificationService $startupModificationService
@@ -169,15 +169,15 @@ public function __construct(
169169
BuildModificationService $buildModificationService,
170170
ConfigRepository $config,
171171
ContainerRebuildService $containerRebuildService,
172-
CreationService $service,
172+
ServerCreationService $service,
173173
DatabaseManagementService $databaseManagementService,
174174
DatabaseRepositoryInterface $databaseRepository,
175175
DatabaseHostRepository $databaseHostRepository,
176-
DeletionService $deletionService,
176+
ServerDeletionService $deletionService,
177177
DetailsModificationService $detailsModificationService,
178178
LocationRepositoryInterface $locationRepository,
179179
NodeRepositoryInterface $nodeRepository,
180-
ReinstallService $reinstallService,
180+
ReinstallServerService $reinstallService,
181181
ServerRepositoryInterface $repository,
182182
ServiceRepositoryInterface $serviceRepository,
183183
StartupModificationService $startupModificationService,

‎app/Http/Controllers/Admin/UserController.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
use Prologue\Alerts\AlertsMessageBag;
3030
use Pterodactyl\Exceptions\DisplayException;
3131
use Pterodactyl\Http\Controllers\Controller;
32-
use Pterodactyl\Services\Users\UpdateService;
33-
use Pterodactyl\Services\Users\CreationService;
34-
use Pterodactyl\Services\Users\DeletionService;
32+
use Pterodactyl\Services\Users\UserUpdateService;
33+
use Pterodactyl\Services\Users\UserCreationService;
34+
use Pterodactyl\Services\Users\UserDeletionService;
3535
use Illuminate\Contracts\Translation\Translator;
3636
use Pterodactyl\Http\Requests\Admin\UserFormRequest;
3737
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@@ -44,12 +44,12 @@ class UserController extends Controller
4444
protected $alert;
4545

4646
/**
47-
* @var \Pterodactyl\Services\Users\CreationService
47+
* @var \Pterodactyl\Services\Users\UserCreationService
4848
*/
4949
protected $creationService;
5050

5151
/**
52-
* @var \Pterodactyl\Services\Users\DeletionService
52+
* @var \Pterodactyl\Services\Users\UserDeletionService
5353
*/
5454
protected $deletionService;
5555

@@ -64,26 +64,26 @@ class UserController extends Controller
6464
protected $translator;
6565

6666
/**
67-
* @var \Pterodactyl\Services\Users\UpdateService
67+
* @var \Pterodactyl\Services\Users\UserUpdateService
6868
*/
6969
protected $updateService;
7070

7171
/**
7272
* UserController constructor.
7373
*
7474
* @param \Prologue\Alerts\AlertsMessageBag $alert
75-
* @param \Pterodactyl\Services\Users\CreationService $creationService
76-
* @param \Pterodactyl\Services\Users\DeletionService $deletionService
75+
* @param \Pterodactyl\Services\Users\UserCreationService $creationService
76+
* @param \Pterodactyl\Services\Users\UserDeletionService $deletionService
7777
* @param \Illuminate\Contracts\Translation\Translator $translator
78-
* @param \Pterodactyl\Services\Users\UpdateService $updateService
78+
* @param \Pterodactyl\Services\Users\UserUpdateService $updateService
7979
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
8080
*/
8181
public function __construct(
8282
AlertsMessageBag $alert,
83-
CreationService $creationService,
84-
DeletionService $deletionService,
83+
UserCreationService $creationService,
84+
UserDeletionService $deletionService,
8585
Translator $translator,
86-
UpdateService $updateService,
86+
UserUpdateService $updateService,
8787
UserRepositoryInterface $repository
8888
) {
8989
$this->alert = $alert;

‎app/Http/Controllers/Base/AccountController.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@
3030
use Illuminate\Http\Request;
3131
use Pterodactyl\Models\User;
3232
use Pterodactyl\Http\Controllers\Controller;
33-
use Pterodactyl\Repositories\oldUserRepository;
3433
use Pterodactyl\Exceptions\DisplayValidationException;
3534

3635
class AccountController extends Controller
3736
{
37+
public function __construct()
38+
{
39+
}
40+
3841
/**
3942
* Display base account information page.
4043
*

app/Services/Nodes/CreationService.php renamed to app/Services/Nodes/NodeCreationService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
2828

29-
class CreationService
29+
class NodeCreationService
3030
{
3131
const DAEMON_SECRET_LENGTH = 18;
3232

app/Services/Nodes/DeletionService.php renamed to app/Services/Nodes/NodeDeletionService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
use Pterodactyl\Exceptions\Service\HasActiveServersException;
3131
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
3232

33-
class DeletionService
33+
class NodeDeletionService
3434
{
3535
/**
3636
* @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface

app/Services/Nodes/UpdateService.php renamed to app/Services/Nodes/NodeUpdateService.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
3232
use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
3333

34-
class UpdateService
34+
class NodeUpdateService
3535
{
3636
/**
3737
* @var \Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface
@@ -74,6 +74,7 @@ public function __construct(
7474
*
7575
* @throws \Pterodactyl\Exceptions\DisplayException
7676
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
77+
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
7778
*/
7879
public function handle($node, array $data)
7980
{
@@ -82,7 +83,7 @@ public function handle($node, array $data)
8283
}
8384

8485
if (! is_null(array_get($data, 'reset_secret'))) {
85-
$data['daemonSecret'] = bin2hex(random_bytes(CreationService::DAEMON_SECRET_LENGTH));
86+
$data['daemonSecret'] = bin2hex(random_bytes(NodeCreationService::DAEMON_SECRET_LENGTH));
8687
unset($data['reset_secret']);
8788
}
8889

0 commit comments

Comments
 (0)