app/Console/Commands/CopyMediaToLocal.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Media;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class CopyMediaToLocal extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:copy-media-to-local';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Copy any historic media saved to S3 to the local filesystem';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        // Load all the Media records
+        $media = Media::all();
+
+        // Loop through each media record and copy the file from S3 to the local filesystem
+        foreach ($media as $mediaItem) {
+            $filename = $mediaItem->path;
+
+            $this->info('Processing: ' . $filename);
+
+            // If the file is already saved locally skip to next one
+            if (Storage::disk('local')->exists('public/' . $filename)) {
+                $this->info('File already exists locally, skipping');
+
+                continue;
+            }
+
+            // Copy the file from S3 to the local filesystem
+            if (! Storage::disk('s3')->exists($filename)) {
+                $this->error('File does not exist on S3');
+
+                continue;
+            }
+            $contents = Storage::disk('s3')->get($filename);
+            Storage::disk('local')->put('public/' . $filename, $contents);
+
+            // Copy -medium and -small versions if they exist
+            $filenameParts = explode('.', $filename);
+            $extension = array_pop($filenameParts);
+            $basename = trim(implode('.', $filenameParts), '.');
+            $mediumFilename = $basename . '-medium.' . $extension;
+            $smallFilename = $basename . '-small.' . $extension;
+            if (Storage::disk('s3')->exists($mediumFilename)) {
+                Storage::disk('local')->put('public/' . $mediumFilename, Storage::disk('s3')->get($mediumFilename));
+            }
+            if (Storage::disk('s3')->exists($smallFilename)) {
+                Storage::disk('local')->put('public/' . $smallFilename, Storage::disk('s3')->get($smallFilename));
+            }
+        }
+    }
+}

app/Http/Controllers/Admin/ContactsController.php

@@ -40,7 +40,7 @@ class ContactsController extends Controller
      */
     public function store(): RedirectResponse
     {
-        $contact = new Contact();
+        $contact = new Contact;
         $contact->name = request()->input('name');
         $contact->nick = request()->input('nick');
         $contact->homepage = request()->input('homepage');
@@ -79,7 +79,7 @@ class ContactsController extends Controller
         if (request()->hasFile('avatar') && (request()->input('homepage') != '')) {
             $dir = parse_url(request()->input('homepage'), PHP_URL_HOST);
             $destination = public_path() . '/assets/profile-images/' . $dir;
-            $filesystem = new Filesystem();
+            $filesystem = new Filesystem;
             if ($filesystem->isDirectory($destination) === false) {
                 $filesystem->makeDirectory($destination);
             }
@@ -139,7 +139,7 @@ class ContactsController extends Controller
             }
             if ($avatar !== null) {
                 $directory = public_path() . '/assets/profile-images/' . parse_url($contact->homepage, PHP_URL_HOST);
-                $filesystem = new Filesystem();
+                $filesystem = new Filesystem;
                 if ($filesystem->isDirectory($directory) === false) {
                     $filesystem->makeDirectory($directory);
                 }

app/Http/Controllers/Admin/PasskeysController.php

@@ -116,8 +116,8 @@ class PasskeysController extends Controller
             throw new WebAuthnException('No public key credential request options found');
         }
 
-        $attestationStatementSupportManager = new AttestationStatementSupportManager();
+        $attestationStatementSupportManager = new AttestationStatementSupportManager;
-        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport());
+        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport);
 
         $webauthnSerializer = (new WebauthnSerializerFactory(
             $attestationStatementSupportManager
@@ -133,12 +133,12 @@ class PasskeysController extends Controller
             throw new WebAuthnException('Invalid response type');
         }
 
-        $algorithmManager = new Manager();
+        $algorithmManager = new Manager;
-        $algorithmManager->add(new Ed25519());
+        $algorithmManager->add(new Ed25519);
-        $algorithmManager->add(new ES256());
+        $algorithmManager->add(new ES256);
-        $algorithmManager->add(new RS256());
+        $algorithmManager->add(new RS256);
 
-        $ceremonyStepManagerFactory = new CeremonyStepManagerFactory();
+        $ceremonyStepManagerFactory = new CeremonyStepManagerFactory;
         $ceremonyStepManagerFactory->setAlgorithmManager($algorithmManager);
         $ceremonyStepManagerFactory->setAttestationStatementSupportManager(
             $attestationStatementSupportManager
@@ -206,8 +206,8 @@ class PasskeysController extends Controller
             ], 400);
         }
 
-        $attestationStatementSupportManager = new AttestationStatementSupportManager();
+        $attestationStatementSupportManager = new AttestationStatementSupportManager;
-        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport());
+        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport);
 
         $webauthnSerializer = (new WebauthnSerializerFactory(
             $attestationStatementSupportManager
@@ -240,15 +240,15 @@ class PasskeysController extends Controller
             'json'
         );
 
-        $algorithmManager = new Manager();
+        $algorithmManager = new Manager;
-        $algorithmManager->add(new Ed25519());
+        $algorithmManager->add(new Ed25519);
-        $algorithmManager->add(new ES256());
+        $algorithmManager->add(new ES256);
-        $algorithmManager->add(new RS256());
+        $algorithmManager->add(new RS256);
 
-        $attestationStatementSupportManager = new AttestationStatementSupportManager();
+        $attestationStatementSupportManager = new AttestationStatementSupportManager;
-        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport());
+        $attestationStatementSupportManager->add(new NoneAttestationStatementSupport);
 
-        $ceremonyStepManagerFactory = new CeremonyStepManagerFactory();
+        $ceremonyStepManagerFactory = new CeremonyStepManagerFactory;
         $ceremonyStepManagerFactory->setAlgorithmManager($algorithmManager);
         $ceremonyStepManagerFactory->setAttestationStatementSupportManager(
             $attestationStatementSupportManager

app/Http/Controllers/ContactsController.php

@@ -18,7 +18,7 @@ class ContactsController extends Controller
      */
     public function index(): View
     {
-        $filesystem = new Filesystem();
+        $filesystem = new Filesystem;
         $contacts = Contact::all();
         foreach ($contacts as $contact) {
             $contact->homepageHost = parse_url($contact->homepage, PHP_URL_HOST);
@@ -40,7 +40,7 @@ class ContactsController extends Controller
         $contact->homepageHost = parse_url($contact->homepage, PHP_URL_HOST);
         $file = public_path() . '/assets/profile-images/' . $contact->homepageHost . '/image';
 
-        $filesystem = new Filesystem();
+        $filesystem = new Filesystem;
         $image = ($filesystem->exists($file)) ?
             '/assets/profile-images/' . $contact->homepageHost . '/image'
         :

app/Http/Controllers/MicropubController.php

@@ -53,13 +53,13 @@ class MicropubController extends Controller
         try {
             $tokenData = $this->tokenService->validateToken($request->input('access_token'));
         } catch (RequiredConstraintsViolated|InvalidTokenStructure|CannotDecodeContent) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->invalidTokenResponse();
         }
 
         if ($tokenData->claims()->has('scope') === false) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->tokenHasNoScopeResponse();
         }
@@ -73,7 +73,7 @@ class MicropubController extends Controller
             }
 
             if (! in_array('create', $scopes)) {
-                $micropubResponses = new MicropubResponses();
+                $micropubResponses = new MicropubResponses;
 
                 return $micropubResponses->insufficientScopeResponse();
             }
@@ -91,7 +91,7 @@ class MicropubController extends Controller
                 $scopes = explode(' ', $scopes);
             }
             if (! in_array('create', $scopes)) {
-                $micropubResponses = new MicropubResponses();
+                $micropubResponses = new MicropubResponses;
 
                 return $micropubResponses->insufficientScopeResponse();
             }
@@ -109,7 +109,7 @@ class MicropubController extends Controller
                 $scopes = explode(' ', $scopes);
             }
             if (! in_array('update', $scopes)) {
-                $micropubResponses = new MicropubResponses();
+                $micropubResponses = new MicropubResponses;
 
                 return $micropubResponses->insufficientScopeResponse();
             }
@@ -136,7 +136,7 @@ class MicropubController extends Controller
         try {
             $tokenData = $this->tokenService->validateToken($request->input('access_token'));
         } catch (RequiredConstraintsViolated|InvalidTokenStructure) {
-            return (new MicropubResponses())->invalidTokenResponse();
+            return (new MicropubResponses)->invalidTokenResponse();
         }
 
         if ($request->input('q') === 'syndicate-to') {

app/Http/Controllers/MicropubMediaController.php

@@ -39,13 +39,13 @@ class MicropubMediaController extends Controller
         try {
             $tokenData = $this->tokenService->validateToken($request->input('access_token'));
         } catch (RequiredConstraintsViolated|InvalidTokenStructure) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->invalidTokenResponse();
         }
 
         if ($tokenData->claims()->has('scope') === false) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->tokenHasNoScopeResponse();
         }
@@ -55,7 +55,7 @@ class MicropubMediaController extends Controller
             $scopes = explode(' ', $scopes);
         }
         if (! in_array('create', $scopes)) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->insufficientScopeResponse();
         }
@@ -111,13 +111,13 @@ class MicropubMediaController extends Controller
         try {
             $tokenData = $this->tokenService->validateToken($request->input('access_token'));
         } catch (RequiredConstraintsViolated|InvalidTokenStructure) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->invalidTokenResponse();
         }
 
         if ($tokenData->claims()->has('scope') === false) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->tokenHasNoScopeResponse();
         }
@@ -127,7 +127,7 @@ class MicropubMediaController extends Controller
             $scopes = explode(' ', $scopes);
         }
         if (! in_array('create', $scopes)) {
-            $micropubResponses = new MicropubResponses();
+            $micropubResponses = new MicropubResponses;
 
             return $micropubResponses->insufficientScopeResponse();
         }
@@ -140,7 +140,10 @@ class MicropubMediaController extends Controller
             ], 400);
         }
 
-        if ($request->file('file')->isValid() === false) {
+        /** @var UploadedFile $file */
+        $file = $request->file('file');
+
+        if ($file->isValid() === false) {
             return response()->json([
                 'response' => 'error',
                 'error' => 'invalid_request',
@@ -148,7 +151,7 @@ class MicropubMediaController extends Controller
             ], 400);
         }
 
-        $filename = $this->saveFile($request->file('file'));
+        $filename = Storage::disk('local')->putFile('media', $file);
 
         /** @var ImageManager $manager */
         $manager = resolve(ImageManager::class);
@@ -162,18 +165,11 @@ class MicropubMediaController extends Controller
 
         $media = Media::create([
             'token' => $request->bearerToken(),
-            'path' => 'media/' . $filename,
+            'path' => $filename,
             'type' => $this->getFileTypeFromMimeType($request->file('file')->getMimeType()),
             'image_widths' => $width,
         ]);
 
-        // put the file on S3 initially, the ProcessMedia job may edit this
-        Storage::disk('s3')->putFileAs(
-            'media',
-            new File(storage_path('app') . '/' . $filename),
-            $filename
-        );
-
         ProcessMedia::dispatch($filename);
 
         return response()->json([
@@ -237,7 +233,7 @@ class MicropubMediaController extends Controller
      *
      * @throws Exception
      */
-    private function saveFile(UploadedFile $file): string
+    private function saveFileToLocal(UploadedFile $file): string
     {
         $filename = Uuid::uuid4()->toString() . '.' . $file->extension();
         Storage::disk('local')->putFileAs('', $file, $filename);

app/Http/Controllers/NotesController.php

@@ -67,7 +67,7 @@ class NotesController extends Controller
      */
     public function redirect(int $decId): RedirectResponse
     {
-        return redirect(config('app.url') . '/notes/' . (new Numbers())->numto60($decId));
+        return redirect(config('app.url') . '/notes/' . (new Numbers)->numto60($decId));
     }
 
     /**

app/Jobs/DownloadWebMention.php

@@ -38,7 +38,7 @@ class DownloadWebMention implements ShouldQueue
         //4XX and 5XX responses should get Guzzle to throw an exception,
         //Laravel should catch and retry these automatically.
         if ($response->getStatusCode() === 200) {
-            $filesystem = new FileSystem();
+            $filesystem = new FileSystem;
             $filename = storage_path('HTML') . '/' . $this->createFilenameFromURL($this->source);
             //backup file first
             $filenameBackup = $filename . '.' . date('Y-m-d') . '.backup';

app/Jobs/ProcessMedia.php

@@ -32,35 +32,35 @@ class ProcessMedia implements ShouldQueue
      */
     public function handle(ImageManager $manager): void
     {
-        //open file
+        // Open file
         try {
-            $image = $manager->read(storage_path('app') . '/' . $this->filename);
+            $image = $manager->read(storage_path('app/media/') . $this->filename);
         } catch (DecoderException) {
             // not an image; delete file and end job
-            unlink(storage_path('app') . '/' . $this->filename);
+            unlink(storage_path('app/media/') . $this->filename);
 
             return;
         }
-        //create smaller versions if necessary
+
+        // Save the file publicly
+        Storage::disk('local')->copy('media/' . $this->filename, 'public/media/' . $this->filename);
+
+        // Create smaller versions if necessary
         if ($image->width() > 1000) {
             $filenameParts = explode('.', $this->filename);
             $extension = array_pop($filenameParts);
             // the following achieves this data flow
             // foo.bar.png => ['foo', 'bar', 'png'] => ['foo', 'bar'] => foo.bar
-            $basename = ltrim(array_reduce($filenameParts, function ($carry, $item) {
+            $basename = trim(implode('.', $filenameParts), '.');
-                return $carry . '.' . $item;
+
-            }, ''), '.');
+            $medium = $image->resize(width: 1000);
-            $medium = $image->resize(1000, null, function ($constraint) {
+            Storage::disk('local')->put('public/media/' . $basename . '-medium.' . $extension, (string) $medium->encode());
-                $constraint->aspectRatio();
+
-            });
+            $small = $image->resize(width: 500);
-            Storage::disk('s3')->put('media/' . $basename . '-medium.' . $extension, (string) $medium->encode());
+            Storage::disk('local')->put('public/media/' . $basename . '-small.' . $extension, (string) $small->encode());
-            $small = $image->resize(500, null, function ($constraint) {
-                $constraint->aspectRatio();
-            });
-            Storage::disk('s3')->put('media/' . $basename . '-small.' . $extension, (string) $small->encode());
         }
 
-        // now we can delete the locally saved image
+        // Now we can delete the locally saved image
-        unlink(storage_path('app') . '/' . $this->filename);
+        unlink(storage_path('app/media/') . $this->filename);
     }
 }

app/Jobs/ProcessWebMention.php

@@ -44,7 +44,7 @@ class ProcessWebMention implements ShouldQueue
         try {
             $response = $guzzle->request('GET', $this->source);
         } catch (RequestException $e) {
-            throw new RemoteContentNotFoundException();
+            throw new RemoteContentNotFoundException;
         }
         $this->saveRemoteContent((string) $response->getBody(), $this->source);
         $microformats = Mf2\parse((string) $response->getBody(), $this->source);
@@ -85,7 +85,7 @@ class ProcessWebMention implements ShouldQueue
         }// foreach
 
         // no webmention in the db so create new one
-        $webmention = new WebMention();
+        $webmention = new WebMention;
         $type = $parser->getMentionType($microformats); // throw error here?
         dispatch(new SaveProfileImage($microformats));
         $webmention->source = $this->source;

app/Jobs/SendWebMentions.php

@@ -108,7 +108,7 @@ class SendWebMentions implements ShouldQueue
         }
 
         $urls = [];
-        $dom = new \DOMDocument();
+        $dom = new \DOMDocument;
         $dom->loadHTML($html);
         $anchors = $dom->getElementsByTagName('a');
         foreach ($anchors as $anchor) {

app/Models/Article.php

@@ -58,10 +58,10 @@ class Article extends Model
     {
         return Attribute::get(
             get: function () {
-                $environment = new Environment();
+                $environment = new Environment;
-                $environment->addExtension(new CommonMarkCoreExtension());
+                $environment->addExtension(new CommonMarkCoreExtension);
-                $environment->addRenderer(FencedCode::class, new FencedCodeRenderer());
+                $environment->addRenderer(FencedCode::class, new FencedCodeRenderer);
-                $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer());
+                $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer);
                 $markdownConverter = new MarkdownConverter($environment);
 
                 return $markdownConverter->convert($this->main)->getContent();

app/Models/Media.php

@@ -33,7 +33,7 @@ class Media extends Model
                     return $attributes['path'];
                 }
 
-                return config('filesystems.disks.s3.url') . '/' . $attributes['path'];
+                return config('app.url') . '/storage/' . $attributes['path'];
             }
         );
     }
@@ -78,7 +78,7 @@ class Media extends Model
         $basename = $this->getBasename($path);
         $extension = $this->getExtension($path);
 
-        return config('filesystems.disks.s3.url') . '/' . $basename . '-' . $size . '.' . $extension;
+        return config('app.url') . '/storage/' . $basename . '-' . $size . '.' . $extension;
     }
 
     private function getBasename(string $path): string

app/Models/Note.php

@@ -271,7 +271,7 @@ class Note extends Model
             ]);
 
             if ($oEmbed->httpstatus >= 400) {
-                throw new Exception();
+                throw new Exception;
             }
         } catch (Exception $e) {
             return null;
@@ -388,18 +388,18 @@ class Note extends Model
                 'mentions_handle' => [
                     'prefix' => '@',
                     'pattern' => '([\w@.])+(\b)',
-                    'generator' => new MentionGenerator(),
+                    'generator' => new MentionGenerator,
                 ],
             ],
         ];
 
         $environment = new Environment($config);
-        $environment->addExtension(new CommonMarkCoreExtension());
+        $environment->addExtension(new CommonMarkCoreExtension);
-        $environment->addExtension(new AutolinkExtension());
+        $environment->addExtension(new AutolinkExtension);
-        $environment->addExtension(new MentionExtension());
+        $environment->addExtension(new MentionExtension);
-        $environment->addRenderer(Mention::class, new MentionRenderer());
+        $environment->addRenderer(Mention::class, new MentionRenderer);
-        $environment->addRenderer(FencedCode::class, new FencedCodeRenderer());
+        $environment->addRenderer(FencedCode::class, new FencedCodeRenderer);
-        $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer());
+        $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer);
         $markdownConverter = new MarkdownConverter($environment);
 
         return $markdownConverter->convert($note)->getContent();

app/Models/WebMention.php

@@ -42,7 +42,7 @@ class WebMention extends Model
                     return null;
                 }
 
-                $authorship = new Authorship();
+                $authorship = new Authorship;
                 $hCard = $authorship->findAuthor(json_decode($attributes['mf2'], true));
 
                 if ($hCard === false) {
@@ -140,7 +140,7 @@ class WebMention extends Model
             return $profile_image;
         }
 
-        $filesystem = new Filesystem();
+        $filesystem = new Filesystem;
         if ($filesystem->exists(public_path() . '/assets/profile-images/' . $host . '/image')) {
             return '/assets/profile-images/' . $host . '/image';
         }

app/Providers/AppServiceProvider.php

@@ -88,9 +88,9 @@ class AppServiceProvider extends ServiceProvider
         $this->app->bind('Lcobucci\JWT\Configuration', function () {
             $key = InMemory::plainText(config('app.key'));
 
-            $config = Configuration::forSymmetricSigner(new Sha256(), $key);
+            $config = Configuration::forSymmetricSigner(new Sha256, $key);
 
-            $config->setValidationConstraints(new SignedWith(new Sha256(), $key));
+            $config->setValidationConstraints(new SignedWith(new Sha256, $key));
 
             return $config;
         });
@@ -98,7 +98,7 @@ class AppServiceProvider extends ServiceProvider
         // Configure HtmlSanitizer
         $this->app->bind(HtmlSanitizer::class, function () {
             return new HtmlSanitizer(
-                (new HtmlSanitizerConfig())
+                (new HtmlSanitizerConfig)
                     ->allowSafeElements()
                     ->forceAttribute('a', 'rel', 'noopener nofollow')
             );

app/Services/BookmarkService.php

@@ -62,7 +62,7 @@ class BookmarkService extends Service
             $response = $client->request('GET', 'https://web.archive.org/save/' . $url);
         } catch (ClientException $e) {
             //throw an exception to be caught
-            throw new InternetArchiveException();
+            throw new InternetArchiveException;
         }
         if ($response->hasHeader('Content-Location')) {
             if (Str::startsWith(Arr::get($response->getHeader('Content-Location'), 0), '/web')) {
@@ -71,6 +71,6 @@ class BookmarkService extends Service
         }
 
         //throw an exception to be caught
-        throw new InternetArchiveException();
+        throw new InternetArchiveException;
     }
 }

app/Services/Micropub/UpdateService.php

@@ -83,7 +83,7 @@ class UpdateService
                 if ($property === 'photo') {
                     foreach ($value as $photoURL) {
                         if (Str::startsWith($photoURL, 'https://')) {
-                            $media = new Media();
+                            $media = new Media;
                             $media->path = $photoURL;
                             $media->type = 'image';
                             $media->save();

app/Services/PlaceService.php

@@ -25,7 +25,7 @@ class PlaceService
             $data['latitude'] = $matches[0][0];
             $data['longitude'] = $matches[0][1];
         }
-        $place = new Place();
+        $place = new Place;
         $place->name = $data['name'];
         $place->description = $data['description'];
         $place->latitude = $data['latitude'];
@@ -53,7 +53,7 @@ class PlaceService
         if (Arr::has($checkin, 'properties.latitude') === false) {
             throw new \InvalidArgumentException('Missing required longitude/latitude');
         }
-        $place = new Place();
+        $place = new Place;
         $place->name = Arr::get($checkin, 'properties.name.0');
         $place->external_urls = Arr::get($checkin, 'properties.url.0');
         $place->latitude = Arr::get($checkin, 'properties.latitude.0');

app/Services/TokenService.php

@@ -19,7 +19,7 @@ class TokenService
         $config = resolve(Configuration::class);
 
         $token = $config->builder()
-            ->issuedAt(new DateTimeImmutable())
+            ->issuedAt(new DateTimeImmutable)
             ->withClaim('client_id', $data['client_id'])
             ->withClaim('me', $data['me'])
             ->withClaim('scope', $data['scope'])