Commit 209dfbd1 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(activitypub): set created_by to null for reblog if no user + update episode oembed data

parent 7aa37d24

app/Config/Embed.php

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class Embed extends BaseConfig 
     * Embeddable player config

     * --------------------------------------------------------------------------

     */

    public int $width = 600;

    public int $width = 485;



    public int $height = 144;

    public int $height = 112;

}

app/Config/Fediverse.php

+8 −0
Original line number Diff line number Diff line
@@ -10,10 +10,18 @@ declare(strict_types=1); 


namespace Config;



use App\Libraries\NoteObject;

use Modules\Fediverse\Config\Fediverse as FediverseBaseConfig;



class Fediverse extends FediverseBaseConfig

{

    /**

     * --------------------------------------------------------------------

     * ActivityPub Objects

     * --------------------------------------------------------------------

     */

    public string $noteObject = NoteObject::class;



    public function __construct()

    {

        parent::__construct();

app/Controllers/EpisodeController.php

+11 −9
Original line number Diff line number Diff line
@@ -205,14 +205,16 @@ class EpisodeController extends BaseController 
            'html' =>

                '<iframe src="' .

                $this->episode->embed_url .

                '" width="100%" height="144" frameborder="0" scrolling="no"></iframe>',

            'width' => 600,

            'height' => 144,

            'thumbnail_url' => $this->episode->cover->large_url,

                '" width="100%" height="' . config('Embed')->height . '" frameborder="0" scrolling="no"></iframe>',

            'width' => config('Embed')

                ->width,

            'height' => config('Embed')

                ->height,

            'thumbnail_url' => $this->episode->cover->og_url,

            'thumbnail_width' => config('Images')

                ->podcastCoverSizes['large']['width'],

                ->podcastCoverSizes['og']['width'],

            'thumbnail_height' => config('Images')

                ->podcastCoverSizes['large']['height'],

                ->podcastCoverSizes['og']['height'],

        ]);

    }
@@ -227,9 +229,9 @@ class EpisodeController extends BaseController 
        $oembed->addChild('provider_url', $this->podcast->link);

        $oembed->addChild('author_name', $this->podcast->title);

        $oembed->addChild('author_url', $this->podcast->link);

        $oembed->addChild('thumbnail', $this->episode->cover->large_url);

        $oembed->addChild('thumbnail_width', (string) config('Images')->podcastCoverSizes['large']['width']);

        $oembed->addChild('thumbnail_height', (string) config('Images')->podcastCoverSizes['large']['height']);

        $oembed->addChild('thumbnail', $this->episode->cover->og_url);

        $oembed->addChild('thumbnail_width', (string) config('Images')->podcastCoverSizes['og']['width']);

        $oembed->addChild('thumbnail_height', (string) config('Images')->podcastCoverSizes['og']['height']);

        $oembed->addChild(

            'html',

            htmlentities(

app/Libraries/NoteObject.php

+1 −6
Original line number Diff line number Diff line
@@ -24,12 +24,7 @@ class NoteObject extends FediverseNoteObject 


        if ($post->episode_id) {

            $this->content =

                '<a href="' .

                $post->episode->link .

                '" target="_blank" rel="noopener noreferrer">' .

                $post->episode->title .

                '</a><br/>' .

                $post->message_html;

                '<a href="' . $post->episode->link . '">' . $post->episode->title . '</a><br/>' . $post->message_html;

        }

    }

}

modules/Fediverse/Config/Fediverse.php

+2 −2
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ class Fediverse extends BaseConfig 
     * Default avatar and cover images

     * --------------------------------------------------------------------

     */

    public string $defaultAvatarImagePath = 'media/castopod-avatar_fediveration.jpg';

    public string $defaultAvatarImagePath = 'media/avatar-default.jpg';



    public string $defaultAvatarImageMimetype = 'image/jpeg';



    public string $defaultCoverImagePath = 'media/castopod-banner-pine_fediveration.jpg';

    public string $defaultCoverImagePath = 'media/banner-default.jpg';



    public string $defaultCoverImageMimetype = 'image/jpeg';