Pterodactyl < Jexactyl (Mesclagem)

.env.ci

@@ -1,7 +1,7 @@
 APP_ENV=testing
 APP_DEBUG=true
 APP_KEY=SomeRandomString3232RandomString
-APP_THEME=pterodactyl
+APP_THEME=jexactyl
 APP_TIMEZONE=America/Sao_Paulo
 APP_URL=http://localhost/
 APP_ENVIRONMENT_ONLY=true

.env.example

@@ -1,7 +1,7 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=base64:CHANGETHISKEY-uo1lv077qKsT9oKhIPFDLNl4x0PGqk=
-APP_THEME=pterodactyl
+APP_THEME=jexactyl
 APP_TIMEZONE=America/Sao_Paulo
 APP_URL=http://panel.example.com
 APP_LOCALE=pt
@@ -23,7 +23,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
+QUEUE_CONNECTION=redis
 SESSION_DRIVER=file
 
 HASHIDS_SALT=
@@ -36,7 +36,7 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
 [email protected]
-MAIL_FROM_NAME="Pterodactyl Panel"
+MAIL_FROM_NAME="Jexactyl"
 # Você deve definir isso para o seu domínio para evitar que ele seja padronizado para 'localhost', 
 # fazendo com que os servidores de e-mail, como o Gmail, rejeitem seu e-mail.
 #

BUILDING.md

@@ -1,11 +1,11 @@
 # Local Development
-Pterodactyl is now powered by React, Typescript, and Tailwindcss using webpack at its core to generate compiled assets.
-Release versions of Pterodactyl will include pre-compiled, minified, and hashed assets ready-to-go.
+Jexactyl is now powered by React, Typescript, and Tailwindcss using webpack at its core to generate compiled assets.
+Release versions of Jexactyl will include pre-compiled, minified, and hashed assets ready-to-go.
 
 However, if you are interested in running custom themes or making modifications to the React files you'll need a build
 system in place to generate these compiled assets. To get your environment setup you'll need at minimum:
 
-* [Node.js](https://nodejs.org/en/) v14.x.x
+* [Node.js](https://nodejs.org/en/) v16.x.x
 * [Yarn](https://classic.yarnpkg.com/lang/en/) v1.x.x
 * [Go](https://golang.org/) 1.17.x
 
@@ -14,7 +14,7 @@ system in place to generate these compiled assets. To get your environment setup
 yarn install
 ```
 
-The command above will download all of the dependencies necessary to get Pterodactyl assets building. After that, its as
+The command above will download all of the dependencies necessary to get Jexactyl assets building. After that, its as
 simple as running the command below to generate assets while you're developing. Until you've run this command at least
 once you'll likely see a 500 error on your Panel about a missing `manifest.json` file. This is generated by the commands
 below.
@@ -40,10 +40,10 @@ PUBLIC_PATH=http://192.168.1.1:8080 yarn run serve --host 192.168.1.1
 There are two _very important_ parts of this command to take note of and change for your specific environment. The first
 is the `--host` flag, which is required and should point to the machine where the `webpack-serve` server will be running.
 The second is the `PUBLIC_PATH` environment variable which is the URL pointing to the HMR server and is appended to all of
-the asset URLs used in Pterodactyl.
+the asset URLs used in Jexactyl.
 
 #### Development Environment
-If you're using the [`pterodactyl/development`](https://github.com/pterodactyl/development) environments, which are
+If you're using the [`Jexactyl/development`](https://github.com/Jexactyl/development) environments, which are
 highly recommended, you can just run `yarn run serve` to run the HMR server, no additional configuration is necessary.
 
 ### Building for Production

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

@@ -1,13 +1,5 @@
 # Contributing
 
-Pterodactyl does not accept Pull Requests (PRs) _for new functionality_ from users that are not currently part of the
-core project team. It has become overwhelming to try and give the proper time and attention that such complicated PRs
-tend to require — and deserve. As a result, it is in the project's best interest to limit the scope of work on
-new functionality to work done within the core project team.
-
-PRs that address existing _bugs_ with a corresponding issue opened in our issue tracker will continue to be accepted
-and reviewed. Their scope is often significantly more targeted, and simply improving upon existing and well defined
-logic.
 
 ### Responsible Disclosure
 
@@ -20,12 +12,12 @@ publicly disclose whatever issue you have found. We understand how frustrating i
 no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and
 keeping this community safe.
 
-If you've found what you believe is a security issue please email `[email protected]`. Please check
+If you've found what you believe is a security issue please email `[email protected]`. Please check
 [SECURITY.md](/SECURITY.md) for additional details.
 
 ### Contact Us
 
 You can find us in a couple places online. First and foremost, we're active right here on GitHub. If you encounter a
 bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
 
-You can also find us on [Discord](https://discord.gg/pterodactyl).
+You can also find us on [Discord](https://discord.gg/qttGR4Z5Pk).

Dockerfile

@@ -1,8 +1,8 @@
 # Stage 0:
 # Build the assets that are needed for the frontend. This build stage is then discarded
 # since we won't need NodeJS anymore in the future. This Docker image ships a final production
-# level distribution of Pterodactyl.
-FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
+# level distribution of Jexactyl.
+FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:16
 WORKDIR /app
 COPY . ./
 RUN yarn install --frozen-lockfile \

LICENSE.md

@@ -1,5 +1,7 @@
 # The MIT License (MIT)
 
+This license is retained from Jexactyl&apos;s parent project, <a href="https://github.com/pterodactyl/panel">Pterodactyl&reg;</a>.
+
 ```
 Pterodactyl®
 Copyright © Dane Everitt <[email protected]> and contributors

SECURITY.md

@@ -5,13 +5,13 @@ As seguintes versões do Jexactyl estão recebendo suporte e manutenção ativos
 
 | Panel   | Suportado          |
 |---------|--------------------|
-| 3.5.x   | :white_check_mark: |
-| 3.4.x   | :white_check_mark: |
-| < 3.4.x | :x:                |
+| 3.7.x   | :white_check_mark: |
+| 3.6.x   | :white_check_mark: |
+| < 3.5.x | :x:                |
 
 ## Relatando uma Vulnerabilidade
 
-Entre em contato diretamente com qualquer membro da equipe do projeto no Discord ao relatar uma vulnerabilidade de segurança ou envie um e-mail para `[email protected]`.
+Entre em contato diretamente com qualquer membro da equipe do projeto no Discord ao relatar uma vulnerabilidade de segurança ou envie um e-mail para `[email protected]`.
 
  Fazemos todos os esforços para responder o mais rápido possível, embora possa levar um ou dois dias para sincronizarmos internamente e determinarmos a gravidade do relatório e seu impacto.  Por favor, _não_ use um canal voltado ao público ou problemas do GitHub para relatar problemas de segurança confidenciais.
 

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Environment;
+namespace Jexactyl\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
-use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
+use Jexactyl\Traits\Commands\EnvironmentWriterTrait;
 
 class AppSettingsCommand extends Command
 {
@@ -58,7 +58,7 @@ public function __construct(private Kernel $console)
     /**
      * Handle command execution.
      *
-     * @throws \Pterodactyl\Exceptions\PterodactylException
+     * @throws \Jexactyl\Exceptions\JexactylException
      */
     public function handle(): int
     {
@@ -69,7 +69,7 @@ public function handle(): int
         $this->output->comment('Forneça o endereço de e-mail que será usado para exportar novos eggs . Este deve ser um endereço de e-mail válido.');
         $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
             'E-mail do autor do Egg',
-            config('pterodactyl.service.author', '[email protected]')
+            config('jexactyl.service.author', '[email protected]')
         );
 
         if (!filter_var($this->variables['APP_SERVICE_AUTHOR'], FILTER_VALIDATE_EMAIL)) {

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Environment;
+namespace Jexactyl\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
-use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
+use Jexactyl\Traits\Commands\EnvironmentWriterTrait;
 
 class DatabaseSettingsCommand extends Command
 {
@@ -33,7 +33,7 @@ public function __construct(private DatabaseManager $database, private Kernel $c
     /**
      * Handle command execution.
      *
-     * @throws \Pterodactyl\Exceptions\PterodactylException
+     * @throws \Jexactyl\Exceptions\JexactylException
      */
     public function handle(): int
     {
@@ -56,7 +56,7 @@ public function handle(): int
         $this->output->note('Usar a conta "root" para conexões MySQL não é apenas altamente desaprovado, mas também não é permitido por este aplicativo. Você precisa ter criado um usuário MySQL para este software.');
         $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
             'Usuário do Database',
-            config('database.connections.mysql.username', 'pterodactyl')
+            config('database.connections.mysql.username', 'Jexactyl')
         );
 
         $askForMySQLPassword = true;
@@ -76,7 +76,7 @@ public function handle(): int
             $this->output->error('Suas credenciais de conexão NÃO foram salvas. Você precisará fornecer informações válidas de conexão antes de prosseguir.');
 
             if ($this->confirm('Voltar e tentar novamente?')) {
-                $this->database->disconnect('_pterodactyl_command_test');
+                $this->database->disconnect('_Jexactyl_command_test');
 
                 return $this->handle();
             }
@@ -96,7 +96,7 @@ public function handle(): int
      */
     private function testMySQLConnection()
     {
-        config()->set('database.connections._pterodactyl_command_test', [
+        config()->set('database.connections._Jexactyl_command_test', [
             'driver' => 'mysql',
             'host' => $this->variables['DB_HOST'],
             'port' => $this->variables['DB_PORT'],
@@ -108,6 +108,6 @@ private function testMySQLConnection()
             'strict' => true,
         ]);
 
-        $this->database->connection('_pterodactyl_command_test')->getPdo();
+        $this->database->connection('_Jexactyl_command_test')->getPdo();
     }
 }

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Environment;
+namespace Jexactyl\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
-use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
+use Jexactyl\Traits\Commands\EnvironmentWriterTrait;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class EmailSettingsCommand extends Command
@@ -36,7 +36,7 @@ public function __construct(private ConfigRepository $config)
     /**
      * Handle command execution.
      *
-     * @throws \Pterodactyl\Exceptions\PterodactylException
+     * @throws \Jexactyl\Exceptions\JexactylException
      */
     public function handle()
     {

app/Console/Commands/InfoCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Console\Commands;
+namespace Jexactyl\Console\Commands;
 
 use Illuminate\Console\Command;
-use Pterodactyl\Services\Helpers\SoftwareVersionService;
+use Jexactyl\Services\Helpers\SoftwareVersionService;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class InfoCommand extends Command
@@ -30,7 +30,7 @@ public function handle()
             ['Panel Version', $this->config->get('app.version')],
             ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
-            ['Unique Identifier', $this->config->get('pterodactyl.service.author')],
+            ['Unique Identifier', $this->config->get('Jexactyl.service.author')],
         ], 'compact');
 
         $this->output->title('Configuração do aplicativo');

app/Console/Commands/Location/DeleteLocationCommand.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Location;
+namespace Jexactyl\Console\Commands\Location;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use Pterodactyl\Services\Locations\LocationDeletionService;
-use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
+use Jexactyl\Services\Locations\LocationDeletionService;
+use Jexactyl\Contracts\Repository\LocationRepositoryInterface;
 
 class DeleteLocationCommand extends Command
 {
@@ -28,8 +28,8 @@ public function __construct(
     /**
      * Respond to the command request.
      *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     * @throws \Pterodactyl\Exceptions\Service\Location\HasActiveNodesException
+     * @throws \Jexactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Jexactyl\Exceptions\Service\Location\HasActiveNodesException
      */
     public function handle()
     {

app/Console/Commands/Location/MakeLocationCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Location;
+namespace Jexactyl\Console\Commands\Location;
 
 use Illuminate\Console\Command;
-use Pterodactyl\Services\Locations\LocationCreationService;
+use Jexactyl\Services\Locations\LocationCreationService;
 
 class MakeLocationCommand extends Command
 {
@@ -24,7 +24,7 @@ public function __construct(private LocationCreationService $creationService)
     /**
      * Handle the command execution process.
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Jexactyl\Exceptions\Model\DataValidationException
      */
     public function handle()
     {

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Maintenance;
+namespace Jexactyl\Console\Commands\Maintenance;
 
 use Carbon\Carbon;
 use Illuminate\Console\Command;

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Maintenance;
+namespace Jexactyl\Console\Commands\Maintenance;
 
 use Carbon\CarbonImmutable;
 use Illuminate\Console\Command;
-use Pterodactyl\Repositories\Eloquent\BackupRepository;
+use Jexactyl\Repositories\Eloquent\BackupRepository;
 
 class PruneOrphanedBackupsCommand extends Command
 {

app/Console/Commands/Node/MakeNodeCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Node;
+namespace Jexactyl\Console\Commands\Node;
 
 use Illuminate\Console\Command;
-use Pterodactyl\Services\Nodes\NodeCreationService;
+use Jexactyl\Services\Nodes\NodeCreationService;
 
 class MakeNodeCommand extends Command
 {
@@ -38,7 +38,7 @@ public function __construct(private NodeCreationService $creationService)
     /**
      * Handle the command execution process.
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Jexactyl\Exceptions\Model\DataValidationException
      */
     public function handle()
     {
@@ -61,7 +61,7 @@ public function handle()
         $data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Insira o tamanho máximo de upload de arquivo', '100');
         $data['daemonListen'] = $this->option('daemonListeningPort') ?? $this->ask('Entre na porta de escuta das Wings', '8080');
         $data['daemonSFTP'] = $this->option('daemonSFTPPort') ?? $this->ask('Entre na porta de escuta SFTP das wings', '2022');
-        $data['daemonBase'] = $this->option('daemonBase') ?? $this->ask('Entre na pasta base', '/var/lib/pterodactyl/volumes');
+        $data['daemonBase'] = $this->option('daemonBase') ?? $this->ask('Entre na pasta base', '/var/lib/Jexactyl/volumes');
 
         $node = $this->creationService->handle($data);
         $this->line('Um novo node foi criado com sucesso na localização ' . $data['location_id'] . ' com o nome ' . $data['name'] . ' e tem um id de ' . $node->id . '.');

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Pterodactyl\Console\Commands\Node;
+namespace Jexactyl\Console\Commands\Node;
 
-use Pterodactyl\Models\Node;
+use Jexactyl\Models\Node;
 use Illuminate\Console\Command;
 
 class NodeConfigurationCommand extends Command
@@ -17,7 +17,7 @@ public function handle(): int
     {
         $column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
 
-        /** @var \Pterodactyl\Models\Node $node */
+        /** @var \Jexactyl\Models\Node $node */
         $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
             $this->error('O node selecionado não existe.');