Rename column names

app/Http/Controllers/UserController.php

@@ -17,8 +17,8 @@ class UserController extends Controller
      */
     public function index(string $username): \Illuminate\View\View
     {
-        $user = User::where('username', $username)
-            ->select('id', 'username', 'global_name', 'avatar', 'created_at', 'is_patreon')
+        $user = User::where('name', $username)
+            ->select('id', 'name', 'discord_name', 'avatar', 'created_at', 'is_patreon')
             ->firstOrFail();
         
         return view('user.index', [

app/Livewire/AdminCommentSearch.php

@@ -28,9 +28,9 @@ class AdminCommentSearch extends Component
     {
         $comments = DB::table('comments')
             ->join('users', 'comments.commenter_id', '=', 'users.id')
-            ->select('comments.*', 'users.username')
+            ->select('comments.*', 'users.name')
             ->when($this->search !== '', fn ($query) => $query->where('comment', 'LIKE', "%$this->search%"))
-            ->when($this->userSearch !== '', fn ($query) => $query->where('username', 'LIKE', "%$this->userSearch%"))
+            ->when($this->userSearch !== '', fn ($query) => $query->where('name', 'LIKE', "%$this->userSearch%"))
             ->paginate(12);
 
         return view('livewire.admin-comment-search', [

app/Livewire/AdminUserSearch.php

@@ -44,8 +44,8 @@ class AdminUserSearch extends Component
             ->when($this->patreon !== [], fn ($query) => $query->where('is_patreon', 1))
             ->when($this->banned !== [], fn ($query) => $query->where('is_banned', 1))
             ->when($this->search !== '',  fn ($query) => $query->where(function($query) { 
-                $query->where('username', 'like', '%'.$this->search.'%')
-                    ->orWhere('global_name', 'like', '%'.$this->search.'%'); 
+                $query->where('name', 'like', '%'.$this->search.'%')
+                    ->orWhere('discord_name', 'like', '%'.$this->search.'%'); 
                 }))
             ->paginate(20);
 

app/Models/User.php

@@ -7,15 +7,13 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
-use Jakyeru\Larascord\Traits\InteractsWithDiscord;
 use Laravelista\Comments\Commenter;
-use Laravel\Sanctum\HasApiTokens;
 
 use Illuminate\Support\Facades\DB;
 
 class User extends Authenticatable
 {
-    use HasApiTokens, HasFactory, Notifiable, InteractsWithDiscord, Commenter;
+    use HasFactory, Notifiable, Commenter;
 
     /**
      * The attributes that are mass assignable.
@@ -23,22 +21,15 @@ class User extends Authenticatable
      * @var string[]
      */
     protected $fillable = [
-        'id',
-        'username',
-        'global_name',
-        'discriminator',
+        'name',
         'email',
-        'avatar',
-        'verified',
-        'banner',
-        'banner_color',
-        'accent_color',
+        'password',
         'locale',
-        'mfa_enabled',
-        'premium_type',
-        'public_flags',
-        'roles',
         'is_banned',
+        // Discord
+        'discord_id',
+        'discord_name',
+        'discord_avatar',
     ];
 
     /**
@@ -47,6 +38,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $hidden = [
+        'password',
         'remember_token',
     ];
 
@@ -56,22 +48,19 @@ class User extends Authenticatable
      * @var array
      */
     protected $casts = [
-        'id' => 'integer',
-        'username' => 'string',
-        'global_name' => 'string',
-        'discriminator' => 'string',
+        // Laravel defaults
+        'email_verified_at' => 'datetime',
+        'password' => 'hashed',
+        // Other
+        'name' => 'string',
         'email' => 'string',
-        'avatar' => 'string',
-        'verified' => 'boolean',
-        'banner' => 'string',
-        'banner_color' => 'string',
-        'accent_color' => 'string',
         'locale' => 'string',
-        'mfa_enabled' => 'boolean',
-        'premium_type' => 'integer',
-        'public_flags' => 'integer',
         'roles' => 'json',
         'tag_blacklist' => 'array',
+        // Discord
+        'discord_id' => 'integer',
+        'discord_name' => 'string',
+        'discord_avatar' => 'string',
     ];
 
     /**

app/Override/Comments/CommentService.php

@@ -122,7 +122,7 @@ class CommentService
             $url = '/hentai/' . $episode->slug . '#comment-' . $reply->id;
 
             $user = Auth::user();
-            $username = $user->global_name ?? $user->username;
+            $username = $user->discord_name ?? $user->name;
     
             $parentCommentUser = User::where('id', $comment->commenter_id)->firstOrFail();
             $parentCommentUser->notify(