Commit a76724a8 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(s3): add proxy to serve images from s3 to client 

refs #321
parent c5eb6ed5

.gitignore

+5 −1
Original line number Diff line number Diff line
@@ -143,16 +143,20 @@ node_modules 


# public folder

public/*

public/media/site

!public/media

!public/.htaccess

!public/favicon.ico

!public/icon*

!public/castopod-banner*

!public/castopod-avatar*

!public/index.php

!public/robots.txt

!public/.well-known

!public/.well-known/GDPR.yml



public/assets/*

!public/assets/index.html



# public media folder

!public/media/podcasts

!public/media/persons

app/Config/Fediverse.php

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ class Fediverse extends FediverseBaseConfig 
     */

    public string $noteObject = NoteObject::class;



    public string $defaultAvatarImagePath = 'media/castopod-avatar_thumbnail.webp';

    public string $defaultAvatarImagePath = 'castopod-avatar_thumbnail.webp';



    public string $defaultAvatarImageMimetype = 'image/webp';
@@ -52,7 +52,7 @@ class Fediverse extends FediverseBaseConfig 


        helper('media');



        $this->defaultCoverImagePath = media_path($defaultBannerPath . '_federation.' . $extension);

        $this->defaultCoverImagePath = $defaultBannerPath . '_federation.' . $extension;

        $this->defaultCoverImageMimetype = $defaultBanner['mimetype'];

    }

}

app/Controllers/CreditsController.php

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class CreditsController extends BaseController 
                            $personId => [

                                'full_name' => $credit->person->full_name,

                                'thumbnail_url' =>

                                    $credit->person->avatar->thumbnail_url,

                                    get_avatar_url($credit->person, 'thumbnail'),

                                'information_url' =>

                                    $credit->person->information_url,

                                'roles' => [
@@ -90,7 +90,7 @@ class CreditsController extends BaseController 
                    $credits[$personGroup]['persons'][$personId] = [

                        'full_name' => $credit->person->full_name,

                        'thumbnail_url' =>

                            $credit->person->avatar->thumbnail_url,

                            get_avatar_url($credit->person, 'thumbnail'),

                        'information_url' => $credit->person->information_url,

                        'roles' => [

                            $personRole => [

app/Controllers/FeedController.php

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ class FeedController extends Controller 
{

    public function index(string $podcastHandle): ResponseInterface

    {

        helper(['rss', 'premium_podcasts']);

        helper(['rss', 'premium_podcasts', 'misc']);



        $podcast = (new PodcastModel())->where('handle', $podcastHandle)

            ->first();

app/Controllers/WebmanifestController.php

+2 −4
Original line number Diff line number Diff line
@@ -61,14 +61,12 @@ class WebmanifestController extends Controller 
            'background_color' => self::THEME_COLORS[service('settings')->get('App.theme')]['background'],

            'icons' => [

                [

                    'src' => service('settings')

                        ->get('App.siteIcon')['192'],

                    'src' => get_site_icon_url('192'),

                    'type' => 'image/png',

                    'sizes' => '192x192',

                ],

                [

                    'src' => service('settings')

                        ->get('App.siteIcon')['512'],

                    'src' => get_site_icon_url('512'),

                    'type' => 'image/png',

                    'sizes' => '512x512',

                ],