diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index dacc501..8b79ea1 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -19,15 +19,11 @@ class AuthController extends Controller $authUser = User::updateOrCreate( [ 'email' => $user->getEmail() ], + [ 'name' => $user->getName() ] ); if ($authUser) { - if ($authUser->name == '') - { - $authUser->name = $user->getName(); - $authUser->save(); - } Auth::login($authUser); return redirect('/'); } diff --git a/app/Livewire/App/Icon.php b/app/Livewire/App/Icon.php index 452a538..1b48b52 100644 --- a/app/Livewire/App/Icon.php +++ b/app/Livewire/App/Icon.php @@ -6,8 +6,6 @@ use Livewire\Component; class Icon extends Component { - public string $family = 'classic'; - public string $variant = 'light'; public string $name = 'paw-simple'; public string $label = ''; public string $style = ''; diff --git a/app/Livewire/Pages/Profile.php b/app/Livewire/Pages/Profile.php index 3bda18d..cb3d29a 100644 --- a/app/Livewire/Pages/Profile.php +++ b/app/Livewire/Pages/Profile.php @@ -4,7 +4,6 @@ namespace App\Livewire\Pages; use App\Models\User; use Illuminate\Support\Facades\Auth; -use Illuminate\Validation\Rule; use Livewire\Attributes\Validate; use Livewire\Component; use Livewire\WithFileUploads; @@ -15,39 +14,15 @@ class Profile extends Component public User $user; + #[Validate('image|max:10240')] public $avatar = null; - public string $name = ''; - - public function mount(User $user) - { - $this->user = $user; - $this->name = $user->name; - } public function render() { return view('livewire.pages.profile')->title($this->user->name); } - public function rules() - { - return [ - 'avatar' => [ - 'nullable', - 'image', - 'max:10240', - ], - 'name' => [ - 'required', - 'string', - 'min:2', - 'max:40', - Rule::unique('users', 'name')->ignore($this->user), - ], - ]; - } - - public function updated($name, $value) + public function updated() { if (Auth::id() != $this->user->id) { @@ -56,16 +31,10 @@ class Profile extends Component $this->validate(); - $this->user->update([ $name => $value ]); - - if (isset($this->avatar)) - { - $this->user->avatarExt = $this->avatar->getClientOriginalExtension(); - $this->user->save(); - - $this->avatar->storeAs('avatars', $this->user->id); - return $this->redirect("/profiles/{$this->user->id}"); - } + $this->user->avatarExt = $this->avatar->getClientOriginalExtension(); + $this->user->save(); + $this->avatar->storeAs('avatars', $this->user->id); + return $this->redirect("/profiles/{$this->user->id}"); } } diff --git a/app/Livewire/Pages/Upload.php b/app/Livewire/Pages/Upload.php index 9707359..d181fd3 100644 --- a/app/Livewire/Pages/Upload.php +++ b/app/Livewire/Pages/Upload.php @@ -48,12 +48,12 @@ class Upload extends Component $fullImg = Storage::get("posts/$post->id/full"); // Create thumbnail preview - $thumb = Image::read($fullImg)->cover(width: 512, height: 512); - Storage::put("posts/$post->id/thumb", $thumb->encodeByMediaType()); + $thumb = Image::read($fullImg)->scaleDown(width: 512, height: 512); + Storage::put("posts/$post->id/thumb", $thumb->encodeByExtension($post->extension, quality: 70)); // Create smaller preview image $preview = Image::read($fullImg)->scaleDown(width: 1280, height: 720); - Storage::put("posts/$post->id/preview", $preview->encodeByMediaType()); + Storage::put("posts/$post->id/preview", $preview->encodeByExtension($post->extension, quality: 70)); return $this->redirect("/posts/$post->id"); } diff --git a/composer.json b/composer.json index 373b96a..d8721f6 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "require": { "php": "^8.2", "ext-gmp": "*", - "intervention/image-driver-vips": "^1.0", "intervention/image-laravel": "^1.5", "laravel/framework": "^12.0", "laravel/octane": "^2.9", diff --git a/composer.lock b/composer.lock index 066558a..6cb89e7 100644 --- a/composer.lock +++ b/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": "5f2425ade7fd4df888b45f1bbc48bdf1", + "content-hash": "75207b40221a16fc6aa38c1290b281f5", "packages": [ { "name": "brick/math", @@ -1261,80 +1261,6 @@ ], "time": "2025-05-22T17:26:23+00:00" }, - { - "name": "intervention/image-driver-vips", - "version": "1.0.6", - "source": { - "type": "git", - "url": "https://github.com/Intervention/image-driver-vips.git", - "reference": "67f92c78cbe94a303f28d7ed84afd464eefac7aa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Intervention/image-driver-vips/zipball/67f92c78cbe94a303f28d7ed84afd464eefac7aa", - "reference": "67f92c78cbe94a303f28d7ed84afd464eefac7aa", - "shasum": "" - }, - "require": { - "intervention/image": "^3.11.0", - "jcupitt/vips": "^2.4", - "php": "^8.1" - }, - "require-dev": { - "ext-fileinfo": "*", - "phpstan/phpstan": "^2", - "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", - "slevomat/coding-standard": "~8.0", - "squizlabs/php_codesniffer": "^3.8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Intervention\\Image\\Drivers\\Vips\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Oliver Vogel", - "email": "oliver@intervention.io", - "homepage": "https://intervention.io/" - }, - { - "name": "Thomas Picquet", - "email": "thomas@sctr.net" - } - ], - "description": "libvips driver for Intervention Image", - "homepage": "https://image.intervention.io/", - "keywords": [ - "image", - "libvips", - "vips" - ], - "support": { - "issues": "https://github.com/Intervention/image-driver-vips/issues", - "source": "https://github.com/Intervention/image-driver-vips/tree/1.0.6" - }, - "funding": [ - { - "url": "https://paypal.me/interventionio", - "type": "custom" - }, - { - "url": "https://github.com/Intervention", - "type": "github" - }, - { - "url": "https://ko-fi.com/interventionphp", - "type": "ko_fi" - } - ], - "time": "2025-06-10T14:30:21+00:00" - }, { "name": "intervention/image-laravel", "version": "1.5.6", @@ -1419,67 +1345,6 @@ ], "time": "2025-04-04T15:09:55+00:00" }, - { - "name": "jcupitt/vips", - "version": "v2.5.0", - "source": { - "type": "git", - "url": "https://github.com/libvips/php-vips.git", - "reference": "a54c1cceea581b592a199edd61a7c06f44a24c08" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/libvips/php-vips/zipball/a54c1cceea581b592a199edd61a7c06f44a24c08", - "reference": "a54c1cceea581b592a199edd61a7c06f44a24c08", - "shasum": "" - }, - "require": { - "ext-ffi": "*", - "php": ">=7.4", - "psr/log": "^1.1.3|^2.0|^3.0" - }, - "require-dev": { - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpdocumentor/shim": "^3.3", - "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Jcupitt\\Vips\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Cupitt", - "email": "jcupitt@gmail.com", - "homepage": "https://github.com/jcupitt", - "role": "Developer" - } - ], - "description": "A high-level interface to the libvips image processing library.", - "homepage": "https://github.com/libvips/php-vips", - "keywords": [ - "image", - "libvips", - "processing" - ], - "support": { - "issues": "https://github.com/libvips/php-vips/issues", - "source": "https://github.com/libvips/php-vips/tree/v2.5.0" - }, - "time": "2025-04-04T17:10:13+00:00" - }, { "name": "laminas/laminas-diactoros", "version": "3.6.0", diff --git a/config/image.php b/config/image.php index f13ce7f..d356964 100644 --- a/config/image.php +++ b/config/image.php @@ -41,6 +41,6 @@ return [ 'autoOrientation' => true, 'decodeAnimation' => true, 'blendingColor' => 'ffffff', - 'strip' => true, + 'strip' => false, ] ]; diff --git a/package-lock.json b/package-lock.json index 0cd0e05..6b923e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "nyaabooru", + "name": "photos", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/resources/views/livewire/app/footer.blade.php b/resources/views/livewire/app/footer.blade.php index 5805df4..37e07d3 100644 --- a/resources/views/livewire/app/footer.blade.php +++ b/resources/views/livewire/app/footer.blade.php @@ -7,8 +7,6 @@ © 2025 NyaaStudios; All rights reserved.