From d4d0a1495aaf1f797089de2eec7d8aaa2d016dbd Mon Sep 17 00:00:00 2001 From: Refringe Date: Sat, 12 Oct 2024 13:09:42 -0600 Subject: [PATCH] User About Markdown Formatting --- app/Jobs/Import/ImportHubDataJob.php | 4 ++-- database/factories/UserFactory.php | 3 +++ resources/views/user/show.blade.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Import/ImportHubDataJob.php b/app/Jobs/Import/ImportHubDataJob.php index cddbef7..28192c5 100644 --- a/app/Jobs/Import/ImportHubDataJob.php +++ b/app/Jobs/Import/ImportHubDataJob.php @@ -388,7 +388,7 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue 'name' => $hubUser->username, 'email' => Str::lower($hubUser->email), 'password' => $this->cleanPasswordHash($hubUser->password), - 'about' => $this->fetchUserAbout($hubUser->userID) ?? '', + 'about' => $this->fetchUserAbout($hubUser->userID), 'profile_photo_path' => $this->fetchUserAvatar($curl, $hubUser), 'cover_photo_path' => $this->fetchUserCoverPhoto($curl, $hubUser), 'created_at' => $this->cleanRegistrationDate($hubUser->registrationDate), @@ -432,7 +432,7 @@ class ImportHubDataJob implements ShouldBeUnique, ShouldQueue $converter = new HtmlConverter; $clean = Purify::clean($dirty); - return $converter->convert($clean) ?? ''; + return $converter->convert($clean); } /** diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index f90525c..5830a4b 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -32,7 +32,10 @@ class UserFactory extends Factory 'email' => fake()->unique()->safeEmail(), 'email_verified_at' => now(), 'password' => static::$password ??= Hash::make('password'), + + // TODO: Does Faker have a markdown plugin? 'about' => fake()->paragraphs(random_int(1, 10), true), + 'two_factor_secret' => null, 'two_factor_recovery_codes' => null, 'remember_token' => Str::random(10), diff --git a/resources/views/user/show.blade.php b/resources/views/user/show.blade.php index fb29e5a..426b409 100644 --- a/resources/views/user/show.blade.php +++ b/resources/views/user/show.blade.php @@ -43,7 +43,7 @@ {{-- About --}} @if ($user->about)
- {{ $user->about }} + {!! Str::markdown($user->about) !!}
@endif