From f3e216dfdcf252a6e676736bf9531093355be5d6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 15 Dec 2018 18:39:52 -0700 Subject: [PATCH 1/2] Update ProfileController, fix rss --- app/Http/Controllers/ProfileController.php | 2 +- resources/views/atom/user.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 233316540..3d5137f49 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -136,7 +136,7 @@ class ProfileController extends Controller return redirect($profile->url()); } } - $items = $profile->statuses()->whereIn('visibility',['public', 'unlisted'])->orderBy('created_at', 'desc')->take(10)->get(); + $items = $profile->statuses()->whereHas('media')->whereIn('visibility',['public', 'unlisted'])->orderBy('created_at', 'desc')->take(10)->get(); return response()->view('atom.user', compact('profile', 'items')) ->header('Content-Type', 'application/atom+xml'); } diff --git a/resources/views/atom/user.blade.php b/resources/views/atom/user.blade.php index c27ebcd8e..0d678b774 100644 --- a/resources/views/atom/user.blade.php +++ b/resources/views/atom/user.blade.php @@ -28,7 +28,7 @@ {{ $item->caption }} - {{ url($item->id) }} + {{ $item->url() }} profile->username }}]]> From 0d0c60c842b61b12c4a8874467ae2200b63d5185 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 15 Dec 2018 18:40:14 -0700 Subject: [PATCH 2/2] Bump version --- config/pixelfed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index 0e2cdb8d2..5af80397a 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.5.6', + 'version' => '0.5.7', /* |--------------------------------------------------------------------------