bitPickups/ad-aures_castoPod
1
0
Fork 0
mirror of https://github.com/ad-aures/castopod.git synced 2026-04-14 12:07:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(activity-pub): get database records using new model instances

Browse source 
update types and some remap logic
This commit is contained in:
Yassine Doghri 2021-06-09 12:40:22 +00:00
commit 92536ddb38
No known key found for this signature in database
GPG key ID: 3E7F89498B960C9F
56 changed files with 203 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Controllers/NoteController.php
View file

@ -39,8 +39,12 @@ class NoteController extends ActivityPubNoteController
public function _remap(string $method, string ...$params): mixed
{
if (count($params) < 2) {
throw PageNotFoundException::forPageNotFound();
}
if (
($this->podcast = (new PodcastModel())->getPodcastByName($params[0],)) === null
($this->podcast = (new PodcastModel())->getPodcastByName($params[0])) === null
) {
throw PageNotFoundException::forPageNotFound();
}
@ -48,11 +52,13 @@ class NoteController extends ActivityPubNoteController
$this->actor = $this->podcast->actor;
if (
count($params) > 1 &&
! ($this->note = (new NoteModel())->getNoteById($params[1]))
($note = (new NoteModel())->getNoteById($params[1])) === null
) {
throw PageNotFoundException::forPageNotFound();
}
$this->note = $note;
unset($params[0]);
unset($params[1]);
@ -125,7 +131,7 @@ class NoteController extends ActivityPubNoteController
if (
$episodeUri &&
($params = extract_params_from_episode_uri(new URI($episodeUri))) &&
($episode = (new EpisodeModel())->getEpisodeBySlug($params['podcastName'], $params['episodeSlug'],))
($episode = (new EpisodeModel())->getEpisodeBySlug($params['podcastName'], $params['episodeSlug']))
) {
$newNote->episode_id = $episode->id;
}
@ -135,7 +141,7 @@ class NoteController extends ActivityPubNoteController
$noteModel = new NoteModel();
if (
! $noteModel
->addNote($newNote, ! (bool) $newNote->episode_id, true,)
->addNote($newNote, ! (bool) $newNote->episode_id, true)
) {
return redirect()
->back()