UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 16:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4358 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-05-07 01:43:36 -06:00 committed by GitHub
commit 56f64ad5f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -3675,7 +3675,8 @@ class ApiV1Controller extends Controller
->filter(function($post) { ->filter(function($post) {
return $post && isset($post['id']); return $post && isset($post['id']);
}) })
->take(3); ->take(3)
->values();
$profile['recent_posts'] = $ids; $profile['recent_posts'] = $ids;
return $profile; return $profile;
}) })

4
app/Services/MediaStorageService.php
View file

@ -77,7 +77,9 @@ class MediaStorageService {
protected function cloudStore($media) protected function cloudStore($media)
{ {
if($media->remote_media == true) { if($media->remote_media == true) {
(new self())->remoteToCloud($media); if(config('media.storage.remote.cloud')) {
(new self())->remoteToCloud($media);
}
} else { } else {
(new self())->localToCloud($media); (new self())->localToCloud($media);
} }

15
config/media.php
View file

@ -6,4 +6,19 @@ return [
'exif' => [ 'exif' => [
'database' => env('MEDIA_EXIF_DATABASE', false), 'database' => env('MEDIA_EXIF_DATABASE', false),
], ],
'storage' => [
'remote' => [
/*
|--------------------------------------------------------------------------
| Store remote media on cloud/S3
|--------------------------------------------------------------------------
|
| Set this to cache remote media on cloud/S3 filesystem drivers.
| Disabled by default.
|
*/
'cloud' => env('MEDIA_REMOTE_STORE_CLOUD', false)
],
]
]; ];