Update cloud storage, use config_cache

app/Console/Commands/AvatarStorage.php

@@ -82,7 +82,7 @@ class AvatarStorage extends Command
 
         $this->line(' ');
 
-        if(config_cache('pixelfed.cloud_storage')) {
+        if((bool) config_cache('pixelfed.cloud_storage')) {
             $this->info('✅ - Cloud storage configured');
             $this->line(' ');
         }
@@ -92,7 +92,7 @@ class AvatarStorage extends Command
             $this->line(' ');
         }
 
-        if(config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
+        if((bool) config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
             $disk = Storage::disk(config_cache('filesystems.cloud'));
             $exists = $disk->exists('cache/avatars/default.jpg');
             $state = $exists ? '✅' : '❌';
@@ -100,7 +100,7 @@ class AvatarStorage extends Command
             $this->info($msg);
         }
 
-        $options = config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud') ?
+        $options = (bool) config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud') ?
             [
                 'Cancel',
                 'Upload default avatar to cloud',
@@ -164,7 +164,7 @@ class AvatarStorage extends Command
 
     protected function uploadAvatarsToCloud()
     {
-        if(!config_cache('pixelfed.cloud_storage') || !config('instance.avatar.local_to_cloud')) {
+        if(!(bool) config_cache('pixelfed.cloud_storage') || !config('instance.avatar.local_to_cloud')) {
             $this->error('Enable cloud storage and avatar cloud storage to perform this action');
             return;
         }
@@ -213,7 +213,7 @@ class AvatarStorage extends Command
             return;
         }
 
-        if(config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
+        if((bool) config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
             $this->error('You have cloud storage disabled and local avatar storage disabled, we cannot refetch avatars.');
             return;
         }

app/Console/Commands/AvatarStorageDeepClean.php

@@ -44,7 +44,7 @@ class AvatarStorageDeepClean extends Command
         $this->line(' ');
 
         $storage = [
-            'cloud' => boolval(config_cache('pixelfed.cloud_storage')),
+            'cloud' => (bool) config_cache('pixelfed.cloud_storage'),
             'local' => boolval(config_cache('federation.avatars.store_local'))
         ];
 

app/Console/Commands/CloudMediaMigrate.php

@@ -35,12 +35,16 @@ class CloudMediaMigrate extends Command
      */
     public function handle()
     {
-        $enabled = config('pixelfed.cloud_storage');
+        $enabled = (bool) config_cache('pixelfed.cloud_storage');
         if(!$enabled) {
             $this->error('Cloud storage not enabled. Exiting...');
             return;
         }
 
+        if(!$this->confirm('Are you sure you want to proceed?')) {
+            return;
+        }
+
         $limit = $this->option('limit');
         $hugeMode = $this->option('huge');
 

app/Console/Commands/FixMediaDriver.php

@@ -37,7 +37,7 @@ class FixMediaDriver extends Command
 			return Command::SUCCESS;
 		}
 
-		if(config_cache('pixelfed.cloud_storage') == false) {
+		if((bool) config_cache('pixelfed.cloud_storage') == false) {
 			$this->error('Cloud storage not enabled, exiting...');
 			return Command::SUCCESS;
 		}

app/Console/Commands/MediaCloudUrlRewrite.php

@@ -47,7 +47,7 @@ class MediaCloudUrlRewrite extends Command implements PromptsForMissingInput
 
     protected function preflightCheck()
     {
-        if(config_cache('pixelfed.cloud_storage') != true) {
+        if(!(bool) config_cache('pixelfed.cloud_storage')) {
             $this->info('Error: Cloud storage is not enabled!');
             $this->error('Aborting...');
             exit;

app/Console/Commands/MediaS3GarbageCollector.php

@@ -45,7 +45,7 @@ class MediaS3GarbageCollector extends Command
     */
     public function handle()
     {
-        $enabled = in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']);
+        $enabled = (bool) config_cache('pixelfed.cloud_storage');
         if(!$enabled) {
             $this->error('Cloud storage not enabled. Exiting...');
             return;

app/Console/Kernel.php

@@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('gc:passwordreset')->dailyAt('09:41')->onOneServer();
         $schedule->command('gc:sessions')->twiceDaily(13, 23)->onOneServer();
 
-        if (in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) {
+        if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('media.delete_local_after_cloud')) {
             $schedule->command('media:s3gc')->hourlyAt(15);
         }
 

app/Http/Controllers/ComposeController.php

@@ -741,7 +741,7 @@ class ComposeController extends Controller
             case 'image/jpeg':
             case 'image/png':
             case 'video/mp4':
-                $finished = config_cache('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
+                $finished = (bool) config_cache('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
                 break;
 
             default:

app/Http/Controllers/MediaController.php

@@ -2,14 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Media;
+use Illuminate\Http\Request;
 
 class MediaController extends Controller
 {
     public function index(Request $request)
     {
         //return view('settings.drive.index');
+        abort(404);
     }
 
     public function composeUpdate(Request $request, $id)
@@ -19,7 +20,7 @@ class MediaController extends Controller
 
     public function fallbackRedirect(Request $request, $pid, $mhash, $uhash, $f)
     {
-		abort_if(!config_cache('pixelfed.cloud_storage'), 404);
+        abort_if(! (bool) config_cache('pixelfed.cloud_storage'), 404);
         $path = 'public/m/_v2/'.$pid.'/'.$mhash.'/'.$uhash.'/'.$f;
         $media = Media::whereProfileId($pid)
             ->whereMediaPath($path)

app/Http/Controllers/RemoteAuthController.php

@@ -2,22 +2,20 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Services\Account\RemoteAuthService;
 use App\Models\RemoteAuth;
-use App\Profile;
+use App\Services\Account\RemoteAuthService;
-use App\Instance;
-use App\User;
-use Purify;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Auth\Events\Registered;
-use App\Util\Lexer\RestrictedNames;
 use App\Services\EmailService;
 use App\Services\MediaStorageService;
+use App\User;
 use App\Util\ActivityPub\Helpers;
+use App\Util\Lexer\RestrictedNames;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 use InvalidArgumentException;
+use Purify;
 
 class RemoteAuthController extends Controller
 {
@@ -33,6 +31,7 @@ class RemoteAuthController extends Controller
         if ($request->user()) {
             return redirect('/');
         }
+
         return view('auth.remote.start');
     }
 
@@ -57,6 +56,7 @@ class RemoteAuthController extends Controller
                 return [];
             }
             $res = explode(',', $res);
+
             return response()->json($res);
         }
 
@@ -70,6 +70,7 @@ class RemoteAuthController extends Controller
                 return [];
             }
             $res = explode(',', $res);
+
             return response()->json($res);
         }
 
@@ -97,8 +98,9 @@ class RemoteAuthController extends Controller
             $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'incompatible_domain'
+                'action' => 'incompatible_domain',
             ];
+
             return response()->json($res);
         }
 
@@ -108,8 +110,9 @@ class RemoteAuthController extends Controller
             $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'blocked_domain'
+                'action' => 'blocked_domain',
             ];
+
             return response()->json($res);
         }
 
@@ -119,8 +122,9 @@ class RemoteAuthController extends Controller
             $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'incompatible_domain'
+                'action' => 'incompatible_domain',
             ];
+
             return response()->json($res);
         }
 
@@ -130,8 +134,9 @@ class RemoteAuthController extends Controller
                 $res = [
                     'domain' => $domain,
                     'ready' => false,
-                    'action' => 'incompatible_domain'
+                    'action' => 'incompatible_domain',
                 ];
+
                 return response()->json($res);
             }
         }
@@ -142,8 +147,9 @@ class RemoteAuthController extends Controller
                 $res = [
                     'domain' => $domain,
                     'ready' => false,
-                    'action' => 'incompatible_domain'
+                    'action' => 'incompatible_domain',
                 ];
+
                 return response()->json($res);
             }
         }
@@ -169,7 +175,7 @@ class RemoteAuthController extends Controller
         $res = [
             'domain' => $domain,
             'ready' => true,
-            'dsh' => $dsh
+            'dsh' => $dsh,
         ];
 
         return response()->json($res);
@@ -218,10 +224,12 @@ class RemoteAuthController extends Controller
 
             if (! $res || ! isset($res['access_token'])) {
                 $request->session()->regenerate();
+
                 return redirect('/login');
             }
 
             $request->session()->put('oauth_remote_session_token', $res['access_token']);
+
             return redirect('/auth/mastodon/getting-started');
         }
 
@@ -240,6 +248,7 @@ class RemoteAuthController extends Controller
         if ($request->user()) {
             return redirect('/');
         }
+
         return view('auth.remote.onboarding');
     }
 
@@ -273,7 +282,7 @@ class RemoteAuthController extends Controller
                 return response()->json([
                     'code' => 200,
                     'msg' => 'Success!',
-                    'action' => 'max_uses_reached'
+                    'action' => 'max_uses_reached',
                 ]);
             }
         }
@@ -283,14 +292,14 @@ class RemoteAuthController extends Controller
             return response()->json([
                 'code' => 200,
                 'msg' => 'Success!',
-                'action' => 'redirect_existing_user'
+                'action' => 'redirect_existing_user',
             ]);
         }
 
         return response()->json([
             'code' => 200,
             'msg' => 'Success!',
-            'action' => 'onboard'
+            'action' => 'onboard',
         ]);
     }
 
@@ -324,7 +333,7 @@ class RemoteAuthController extends Controller
             'bearer_token' => $token,
             'verify_credentials' => $res,
             'last_verify_credentials_at' => now(),
-            'last_successful_login_at' => now()
+            'last_successful_login_at' => now(),
         ]);
 
         $request->session()->put('oauth_masto_raid', $ra->id);
@@ -380,8 +389,8 @@ class RemoteAuthController extends Controller
                     if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
                         return $fail('Username cannot be used.');
                     }
-                }
+                },
-            ]
+            ],
         ]);
         $username = strtolower($request->input('username'));
 
@@ -390,7 +399,7 @@ class RemoteAuthController extends Controller
         return response()->json([
             'code' => 200,
             'username' => $username,
-            'exists' => $exists
+            'exists' => $exists,
         ]);
     }
 
@@ -411,7 +420,7 @@ class RemoteAuthController extends Controller
             'email' => [
                 'required',
                 'email:strict,filter_unicode,dns,spoof',
-            ]
+            ],
         ]);
 
         $email = $request->input('email');
@@ -422,7 +431,7 @@ class RemoteAuthController extends Controller
             'code' => 200,
             'email' => $email,
             'exists' => $exists,
-            'banned' => $banned
+            'banned' => $banned,
         ]);
     }
 
@@ -448,7 +457,7 @@ class RemoteAuthController extends Controller
         if (! $res) {
             return response()->json([
                 'code' => 200,
-                'following' => []
+                'following' => [],
             ]);
         }
 
@@ -456,7 +465,7 @@ class RemoteAuthController extends Controller
 
         return response()->json([
             'code' => 200,
-            'following' => $res
+            'following' => $res,
         ]);
     }
 
@@ -512,10 +521,10 @@ class RemoteAuthController extends Controller
                     if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
                         return $fail('Username cannot be used.');
                     }
-                }
+                },
             ],
             'password' => 'required|string|min:8|confirmed',
-            'name' => 'nullable|max:30'
+            'name' => 'nullable|max:30',
         ]);
 
         $email = $request->input('email');
@@ -527,7 +536,7 @@ class RemoteAuthController extends Controller
             'name' => $name,
             'username' => $username,
             'password' => $password,
-            'email' => $email
+            'email' => $email,
         ]);
 
         $raid = $request->session()->pull('oauth_masto_raid');
@@ -541,7 +550,7 @@ class RemoteAuthController extends Controller
         return [
             'code' => 200,
             'msg' => 'Success',
-            'token' => $token
+            'token' => $token,
         ];
     }
 
@@ -585,7 +594,7 @@ class RemoteAuthController extends Controller
         abort_unless($request->session()->exists('oauth_remasto_id'), 403);
 
         $this->validate($request, [
-            'account' => 'required|url'
+            'account' => 'required|url',
         ]);
 
         $account = $request->input('account');
@@ -641,7 +650,7 @@ class RemoteAuthController extends Controller
         $avatar->remote_url = $request->input('avatar_url');
         $avatar->save();
 
-        MediaStorageService::avatar($avatar, config_cache('pixelfed.cloud_storage') == false);
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false);
 
         return [200];
     }
@@ -691,6 +700,7 @@ class RemoteAuthController extends Controller
         $user = User::findOrFail($ra->user_id);
         abort_if($user->is_admin || $user->status != null, 422, 'Invalid auth action');
         Auth::loginUsingId($ra->user_id);
+
         return [200];
     }
 
@@ -703,7 +713,7 @@ class RemoteAuthController extends Controller
             'password' => Hash::make($data['password']),
             'email_verified_at' => config('remote-auth.mastodon.contraints.skip_email_verification') ? now() : null,
             'app_register_ip' => request()->ip(),
-            'register_source' => 'mastodon'
+            'register_source' => 'mastodon',
         ])));
 
         $this->guarder()->login($user);

app/Jobs/AvatarPipeline/AvatarOptimize.php

@@ -2,9 +2,9 @@
 
 namespace App\Jobs\AvatarPipeline;
 
-use Cache;
 use App\Avatar;
 use App\Profile;
+use Cache;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -20,6 +20,7 @@ class AvatarOptimize implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $profile;
+
     protected $current;
 
     /**
@@ -65,7 +66,7 @@ class AvatarOptimize implements ShouldQueue
             Cache::forget('avatar:'.$avatar->profile_id);
             $this->deleteOldAvatar($avatar->media_path, $this->current);
 
-			if(config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
+            if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('instance.avatar.local_to_cloud')) {
                 $this->uploadToCloud($avatar);
             } else {
                 $avatar->cdn_url = null;
@@ -79,8 +80,7 @@ class AvatarOptimize implements ShouldQueue
     {
         if (storage_path('app/'.$new) == $current ||
              Str::endsWith($current, 'avatars/default.png') ||
-			 Str::endsWith($current, 'avatars/default.jpg'))
+             Str::endsWith($current, 'avatars/default.jpg')) {
-		{
             return;
         }
         if (is_file($current)) {

app/Jobs/AvatarPipeline/RemoteAvatarFetch.php

@@ -4,20 +4,13 @@ namespace App\Jobs\AvatarPipeline;
 
 use App\Avatar;
 use App\Profile;
+use App\Services\MediaStorageService;
+use App\Util\ActivityPub\Helpers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use Zttp\Zttp;
-use App\Http\Controllers\AvatarController;
-use Storage;
-use Log;
-use Illuminate\Http\File;
-use App\Services\MediaStorageService;
-use App\Services\ActivityPubFetchService;
 
 class RemoteAvatarFetch implements ShouldQueue
 {
@@ -38,7 +31,9 @@ class RemoteAvatarFetch implements ShouldQueue
      * @var int
      */
     public $tries = 1;
+
     public $timeout = 300;
+
     public $maxExceptions = 1;
 
     /**
@@ -60,7 +55,7 @@ class RemoteAvatarFetch implements ShouldQueue
     {
         $profile = $this->profile;
 
-		if(boolval(config_cache('pixelfed.cloud_storage')) == false && boolval(config_cache('federation.avatars.store_local')) == false) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == false && (bool) config_cache('federation.avatars.store_local') == false) {
             return 1;
         }
 
@@ -108,7 +103,7 @@ class RemoteAvatarFetch implements ShouldQueue
         $avatar->remote_url = $icon['url'];
         $avatar->save();
 
-		MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false, true);
 
         return 1;
     }

app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php

@@ -4,28 +4,21 @@ namespace App\Jobs\AvatarPipeline;
 
 use App\Avatar;
 use App\Profile;
+use App\Services\AccountService;
+use App\Services\MediaStorageService;
+use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use Zttp\Zttp;
-use App\Http\Controllers\AvatarController;
-use Cache;
-use Storage;
-use Log;
-use Illuminate\Http\File;
-use App\Services\AccountService;
-use App\Services\MediaStorageService;
-use App\Services\ActivityPubFetchService;
 
 class RemoteAvatarFetchFromUrl implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $profile;
+
     protected $url;
 
     /**
@@ -41,7 +34,9 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue
      * @var int
      */
     public $tries = 1;
+
     public $timeout = 300;
+
     public $maxExceptions = 1;
 
     /**
@@ -67,7 +62,7 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue
         Cache::forget('avatar:'.$profile->id);
         AccountService::del($profile->id);
 
-		if(boolval(config_cache('pixelfed.cloud_storage')) == false && boolval(config_cache('federation.avatars.store_local')) == false) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == false && (bool) config_cache('federation.avatars.store_local') == false) {
             return 1;
         }
 
@@ -89,7 +84,7 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue
             $avatar->save();
         }
 
-		MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false, true);
 
         return 1;
     }

app/Jobs/MediaPipeline/MediaDeletePipeline.php

@@ -3,27 +3,30 @@
 namespace App\Jobs\MediaPipeline;
 
 use App\Media;
+use App\Services\Media\MediaHlsService;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Redis;
-use Illuminate\Support\Facades\Storage;
-use App\Services\Media\MediaHlsService;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
-use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 
-class MediaDeletePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+class MediaDeletePipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $media;
 
     public $timeout = 300;
+
     public $tries = 3;
+
     public $maxExceptions = 1;
+
     public $failOnTimeout = true;
+
     public $deleteWhenMissingModels = true;
 
     /**
@@ -70,7 +73,7 @@ class MediaDeletePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
         array_pop($e);
         $i = implode('/', $e);
 
-		if(config_cache('pixelfed.cloud_storage') == true) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
             $disk = Storage::disk(config('filesystems.cloud'));
 
             if ($path && $disk->exists($path)) {

app/Jobs/MediaPipeline/MediaFixLocalFilesystemCleanupPipeline.php

@@ -8,7 +8,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
 
 class MediaFixLocalFilesystemCleanupPipeline implements ShouldQueue
@@ -16,12 +15,14 @@ class MediaFixLocalFilesystemCleanupPipeline implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $timeout = 1800;
+
     public $tries = 5;
+
     public $maxExceptions = 1;
 
     public function handle()
     {
-		if(config_cache('pixelfed.cloud_storage') == false) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == false) {
             // Only run if cloud storage is enabled
             return;
         }

app/Observers/AvatarObserver.php

@@ -3,9 +3,9 @@
 namespace App\Observers;
 
 use App\Avatar;
+use App\Services\AccountService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use App\Services\AccountService;
 
 class AvatarObserver
 {
@@ -19,7 +19,6 @@ class AvatarObserver
     /**
      * Handle the avatar "created" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function created(Avatar $avatar)
@@ -30,7 +29,6 @@ class AvatarObserver
     /**
      * Handle the avatar "updated" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function updated(Avatar $avatar)
@@ -41,7 +39,6 @@ class AvatarObserver
     /**
      * Handle the avatar "deleted" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function deleted(Avatar $avatar)
@@ -52,7 +49,6 @@ class AvatarObserver
     /**
      * Handle the avatar "deleting" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function deleting(Avatar $avatar)
@@ -65,7 +61,7 @@ class AvatarObserver
             @unlink($path);
         }
 
-        if(config_cache('pixelfed.cloud_storage')) {
+        if ((bool) config_cache('pixelfed.cloud_storage')) {
             $disk = Storage::disk(config('filesystems.cloud'));
             $base = Str::startsWith($avatar->media_path, 'cache/avatars/');
             if ($base && $disk->exists($avatar->media_path)) {
@@ -78,7 +74,6 @@ class AvatarObserver
     /**
      * Handle the avatar "restored" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function restored(Avatar $avatar)
@@ -89,7 +84,6 @@ class AvatarObserver
     /**
      * Handle the avatar "force deleted" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function forceDeleted(Avatar $avatar)

app/Services/ConfigCacheService.php

@@ -102,6 +102,7 @@ class ConfigCacheService
                 'pixelfed.optimize_image',
                 'pixelfed.optimize_video',
                 'pixelfed.max_collection_length',
+                'media.delete_local_after_cloud',
                 // 'system.user_mode'
             ];
 

app/Services/MediaStorageService.php

@@ -2,32 +2,26 @@
 
 namespace App\Services;
 
+use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Media;
 use App\Util\ActivityPub\Helpers;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Http\File;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use App\Media;
-use App\Profile;
-use App\User;
-use GuzzleHttp\Client;
-use App\Services\AccountService;
-use App\Http\Controllers\AvatarController;
-use GuzzleHttp\Exception\RequestException;
-use App\Jobs\MediaPipeline\MediaDeletePipeline;
-use Illuminate\Support\Arr;
-use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
-
-class MediaStorageService {
 
+class MediaStorageService
+{
     public static function store(Media $media)
     {
-        if(config_cache('pixelfed.cloud_storage') == true) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
             (new self())->cloudStore($media);
         }
 
-        return;
     }
 
     public static function move(Media $media)
@@ -36,10 +30,10 @@ class MediaStorageService {
             return;
         }
 
-        if(config_cache('pixelfed.cloud_storage') == true) {
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
             return (new self())->cloudMove($media);
         }
-        return;
+
     }
 
     public static function avatar($avatar, $local = false, $skipRecentCheck = false)
@@ -73,7 +67,7 @@ class MediaStorageService {
 
         return [
             'length' => $len,
-            'mime' => $mime
+            'mime' => $mime,
         ];
     }
 
@@ -132,7 +126,7 @@ class MediaStorageService {
         $mimes = [
             'image/jpeg',
             'image/png',
-            'video/mp4'
+            'video/mp4',
         ];
 
         $mime = $head['mime'];
@@ -258,6 +252,7 @@ class MediaStorageService {
             $avatar->last_fetched_at = now();
             $avatar->save();
             unlink($tmpName);
+
             return;
         }
 

app/Util/ActivityPub/Helpers.php

@@ -2,49 +2,34 @@
 
 namespace App\Util\ActivityPub;
 
-use DB, Cache, Purify, Storage, Request, Validator;
+use App\Instance;
-use App\{
-    Activity,
-    Follower,
-    Instance,
-    Like,
-    Media,
-    Notification,
-    Profile,
-    Status
-};
-use Zttp\Zttp;
-use Carbon\Carbon;
-use GuzzleHttp\Client;
-use Illuminate\Http\File;
-use Illuminate\Validation\Rule;
-use App\Jobs\AvatarPipeline\CreateAvatar;
-use App\Jobs\RemoteFollowPipeline\RemoteFollowImportRecent;
-use App\Jobs\ImageOptimizePipeline\{ImageOptimize,ImageThumbnail};
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Jobs\StatusPipeline\StatusReplyPipeline;
-use App\Jobs\StatusPipeline\StatusTagsPipeline;
-use App\Util\ActivityPub\HttpSignature;
-use Illuminate\Support\Str;
-use App\Services\ActivityPubFetchService;
-use App\Services\ActivityPubDeliveryService;
-use App\Services\CustomEmojiService;
-use App\Services\InstanceService;
-use App\Services\MediaPathService;
-use App\Services\MediaStorageService;
-use App\Services\NetworkTimelineService;
-use App\Jobs\MediaPipeline\MediaStoragePipeline;
 use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
 use App\Jobs\HomeFeedPipeline\FeedInsertRemotePipeline;
-use App\Util\Media\License;
+use App\Jobs\MediaPipeline\MediaStoragePipeline;
+use App\Jobs\StatusPipeline\StatusReplyPipeline;
+use App\Jobs\StatusPipeline\StatusTagsPipeline;
+use App\Media;
 use App\Models\Poll;
-use Illuminate\Contracts\Cache\LockTimeoutException;
+use App\Profile;
-use App\Services\DomainService;
-use App\Services\UserFilterService;
 use App\Services\Account\AccountStatService;
+use App\Services\ActivityPubDeliveryService;
+use App\Services\ActivityPubFetchService;
+use App\Services\DomainService;
+use App\Services\InstanceService;
+use App\Services\MediaPathService;
+use App\Services\NetworkTimelineService;
+use App\Services\UserFilterService;
+use App\Status;
+use App\Util\Media\License;
+use Cache;
+use Carbon\Carbon;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use Purify;
+use Validator;
 
-class Helpers {
+class Helpers
-
+{
     public static function validateObject($data)
     {
         $verbs = ['Create', 'Announce', 'Like', 'Follow', 'Delete', 'Accept', 'Reject', 'Undo', 'Tombstone'];
@@ -53,14 +38,14 @@ class Helpers {
             'type' => [
                 'required',
                 'string',
-                Rule::in($verbs)
+                Rule::in($verbs),
             ],
             'id' => 'required|string',
             'actor' => 'required|string|url',
             'object' => 'required',
             'object.type' => 'required_if:type,Create',
             'object.attributedTo' => 'required_if:type,Create|url',
-            'published' => 'required_if:type,Create|date'
+            'published' => 'required_if:type,Create|date',
         ])->passes();
 
         return $valid;
@@ -100,13 +85,13 @@ class Helpers {
             '*.type' => [
                 'required',
                 'string',
-                Rule::in($mediaTypes)
+                Rule::in($mediaTypes),
             ],
             '*.url' => 'required|url',
             '*.mediaType' => [
                 'required',
                 'string',
-                Rule::in($mimeTypes)
+                Rule::in($mimeTypes),
             ],
             '*.name' => 'sometimes|nullable|string',
             '*.blurhash' => 'sometimes|nullable|string|min:6|max:164',
@@ -132,6 +117,7 @@ class Helpers {
             foreach ($data['to'] as $to) {
                 if ($to == 'https://www.w3.org/ns/activitystreams#Public') {
                     $scope = 'public';
+
                     continue;
                 }
                 $url = $localOnly ? self::validateLocalUrl($to) : self::validateUrl($to);
@@ -145,6 +131,7 @@ class Helpers {
             foreach ($data['cc'] as $cc) {
                 if ($cc == 'https://www.w3.org/ns/activitystreams#Public') {
                     $scope = 'unlisted';
+
                     continue;
                 }
                 $url = $localOnly ? self::validateLocalUrl($cc) : self::validateUrl($cc);
@@ -154,6 +141,7 @@ class Helpers {
             }
         }
         $audience['scope'] = $scope;
+
         return $audience;
     }
 
@@ -161,6 +149,7 @@ class Helpers {
     {
         $audience = self::normalizeAudience($data);
         $url = $profile->permalink();
+
         return in_array($url, $audience['to']) || in_array($url, $audience['cc']);
     }
 
@@ -175,7 +164,7 @@ class Helpers {
 
         $valid = Cache::remember($key, 900, function () use ($url) {
             $localhosts = [
-                '127.0.0.1', 'localhost', '::1'
+                '127.0.0.1', 'localhost', '::1',
             ];
 
             if (strtolower(mb_substr($url, 0, 8)) !== 'https://') {
@@ -228,8 +217,10 @@ class Helpers {
             $domain = config('pixelfed.domain.app');
             $host = parse_url($url, PHP_URL_HOST);
             $url = strtolower($domain) === strtolower($host) ? $url : false;
+
             return $url;
         }
+
         return false;
     }
 
@@ -237,6 +228,7 @@ class Helpers {
     {
         $version = config('pixelfed.version');
         $url = config('app.url');
+
         return [
             'Accept' => 'application/activity+json',
             'User-Agent' => "(Pixelfed/{$version}; +{$url})",
@@ -297,6 +289,7 @@ class Helpers {
 
         if ($local) {
             $id = (int) last(explode('/', $url));
+
             return Status::whereNotIn('scope', ['draft', 'archived'])->findOrFail($id);
         }
 
@@ -346,7 +339,7 @@ class Helpers {
             if (is_array($res['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['to'])) {
                 $scope = 'public';
             }
-            if(is_string($res['to']) && 'https://www.w3.org/ns/activitystreams#Public' == $res['to']) {
+            if (is_string($res['to']) && $res['to'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'public';
             }
         }
@@ -355,7 +348,7 @@ class Helpers {
             if (is_array($res['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['cc'])) {
                 $scope = 'unlisted';
             }
-            if(is_string($res['cc']) && 'https://www.w3.org/ns/activitystreams#Public' == $res['cc']) {
+            if (is_string($res['cc']) && $res['cc'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'unlisted';
             }
         }
@@ -417,8 +410,7 @@ class Helpers {
             if (! self::validateUrl($attributedTo) ||
                 $idDomain !== $actorDomain ||
                 $actorDomain !== $urlDomain
-            )
+            ) {
-            {
                 return;
             }
         }
@@ -466,6 +458,7 @@ class Helpers {
                 $scope,
                 $id
             );
+
             return $status;
         } else {
             $status = self::storeStatus($url, $profile, $res);
@@ -512,7 +505,7 @@ class Helpers {
 
         $status = Status::updateOrCreate(
             [
-                'uri' => $url
+                'uri' => $url,
             ], [
                 'profile_id' => $pid,
                 'url' => $url,
@@ -527,7 +520,7 @@ class Helpers {
                 'visibility' => $scope,
                 'cw_summary' => ($cw == true && isset($activity['summary']) ?
                     Purify::clean(strip_tags($activity['summary'])) : null),
-                'comments_disabled' => $commentsDisabled
+                'comments_disabled' => $commentsDisabled,
             ]
         );
 
@@ -620,7 +613,7 @@ class Helpers {
             if (is_array($activity['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['to'])) {
                 $scope = 'public';
             }
-            if(is_string($activity['to']) && 'https://www.w3.org/ns/activitystreams#Public' == $activity['to']) {
+            if (is_string($activity['to']) && $activity['to'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'public';
             }
         }
@@ -629,7 +622,7 @@ class Helpers {
             if (is_array($activity['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['cc'])) {
                 $scope = 'unlisted';
             }
-            if(is_string($activity['cc']) && 'https://www.w3.org/ns/activitystreams#Public' == $activity['cc']) {
+            if (is_string($activity['cc']) && $activity['cc'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'unlisted';
             }
         }
@@ -700,6 +693,7 @@ class Helpers {
         if (self::verifyAttachments($data) == false) {
             // \Log::info('importNoteAttachment::failedVerification.', [$data['id']]);
             $status->viewType();
+
             return;
         }
         $attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment'];
@@ -748,13 +742,13 @@ class Helpers {
             $media->version = 3;
             $media->save();
 
-            if(config_cache('pixelfed.cloud_storage') == true) {
+            if ((bool) config_cache('pixelfed.cloud_storage') == true) {
                 MediaStoragePipeline::dispatch($media);
             }
         }
 
         $status->viewType();
-        return;
+
     }
 
     public static function profileFirstOrNew($url)
@@ -769,6 +763,7 @@ class Helpers {
 
         if ($local == true) {
             $id = last(explode('/', $url));
+
             return Profile::whereNull('status')
                 ->whereNull('domain')
                 ->whereUsername($id)
@@ -779,6 +774,7 @@ class Helpers {
             if ($profile->last_fetched_at && $profile->last_fetched_at->lt(now()->subHours(24))) {
                 return self::profileUpdateOrCreate($url);
             }
+
             return $profile;
         }
 
@@ -821,7 +817,7 @@ class Helpers {
         }
 
         $instance = Instance::updateOrCreate([
-            'domain' => $domain
+            'domain' => $domain,
         ]);
         if ($instance->wasRecentlyCreated == true) {
             \App\Jobs\InstancePipeline\FetchNodeinfoPipeline::dispatch($instance)->onQueue('low');
@@ -853,6 +849,7 @@ class Helpers {
         }
         $profile->last_fetched_at = now();
         $profile->save();
+
         return $profile;
     }
 

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

@@ -740,7 +740,7 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_ENABLE_CLOUD</strong></td>
-		<td><span>{{config_cache('pixelfed.cloud_storage') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.cloud_storage') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>