Fix Routes, Fix Ptero User ID, Show ReferredBy (#829)

app/Http/Controllers/Auth/RegisterController.php

@@ -142,7 +142,7 @@ class RegisterController extends Controller
         $user->syncRoles(4);
 
         $response = $this->pterodactyl->application->post('/application/users', [
-            'external_id' => $user->pterodactyl_id,
+            'external_id' => null,
             'username' => $user->name,
             'email' => $user->email,
             'first_name' => $user->name,
@@ -151,6 +151,14 @@ class RegisterController extends Controller
             'root_admin' => false,
             'language' => 'en',
         ]);
+        
+        $user->update([
+            'pterodactyl_id' => $response->json()['attributes']['id'],
+        ]);
+
+
+
+
 
         if ($response->failed()) {
             $user->delete();

app/Models/User.php

@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\DB;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
@@ -97,6 +98,8 @@ class User extends Authenticatable implements MustVerifyEmail
 
         $ptero_settings = new PterodactylSettings();
         $this->pterodactyl = new PterodactylClient($ptero_settings);
+
+
     }
 
     public static function boot()
@@ -285,6 +288,17 @@ class User extends Authenticatable implements MustVerifyEmail
         ])->save();
     }
 
+    public function referredBy(){
+        $referee = DB::table('user_referrals')->where("registered_user_id",$this->id)->first();
+
+        if($referee){
+            $referee = User::where("id",$referee->referral_id)->firstOrFail();
+            return $referee;
+        }
+        return Null;
+
+    }
+
     public function getActivitylogOptions(): LogOptions
     {
         return LogOptions::defaults()

routes/web.php

@@ -76,9 +76,11 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
     Route::patch('/servers/cancel/{server}', [ServerController::class, 'cancel'])->name('servers.cancel');
     Route::resource('servers', ServerController::class);
 
-    $serverSettings = app(App\Settings\ServerSettings::class);
-    if ($serverSettings->enable_upgrade) {
-        Route::post('servers/{server}/upgrade', [ServerController::class, 'upgrade'])->name('servers.upgrade');
+    if (config('app.key')) {
+        $serverSettings = app(App\Settings\ServerSettings::class);
+        if ($serverSettings->enable_upgrade) {
+            Route::post('servers/{server}/upgrade', [ServerController::class, 'upgrade'])->name('servers.upgrade');
+        }
     }
 
     Route::post('profile/selfdestruct', [ProfileController::class, 'selfDestroyUser'])->name('profile.selfDestroyUser');

themes/default/views/admin/users/show.blade.php

@@ -173,6 +173,20 @@
                             </div>
                         </div>
 
+
+
+                        <div class="col-lg-6">
+                            <div class="row">
+                                <div class="col-lg-4">
+                                    <label>{{ __('IP') }}</label>
+                                </div>
+                                <div class="col-lg-8">
+                                    <span style="max-width: 250px;" class="d-inline-block text-truncate">
+                                        {{ $user->ip }}
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-lg-6">
                             <div class="row">
                                 <div class="col-lg-4">
@@ -185,21 +199,18 @@
                                 </div>
                             </div>
                         </div>
-
-
                         <div class="col-lg-6">
                             <div class="row">
                                 <div class="col-lg-4">
-                                    <label>{{ __('IP') }}</label>
+                                    <label>{{ __('Referred by') }}</label>
                                 </div>
                                 <div class="col-lg-8">
                                     <span style="max-width: 250px;" class="d-inline-block text-truncate">
-                                        {{ $user->ip }}
+                                        {{ $user->referredBy() != Null ? $user->referredBy()->name : "None" }}
                                     </span>
                                 </div>
                             </div>
                         </div>
-
                         <div class="col-lg-6">
                             <div class="row">
                                 <div class="col-lg-4">