Rename column names

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Auth\LoginRequest;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\View\View;
-
-class AuthenticatedSessionController extends Controller
-{
-    /**
-     * Display the login view.
-     */
-    public function create(): View
-    {
-        return view('auth.login');
-    }
-
-    /**
-     * Handle an incoming authentication request.
-     */
-    public function store(LoginRequest $request): RedirectResponse
-    {
-        $request->authenticate();
-
-        $request->session()->regenerate();
-
-        return redirect()->intended(RouteServiceProvider::HOME);
-    }
-
-    /**
-     * Destroy an authenticated session.
-     */
-    public function destroy(Request $request): RedirectResponse
-    {
-        Auth::guard('web')->logout();
-
-        $request->session()->invalidate();
-
-        $request->session()->regenerateToken();
-
-        return redirect('/');
-    }
-}

app/Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\ValidationException;
-use Illuminate\View\View;
-
-class ConfirmablePasswordController extends Controller
-{
-    /**
-     * Show the confirm password view.
-     */
-    public function show(): View
-    {
-        return view('auth.confirm-password');
-    }
-
-    /**
-     * Confirm the user's password.
-     */
-    public function store(Request $request): RedirectResponse
-    {
-        if (! Auth::guard('web')->validate([
-            'email' => $request->user()->email,
-            'password' => $request->password,
-        ])) {
-            throw ValidationException::withMessages([
-                'password' => __('auth.password'),
-            ]);
-        }
-
-        $request->session()->put('auth.password_confirmed_at', time());
-
-        return redirect()->intended(RouteServiceProvider::HOME);
-    }
-}

app/Http/Controllers/Auth/EmailVerificationNotificationController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-
-class EmailVerificationNotificationController extends Controller
-{
-    /**
-     * Send a new email verification notification.
-     */
-    public function store(Request $request): RedirectResponse
-    {
-        if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME);
-        }
-
-        $request->user()->sendEmailVerificationNotification();
-
-        return back()->with('status', 'verification-link-sent');
-    }
-}

app/Http/Controllers/Auth/EmailVerificationPromptController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\View\View;
-
-class EmailVerificationPromptController extends Controller
-{
-    /**
-     * Display the email verification prompt.
-     */
-    public function __invoke(Request $request): RedirectResponse|View
-    {
-        return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(RouteServiceProvider::HOME)
-                    : view('auth.verify-email');
-    }
-}

app/Http/Controllers/Auth/NewPasswordController.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Password;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rules;
-use Illuminate\View\View;
-
-class NewPasswordController extends Controller
-{
-    /**
-     * Display the password reset view.
-     */
-    public function create(Request $request): View
-    {
-        return view('auth.reset-password', ['request' => $request]);
-    }
-
-    /**
-     * Handle an incoming new password request.
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function store(Request $request): RedirectResponse
-    {
-        $request->validate([
-            'token' => ['required'],
-            'email' => ['required', 'email'],
-            'password' => ['required', 'confirmed', Rules\Password::defaults()],
-        ]);
-
-        // Here we will attempt to reset the user's password. If it is successful we
-        // will update the password on an actual user model and persist it to the
-        // database. Otherwise we will parse the error and return the response.
-        $status = Password::reset(
-            $request->only('email', 'password', 'password_confirmation', 'token'),
-            function ($user) use ($request) {
-                $user->forceFill([
-                    'password' => Hash::make($request->password),
-                    'remember_token' => Str::random(60),
-                ])->save();
-
-                event(new PasswordReset($user));
-            }
-        );
-
-        // If the password was successfully reset, we will redirect the user back to
-        // the application's home authenticated view. If there is an error we can
-        // redirect them back to where they came from with their error message.
-        return $status == Password::PASSWORD_RESET
-                    ? redirect()->route('login')->with('status', __($status))
-                    : back()->withInput($request->only('email'))
-                            ->withErrors(['email' => __($status)]);
-    }
-}

app/Http/Controllers/Auth/PasswordController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Validation\Rules\Password;
-
-class PasswordController extends Controller
-{
-    /**
-     * Update the user's password.
-     */
-    public function update(Request $request): RedirectResponse
-    {
-        $validated = $request->validateWithBag('updatePassword', [
-            'current_password' => ['required', 'current_password'],
-            'password' => ['required', Password::defaults(), 'confirmed'],
-        ]);
-
-        $request->user()->update([
-            'password' => Hash::make($validated['password']),
-        ]);
-
-        return back()->with('status', 'password-updated');
-    }
-}

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Password;
-use Illuminate\View\View;
-
-class PasswordResetLinkController extends Controller
-{
-    /**
-     * Display the password reset link request view.
-     */
-    public function create(): View
-    {
-        return view('auth.forgot-password');
-    }
-
-    /**
-     * Handle an incoming password reset link request.
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function store(Request $request): RedirectResponse
-    {
-        $request->validate([
-            'email' => ['required', 'email'],
-        ]);
-
-        // We will send the password reset link to this user. Once we have attempted
-        // to send the link, we will examine the response then see the message we
-        // need to show to the user. Finally, we'll send out a proper response.
-        $status = Password::sendResetLink(
-            $request->only('email')
-        );
-
-        return $status == Password::RESET_LINK_SENT
-                    ? back()->with('status', __($status))
-                    : back()->withInput($request->only('email'))
-                            ->withErrors(['email' => __($status)]);
-    }
-}

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Validation\Rules;
-use Illuminate\View\View;
-
-class RegisteredUserController extends Controller
-{
-    /**
-     * Display the registration view.
-     */
-    public function create(): View
-    {
-        return view('auth.register');
-    }
-
-    /**
-     * Handle an incoming registration request.
-     *
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function store(Request $request): RedirectResponse
-    {
-        $request->validate([
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class],
-            'password' => ['required', 'confirmed', Rules\Password::defaults()],
-        ]);
-
-        $user = User::create([
-            'name' => $request->name,
-            'email' => $request->email,
-            'password' => Hash::make($request->password),
-        ]);
-
-        event(new Registered($user));
-
-        Auth::login($user);
-
-        return redirect(RouteServiceProvider::HOME);
-    }
-}

app/Http/Controllers/Auth/VerifyEmailController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Auth\Events\Verified;
-use Illuminate\Foundation\Auth\EmailVerificationRequest;
-use Illuminate\Http\RedirectResponse;
-
-class VerifyEmailController extends Controller
-{
-    /**
-     * Mark the authenticated user's email address as verified.
-     */
-    public function __invoke(EmailVerificationRequest $request): RedirectResponse
-    {
-        if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
-        }
-
-        if ($request->user()->markEmailAsVerified()) {
-            event(new Verified($request->user()));
-        }
-
-        return redirect()->intended(RouteServiceProvider::HOME.'?verified=1');
-    }
-}

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(

app/Override/Discord/DiscordController.php

@@ -1,155 +0,0 @@
-<?php
-
-namespace Jakyeru\Larascord\Http\Controllers;
-
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
-use Jakyeru\Larascord\Http\Requests\StoreUserRequest;
-use Jakyeru\Larascord\Services\DiscordService;
-
-use RealRashid\SweetAlert\Facades\Alert;
-
-class DiscordController extends Controller
-{
-    /**
-     * Handles the Discord OAuth2 login.
-     */
-    public function handle(StoreUserRequest $request): RedirectResponse | JsonResponse
-    {
-        // Making sure the "guilds" scope was added to .env if there are any guilds specified in "larascord.guilds".
-        if (count(config('larascord.guilds'))) {
-            if (!in_array('guilds', explode('&', config('larascord.scopes')))) {
-                return $this->throwError('missing_guilds_scope');
-            }
-        }
-
-        // Getting the accessToken from the Discord API.
-        try {
-            $accessToken = (new DiscordService())->getAccessTokenFromCode($request->get('code'));
-        } catch (\Exception $e) {
-            return $this->throwError('invalid_code', $e);
-        }
-
-        // Get the user from the Discord API.
-        try {
-            $user = (new DiscordService())->getCurrentUser($accessToken);
-            $user->setAccessToken($accessToken);
-        } catch (\Exception $e) {
-            return $this->throwError('authorization_failed', $e);
-        }
-
-        // Making sure the user has an email if the email scope is set.
-        if (in_array('email', explode('&', config('larascord.scopes')))) {
-            if (empty($user->email)) {
-                return $this->throwError('missing_email');
-            }
-        }
-
-        if (auth()->check()) {
-            // Making sure the current logged-in user's ID is matching the ID retrieved from the Discord API.
-            if (auth()->id() !== (int)$user->id) {
-                auth()->logout();
-                return $this->throwError('invalid_user');
-            }
-
-            // Confirming the session in case the user was redirected from the password.confirm middleware.
-            $request->session()->put('auth.password_confirmed_at', time());
-        }
-
-        // Trying to create or update the user in the database.
-        // Initiating a database transaction in case something goes wrong.
-        DB::beginTransaction();
-        try {
-            $user = (new DiscordService())->createOrUpdateUser($user);
-            $user->accessToken()->updateOrCreate([], $accessToken->toArray());
-        } catch (\Exception $e) {
-            DB::rollBack();
-            return $this->throwError('database_error', $e);
-        }
-
-        // Verifying if the user is soft-deleted.
-        if (Schema::hasColumn('users', 'deleted_at')) {
-            if ($user->trashed()) {
-                DB::rollBack();
-                return $this->throwError('user_deleted');
-            }
-        }
-
-        // Patreon check
-        try {
-            if (!$accessToken->hasScopes(['guilds', 'guilds.members.read'])) {
-                DB::rollBack();
-                return $this->throwError('missing_guilds_members_read_scope');
-            }
-            $guildMember = (new DiscordService())->getGuildMember($accessToken, config('discord.guild_id'));
-            $patreonroles = config('discord.patreon_roles');
-            $user->is_patreon = false;
-            if ((new DiscordService())->hasRoleInGuild($guildMember, $patreonroles)) {
-                $user->is_patreon = true;
-            }
-            $user->save();
-        } catch (\Exception $e) {
-            // Clearly not a patreon
-            $user->is_patreon = false;
-            $user->save();
-        }
-
-        // Committing the database transaction.
-        DB::commit();
-
-        // Authenticating the user if the user is not logged in.
-        if (!auth()->check()) {
-            auth()->login($user, config('larascord.remember_me', false));
-        }
-
-        // Redirecting the user to the intended page or to the home page.
-        return redirect()->intended(RouteServiceProvider::HOME);
-    }
-
-    /**
-     * Handles the throwing of an error.
-     */
-    private function throwError(string $message, \Exception $exception = NULL): RedirectResponse | JsonResponse
-    {
-        if (app()->hasDebugModeEnabled()) {
-            return response()->json([
-                'larascord_message' => config('larascord.error_messages.' . $message),
-                'message' => $exception?->getMessage(),
-                'code' => $exception?->getCode()
-            ]);
-        } else {
-            if (config('larascord.error_messages.' . $message . '.redirect')) {
-                Alert::error('Error', config('larascord.error_messages.' . $message . '.message', 'An error occurred while trying to log you in.'));
-                return redirect(config('larascord.error_messages.' . $message . '.redirect'))->with('error', config('larascord.error_messages.' . $message . '.message', 'An error occurred while trying to log you in.'));
-            } else {
-                return redirect('/')->with('error', config('larascord.error_messages.' . $message, 'An error occurred while trying to log you in.'));
-            }
-        }
-    }
-
-    /**
-     * Handles the deletion of the user.
-     */
-    public function destroy(): RedirectResponse | JsonResponse
-    {
-        // Revoking the OAuth2 access token.
-        try {
-            (new DiscordService())->revokeAccessToken(auth()->user()->accessToken()->first()->refresh_token);
-        } catch (\Exception $e) {
-            return $this->throwError('revoke_token_failed', $e);
-        }
-
-        // Deleting the user from the database.
-        auth()->user()->delete();
-
-        // Showing the success message.
-        if (config('larascord.success_messages.user_deleted.redirect')) {
-            return redirect(config('larascord.success_messages.user_deleted.redirect'))->with('success', config('larascord.success_messages.user_deleted.message', 'Your account has been deleted.'));
-        } else {
-            return redirect('/')->with('success', config('larascord.success_messages.user_deleted', 'Your account has been deleted.'));
-        }
-    }
-}

app/Override/Discord/Services/DiscordService.php

@@ -1,273 +0,0 @@
-<?php
-
-namespace Jakyeru\Larascord\Services;
-
-use App\Models\User;
-use App\Models\OldUser;
-use App\Models\Playlist;
-use App\Models\PlaylistEpisode;
-
-use Exception;
-use Illuminate\Http\Client\RequestException;
-use Illuminate\Support\Facades\Http;
-use Jakyeru\Larascord\Types\AccessToken;
-use Jakyeru\Larascord\Types\GuildMember;
-use Illuminate\Support\Facades\DB;
-
-class DiscordService
-{
-    /**
-     * The Discord OAuth2 token URL.
-     */
-    protected string $tokenURL = "https://discord.com/api/oauth2/token";
-
-    /**
-     * The Discord API base URL.
-     */
-    protected string $baseApi = "https://discord.com/api";
-    /**
-     * The required data for the token request.
-     */
-    protected array $tokenData = [
-        "client_id" => NULL,
-        "client_secret" => NULL,
-        "grant_type" => "authorization_code",
-        "code" => NULL,
-        "redirect_uri" => NULL,
-        "scope" => null
-    ];
-
-    /**
-     * UserService constructor.
-     */
-    public function __construct()
-    {
-        $this->tokenData['client_id'] = config('larascord.client_id');
-        $this->tokenData['client_secret'] = config('larascord.client_secret');
-        $this->tokenData['grant_type'] = config('larascord.grant_type');
-        $this->tokenData['redirect_uri'] = config('larascord.redirect_uri');
-        $this->tokenData['scope'] = config('larascord.scopes');
-    }
-
-    /**
-     * Handles the Discord OAuth2 callback and returns the access token.
-     *
-     * @throws RequestException
-     */
-    public function getAccessTokenFromCode(string $code): AccessToken
-    {
-        $this->tokenData['code'] = $code;
-
-        $response = Http::asForm()->post($this->tokenURL, $this->tokenData);
-
-        $response->throw();
-
-        return new AccessToken(json_decode($response->body()));
-    }
-
-    /**
-     * Get access token from refresh token.
-     *
-     * @throws RequestException
-     */
-    public function refreshAccessToken(string $refreshToken): AccessToken
-    {
-        $response = Http::asForm()->post($this->tokenURL, [
-            'client_id' => config('larascord.client_id'),
-            'client_secret' => config('larascord.client_secret'),
-            'grant_type' => 'refresh_token',
-            'refresh_token' => $refreshToken,
-        ]);
-
-        $response->throw();
-
-        return new AccessToken(json_decode($response->body()));
-    }
-
-    /**
-     * Authenticates the user with the access token and returns the user data.
-     *
-     * @throws RequestException
-     */
-    public function getCurrentUser(AccessToken $accessToken): \Jakyeru\Larascord\Types\User
-    {
-        $response = Http::withToken($accessToken->access_token)->get($this->baseApi . '/users/@me');
-
-        $response->throw();
-
-        return new \Jakyeru\Larascord\Types\User(json_decode($response->body()));
-    }
-
-    /**
-     * Get the user's guilds.
-     *
-     * @throws RequestException
-     * @throws Exception
-     */
-    public function getCurrentUserGuilds(AccessToken $accessToken, bool $withCounts = false): array
-    {
-        if (!$accessToken->hasScope('guilds')) throw new Exception(config('larascord.error_messages.missing_guilds_scope.message'));
-
-        $endpoint = '/users/@me/guilds';
-
-        if ($withCounts) {
-            $endpoint .= '?with_counts=true';
-        }
-
-        $response = Http::withToken($accessToken->access_token, $accessToken->token_type)->get($this->baseApi . $endpoint);
-
-        $response->throw();
-
-        return array_map(function ($guild) {
-            return new \Jakyeru\Larascord\Types\Guild($guild);
-        }, json_decode($response->body()));
-    }
-
-    /**
-     * Get the Guild Member object for a user.
-     *
-     * @throws RequestException
-     * @throws Exception
-     */
-    public function getGuildMember(AccessToken $accessToken, string $guildId): GuildMember
-    {
-        if (!$accessToken->hasScopes(['guilds', 'guilds.members.read'])) throw new Exception(config('larascord.error_messages.missing_guilds_members_read_scope.message'));
-
-        $response = Http::withToken($accessToken->access_token, $accessToken->token_type)->get($this->baseApi . '/users/@me/guilds/' . $guildId . '/member');
-
-        $response->throw();
-
-        return new GuildMember(json_decode($response->body()));
-    }
-
-    /**
-     * Get the User's connections.
-     *
-     * @throws RequestException
-     * @throws Exception
-     */
-    public function getCurrentUserConnections(AccessToken $accessToken): array
-    {
-        if (!$accessToken->hasScope('connections')) throw new Exception('The "connections" scope is required.');
-
-        $response = Http::withToken($accessToken->access_token, $accessToken->token_type)->get($this->baseApi . '/users/@me/connections');
-
-        $response->throw();
-
-        return array_map(function ($connection) {
-            return new \Jakyeru\Larascord\Types\Connection($connection);
-        }, json_decode($response->body()));
-    }
-
-    /**
-     * Join a guild.
-     *
-     * @throws RequestException
-     * @throws Exception
-     */
-    public function joinGuild(AccessToken $accessToken, User $user, string $guildId, array $options = []): GuildMember
-    {
-        if (!config('larascord.access_token')) throw new Exception(config('larascord.error_messages.missing_access_token.message'));
-        if (!$accessToken->hasScope('guilds.join')) throw new Exception('The "guilds" and "guilds.join" scopes are required.');
-
-        $response = Http::withToken(config('larascord.access_token'), 'Bot')->put($this->baseApi . '/guilds/' . $guildId . '/members/' . $user->id, array_merge([
-            'access_token' => $accessToken->access_token,
-        ], $options));
-
-        $response->throw();
-
-        if ($response->status() === 204) return throw new Exception('User is already in the guild.');
-
-        return new GuildMember(json_decode($response->body()));
-    }
-
-    /**
-     * Create or update a user in the database.
-     *
-     * @throws Exception
-     */
-    public function createOrUpdateUser(\Jakyeru\Larascord\Types\User $user): User
-    {
-        if (!$user->getAccessToken()) {
-            throw new Exception('User access token is missing.');
-        }
-
-        $forgottenUser = User::where('email', '=', $user->email)->where('id', '!=', $user->id)->first();
-        if ($forgottenUser) {
-            // This case should never happen (TM) - The discord id changed
-            // The user probably re-created their discord account with the same email
-
-            // Delete Playlist
-            $playlists = Playlist::where('user_id', $forgottenUser->id)->get();
-            foreach($playlists as $playlist) {
-                PlaylistEpisode::where('playlist_id', $playlist->id)->forceDelete();
-                $playlist->forceDelete();
-            }
-
-            // Update comments to deleted user
-            DB::table('comments')->where('commenter_id', '=', $forgottenUser->id)->update(['commenter_id' => 1]);
-
-            $forgottenUser->forceDelete();
-        }
-
-        return User::updateOrCreate(
-            [
-                'id' => $user->id,
-            ],
-            $user->toArray(),
-        );
-    }
-
-    /**
-     * Verify if the user is in the specified guild(s).
-     */
-    public function isUserInGuilds(array $guilds): bool
-    {
-        // Verify if the user is in all the specified guilds if strict mode is enabled.
-        if (config('larascord.guilds_strict')) {
-            return empty(array_diff(config('larascord.guilds'), array_column($guilds, 'id')));
-        }
-
-        // Verify if the user is in any of the specified guilds if strict mode is disabled.
-        return !empty(array_intersect(config('larascord.guilds'), array_column($guilds, 'id')));
-    }
-
-    /**
-     * Verify if the user has the specified role(s) in the specified guild.
-     */
-    public function hasRoleInGuild(GuildMember $guildMember, array $roles): bool
-    {
-        // Verify if the user has any of the specified roles.
-        return !empty(array_intersect($roles, $guildMember->roles));
-    }
-
-    /**
-     * Updates the user's roles in the database.
-     */
-    public function updateUserRoles(User $user, GuildMember $guildMember, int $guildId): void
-    {
-        // Updating the user's roles in the database.
-        $updatedRoles = $user->roles;
-        $updatedRoles[$guildId] = $guildMember->roles;
-        $user->roles = $updatedRoles;
-        $user->save();
-    }
-
-    /**
-     * Revoke the user's access token.
-     *
-     * @throws RequestException
-     */
-    public function revokeAccessToken(string $accessToken): object
-    {
-        $response = Http::asForm()->post($this->tokenURL . '/revoke', [
-            'token' => $accessToken,
-            'client_id' => config('larascord.client_id'),
-            'client_secret' => config('larascord.client_secret'),
-        ]);
-
-        $response->throw();
-
-        return json_decode($response->body());
-    }
-}

composer.json

@@ -14,7 +14,6 @@
         "http-interop/http-factory-guzzle": "^1.2",
         "intervention/image": "^3.9",
         "intervention/image-laravel": "^1.3",
-        "jakyeru/larascord": "^6.0",
         "laravel/framework": "^11.0",
         "laravel/sanctum": "^4.0",
         "laravel/scout": "^10.20",
@@ -49,8 +48,6 @@
     ],
     "autoload": {
         "exclude-from-classmap": [
-            "vendor/jakyeru/larascord/src/Http/Services/DiscordService.php",
-            "vendor/jakyeru/larascord/src/Http/Controllers/DiscordController.php",
             "vendor/laravelista/comments/src/CommentPolicy.php",
             "vendor/laravelista/comments/src/CommentService.php"
         ],
@@ -60,8 +57,6 @@
             "Database\\Seeders\\": "database/seeders/"
         },
         "files": [
-            "app/Override/Discord/Services/DiscordService.php",
-            "app/Override/Discord/DiscordController.php",
             "app/Override/Comments/CommentPolicy.php",
             "app/Override/Comments/CommentService.php"
         ]

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "484d21a7c10b1609a22d642e71a71cc3",
+    "content-hash": "1759692ca41f87ed3c80648a187d595b",
     "packages": [
         {
             "name": "brick/math",
@@ -1533,59 +1533,6 @@
             ],
             "time": "2025-04-04T15:09:55+00:00"
         },
-        {
-            "name": "jakyeru/larascord",
-            "version": "v6.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/JakyeRU/Larascord.git",
-                "reference": "d1099d1418022eda970fec4f13634ee5fbee93b3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/JakyeRU/Larascord/zipball/d1099d1418022eda970fec4f13634ee5fbee93b3",
-                "reference": "d1099d1418022eda970fec4f13634ee5fbee93b3",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^7.5",
-                "laravel/breeze": "^v2.0",
-                "laravel/framework": "^11",
-                "php": "^8.2|^8.3"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^9"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Jakyeru\\Larascord\\LarascordServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Jakyeru\\Larascord\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jakye",
-                    "email": "jakyeru@gmail.com"
-                }
-            ],
-            "description": "Larascord is a package that allows you to authenticate users in your Laravel application using Discord.",
-            "support": {
-                "issues": "https://github.com/JakyeRU/Larascord/issues",
-                "source": "https://github.com/JakyeRU/Larascord/tree/v6.0.3"
-            },
-            "time": "2025-06-18T18:41:42+00:00"
-        },
         {
             "name": "jaybizzle/crawler-detect",
             "version": "v1.3.6",
@@ -1638,67 +1585,6 @@
             },
             "time": "2025-09-30T16:22:43+00:00"
         },
-        {
-            "name": "laravel/breeze",
-            "version": "v2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/breeze.git",
-                "reference": "1a29c5792818bd4cddf70b5f743a227e02fbcfcd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/breeze/zipball/1a29c5792818bd4cddf70b5f743a227e02fbcfcd",
-                "reference": "1a29c5792818bd4cddf70b5f743a227e02fbcfcd",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/console": "^11.0|^12.0",
-                "illuminate/filesystem": "^11.0|^12.0",
-                "illuminate/support": "^11.0|^12.0",
-                "illuminate/validation": "^11.0|^12.0",
-                "php": "^8.2.0",
-                "symfony/console": "^7.0"
-            },
-            "require-dev": {
-                "laravel/framework": "^11.0|^12.0",
-                "orchestra/testbench-core": "^9.0|^10.0",
-                "phpstan/phpstan": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Laravel\\Breeze\\BreezeServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\Breeze\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
-                }
-            ],
-            "description": "Minimal Laravel authentication scaffolding with Blade and Tailwind.",
-            "keywords": [
-                "auth",
-                "laravel"
-            ],
-            "support": {
-                "issues": "https://github.com/laravel/breeze/issues",
-                "source": "https://github.com/laravel/breeze"
-            },
-            "time": "2025-07-18T18:49:59+00:00"
-        },
         {
             "name": "laravel/framework",
             "version": "v11.46.1",

config/larascord.php

@@ -1,247 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application ID
-    |--------------------------------------------------------------------------
-    |
-    | This is the ID of your Discord application.
-    |
-    */
-
-    'client_id' => env('LARASCORD_CLIENT_ID', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Secret
-    |--------------------------------------------------------------------------
-    |
-    | This is the secret of your Discord application.
-    |
-    */
-
-    'client_secret' => env('LARASCORD_CLIENT_SECRET', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Application Access Token
-    |--------------------------------------------------------------------------
-    |
-    | This is the access token of your Discord application.
-    |
-    */
-
-    'access_token' => env('LARASCORD_ACCESS_TOKEN', null),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Grant Type
-    |--------------------------------------------------------------------------
-    |
-    | This is the grant type of your Discord application. It must be set to
-    | "authorization_code".
-    |
-    */
-
-    'grant_type' => env('LARASCORD_GRANT_TYPE', 'authorization_code'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Redirect URI
-    |--------------------------------------------------------------------------
-    |
-    | This is the URI that Discord will redirect to after the user authorizes
-    | your application.
-    |
-    */
-
-    'redirect_uri' => env('APP_URL', 'http://localhost:8000') . '/' . env('LARASCORD_PREFIX', 'larascord') . '/callback',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Scopes
-    |--------------------------------------------------------------------------
-    |
-    | These are the OAuth2 scopes of your Discord application.
-    |
-    */
-
-    'scopes' => env('LARASCORD_SCOPE', 'identify&email&guilds&guilds.members.read'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Route Prefix
-    |--------------------------------------------------------------------------
-    |
-    | This is the prefix that Larascord will use for its routes. For example,
-    | the prefix "larascord" will result in the route
-    | "https://domain.com/larascord/login".
-    |
-    */
-
-    'route_prefix' => env('LARASCORD_PREFIX', 'larascord'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | OAuth2 Prompt - "none" or "consent"
-    |--------------------------------------------------------------------------
-    |
-    | The prompt controls how the authorization flow handles existing authorizations.
-    | If a user has previously authorized your application with the requested scopes
-    | and prompt is set to consent,it will request them to re-approve their
-    | authorization. If set to none, it will skip the authorization screen
-    | and redirect them back to your redirect URI without requesting
-    | their authorization.
-    |
-    */
-
-    'prompt' => 'none',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Restrict Access to Specific Guilds
-    |--------------------------------------------------------------------------
-    |
-    | This option restricts access to the application to users who are members
-    | of specific Discord guilds. Users who are not members of the specified
-    | guilds will not be able to use the application.
-    |
-    */
-
-    'guilds' => [],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Restrict Access to Specific Guilds - Strict Mode
-    |--------------------------------------------------------------------------
-    |
-    | Enabling this option will require the user to be a member of ALL the
-    | aforementioned guilds. If this option is disabled, the user will
-    | only need to be a member of at least ONE of the guilds.
-    |
-    */
-
-    'guilds_strict' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Restrict Access to Specific Roles
-    |--------------------------------------------------------------------------
-    |
-    | When this option is enabled, the user will only be able to use the
-    | application if they have at least one of the specified roles.
-    |
-    */
-
-    // WARNING: This feature makes one request to the Discord API for each guild you specify. (Because you need to fetch the roles for each guild)
-    // At the moment the database is not checked for roles when the user logs in. It will always fetch the roles from the Discord API.
-    // Currently, the roles are only updated in the database when the user logs in. The roles from the database can be used in a middleware.
-    // I'm working on a better way to do this, but for now, this will work.
-
-    'guild_roles' => [
-        // 'guild_id' => [
-        //     'role_id',
-        //     'role_id',
-        // ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Remember Me
-    |--------------------------------------------------------------------------
-    |
-    | Whether or not to remember the user after they log in.
-    |
-    */
-
-    'remember_me' => true,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Error Messages
-    |--------------------------------------------------------------------------
-    |
-    | These are the error messages that will be displayed to the user if there
-    | is an error.
-    |
-    */
-
-    'error_messages' => [
-        'missing_code' => [
-            'message' => 'The authorization code is missing.',
-            'redirect' => '/'
-        ],
-        'invalid_code' => [
-            'message' => 'The authorization code is invalid.',
-            'redirect' => '/'
-        ],
-        'authorization_failed' => [
-            'message' => 'The authorization failed.',
-            'redirect' => '/'
-        ],
-        'missing_email' => [
-            'message' => 'Couldn\'t get your e-mail address. Please add an e-mail address to your Discord account!',
-            'redirect' => '/'
-        ],
-        'invalid_user' => [
-            'message' => 'The user ID doesn\'t match the logged-in user.',
-            'redirect' => '/'
-        ],
-        'database_error' => [
-            'message' => 'There was an error with the database. Please try again later.',
-            'redirect' => '/'
-        ],
-        'missing_guilds_scope' => [
-            'message' => 'The "guilds" scope is required.',
-            'redirect' => '/'
-        ],
-        'missing_guilds_members_read_scope' => [
-            'message' => 'The "guilds" and "guilds.members.read" scopes are required.',
-            'redirect' => '/'
-        ],
-        'authorization_failed_guilds' => [
-            'message' => 'Couldn\'t get the servers you\'re in.',
-            'redirect' => '/'
-        ],
-        'not_member_guild_only' => [
-            'message' => 'You are not a member of the required guilds.',
-            'redirect' => '/'
-        ],
-        'missing_access_token' => [
-            'message' => 'The access token is missing.',
-            'redirect' => '/'
-        ],
-        'authorization_failed_roles' => [
-            'message' => 'Couldn\'t get the roles you have.',
-            'redirect' => '/'
-        ],
-        'missing_role' => [
-            'message' => 'You don\'t have the required roles.',
-            'redirect' => '/'
-        ],
-        'revoke_token_failed' => [
-            'message' => 'An error occurred while trying to revoke your access token.',
-            'redirect' => '/'
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Success Messages
-    |--------------------------------------------------------------------------
-    |
-    | These are the success messages that will be displayed to the user if there
-    | is no error.
-    |
-    */
-
-    'success_messages' => [
-        'user_deleted' => [
-            'message' => 'Your account has been deleted.',
-            'redirect' => '/'
-        ],
-    ],
-
-];

database/migrations/2025_09_21_215923_add_unique_constraint_to_downloads_table.php

@@ -5,6 +5,7 @@ use App\Models\Downloads;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
 
 return new class extends Migration
 {

database/migrations/2025_12_03_193018_fix_user_ids.php

@@ -0,0 +1,154 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Collection;
+
+use App\Models\User;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // 1. Create new column discord_id
+        Schema::table('users', function (Blueprint $table) {
+            $table->unsignedBigInteger('discord_id')->nullable()->after('id');
+        });
+
+        // 2. Migrate Discord Users IDs
+        DB::table('users')
+            ->where('id', '>', 10000)
+            ->update(['discord_id' => DB::raw('id')]);
+
+        // 3. Temporary new auto increment column
+        Schema::table('users', function (Blueprint $table) {
+            $table->unsignedBigInteger('new_id')->first();
+        });
+
+        // 3.5 Manually count (cursed)
+        $counter = 1;
+        foreach(User::orderBy('id')->get() as $user) {
+            $user->new_id = $counter;
+            $user->save();
+            $counter++;
+        }
+
+        // 4. Drop foreign keys
+        $this->dropForeignKeys();
+
+        // 5. Fix ID's in other tables
+        $this->updateUserIDsInOtherTables();
+
+        // 6. Remove old ID
+        Schema::table('users', function (Blueprint $table) {
+            $table->bigInteger('id')->unsigned()->change();
+            $table->dropPrimary('id');
+            $table->dropColumn('id');
+        });
+
+        // 7. Rename new_id to id
+        Schema::table('users', function (Blueprint $table) {
+            $table->renameColumn('new_id', 'id');
+            $table->unsignedBigInteger('id')->autoIncrement()->primary()->change();
+        });
+
+        // 8. Recreate foreign key constraints
+        $this->addForeignKeys();
+    }
+
+    /**
+     * Drop Foreign Keys referencing the user id
+     */
+    private function dropForeignKeys(): void
+    {
+        Schema::table('markable_likes', function (Blueprint $table) {
+            $table->dropForeign(['user_id']);
+        });
+
+        Schema::table('watched', function (Blueprint $table) {
+            $table->dropForeign(['user_id']);
+        });
+
+        Schema::table('discord_access_tokens', function (Blueprint $table) {
+            $table->dropForeign(['user_id']);
+        });
+
+        // Our Schema does include a foreign key, for whatever reason it doesn't exist in the first palce
+        // Schema::table('user_downloads', function (Blueprint $table) {
+        //     $table->dropForeign(['user_id']);
+        // });
+    }
+
+    /**
+     * Tables to fix the IDs:
+     *  - comments ['commenter_id']
+     *  - discord_access_tokens ['user_id']
+     *  - markable_likes ['user_id']
+     *  - notifications ['notifiable_id']
+     *  - playlists ['user_id']
+     *  - user_downloads ['user_id']
+     *  - watched ['user_id']
+     */
+    private function updateUserIDsInOtherTables(): void
+    {
+
+        DB::table('users')->orderBy('id')->chunk(100, function (Collection $users) {
+            foreach ($users as $user) {
+                DB::table('comments')
+                    ->where('commenter_id', $user->id)
+                    ->update(['commenter_id' => $user->new_id]);
+
+                DB::table('discord_access_tokens')
+                    ->where('user_id', $user->id)
+                    ->update(['user_id' => $user->new_id]);
+
+                DB::table('markable_likes')
+                    ->where('user_id', $user->id)
+                    ->update(['user_id' => $user->new_id]);
+
+                DB::table('notifications')
+                    ->where('notifiable_id', $user->id)
+                    ->update(['notifiable_id' => $user->new_id]);
+
+                DB::table('playlists')
+                    ->where('user_id', $user->id)
+                    ->update(['user_id' => $user->new_id]);
+
+                DB::table('user_downloads')
+                    ->where('user_id', $user->id)
+                    ->update(['user_id' => $user->new_id]);
+
+                DB::table('watched')
+                    ->where('user_id', $user->id)
+                    ->update(['user_id' => $user->new_id]);
+            }
+        });
+    }
+
+    /**
+     * Re-Add Foreign Keys to tables which we dropped previously
+     */
+    private function addForeignKeys(): void
+    {
+        Schema::table('markable_likes', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->references('id')->on('users')->onDelete('cascade')->change();
+        });
+
+        Schema::table('watched', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->references('id')->on('users')->onDelete('cascade')->change();
+        });
+
+        Schema::table('discord_access_tokens', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->references('id')->on('users')->onDelete('cascade')->change();
+        });
+
+        Schema::table('user_downloads', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->references('id')->on('users')->onDelete('cascade')->change();
+        });
+    }
+};

database/migrations/2026_01_06_161620_fix_discord_oauth_system.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Remove tables from larascord
+        Schema::dropIfExists('discord_access_tokens');
+        Schema::dropIfExists('personal_access_tokens');
+
+        // Drop columns from larascord
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('discriminator');
+            $table->dropColumn('remember_token');
+            $table->dropColumn('banner');
+            $table->dropColumn('banner_color');
+            $table->dropColumn('accent_color');
+            $table->dropColumn('premium_type');
+            $table->dropColumn('public_flags');
+            $table->dropColumn('verified');
+            $table->dropColumn('mfa_enabled');
+        });
+
+        // Change & Add Columns
+        Schema::table('users', function (Blueprint $table) {
+            // Rename
+            $table->renameColumn('username', 'name');
+            $table->renameColumn('global_name', 'discord_name');
+            $table->renameColumn('avatar', 'discord_avatar');
+
+            // Re-Add Email verification
+            $table->timestamp('email_verified_at')->nullable()->after('email');
+
+            // Re-Add Password Auth
+            $table->string('password')->nullable()->after('email_verified_at');
+            $table->rememberToken()->after('password');
+        });
+    }
+};

resources/views/auth/confirm-password.blade.php

@@ -1,20 +0,0 @@
-<x-guest-layout>
-    <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
-        {{ __('This is a secure area of the application. Please confirm your session before continuing.') }}
-    </div>
-
-    <form method="POST" action="{{ route('larascord.refresh_token') }}">
-        @csrf
-
-        <div class="flex justify-end mt-4">
-            <x-primary-button>
-                <svg style="margin-right: 10px;" width="30px" height="30px" viewBox="0 -28.5 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-                    <g>
-                        <path d="M216.856339,16.5966031 C200.285002,8.84328665 182.566144,3.2084988 164.041564,0 C161.766523,4.11318106 159.108624,9.64549908 157.276099,14.0464379 C137.583995,11.0849896 118.072967,11.0849896 98.7430163,14.0464379 C96.9108417,9.64549908 94.1925838,4.11318106 91.8971895,0 C73.3526068,3.2084988 55.6133949,8.86399117 39.0420583,16.6376612 C5.61752293,67.146514 -3.4433191,116.400813 1.08711069,164.955721 C23.2560196,181.510915 44.7403634,191.567697 65.8621325,198.148576 C71.0772151,190.971126 75.7283628,183.341335 79.7352139,175.300261 C72.104019,172.400575 64.7949724,168.822202 57.8887866,164.667963 C59.7209612,163.310589 61.5131304,161.891452 63.2445898,160.431257 C105.36741,180.133187 151.134928,180.133187 192.754523,160.431257 C194.506336,161.891452 196.298154,163.310589 198.110326,164.667963 C191.183787,168.842556 183.854737,172.420929 176.223542,175.320965 C180.230393,183.341335 184.861538,190.991831 190.096624,198.16893 C211.238746,191.588051 232.743023,181.531619 254.911949,164.955721 C260.227747,108.668201 245.831087,59.8662432 216.856339,16.5966031 Z M85.4738752,135.09489 C72.8290281,135.09489 62.4592217,123.290155 62.4592217,108.914901 C62.4592217,94.5396472 72.607595,82.7145587 85.4738752,82.7145587 C98.3405064,82.7145587 108.709962,94.5189427 108.488529,108.914901 C108.508531,123.290155 98.3405064,135.09489 85.4738752,135.09489 Z M170.525237,135.09489 C157.88039,135.09489 147.510584,123.290155 147.510584,108.914901 C147.510584,94.5396472 157.658606,82.7145587 170.525237,82.7145587 C183.391518,82.7145587 193.761324,94.5189427 193.539891,108.914901 C193.539891,123.290155 183.391518,135.09489 170.525237,135.09489 Z" fill="#ffff" fill-rule="nonzero"></path>
-                    </g>
-                </svg>
-                {{ __('Confirm') }}
-            </x-primary-button>
-        </div>
-    </form>
-</x-guest-layout>

resources/views/layouts/navigation.blade.php

@@ -94,9 +94,9 @@
                         <button
                             class="inline-flex items-center px-3 py-2 border text-sm leading-4 font-medium rounded-md text-gray-500 border-neutral-300/50 dark:text-gray-400 bg-white/20 dark:bg-neutral-950/20 dark:border-neutral-800/50 hover:text-gray-700 dark:hover:text-gray-300 focus:outline-none transition ease-in-out duration-150">
                             @auth
-                                @if (Auth::user()->avatar)
+                                @if (Auth::user()->discord_avatar)
                                     <img class="h-8 w-8 rounded-full object-cover mr-2"
-                                        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ Auth::user()->id }}/{{ Auth::user()->avatar }}.webp"
+                                        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ Auth::user()->discord_id }}/{{ Auth::user()->discord_avatar }}.webp"
                                         alt="{{ Auth::user()->getTagAttribute() }}" />
                                 @endif
                             @else
@@ -231,15 +231,15 @@
             <div class="pt-4 pb-1 border-t border-gray-200 dark:border-gray-600 dark:bg-neutral-900/30">
 
                 <div class="flex justify-center">
-                    @if (Auth::user()->avatar)
+                    @if (Auth::user()->discord_avatar)
                         <img class="h-8 w-8 rounded-full object-cover mr-2"
-                            src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ Auth::user()->id }}/{{ Auth::user()->avatar }}.webp"
+                            src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ Auth::user()->discord_id }}/{{ Auth::user()->discord_avatar }}.webp"
                             alt="{{ Auth::user()->getTagAttribute() }}" />
                     @else
                         <img class="h-8 w-8 rounded-full object-cover mr-2" src="/images/default-avatar.webp"
                             alt="Guest" />
                     @endif
-                    <span class="font-medium text-base text-gray-800 dark:text-neutral-200">{{ Auth::user()->username }}
+                    <span class="font-medium text-base text-gray-800 dark:text-neutral-200">{{ Auth::user()->name }}
                     </span>
                 </div>
 

resources/views/livewire/admin-comment-search.blade.php

@@ -34,7 +34,7 @@
                         @foreach($comments as $comment)
                         <tr wire:key="comment-{{ $comment->id }}" class="bg-white border-t dark:bg-neutral-800 dark:border-pink-700">
                             <td class="px-6 py-4">
-                                <a href="{{ route('user.index', ['username' => $comment->username]) }}">{{ $comment->username }}</a>
+                                <a href="{{ route('user.index', ['username' => $comment->name]) }}">{{ $comment->name }}</a>
                             </td>
                             <th scope="row" class="px-6 py-4 font-medium text-gray-900 dark:text-white max-w-lg">
                                 {{ $comment->comment }}

resources/views/livewire/admin-user-search.blade.php

@@ -60,7 +60,7 @@
                                 {{ $user->id }}
                             </th>
                             <td class="px-6 py-4">
-                                {{ $user->global_name ?? $user->username }}
+                                {{ $user->discord_name ?? $user->name }}
                             </td>
                             <td class="px-6 py-4">
                                 {{ $user->is_patreon ? 'Yes' : 'No' }}

resources/views/livewire/playlist-overview.blade.php

@@ -4,10 +4,10 @@
 
         <!-- Header -->
         <div class="flex text-sm font-light bg-neutral-950/50 backdrop-blur-lg rounded-lg p-10 gap-2">
-            <a href="{{ route('user.index', ['username' => $playlist->user->username]) }}">
-                @if ($playlist->user->avatar)
+            <a href="{{ route('user.index', ['username' => $playlist->user->name]) }}">
+                @if ($playlist->user->discord_avatar)
                     <img class="relative w-24 h-24 flex-none rounded-full shadow-lg"
-                        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $playlist->user->id }}/{{ $playlist->user->avatar }}.webp">
+                        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $playlist->user->discord_id }}/{{ $playlist->user->discord_avatar }}.webp">
                 @else
                     <img class="relative w-24 h-24 flex-none rounded-full shadow-lg" src="/images/default-avatar.webp">
                 @endif
@@ -16,7 +16,7 @@
                 <h1 class="font-bold text-3xl">{{ $playlist->name }}</h1>
                 <p class="font-light text-lg text-neutral-200">Episodes: {{ count($playlistEpisodes) }}</p>
                 <p class="font-light text-lg text-neutral-200">Creator: <a
-                        href="{{ route('user.index', ['username' => $playlist->user->username]) }}">{{ $playlist->user->username }}</a>
+                        href="{{ route('user.index', ['username' => $playlist->user->name]) }}">{{ $playlist->user->name }}</a>
                 </p>
             </div>
             <div class="flex flex-col justify-center pl-4">

resources/views/partials/comment.blade.php

@@ -5,19 +5,19 @@
 @endphp
 <div id="comment-{{ $comment->id }}" class="flex rounded-lg bg-white p-1 mb-2 shadow-[0_2px_15px_-3px_rgba(0,0,0,0.07),0_10px_20px_-2px_rgba(0,0,0,0.04)] dark:bg-neutral-900">
     @php $user = cache()->rememberForever('commentUser'.$comment->commenter_id, fn () => \App\Models\User::where('id', $comment->commenter_id)->first()); @endphp
-    <a class="contents" href="{{ route('user.index', ['username' => $user->username]) }}">
-        @if($user->avatar)
-        <img class="w-16 h-16 rounded-full m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $comment->commenter_id }}/{{ $user->avatar }}.webp" alt="{{ $user->global_name ?? $user->username }} Avatar">
+    <a class="contents" href="{{ route('user.index', ['username' => $user->name]) }}">
+        @if($user->discord_avatar)
+        <img class="w-16 h-16 rounded-full m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $user->discord_id }}/{{ $user->discord_avatar }}.webp" alt="{{ $user->discord_name ?? $user->name }} Avatar">
         @else
-        <img class="w-16 h-16 rounded-full m-2" src="/images/default-avatar.webp" alt="{{ $user->global_name ?? $user->username }} Avatar">
+        <img class="w-16 h-16 rounded-full m-2" src="/images/default-avatar.webp" alt="{{ $user->discord_name ?? $user->name }} Avatar">
         @endif
     </a>
     <div class="text-gray-800 dark:text-gray-200">
-        <a href="{{ route('user.index', ['username' => $user->username]) }}">
+        <a href="{{ route('user.index', ['username' => $user->name]) }}">
             @if($user->is_patreon)
-            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->global_name ?? $user->username }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
+            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->discord_name ?? $user->name }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
             @else
-            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->global_name ?? $user->username }} <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
+            <h5 class="text-gray-800 dark:text-gray-400">{{ $user->discord_name ?? $user->name }} <small class="text-muted">- {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}</small></h5>
             @endif
         </a>
         <div style="white-space: pre-wrap;">{!! $markdown->line($comment->comment) !!}</div>                                    

resources/views/profile/edit.blade.php

@@ -9,10 +9,10 @@
         <div class="flex flex-row gap-4 flex-wrap">
             <!-- Profile Image -->
             <div class="p-2 bg-white dark:bg-neutral-800 shadow rounded-lg flex-none">
-                @if($user->avatar)
-                <img class="w-28 h-28 rounded-lg m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $user->id }}/{{ $user->avatar }}.webp" alt="{{ $user->global_name ?? $user->username }} Avatar">
+                @if($user->discord_avatar)
+                <img class="w-28 h-28 rounded-lg m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $user->discord_id }}/{{ $user->discord_avatar }}.webp" alt="{{ $user->discord_name ?? $user->name }} Avatar">
                 @else
-                <img class="w-24 h-24 rounded-lg m-2" src="/images/default-avatar.webp" alt="{{ $user->global_name ?? $user->username }} Avatar">
+                <img class="w-24 h-24 rounded-lg m-2" src="/images/default-avatar.webp" alt="{{ $user->discord_name ?? $user->name }} Avatar">
                 @endif
             </div>
 

resources/views/profile/partials/update-profile-information-form.blade.php

@@ -6,27 +6,19 @@
     </header>
 
     <div class="mt-6 space-y-6">
-        @if (Auth::user()->global_name)
+        @if (Auth::user()->discord_name)
             <div>
-                <x-input-label for="global_name" :value="__('Display Name')" />
-                <x-text-input id="global_name" name="global_name" type="text" class="mt-1 block w-full" :value="old('global_name', $user->global_name)" required autocomplete="global_name" disabled />
-                <x-input-error class="mt-2" :messages="$errors->get('global_name')" />
+                <x-input-label for="discord_name" :value="__('Display Name')" />
+                <x-text-input id="discord_name" name="discord_name" type="text" class="mt-1 block w-full" :value="old('discord_name', $user->discord_name)" required autocomplete="discord_name" disabled />
+                <x-input-error class="mt-2" :messages="$errors->get('discord_name')" />
             </div>
         @endif
         <div>
-            <x-input-label for="username" :value="__('Username')" />
-            <x-text-input id="username" name="username" type="text" class="mt-1 block w-full" :value="old('username', $user->username)" required autocomplete="username" disabled />
-            <x-input-error class="mt-2" :messages="$errors->get('username')" />
+            <x-input-label for="name" :value="__('Username')" />
+            <x-text-input id="name" name="name" type="text" class="mt-1 block w-full" :value="old('name', $user->name)" required autocomplete="name" disabled />
+            <x-input-error class="mt-2" :messages="$errors->get('name')" />
         </div>
 
-        @if (!Auth::user()->global_name)
-            <div>
-                <x-input-label for="discriminator" :value="__('Discriminator')" />
-                <x-text-input id="discriminator" name="discriminator" type="text" class="mt-1 block w-full" :value="old('discriminator', $user->discriminator)" required autocomplete="discriminator" disabled />
-                <x-input-error class="mt-2" :messages="$errors->get('discriminator')" />
-            </div>
-        @endif
-
         <div>
             <x-input-label for="email" :value="__('Email')" />
             <x-text-input id="email" name="email" type="email" class="mt-1 block w-full" :value="old('email', $user->email ?? __('Unknown'))" required autocomplete="email" disabled />

resources/views/stream/partials/playlist.blade.php

@@ -22,7 +22,7 @@
                 }
             @endphp
             <p class="text-neutral-800 dark:text-neutral-300">
-                {{ $playlist->user->global_name ?? $playlist->user->username }} • {{ $currentIndex + 1 }}/{{ $episodeCount }} Episodes
+                {{ $playlist->user->discord_name ?? $playlist->user->name }} • {{ $currentIndex + 1 }}/{{ $episodeCount }} Episodes
             </p>
         </div>
         

resources/views/user/partials/profile.blade.php

@@ -1,14 +1,14 @@
 <div
     class="overflow-hidden relative max-w-sm min-w-80 mx-auto bg-white/40 shadow-lg ring-1 ring-black/5 rounded-xl flex items-center gap-6 dark:bg-neutral-950/40 backdrop-blur dark:highlight-white/5">
-    @if($user->avatar)
+    @if($user->discord_avatar)
     <img class="absolute -left-6 w-24 h-24 rounded-full shadow-lg"
-        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $user->id }}/{{ $user->avatar }}.webp">
+        src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $user->discord_id }}/{{ $user->discord_avatar }}.webp">
     @else
     <img class="absolute -left-6 w-24 h-24 rounded-full shadow-lg" src="/images/default-avatar.webp">
     @endif
     <div class="flex flex-col py-5 pl-24">
         <strong class="text-slate-900 text-xl font-bold dark:text-slate-200">
-            {{ $user->global_name ?? $user->username }}
+            {{ $user->discord_name ?? $user->name }}
             @if ($user->is_patreon)
                 <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i
                         class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a>

resources/views/vendor/comments/_comment.blade.php

@@ -7,20 +7,20 @@
 
 <div id="comment-{{ $comment->getKey() }}" class="flex rounded-lg p-1 mb-2 ">
 
-    <a class="contents" href="{{ route('user.index', ['username' => $comment->commenter->username]) }}">
-        @if($comment->commenter->avatar)
-        <img class="w-12 h-12 rounded-lg m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $comment->commenter->id }}/{{ $comment->commenter->avatar }}.webp" alt="{{ $comment->commenter->global_name ?? $comment->commenter->username }} Avatar">
+    <a class="contents" href="{{ route('user.index', ['username' => $comment->commenter->name]) }}">
+        @if($comment->commenter->discord_avatar)
+        <img class="w-12 h-12 rounded-lg m-2" src="https://external-content.duckduckgo.com/iu/?u=https://cdn.discordapp.com/avatars/{{ $comment->commenter->discord_id }}/{{ $comment->commenter->discord_avatar }}.webp" alt="{{ $comment->commenter->discord_name ?? $comment->commenter->name }} Avatar">
         @else
-        <img class="w-12 h-12 rounded-lg m-2" src="/images/default-avatar.webp" alt="{{ $comment->commenter->global_name ?? $comment->commenter->username }} Avatar">
+        <img class="w-12 h-12 rounded-lg m-2" src="/images/default-avatar.webp" alt="{{ $comment->commenter->discord_name ?? $comment->commenter->name }} Avatar">
         @endif
     </a>
 
     <div class="text-gray-800 dark:text-gray-200">
-        <a href="{{ route('user.index', ['username' => $comment->commenter->username]) }}">
+        <a href="{{ route('user.index', ['username' => $comment->commenter->name]) }}">
             @if($comment->commenter->is_patreon)
-                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->global_name ?? $comment->commenter->username }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
+                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->discord_name ?? $comment->commenter->name }} <a data-te-toggle="tooltip" title="Badge of appreciation for the horny people supporting us! :3"><i class="fa-solid fa-hand-holding-heart text-rose-600 animate-pulse"></i></a> <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
             @else
-                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->global_name ?? $comment->commenter->username }} <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
+                <h5 class="text-gray-800 dark:text-gray-400">{{ $comment->commenter->discord_name ?? $comment->commenter->name }} <small class="text-muted">- {{ $comment->created_at->diffForHumans() }}</small></h5>
             @endif
         </a>
         <div style="white-space: pre-wrap;">{!! $markdown->line($comment->comment) !!}</div>