diff --git a/CHANGELOG.md b/CHANGELOG.md index f991f9ddd..4b0512a7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.3...dev) +### Updates +- Improve S3 support by removing `ListObjects` call in media deletion ([#3438](https://github.com/pixelfed/pixelfed/pull/3438)) +- Enforce UTC in incoming activities ([18931a1f](https://github.com/pixelfed/pixelfed/commit/18931a1f)) +- Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444)) +- Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1)) + ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3) ### Added diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index d6e9f1338..a231f86d0 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -45,26 +45,6 @@ class DiscoverController extends Controller return view('discover.tags.show', compact('tag', 'tagCount')); } - public function showCategory(Request $request, $slug) - { - abort(404); - } - - public function showLoops(Request $request) - { - abort(404); - } - - public function loopsApi(Request $request) - { - abort(404); - } - - public function loopWatch(Request $request) - { - return response()->json(200); - } - public function getHashtags(Request $request) { $user = $request->user(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php deleted file mode 100644 index a9e74ab8f..000000000 --- a/app/Http/Controllers/HomeController.php +++ /dev/null @@ -1,28 +0,0 @@ -middleware('auth'); - } - - /** - * Show the application dashboard. - * - * @return \Illuminate\Http\Response - */ - public function index(Request $request) - { - return redirect('/'); - } -} diff --git a/app/Jobs/MediaPipeline/MediaDeletePipeline.php b/app/Jobs/MediaPipeline/MediaDeletePipeline.php index f44d080ce..3c486a9cc 100644 --- a/app/Jobs/MediaPipeline/MediaDeletePipeline.php +++ b/app/Jobs/MediaPipeline/MediaDeletePipeline.php @@ -38,12 +38,8 @@ class MediaDeletePipeline implements ShouldQueue if(config_cache('pixelfed.cloud_storage') == true) { $disk = Storage::disk(config('filesystems.cloud')); - if($disk->exists($path)) { - $disk->delete($path); - } - if($disk->exists($thumb)) { - $disk->delete($thumb); - } + $disk->delete($path); + $disk->delete($thumb); if(count($e) > 4 && count($disk->files($i)) == 0) { $disk->deleteDirectory($i); diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index ccf754d01..b29d25aa2 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -470,7 +470,7 @@ class Helpers { $status->object_url = $id; $status->caption = strip_tags($activity['content']); $status->rendered = Purify::clean($activity['content']); - $status->created_at = Carbon::parse($ts); + $status->created_at = Carbon::parse($ts)->tz('UTC'); $status->in_reply_to_id = $reply_to; $status->local = false; $status->is_nsfw = $cw; @@ -580,7 +580,7 @@ class Helpers { $status->object_url = $id; $status->caption = strip_tags($res['content']); $status->rendered = Purify::clean($res['content']); - $status->created_at = Carbon::parse($ts); + $status->created_at = Carbon::parse($ts)->tz('UTC'); $status->in_reply_to_id = null; $status->local = false; $status->is_nsfw = $cw; diff --git a/config/app.php b/config/app.php index eb1ca77ad..93273b625 100644 --- a/config/app.php +++ b/config/app.php @@ -55,17 +55,10 @@ return [ 'url' => env('APP_URL', 'https://localhost'), /* - |-------------------------------------------------------------------------- - | Application Timezone - |-------------------------------------------------------------------------- - | - | Here you may specify the default timezone for your application, which - | will be used by the PHP date and date-time functions. We have gone - | ahead and set this to a sensible default for you out of the box. - | - */ + * Do not edit your timezone or things will break! + */ - 'timezone' => env('APP_TIMEZONE', 'UTC'), + 'timezone' => 'UTC', /* |-------------------------------------------------------------------------- diff --git a/resources/views/admin/diagnostics/home.blade.php b/resources/views/admin/diagnostics/home.blade.php index 3c40099e7..c55645e7b 100644 --- a/resources/views/admin/diagnostics/home.blade.php +++ b/resources/views/admin/diagnostics/home.blade.php @@ -176,6 +176,14 @@ OAUTH private key exists: {{ file_exists(storage_path('oauth-private.key')) ? '✅' : '❌' }} +
  • + Storage Cloud Storage: + {{ config_cache('pixelfed.cloud_storage') ? '✅' : '❌' }} +
    • +
  • + Storage Filesystems default (local/s3/spaces): + {{ config_cache('filesystems.default')}} +
    • diff --git a/routes/web.php b/routes/web.php index 7445b747c..bfea6b275 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,17 +94,10 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () { Route::get('/', 'SiteController@home')->name('timeline.personal'); - Route::post('/', 'StatusController@store'); Auth::routes(); - Route::get('/home', 'HomeController@index')->name('home'); - - Route::get('discover/c/{slug}', 'DiscoverController@showCategory'); - Route::redirect('discover/personal', '/discover'); Route::get('discover', 'DiscoverController@home')->name('discover'); - Route::get('discover/loops', 'DiscoverController@showLoops'); - Route::get('discover/profiles', 'DiscoverController@profilesDirectory')->name('discover.profiles'); Route::group(['prefix' => 'api'], function () { Route::get('search', 'SearchController@searchAPI');