Commit 7ff1dbe9 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix: remove fediverse prefix to prevent migration error + load routes during podcast import 

refactor migration queries to use forge functions
parent 072b3ff6

app/Config/View.php

+4 −2
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ class View extends BaseView 
     *

     * Examples: { title|esc(js) } { created_on|date(Y-m-d)|esc(attr) }

     *

     * @var string[]

     * @var array<string, string>

     * @phpstan-var array<string, callable-string>

     */

    public $filters = [];
@@ -35,7 +36,8 @@ class View extends BaseView 
     * Parser Plugins provide a way to extend the functionality provided by the core Parser by creating aliases that

     * will be replaced with any callable. Can be single or tag pair.

     *

     * @var string[]

     * @var array<string, string>

     * @phpstan-var array<string, callable-string>

     */

    public $plugins = [];

app/Controllers/EpisodeController.php

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ class EpisodeController extends BaseController 
        $episodeComments = model(PostModel::class)

            ->whereIn('in_reply_to_id', function (BaseBuilder $builder): BaseBuilder {

                return $builder->select('id')

                    ->from(config('Fediverse')->tablesPrefix . 'posts')

                    ->from('fediverse_posts')

                    ->where('episode_id', $this->episode->id);

            })

            ->where('`published_at` <= UTC_TIMESTAMP()', null, false)

app/Database/Migrations/2021-05-30-101500_add_podcasts.php

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ class AddPodcasts extends BaseMigration 
        $this->forge->addUniqueKey('handle');

        $this->forge->addUniqueKey('guid');

        $this->forge->addUniqueKey('actor_id');

        $this->forge->addForeignKey('actor_id', config('Fediverse')->tablesPrefix . 'actors', 'id', '', 'CASCADE');

        $this->forge->addForeignKey('actor_id', 'fediverse_actors', 'id', '', 'CASCADE');

        $this->forge->addForeignKey('cover_id', 'media', 'id');

        $this->forge->addForeignKey('banner_id', 'media', 'id', '', 'SET NULL');

        $this->forge->addForeignKey('category_id', 'categories', 'id');

app/Database/Migrations/2021-06-05-170000_add_episodes.php

+3 −3
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ class AddEpisodes extends BaseMigration 


        // Add Full-Text Search index on title and description_markdown

        $prefix = $this->db->getPrefix();

        $createQuery = <<<CODE_SAMPLE

        $createQuery = <<<SQL

            ALTER TABLE {$prefix}episodes

            ADD FULLTEXT(title, description_markdown);

        CODE_SAMPLE;

            ADD FULLTEXT title (title, description_markdown);

        SQL;

        $this->db->query($createQuery);

    }

app/Database/Migrations/2021-08-12-150000_add_episode_comments.php

+1 −4
Original line number Diff line number Diff line
@@ -64,12 +64,9 @@ class AddEpisodeComments extends BaseMigration 
            ],

        ]);



        $fediverseTablesPrefix = config('Fediverse')

            ->tablesPrefix;



        $this->forge->addPrimaryKey('id');

        $this->forge->addForeignKey('episode_id', 'episodes', 'id', '', 'CASCADE');

        $this->forge->addForeignKey('actor_id', $fediverseTablesPrefix . 'actors', 'id', '', 'CASCADE');

        $this->forge->addForeignKey('actor_id', 'fediverse_actors', 'id', '', 'CASCADE');

        $this->forge->addForeignKey('created_by', 'users', 'id');

        $this->forge->createTable('episode_comments');

    }