Commit 9dd4c774 authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix: rename podcast name to podcast handle to clarify field usage 

- podcast name was too vague and didn't come clearly for users: handle is more relevant
- update
package.json dependencies and remove unnused packages

closes #126
parent 3a0a76d7

.devcontainer/devcontainer.json

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  "settings": {

    "terminal.integrated.defaultProfile.linux": "bash",

    "editor.formatOnSave": true,

    "editor.defaultFormatter": "esbenp.prettier-vscode",

    "[php]": {

      "editor.defaultFormatter": "bmewburn.vscode-intelephense-client",

      "editor.formatOnSave": false

app/Config/Routes.php

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ $routes->setAutoRoute(false); 
 * --------------------------------------------------------------------

 */



$routes->addPlaceholder('podcastName', '[a-zA-Z0-9\_]{1,32}');

$routes->addPlaceholder('podcastHandle', '[a-zA-Z0-9\_]{1,32}');

$routes->addPlaceholder('slug', '[a-zA-Z0-9\-]{1,191}');

$routes->addPlaceholder('base64', '[A-Za-z0-9\.\_]+\-{0,2}');

$routes->addPlaceholder('platformType', '\bpodcasting|\bsocial|\bfunding');
@@ -685,7 +685,7 @@ $routes->group(config('App')->authGateway, function ($routes): void { 
});



// Podcast's Public routes

$routes->group('@(:podcastName)', function ($routes): void {

$routes->group('@(:podcastHandle)', function ($routes): void {

    $routes->get('/', 'PodcastController::activity/$1', [

        'as' => 'podcast-activity',

    ]);
@@ -802,7 +802,7 @@ $routes->post('interact-as-actor', 'AuthController::attemptInteractAsActor', [ 
/**

 * Overwriting ActivityPub routes file

 */

$routes->group('@(:podcastName)', function ($routes): void {

$routes->group('@(:podcastHandle)', function ($routes): void {

    $routes->post('statuses/new', 'StatusController::attemptCreate/$1', [

        'as' => 'status-attempt-create',

        'filter' => 'permission:podcast-manage_publications',

app/Controllers/Admin/PodcastController.php

+2 −2
Original line number Diff line number Diff line
@@ -192,9 +192,9 @@ class PodcastController extends BaseController 
        }



        $podcast = new Podcast([

            'guid' => podcast_uuid(url_to('podcast_feed', $this->request->getPost('name'))),

            'guid' => podcast_uuid(url_to('podcast_feed', $this->request->getPost('handle'))),

            'title' => $this->request->getPost('title'),

            'name' => $this->request->getPost('name'),

            'handle' => $this->request->getPost('handle'),

            'description_markdown' => $this->request->getPost('description'),

            'image' => new Image($this->request->getFile('image')),

            'language_code' => $this->request->getPost('language'),

app/Controllers/Admin/PodcastImportController.php

+3 −3
Original line number Diff line number Diff line
@@ -131,14 +131,14 @@ class PodcastImportController extends BaseController 
            if (property_exists($nsPodcast, 'guid') && $nsPodcast->guid !== null) {

                $guid = (string) $nsPodcast->guid;

            } else {

                $guid = podcast_uuid(url_to('podcast_feed', $this->request->getPost('name')));

                $guid = podcast_uuid(url_to('podcast_feed', $this->request->getPost('handle')));

            }



            $podcast = new Podcast([

                'guid' => $guid,

                'name' => $this->request->getPost('name'),

                'handle' => $this->request->getPost('handle'),

                'imported_feed_url' => $this->request->getPost('imported_feed_url'),

                'new_feed_url' => url_to('podcast_feed', $this->request->getPost('name')),

                'new_feed_url' => url_to('podcast_feed', $this->request->getPost('handle')),

                'title' => (string) $feed->channel[0]->title,

                'description_markdown' => $converter->convert($channelDescriptionHtml),

                'description_html' => $channelDescriptionHtml,

app/Controllers/EpisodeController.php

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class EpisodeController extends BaseController 
        }



        if (

            ($podcast = (new PodcastModel())->getPodcastByName($params[0])) === null

            ($podcast = (new PodcastModel())->getPodcastByHandle($params[0])) === null

        ) {

            throw PageNotFoundException::forPageNotFound();

        }