rdelaage
/
castopod
mirror of https://code.castopod.org/adaures/castopod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci: fix lint and formatting issues

This commit is contained in:
Yassine Doghri 2023-02-22 16:29:45 +00:00
parent 34777598dd
commit 84a6447fd4
94 changed files with 987 additions and 1104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.phpunit.cache/test-results
View File

@ -1 +1 @@
{"version":1,"defects":[],"times":{"Tests\\Database\\ExampleDatabaseTest::testModelFindAll":0.003,"Tests\\Database\\ExampleDatabaseTest::testSoftDeleteLeavesRow":0.004,"modules\\Api\\Rest\\V1\\PodcastTest::testList":0.033,"modules\\Api\\Rest\\V1\\PodcastTest::testView":0.004,"modules\\Api\\Rest\\V1\\PodcastTest::testViewNotFound":0.01,"modules\\Api\\Rest\\V1\\PodcastTest::testListEmpty":4.313,"Tests\\Session\\ExampleSessionTest::testSessionSimple":0,"HealthTest::testIsDefinedAppPath":0,"HealthTest::testBaseUrlHasBeenSet":0.005}}
{"version":1,"defects":[],"times":{"Tests\\Database\\ExampleDatabaseTest::testModelFindAll":0.002,"Tests\\Database\\ExampleDatabaseTest::testSoftDeleteLeavesRow":0.002,"modules\\Api\\Rest\\V1\\PodcastTest::testList":0.008,"modules\\Api\\Rest\\V1\\PodcastTest::testView":0.003,"modules\\Api\\Rest\\V1\\PodcastTest::testViewNotFound":0.002,"modules\\Api\\Rest\\V1\\PodcastTest::testListEmpty":0.633,"Tests\\Session\\ExampleSessionTest::testSessionSimple":0,"HealthTest::testIsDefinedAppPath":0,"HealthTest::testBaseUrlHasBeenSet":0.001}}

3
app/Config/Database.php
View File

@ -49,8 +49,6 @@ class Database extends Config
/**
* This database connection is used when running PHPUnit database tests.
*
* @noRector StringClassNameToClassConstantRector
*
* @var array<string, mixed>
*/
public array $tests = [
@ -84,7 +82,6 @@ class Database extends Config
// Ensure that we always set the database group to 'tests' if
// we are currently running an automated test suite, so that
// we don't overwrite live data on accident.
/** @noRector RemoveAlwaysTrueIfConditionRector */
if (ENVIRONMENT === 'testing') {
$this->defaultGroup = 'tests';
}

3
app/Config/Events.php
View File

@ -7,6 +7,7 @@ namespace Config;
use App\Entities\Actor;
use App\Entities\Post;
use App\Models\EpisodeModel;
use CodeIgniter\Debug\Toolbar\Collectors\Database;
use CodeIgniter\Events\Events;
use CodeIgniter\Exceptions\FrameworkException;
@ -47,7 +48,7 @@ Events::on('pre_system', static function () {
* If you delete, they will no longer be collected.
*/
if (CI_DEBUG && ! is_cli()) {
Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
Events::on('DBQuery', Database::class . '::collect');
Services::toolbar()->respond();
}
});

2
app/Config/Pager.php
View File

@ -21,8 +21,6 @@ class Pager extends BaseConfig
* and the desired group as $pagerGroup;
*
* @var array<string, string>
*
* @noRector Rector\Php55\Rector\String_\StringClassNameToClassConstantRector
*/
public $templates = [
'default_full' => 'App\Views\pager\default_full',

4
app/Config/Services.php
View File

@ -27,8 +27,6 @@ class Services extends BaseService
/**
* The Router class uses a RouteCollection's array of routes, and determines the correct Controller and Method to
* execute.
*
* @noRector PHPStan\Reflection\MissingMethodFromReflectionException
*/
public static function router(
?RouteCollectionInterface $routes = null,
@ -48,8 +46,6 @@ class Services extends BaseService
/**
* The Negotiate class provides the content negotiation features for working the request to determine correct
* language, encoding, charset, and more.
*
* @noRector PHPStan\Reflection\MissingMethodFromReflectionException
*/
public static function negotiator(?RequestInterface $request = null, bool $getShared = true): Negotiate
{

3
app/Controllers/ColorsController.php
View File

@ -15,9 +15,6 @@ use CodeIgniter\HTTP\Response;
class ColorsController extends Controller
{
/**
* @noRector ReturnTypeDeclarationRector
*/
public function index(): Response
{
$cacheName = 'colors.css';

6
app/Controllers/EpisodeCommentController.php
View File

@ -120,9 +120,6 @@ class EpisodeCommentController extends BaseController
return $cachedView;
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function commentObject(): Response
{
$commentObject = new CommentObject($this->comment);
@ -132,9 +129,6 @@ class EpisodeCommentController extends BaseController
->setBody($commentObject->toJSON());
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function replies(): Response
{
/**

6
app/Controllers/EpisodeController.php
View File

@ -274,9 +274,6 @@ class EpisodeController extends BaseController
return $this->response->setXML($oembed);
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function episodeObject(): Response
{
$podcastObject = new PodcastEpisode($this->episode);
@ -286,9 +283,6 @@ class EpisodeController extends BaseController
->setBody($podcastObject->toJSON());
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function comments(): Response
{
/**

6
app/Controllers/PodcastController.php
View File

@ -47,9 +47,6 @@ class PodcastController extends BaseController
return $this->{$method}(...$params);
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function podcastActor(): Response
{
$podcastActor = new PodcastActor($this->podcast);
@ -285,9 +282,6 @@ class PodcastController extends BaseController
return $cachedView;
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function episodeCollection(): Response
{
if ($this->podcast->type === 'serial') {

2
app/Controllers/PostController.php
View File

@ -45,7 +45,7 @@ class PostController extends FediversePostController
public function _remap(string $method, string ...$params): mixed
{
if (
($podcast = (new PodcastModel())->getPodcastByHandle($params[0],)) === null
($podcast = (new PodcastModel())->getPodcastByHandle($params[0])) === null
) {
throw PageNotFoundException::forPageNotFound();
}

3
app/Entities/Category.php
View File

@ -36,9 +36,6 @@ class Category extends Entity
'google_category' => 'string',
];
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getParent(): ?self
{
if ($this->parent_id === null) {

6
app/Entities/Credit.php
View File

@ -92,9 +92,6 @@ class Credit extends Entity
return $this->episode;
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getGroupLabel(): string
{
if ($this->person_group === null) {
@ -104,9 +101,6 @@ class Credit extends Entity
return lang("PersonsTaxonomy.persons.{$this->person_group}.label");
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getRoleLabel(): string
{
if ($this->person_group === '') {

2
app/Entities/Episode.php
View File

@ -450,7 +450,7 @@ class Episode extends Entity
public function getEmbedUrl(string $theme = null): string
{
return $theme
? url_to('embed-theme', esc($this->getPodcast()->handle), esc($this->attributes['slug']), $theme,)
? url_to('embed-theme', esc($this->getPodcast()->handle), esc($this->attributes['slug']), $theme)
: url_to('embed', esc($this->getPodcast()->handle), esc($this->attributes['slug']));
}

5
app/Entities/EpisodeComment.php
View File

@ -87,8 +87,6 @@ class EpisodeComment extends UuidEntity
/**
* Returns the comment's actor
*
* @noRector ReturnTypeDeclarationRector
*/
public function getActor(): ?Actor
{
@ -125,9 +123,6 @@ class EpisodeComment extends UuidEntity
return $this->getReplies() !== [];
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getReplyToComment(): ?self
{
if ($this->in_reply_to_id === null) {

3
app/Entities/Podcast.php
View File

@ -215,9 +215,6 @@ class Podcast extends Entity
return '@' . $this->handle;
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getActor(): ?Actor
{
if ($this->actor_id === 0) {

2
app/Helpers/form_helper.php
View File

@ -61,7 +61,7 @@ if (! function_exists('parse_form_attributes')) {
}
}
if (! empty($attributes)) {
if ($attributes !== []) {
$default = array_merge($default, $attributes);
}
}

1
app/Helpers/misc_helper.php
View File

@ -239,7 +239,6 @@ if (! function_exists('generate_random_salt')) {
if (! function_exists('file_upload_max_size')) {
/**
* Returns a file size limit in bytes based on the PHP upload_max_filesize and post_max_size Adapted from:
* https://stackoverflow.com/a/25370978

10
app/Helpers/rss_helper.php
View File

@ -125,7 +125,7 @@ if (! function_exists('get_rss_feed')) {
$castopodSocialElement->addAttribute('accountUrl', $podcast->link);
foreach ($podcast->social_platforms as $socialPlatform) {
$socialElement = $channel->addChild('social', null, $podcastNamespace,);
$socialElement = $channel->addChild('social', null, $podcastNamespace);
$socialElement->addAttribute('priority', '2');
$socialElement->addAttribute('platform', $socialPlatform->slug);
@ -202,7 +202,7 @@ if (! function_exists('get_rss_feed')) {
foreach ($podcast->persons as $person) {
foreach ($person->roles as $role) {
$personElement = $channel->addChild('person', $person->full_name, $podcastNamespace,);
$personElement = $channel->addChild('person', $person->full_name, $podcastNamespace);
$personElement->addAttribute('img', $person->avatar->medium_url);
@ -294,7 +294,7 @@ if (! function_exists('get_rss_feed')) {
$item->addChild('guid', $episode->guid);
$item->addChild('pubDate', $episode->published_at->format(DATE_RFC1123));
if ($episode->location !== null) {
$locationElement = $item->addChild('location', $episode->location->name, $podcastNamespace,);
$locationElement = $item->addChild('location', $episode->location->name, $podcastNamespace);
if ($episode->location->geo !== null) {
$locationElement->addAttribute('geo', $episode->location->geo);
}
@ -376,11 +376,11 @@ if (! function_exists('get_rss_feed')) {
foreach ($episode->persons as $person) {
foreach ($person->roles as $role) {
$personElement = $item->addChild('person', esc($person->full_name), $podcastNamespace,);
$personElement = $item->addChild('person', esc($person->full_name), $podcastNamespace);
$personElement->addAttribute(
'role',
esc(lang("PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label", [], 'en'),),
esc(lang("PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label", [], 'en')),
);
$personElement->addAttribute(

1
app/Libraries/Router.php
View File

@ -30,7 +30,6 @@ class Router extends CodeIgniterRouter
*/
protected function checkRoutes(string $uri): bool
{
/** @noRector RemoveExtraParametersRector */
$routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
// Don't waste any time

1
app/Libraries/TranscriptParser.php
View File

@ -86,7 +86,6 @@ class TranscriptParser
}
break;
}
}

1
app/Libraries/Vite/Vite.php
View File

@ -70,7 +70,6 @@ class Vite
if (array_key_exists('imports', $manifestElement)) {
foreach ($manifestElement['imports'] as $importPath) {
if (array_key_exists($importPath, $this->manifestData)) {
// import css dependencies if any
if (array_key_exists('css', $this->manifestData[$importPath])) {
foreach ($this->manifestData[$importPath]['css'] as $cssFile) {

3
app/Models/ClipModel.php
View File

@ -53,9 +53,6 @@ class ClipModel extends Model
'job_ended_at',
];
/**
* @noRector
*/
protected $returnType = BaseClip::class;
/**

2
app/Models/EpisodeCommentModel.php
View File

@ -195,8 +195,6 @@ class EpisodeCommentModel extends UuidModel
* Retrieves all published posts for a given episode ordered by publication date
*
* @return EpisodeComment[]
*
* @noRector ReturnTypeDeclarationRector
*/
public function getEpisodeComments(int $episodeId): array
{

7
app/Models/MediaModel.php
View File

@ -28,9 +28,6 @@ class MediaModel extends Model
*/
protected $table = 'media';
/**
* @noRector
*/
protected $returnType = Document::class;
/**
@ -135,8 +132,6 @@ class MediaModel extends Model
/**
* @param Document|Audio|Video|Image|Transcript|Chapters $media
*
* @noRector ReturnTypeDeclarationRector
*/
public function saveMedia(object $media): int | false
{
@ -150,8 +145,6 @@ class MediaModel extends Model
/**
* @param Document|Audio|Video|Image|Transcript|Chapters $media
*
* @noRector ReturnTypeDeclarationRector
*/
public function updateMedia(object $media): bool
{

4
app/Views/pager/default_full.php
View File

@ -34,9 +34,7 @@ $pager->setSurroundCount(2);
<?= $link['title'] ?>
</span>
<?php else: ?>
<a href="<?= $link[
'uri'
] ?>" class="block px-4 py-2 rounded-full text-skin-muted hover:bg-highlight">
<a href="<?= $link['uri'] ?>" class="block px-4 py-2 rounded-full text-skin-muted hover:bg-highlight">
<?= $link['title'] ?>
</a>
<?php endif; ?>

2
modules/Admin/Controllers/PodcastPlatformController.php
View File

@ -89,7 +89,7 @@ class PodcastPlatformController extends BaseController
array_key_exists('visible', $podcastPlatform) &&
$podcastPlatform['visible'] === 'yes',
'is_on_embed' =>
array_key_exists('on_embed', $podcastPlatform,) && $podcastPlatform['on_embed'] === 'yes',
array_key_exists('on_embed', $podcastPlatform) && $podcastPlatform['on_embed'] === 'yes',
];
}

1
modules/Admin/Controllers/SchedulerController.php
View File

@ -47,7 +47,6 @@ class SchedulerController extends Controller
// Loop through clips to generate them
foreach ($scheduledClips as $scheduledClip) {
try {
// set clip to pending
(new ClipModel())
->update($scheduledClip->id, [

2
modules/Admin/Controllers/SoundbiteController.php
View File

@ -117,7 +117,7 @@ class SoundbiteController extends BaseController
$newSoundbite = new Soundbite([
'title' => $this->request->getPost('title'),
'start_time' => (float) $this->request->getPost('start_time'),
'duration' => (float) $this->request->getPost('duration',),
'duration' => (float) $this->request->getPost('duration'),
'type' => 'audio',
'status' => '',
'podcast_id' => $this->podcast->id,

2
modules/Admin/Controllers/VideoClipsController.php
View File

@ -165,7 +165,7 @@ class VideoClipsController extends BaseController
$videoClip = new VideoClip([
'title' => $this->request->getPost('title'),
'start_time' => (float) $this->request->getPost('start_time'),
'duration' => (float) $this->request->getPost('duration',),
'duration' => (float) $this->request->getPost('duration'),
'theme' => $theme,
'format' => $this->request->getPost('format'),
'type' => 'video',

4
modules/Analytics/Config/Routes.php
View File

@ -57,8 +57,8 @@ $routes->group('', [
/**
* @deprecated Route for podcast audio file analytics (/audio/pack(podcast_id,episode_id,bytes_threshold,filesize,duration,date)/podcast_folder/filename.mp3)
*/
$routes->head('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2',);
$routes->get('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2',);
$routes->head('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2');
$routes->get('audio/(:base64)/(:any)', 'EpisodeAnalyticsController::hit/$1/$2');
});
// Show the Unknown UserAgents

3
modules/Analytics/Entities/AnalyticsPodcastsByCountry.php
View File

@ -39,9 +39,6 @@ class AnalyticsPodcastsByCountry extends Entity
'hits' => 'integer',
];
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getLabels(): string
{
return lang('Countries.' . $this->attributes['labels']);

3
modules/Analytics/Entities/AnalyticsPodcastsByRegion.php
View File

@ -44,9 +44,6 @@ class AnalyticsPodcastsByRegion extends Entity
'hits' => 'integer',
];
/**
* @noRector ReturnTypeDeclarationRector
*/
public function getCountryCode(): string
{
return lang('Countries.' . $this->attributes['country_code']);

3
modules/Fediverse/Controllers/ActivityPubController.php
View File

@ -15,9 +15,6 @@ use CodeIgniter\HTTP\Response;
class ActivityPubController extends Controller
{
/**
* @noRector ReturnTypeDeclarationRector
*/
public function preflight(): Response
{
return $this->response->setHeader('Access-Control-Allow-Origin', '*') // for allowing any domain, insecure

14
modules/Fediverse/Controllers/ActorController.php
View File

@ -56,9 +56,6 @@ class ActorController extends Controller
return $this->{$method}(...$params);
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function index(): ResponseInterface
{
$actorObjectClass = $this->config->actorObject;
@ -71,8 +68,6 @@ class ActorController extends Controller
/**
* Handles incoming requests from fediverse servers
*
* @noRector ReturnTypeDeclarationRector
*/
public function inbox(): ResponseInterface
{
@ -264,9 +259,6 @@ class ActorController extends Controller
}
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function outbox(): ResponseInterface
{
// get published activities by publication date
@ -297,9 +289,6 @@ class ActorController extends Controller
->setBody($collection->toJSON());
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function followers(): ResponseInterface
{
$tablesPrefix = config('Fediverse')
@ -386,9 +375,6 @@ class ActorController extends Controller
);
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function activity(string $activityId): ResponseInterface
{
if (

6
modules/Fediverse/Controllers/PostController.php
View File

@ -53,9 +53,6 @@ class PostController extends Controller
return $this->{$method}(...$params);
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function index(): Response
{
$noteObjectClass = $this->config->noteObject;
@ -66,9 +63,6 @@ class PostController extends Controller
->setBody($noteObject->toJSON());
}
/**
* @noRector ReturnTypeDeclarationRector
*/
public function replies(): Response
{
/**

2
modules/Fediverse/Models/PostModel.php
View File

@ -539,7 +539,7 @@ class PostModel extends BaseUuidModel
->first();
$announceActivity = new AnnounceActivity($reblogPost);
$announceActivity->set('id', url_to('activity', $reblogPost->actor->username, $activity->id),);
$announceActivity->set('id', url_to('activity', $reblogPost->actor->username, $activity->id));
$undoActivity
->set('actor', $reblogPost->actor->uri)

8
modules/Install/Controllers/InstallController.php
View File

@ -115,19 +115,13 @@ class InstallController extends Controller
}
try {
$db = db_connect();
// Check if instance owner has been created, meaning install was completed
if (
$db->tableExists('users') &&
(new UserModel())->where('is_owner', true)
if ((new UserModel())->where('is_owner', true)
->first() !== null
) {
// if so, show a 404 page
throw PageNotFoundException::forPageNotFound();
}
/** @noRector */
} catch (DatabaseException) {
// Could not connect to the database
// show database config view to fix value

3
modules/PremiumPodcasts/Models/SubscriptionModel.php
View File

@ -42,9 +42,6 @@ class SubscriptionModel extends Model
'updated_by',
];
/**
* @noRector
*/
protected $returnType = Subscription::class;
/**

1
modules/WebSub/Controllers/WebSubController.php
View File

@ -20,7 +20,6 @@ class WebSubController extends Controller
{
public function publish(): void
{
/** @noRector RemoveAlwaysTrueIfConditionRector */
if (ENVIRONMENT !== 'production') {
return;
}

7
tests/modules/Api/Rest/V1/PodcastTest.php
View File

@ -46,12 +46,9 @@ class PodcastTest extends CIUnitTestCase
private readonly string $podcastApiUrl;
/**
* @param array<mixed> $data
*/
public function __construct(?string $name = null, array $data = [], $dataName = '')
public function __construct(?string $name = null)
{
parent::__construct($name, $data, $dataName);
parent::__construct($name);
$this->podcast = FakeSinglePodcastApiSeeder::podcast();
$this->podcast['created_at'] = [];
$this->podcast['updated_at'] = [];

2
themes/cp_admin/episode/create.php
View File

@ -32,7 +32,7 @@
name="cover"
label="<?= lang('Episode.form.cover') ?>"
hint="<?= lang('Episode.form.cover_hint') ?>"
helper="<?= lang('Episode.form.cover_size_hint', ) ?>"
helper="<?= lang('Episode.form.cover_size_hint') ?>"
type="file"
accept=".jpg,.jpeg,.png" />

4
themes/cp_admin/podcast/create.php
View File

@ -111,11 +111,11 @@
<Forms.RadioButton
value="clean"
name="parental_advisory"
isChecked="false" ><?= lang('Podcast.form.parental_advisory.clean', ) ?></Forms.RadioButton>
isChecked="false" ><?= lang('Podcast.form.parental_advisory.clean') ?></Forms.RadioButton>
<Forms.RadioButton
value="explicit"
name="parental_advisory"
isChecked="false" ><?= lang('Podcast.form.parental_advisory.explicit', ) ?></Forms.RadioButton>
isChecked="false" ><?= lang('Podcast.form.parental_advisory.explicit') ?></Forms.RadioButton>
</div>
</fieldset>
</Forms.Section>

4
themes/cp_admin/podcast/edit.php
View File

@ -128,11 +128,11 @@
<Forms.RadioButton
value="clean"
name="parental_advisory"
isChecked="<?= $podcast->parental_advisory === 'clean' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.clean', ) ?></Forms.RadioButton>
isChecked="<?= $podcast->parental_advisory === 'clean' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.clean') ?></Forms.RadioButton>
<Forms.RadioButton
value="explicit"
name="parental_advisory"
isChecked="<?= $podcast->parental_advisory === 'explicit' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.explicit', ) ?></Forms.RadioButton>
isChecked="<?= $podcast->parental_advisory === 'explicit' ? 'true' : 'false' ?>" ><?= lang('Podcast.form.parental_advisory.explicit') ?></Forms.RadioButton>
</div>
</fieldset>
</Forms.Section>

2
themes/cp_app/_admin_navbar.php
View File

@ -7,7 +7,7 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
<a href="<?= route_to('home') ?>" class="inline-flex items-center h-full px-2 border-r border-navigation focus:ring-inset focus:ring-accent">
<?= svg('castopod-logo-base', 'h-6') ?>
</a>
<a href="<?= route_to('admin', ) ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
<a href="<?= route_to('admin') ?>" class="inline-flex items-center h-full px-6 text-sm font-semibold hover:underline focus:ring-inset focus:ring-accent">
<?= lang('Navigation.go_to_admin') ?>
<?= icon('external-link', 'ml-1 opacity-60') ?>
</a>

3
themes/cp_app/episode/_layout.php
View File

@ -98,7 +98,8 @@
<?php $i = 0; ?>
<?php foreach ($episode->persons as $person): ?>
<img src="<?= $person->avatar->thumbnail_url ?>" alt="<?= esc($person->full_name) ?>" class="object-cover w-8 h-8 -ml-4 border-2 rounded-full aspect-square border-background-header last:ml-0" loading="lazy" />
<?php $i++; if ($i === 3) {
<?php $i++;
if ($i === 3) {
break;
}?>
<?php endforeach; ?>

3
themes/cp_app/podcast/about.php
View File

@ -22,7 +22,8 @@
<?php $i = 0; ?>
<?php foreach ($podcast->persons as $person): ?>
<img src="<?= $person->avatar->thumbnail_url ?>" alt="<?= esc($person->full_name) ?>" class="object-cover w-8 -ml-4 border-2 rounded-full aspect-square bg-header border-background-base last:ml-0" loading="lazy" />
<?php $i++; if ($i === 3) {
<?php $i++;
if ($i === 3) {
break;
}?>
<?php endforeach; ?>

24
themes/cp_app/post/_partials/reblog.php
View File

@ -2,29 +2,17 @@
<p class="inline-flex px-6 pt-4 text-xs text-skin-muted"><?= icon(
'repeat',
'text-lg mr-2 opacity-40',
) .
lang('Post.actor_shared', [
) . lang('Post.actor_shared', [
'actor' => esc($post->actor->display_name),
]) ?></p>
<header class="flex px-6 py-4 gap-x-2">
<img src="<?= $post->actor
->avatar_image_url ?>" alt="<?= esc($post->actor->display_name) ?>" class="w-10 h-10 rounded-full aspect-square" loading="lazy" />
<img src="<?= $post->actor->avatar_image_url ?>" alt="<?= esc($post->actor->display_name) ?>" class="w-10 h-10 rounded-full aspect-square" loading="lazy" />
<div class="flex flex-col min-w-0">
<a href="<?= $post->actor
->uri ?>" class="flex items-baseline hover:underline" <?= $post
->actor->is_local
? ''
: 'target="_blank" rel="noopener noreferrer"' ?>>
<span class="mr-2 font-semibold truncate"><?= esc($post->actor
->display_name) ?></span>
<span class="text-sm truncate text-skin-muted">@<?= esc($post->actor
->username) .
($post->actor->is_local
? ''
: '@' . $post->actor->domain) ?></span>
<a href="<?= $post->actor->uri ?>" class="flex items-baseline hover:underline" <?= $post->actor->is_local ? '' : 'target="_blank" rel="noopener noreferrer"' ?>>
<span class="mr-2 font-semibold truncate"><?= esc($post->actor->display_name) ?></span>
<span class="text-sm truncate text-skin-muted">@<?= esc($post->actor->username) . ($post->actor->is_local ? '' : '@' . $post->actor->domain) ?></span>
</a>
<a href="<?= route_to('post', esc($podcast->handle), $post->id) ?>"
class="text-xs text-skin-muted">
<a href="<?= route_to('post', esc($podcast->handle), $post->id) ?>" class="text-xs text-skin-muted">
<?= relative_time($post->published_at) ?>
</a>
</div>