Merge pull request #3445 from pixelfed/staging

Staging

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

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();

app/Http/Controllers/HomeController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-class HomeController extends Controller
-{
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return redirect('/');
-    }
-}

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);

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;

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',
 
     /*
     |--------------------------------------------------------------------------

resources/views/admin/diagnostics/home.blade.php

@@ -176,6 +176,14 @@
 			<strong><span class="badge badge-primary">OAUTH</span> private key exists: </strong>
 			<span>{{ file_exists(storage_path('oauth-private.key')) ? '✅' : '❌' }}</span>
 		</li>
+		<li>
+			<strong><span class="badge badge-primary">Storage</span> Cloud Storage: </strong>
+			<span>{{ config_cache('pixelfed.cloud_storage') ? '✅' : '❌' }}</span>
+		</li>
+		<li>
+			<strong><span class="badge badge-primary">Storage</span> Filesystems default (local/s3/spaces): </strong>
+			<span>{{ config_cache('filesystems.default')}}</span>
+		</li>
 	</ul>
 </div>
 <div class="pb-3 border-bottom">

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');