From e972f8db4112c00fecd9a72e24274079bc0400eb Mon Sep 17 00:00:00 2001 From: w33b Date: Wed, 7 Jan 2026 12:54:10 +0100 Subject: [PATCH] Rename column names --- app/Http/Controllers/UserController.php | 4 +- app/Livewire/AdminCommentSearch.php | 4 +- app/Livewire/AdminUserSearch.php | 4 +- app/Models/User.php | 45 +++++++------------ app/Override/Comments/CommentService.php | 2 +- resources/views/layouts/navigation.blade.php | 10 ++--- .../livewire/admin-comment-search.blade.php | 2 +- .../livewire/admin-user-search.blade.php | 2 +- .../livewire/playlist-overview.blade.php | 8 ++-- resources/views/partials/comment.blade.php | 14 +++--- resources/views/profile/edit.blade.php | 6 +-- .../update-profile-information-form.blade.php | 22 +++------ .../views/stream/partials/playlist.blade.php | 2 +- .../views/user/partials/profile.blade.php | 6 +-- .../views/vendor/comments/_comment.blade.php | 14 +++--- 15 files changed, 63 insertions(+), 82 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 1836c3e..5e24903 100644 --- a/app/Http/Controllers/UserController.php +++ b/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', [ diff --git a/app/Livewire/AdminCommentSearch.php b/app/Livewire/AdminCommentSearch.php index 0fe21fe..aa49241 100644 --- a/app/Livewire/AdminCommentSearch.php +++ b/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', [ diff --git a/app/Livewire/AdminUserSearch.php b/app/Livewire/AdminUserSearch.php index 8680b44..36e18e9 100644 --- a/app/Livewire/AdminUserSearch.php +++ b/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); diff --git a/app/Models/User.php b/app/Models/User.php index 77d4f84..97fa370 100644 --- a/app/Models/User.php +++ b/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', ]; /** diff --git a/app/Override/Comments/CommentService.php b/app/Override/Comments/CommentService.php index e4406b0..3b47f3c 100644 --- a/app/Override/Comments/CommentService.php +++ b/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( diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 86fee6c..a766ec4 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -94,9 +94,9 @@