mirror of
https://github.com/ad-aures/castopod.git
synced 2026-04-14 12:07:46 +02:00
feat: set min PHP version to 8.4
update CI4 to 4.6.0 + use codeigniter-vite and vite-plugin-codeigniter to load assets
This commit is contained in:
parent
0e4e301b81
commit
94cea0ce91
397 changed files with 4693 additions and 4302 deletions
|
|
@ -102,7 +102,7 @@ class EpisodeCommentModel extends UuidModel
|
|||
'episode-comment',
|
||||
esc($comment->actor->username),
|
||||
$comment->episode->slug,
|
||||
$comment->id
|
||||
$comment->id,
|
||||
);
|
||||
|
||||
$createActivity = new CreateActivity();
|
||||
|
|
@ -211,7 +211,7 @@ class EpisodeCommentModel extends UuidModel
|
|||
$postModel = new PostModel();
|
||||
$episodePostsRepliesBuilder = $postModel->builder();
|
||||
$episodePostsReplies = $episodePostsRepliesBuilder->select(
|
||||
'id, uri, episode_id, actor_id, in_reply_to_id, message, message_html, favourites_count as likes_count, replies_count, published_at as created_at, created_by, 1 as is_from_post'
|
||||
'id, uri, episode_id, actor_id, in_reply_to_id, message, message_html, favourites_count as likes_count, replies_count, published_at as created_at, created_by, 1 as is_from_post',
|
||||
)
|
||||
->whereIn('in_reply_to_id', static function (BaseBuilder $builder) use (&$episodeId): BaseBuilder {
|
||||
return $builder->select('id')
|
||||
|
|
@ -226,12 +226,12 @@ class EpisodeCommentModel extends UuidModel
|
|||
|
||||
/** @var BaseResult $allEpisodeComments */
|
||||
$allEpisodeComments = $this->db->query(
|
||||
$episodeComments . ' UNION ' . $episodePostsReplies . ' ORDER BY created_at ASC'
|
||||
$episodeComments . ' UNION ' . $episodePostsReplies . ' ORDER BY created_at ASC',
|
||||
);
|
||||
|
||||
return $this->convertUuidFieldsToStrings(
|
||||
$allEpisodeComments->getCustomResultObject($this->tempReturnType),
|
||||
$this->tempReturnType
|
||||
$this->tempReturnType,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue