jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Host images locally
Some checks failed
PHP Unit / PHPUnit test suite (pull_request) Has been cancelled
Details
Laravel Pint / Laravel Pint (pull_request) Has been cancelled
Details

Browse source 
We don’t need the complexity of S3. Sepcifically the complexity of
managing my own AWS account, flysystem made the Laravel side easy.

A command is added to copy the the S3 files over to local storage.
This commit is contained in:
Jonny Barnes 2024-10-25 20:40:52 +01:00
parent d80e8164c8
commit d7da42b626
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
47 changed files with 295 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/Unit/ArticlesTest.php
View file

@ -16,7 +16,7 @@ class ArticlesTest extends TestCase
/** @test */
public function titleSlugIsGeneratedAutomatically(): void
{
$article = new Article();
$article = new Article;
$article->title = 'My Title';
$article->main = 'Content';
$article->save();
@ -27,7 +27,7 @@ class ArticlesTest extends TestCase
/** @test */
public function markdownContentIsConverted(): void
{
$article = new Article();
$article = new Article;
$article->main = 'Some *markdown*';
$this->assertEquals('<p>Some <em>markdown</em></p>' . PHP_EOL, $article->html);

6
tests/Unit/BookmarksTest.php
View file

@ -34,7 +34,7 @@ class BookmarksTest extends TestCase
$handler = HandlerStack::create($mock);
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$url = (new BookmarkService())->getArchiveLink('https://example.org');
$url = (new BookmarkService)->getArchiveLink('https://example.org');
$this->assertEquals('/web/1234/example.org', $url);
}
@ -49,7 +49,7 @@ class BookmarksTest extends TestCase
$handler = HandlerStack::create($mock);
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
(new BookmarkService())->getArchiveLink('https://example.org');
(new BookmarkService)->getArchiveLink('https://example.org');
}
/** @test */
@ -63,6 +63,6 @@ class BookmarksTest extends TestCase
$handler = HandlerStack::create($mock);
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
(new BookmarkService())->getArchiveLink('https://example.org');
(new BookmarkService)->getArchiveLink('https://example.org');
}
}

2
tests/Unit/Jobs/DownloadWebMentionJobTest.php
View file

@ -16,7 +16,7 @@ class DownloadWebMentionJobTest extends TestCase
{
protected function tearDown(): void
{
$fs = new FileSystem();
$fs = new FileSystem;
if ($fs->exists(storage_path() . '/HTML/https')) {
$fs->deleteDirectory(storage_path() . '/HTML/https');
}

2
tests/Unit/Jobs/ProcessBookmarkJobTest.php
View file

@ -46,7 +46,7 @@ class ProcessBookmarkJobTest extends TestCase
$bookmark = Bookmark::factory()->create();
$service = $this->createMock(BookmarkService::class);
$service->method('getArchiveLink')
->will($this->throwException(new InternetArchiveException()));
->will($this->throwException(new InternetArchiveException));
$this->app->instance(BookmarkService::class, $service);
$job = new ProcessBookmark($bookmark);

32
tests/Unit/Jobs/ProcessMediaJobTest.php
View file

@ -14,38 +14,48 @@ class ProcessMediaJobTest extends TestCase
/** @test */
public function nonMediaFilesAreNotSaved(): void
{
Storage::fake('s3');
$manager = app()->make(ImageManager::class);
Storage::disk('local')->put('file.txt', 'This is not an image');
Storage::disk('local')->put('media/file.txt', 'This is not an image');
$job = new ProcessMedia('file.txt');
$job->handle($manager);
$this->assertFalse(file_exists(storage_path('app') . '/file.txt'));
$this->assertFileDoesNotExist(storage_path('app/media/') . 'file.txt');
}
/** @test */
public function smallImagesAreNotResized(): void
{
Storage::fake('s3');
$manager = app()->make(ImageManager::class);
Storage::disk('local')->put('aaron.png', file_get_contents(__DIR__ . '/../../aaron.png'));
Storage::disk('local')->put('media/aaron.png', file_get_contents(__DIR__ . '/../../aaron.png'));
$job = new ProcessMedia('aaron.png');
$job->handle($manager);
$this->assertFalse(file_exists(storage_path('app') . '/aaron.png'));
$this->assertFileDoesNotExist(storage_path('app/media/') . 'aaron.png');
// Tidy up files created by the job
Storage::disk('local')->delete('public/media/aaron.png');
Storage::disk('local')->delete('public/media');
}
/** @test */
public function largeImagesHaveSmallerImagesCreated(): void
{
$manager = app()->make(ImageManager::class);
Storage::disk('local')->put('test-image.jpg', file_get_contents(__DIR__.'/../../test-image.jpg'));
Storage::fake('s3');
Storage::disk('local')->put('media/test-image.jpg', file_get_contents(__DIR__.'/../../test-image.jpg'));
$job = new ProcessMedia('test-image.jpg');
$job->handle($manager);
Storage::disk('s3')->assertExists('media/test-image-small.jpg');
Storage::disk('s3')->assertExists('media/test-image-medium.jpg');
$this->assertFalse(file_exists(storage_path('app') . '/test-image.jpg'));
Storage::disk('local')->assertExists('public/media/test-image.jpg');
Storage::disk('local')->assertExists('public/media/test-image-small.jpg');
Storage::disk('local')->assertExists('public/media/test-image-medium.jpg');
$this->assertFileDoesNotExist(storage_path('app/media/') . 'test-image.jpg');
// Tidy up files created by the job
Storage::disk('local')->delete('public/media/test-image.jpg');
Storage::disk('local')->delete('public/media/test-image-small.jpg');
Storage::disk('local')->delete('public/media/test-image-medium.jpg');
$this->removeDirIfEmpty(storage_path('app/public/media'));
$this->removeDirIfEmpty(storage_path('app/media'));
}
}

20
tests/Unit/Jobs/ProcessWebMentionJobTest.php
View file

@ -25,7 +25,7 @@ class ProcessWebMentionJobTest extends TestCase
protected function tearDown(): void
{
$fs = new FileSystem();
$fs = new FileSystem;
if ($fs->exists(storage_path() . '/HTML/https')) {
$fs->deleteDirectory(storage_path() . '/HTML/https');
}
@ -37,7 +37,7 @@ class ProcessWebMentionJobTest extends TestCase
{
$this->expectException(RemoteContentNotFoundException::class);
$parser = new Parser();
$parser = new Parser;
$mock = new MockHandler([
new Response(404),
]);
@ -56,7 +56,7 @@ class ProcessWebMentionJobTest extends TestCase
{
Queue::fake();
$parser = new Parser();
$parser = new Parser;
$html = <<<'HTML'
<div class="h-entry">
@ -88,7 +88,7 @@ class ProcessWebMentionJobTest extends TestCase
{
Queue::fake();
$parser = new Parser();
$parser = new Parser;
$note = Note::factory()->create();
$source = 'https://aaronpk.localhost/reply/1';
WebMention::factory()->create([
@ -123,7 +123,7 @@ class ProcessWebMentionJobTest extends TestCase
/** @test */
public function webmentionReplyGetsDeletedWhenReplyToValueChanges(): void
{
$parser = new Parser();
$parser = new Parser;
$html = <<<'HTML'
<div class="h-entry">
@ -139,7 +139,7 @@ class ProcessWebMentionJobTest extends TestCase
$note = Note::factory()->create();
$source = 'https://example.org/reply/1';
$webmention = new WebMention();
$webmention = new WebMention;
$webmention->source = $source;
$webmention->target = config('app.url') . '/notes/E';
$webmention->type = 'in-reply-to';
@ -160,7 +160,7 @@ class ProcessWebMentionJobTest extends TestCase
/** @test */
public function webmentionLikeGetsDeletedWhenLikeOfValueChanges(): void
{
$parser = new Parser();
$parser = new Parser;
$html = <<<'HTML'
<div class="h-entry">
@ -176,7 +176,7 @@ class ProcessWebMentionJobTest extends TestCase
$note = Note::factory()->create();
$source = 'https://example.org/reply/1';
$webmention = new WebMention();
$webmention = new WebMention;
$webmention->source = $source;
$webmention->target = config('app.url') . '/notes/E';
$webmention->type = 'like-of';
@ -197,7 +197,7 @@ class ProcessWebMentionJobTest extends TestCase
/** @test */
public function webmentionRepostGetsDeletedWhenRepostOfValueChanges(): void
{
$parser = new Parser();
$parser = new Parser;
$html = <<<'HTML'
<div class="h-entry">
@ -213,7 +213,7 @@ class ProcessWebMentionJobTest extends TestCase
$note = Note::factory()->create();
$source = 'https://example.org/reply/1';
$webmention = new WebMention();
$webmention = new WebMention;
$webmention->source = $source;
$webmention->target = config('app.url') . '/notes/E';
$webmention->type = 'repost-of';

2
tests/Unit/Jobs/SaveProfileImageJobTest.php
View file

@ -30,7 +30,7 @@ class SaveProfileImageJobTest extends TestCase
$mf = ['items' => []];
$authorship = $this->createMock(Authorship::class);
$authorship->method('findAuthor')
->will($this->throwException(new AuthorshipParserException()));
->will($this->throwException(new AuthorshipParserException));
$job = new SaveProfileImage($mf);
$this->assertNull($job->handle($authorship));

16
tests/Unit/Jobs/SendWebMentionJobTest.php
View file

@ -17,7 +17,7 @@ class SendWebMentionJobTest extends TestCase
/** @test */
public function discoverWebmentionEndpointOnOwnDomain(): void
{
$note = new Note();
$note = new Note;
$job = new SendWebMentions($note);
$this->assertNull($job->discoverWebmentionEndpoint(config('app.url')));
$this->assertNull($job->discoverWebmentionEndpoint('/notes/tagged/test'));
@ -34,7 +34,7 @@ class SendWebMentionJobTest extends TestCase
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertEquals($url, $job->discoverWebmentionEndpoint('https://example.org'));
}
@ -49,7 +49,7 @@ class SendWebMentionJobTest extends TestCase
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertEquals(
'https://example.org/webmention',
$job->discoverWebmentionEndpoint('https://example.org')
@ -67,7 +67,7 @@ class SendWebMentionJobTest extends TestCase
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertEquals(
'https://example.org/webmention',
$job->discoverWebmentionEndpoint('https://example.org')
@ -77,7 +77,7 @@ class SendWebMentionJobTest extends TestCase
/** @test */
public function ensureEmptyNoteDoesNotTriggerAnyActions(): void
{
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertNull($job->handle());
}
@ -86,7 +86,7 @@ class SendWebMentionJobTest extends TestCase
{
$uri = '/blog/post';
$base = 'https://example.org/';
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertEquals('https://example.org/blog/post', $job->resolveUri($uri, $base));
}
@ -102,7 +102,7 @@ class SendWebMentionJobTest extends TestCase
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$note->note = 'Hi [Aaron](https://aaronparecki.com)';
$note->save();
$job = new SendWebMentions($note);
@ -121,7 +121,7 @@ class SendWebMentionJobTest extends TestCase
$client = new Client(['handler' => $handler]);
$this->app->instance(Client::class, $client);
$job = new SendWebMentions(new Note());
$job = new SendWebMentions(new Note);
$this->assertNull($job->discoverWebmentionEndpoint('https://example.org'));
}
}

8
tests/Unit/LikesTest.php
View file

@ -15,7 +15,7 @@ class LikesTest extends TestCase
/** @test */
public function weCanSetTheAuthorUrl(): void
{
$like = new Like();
$like = new Like;
$like->author_url = 'https://joe.bloggs/';
$this->assertEquals('https://joe.bloggs', $like->author_url);
}
@ -23,7 +23,7 @@ class LikesTest extends TestCase
/** @test */
public function weDoNotModifyPlainTextContent(): void
{
$like = new Like();
$like = new Like;
$like->url = 'https://example.org/post/123';
$like->content = 'some plaintext content';
$like->save();
@ -34,7 +34,7 @@ class LikesTest extends TestCase
/** @test */
public function weCanHandleBlankContent(): void
{
$like = new Like();
$like = new Like;
$like->url = 'https://example.org/post/123';
$like->content = null;
$like->save();
@ -57,7 +57,7 @@ class LikesTest extends TestCase
<p>Hello</p>
<img />
HTML;
$like = new Like();
$like = new Like;
$like->url = 'https://example.org/post/123';
$like->content = $htmlEvil;
$like->save();

2
tests/Unit/MediaTest.php
View file

@ -25,7 +25,7 @@ class MediaTest extends TestCase
public function absoluteUrlsAreReturnedUnmodified(): void
{
$absoluteUrl = 'https://instagram-cdn.com/image/uuid';
$media = new Media();
$media = new Media;
$media->path = $absoluteUrl;
$this->assertEquals($absoluteUrl, $media->url);

20
tests/Unit/NotesTest.php
View file

@ -82,7 +82,7 @@ class NotesTest extends TestCase
'twitter' => null,
'facebook' => 123456,
]);
$fileSystem = new Filesystem();
$fileSystem = new Filesystem;
$fileSystem->ensureDirectoryExists(public_path('/assets/profile-images/aaronparecki.com'));
if (! $fileSystem->exists(public_path('/assets/profile-images/aaronparecki.com/image'))) {
$fileSystem->copy('./tests/aaron.png', public_path('/assets/profile-images/aaronparecki.com/image'));
@ -201,7 +201,7 @@ class NotesTest extends TestCase
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$address = $note->reverseGeoCode(51.50084, -0.14264);
$this->assertEquals(
@ -226,7 +226,7 @@ class NotesTest extends TestCase
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$address = $note->reverseGeoCode(51.02, 0.91);
$this->assertEquals(
@ -253,7 +253,7 @@ class NotesTest extends TestCase
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$address = $note->reverseGeoCode(53.466277988406, -2.2304474827445);
$this->assertEquals(
@ -280,7 +280,7 @@ class NotesTest extends TestCase
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$address = $note->reverseGeoCode(51.1, 0.61);
$this->assertEquals('<span class="p-region">Kent</span>, <span class="p-country-name">UK</span>', $address);
@ -304,7 +304,7 @@ class NotesTest extends TestCase
$this->app->instance(Client::class, $client);
$note = new Note();
$note = new Note;
$address = $note->reverseGeoCode(54.3, 9.4);
$this->assertEquals('<span class="p-country-name">Ireland</span>', $address);
@ -323,7 +323,7 @@ class NotesTest extends TestCase
$note->media()->save($media);
$expected = 'A nice image
<img src="' . config('filesystems.disks.s3.url') . '/test.png" alt="">';
<img src="' . config('app.url') . '/test.png" alt="">';
$this->assertEquals($expected, $note->content);
}
@ -340,7 +340,7 @@ class NotesTest extends TestCase
$note->media()->save($media);
$expected = 'A nice video
<video src="' . config('filesystems.disks.s3.url') . '/test.mkv">';
<video src="' . config('app.url') . '/test.mkv">';
$this->assertEquals($expected, $note->content);
}
@ -357,7 +357,7 @@ class NotesTest extends TestCase
$note->media()->save($media);
$expected = 'Some nice audio
<audio src="' . config('filesystems.disks.s3.url') . '/test.flac">';
<audio src="' . config('app.url') . '/test.flac">';
$this->assertEquals($expected, $note->content);
}
@ -368,7 +368,7 @@ class NotesTest extends TestCase
*/
public function provideTextForBlankContent(): void
{
$note = new Note();
$note = new Note;
$this->assertEquals('A blank note', $note->content);
}

8
tests/Unit/PlacesTest.php
View file

@ -71,13 +71,13 @@ class PlacesTest extends TestCase
{
Place::factory(10)->create();
$place = new Place();
$place = new Place;
$place->name = 'Temp Place';
$place->latitude = 37.422009;
$place->longitude = -122.084047;
$place->external_urls = 'https://www.openstreetmap.org/way/1234';
$place->save();
$service = new PlaceService();
$service = new PlaceService;
$ret = $service->createPlaceFromCheckin([
'properties' => [
'url' => ['https://www.openstreetmap.org/way/1234'],
@ -92,7 +92,7 @@ class PlacesTest extends TestCase
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Missing required name');
$service = new PlaceService();
$service = new PlaceService;
$service->createPlaceFromCheckin(['foo' => 'bar']);
}
@ -102,7 +102,7 @@ class PlacesTest extends TestCase
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Missing required longitude/latitude');
$service = new PlaceService();
$service = new PlaceService;
$service->createPlaceFromCheckin(['properties' => ['name' => 'bar']]);
}

18
tests/Unit/WebMentionTest.php
View file

@ -30,7 +30,7 @@ class WebMentionTest extends TestCase
/** @test */
public function publishedAttributeUsesUpdatedAtWhenNoRelevantMf2Data(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$updated_at = Carbon::now();
$webmention->updated_at = $updated_at;
$this->assertEquals($updated_at->toDayDateTimeString(), $webmention->published);
@ -39,7 +39,7 @@ class WebMentionTest extends TestCase
/** @test */
public function publishedAttributeUsesUpdatedAtWhenErrorParsingMf2Data(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$updated_at = Carbon::now();
$webmention->updated_at = $updated_at;
$webmention->mf2 = json_encode([
@ -57,7 +57,7 @@ class WebMentionTest extends TestCase
/** @test */
public function createPhotoLinkDoesNothingWithGenericUrlAndNoLocallySavedImage(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$homepage = 'https://example.org/profile.png';
$expected = 'https://example.org/profile.png';
$this->assertEquals($expected, $webmention->createPhotoLink($homepage));
@ -66,7 +66,7 @@ class WebMentionTest extends TestCase
/** @test */
public function createPhotoLinkReturnsLocallySavedImageUrlIfItExists(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$homepage = 'https://aaronparecki.com/profile.png';
$expected = '/assets/profile-images/aaronparecki.com/image';
$this->assertEquals($expected, $webmention->createPhotoLink($homepage));
@ -75,7 +75,7 @@ class WebMentionTest extends TestCase
/** @test */
public function createPhotoLinkDealsWithSpecialCaseOfDirectTwitterPhotoLinks(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$twitterProfileImage = 'http://pbs.twimg.com/1234';
$expected = 'https://pbs.twimg.com/1234';
$this->assertEquals($expected, $webmention->createPhotoLink($twitterProfileImage));
@ -84,7 +84,7 @@ class WebMentionTest extends TestCase
/** @test */
public function createPhotoLinkReturnsCachedTwitterPhotoLinks(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$twitterURL = 'https://twitter.com/example';
$expected = 'https://pbs.twimg.com/static_profile_link.jpg';
Cache::put($twitterURL, $expected, 1);
@ -111,7 +111,7 @@ class WebMentionTest extends TestCase
->once()
->andReturn(true);
$webmention = new WebMention();
$webmention = new WebMention;
$twitterURL = 'https://twitter.com/example';
$expected = 'https://pbs.twimg.com/static_profile_link.jpg';
$this->assertEquals($expected, $webmention->createPhotoLink($twitterURL));
@ -120,14 +120,14 @@ class WebMentionTest extends TestCase
/** @test */
public function getReplyAttributeDefaultsToNull(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$this->assertNull($webmention->reply);
}
/** @test */
public function getReplyAttributeWithMf2WithoutHtmlReturnsNull(): void
{
$webmention = new WebMention();
$webmention = new WebMention;
$webmention->mf2 = json_encode(['no_html' => 'found_here']);
$this->assertNull($webmention->reply);
}