From 92b0f42be033cd9284bb2380a6de6c0b37cee17b Mon Sep 17 00:00:00 2001 From: Silberengel Date: Sat, 25 Apr 2026 20:58:02 +0200 Subject: [PATCH] more reformatting --- assets/styles/layout.css | 92 +++++++++++++++++++ src/Controller/FeaturedAuthorsController.php | 22 +---- src/Controller/SeoController.php | 2 +- src/Dto/FeaturedArticleCard.php | 11 +++ src/Entity/Article.php | 8 ++ src/Factory/ArticleFactory.php | 42 ++++++++- src/Repository/ArticleRepository.php | 4 +- src/Repository/FeaturedAuthorRepository.php | 19 ++++ src/Service/FeaturedAuthorListedRows.php | 45 +++++++++ .../Components/Organisms/FeaturedList.php | 4 +- src/Twig/SidebarFeaturedAuthorsExtension.php | 27 ++++++ templates/base.html.twig | 4 + templates/components/Molecules/Card.html.twig | 2 +- .../Organisms/FeaturedList.html.twig | 8 +- .../SidebarFeaturedAuthors.html.twig | 32 +++++++ templates/pages/article.html.twig | 10 +- translations/messages.en.yaml | 2 + 17 files changed, 297 insertions(+), 37 deletions(-) create mode 100644 src/Service/FeaturedAuthorListedRows.php create mode 100644 src/Twig/SidebarFeaturedAuthorsExtension.php create mode 100644 templates/components/Organisms/SidebarFeaturedAuthors.html.twig diff --git a/assets/styles/layout.css b/assets/styles/layout.css index d8c3a16..2054291 100644 --- a/assets/styles/layout.css +++ b/assets/styles/layout.css @@ -51,6 +51,98 @@ text-decoration: none; } +/* Left nav: featured authors (desktop only; same site logo as header when no Nostr picture) */ +.sidebar-featured-authors { + display: none; +} + +@media (min-width: 1025px) { + .sidebar-featured-authors { + display: block; + margin-top: 1.1rem; + padding-top: 0.9rem; + border-top: 1px solid var(--color-border); + } + + .layout > nav .sidebar-featured-authors a, + .layout > nav .sidebar-featured-authors a:hover { + color: inherit; + text-decoration: none; + } + + .sidebar-featured-authors__title { + margin: 0 0 0.55rem; + font-family: var(--font-family), sans-serif; + font-size: 0.68rem; + font-weight: 600; + letter-spacing: 0.07em; + text-transform: uppercase; + color: color-mix(in srgb, var(--color-text-mid) 72%, var(--color-bg) 28%); + line-height: 1.3; + } + + .sidebar-featured-authors__grid { + display: flex; + flex-wrap: wrap; + gap: 0.5rem 0.45rem; + align-content: flex-start; + list-style: none; + margin: 0; + padding: 0; + } + + .layout > nav .sidebar-featured-authors__item, + .sidebar-featured-authors__item { + margin: 0; + padding: 0; + list-style: none; + } + + .sidebar-featured-authors__link { + display: block; + border-radius: 50%; + line-height: 0; + } + + .sidebar-featured-authors__link:hover { + text-decoration: none; + } + + .sidebar-featured-authors__link:hover .sidebar-featured-authors__avatar { + box-shadow: 0 0 0 2px var(--color-secondary); + } + + .sidebar-featured-authors__link:focus-visible .sidebar-featured-authors__avatar, + .sidebar-featured-authors__link:focus-visible { + outline: 2px solid var(--color-focus-ring); + outline-offset: 2px; + } + + .sidebar-featured-authors__avatar { + display: block; + width: 40px; + height: 40px; + border-radius: 50%; + overflow: hidden; + background: var(--color-bg-light); + box-shadow: 0 0 0 1px var(--color-border); + } + + .sidebar-featured-authors__avatar img { + display: block; + width: 100%; + height: 100%; + object-fit: cover; + } + + .sidebar-featured-authors__avatar img[src*="favicon-96x96"] { + object-fit: contain; + object-position: center; + padding: 0.2rem; + box-sizing: border-box; + } +} + /* Only the app chrome in Header.html.twig (#site-header). A bare `header` rule also matched
and fixed it under the real bar, hiding it. */ #site-header { diff --git a/src/Controller/FeaturedAuthorsController.php b/src/Controller/FeaturedAuthorsController.php index 374cd80..2b7b2e3 100644 --- a/src/Controller/FeaturedAuthorsController.php +++ b/src/Controller/FeaturedAuthorsController.php @@ -5,8 +5,7 @@ declare(strict_types=1); namespace App\Controller; use App\Repository\FeaturedAuthorRepository; -use App\Service\CacheService; -use swentel\nostr\Key\Key; +use App\Service\FeaturedAuthorListedRows; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; use Symfony\Component\HttpFoundation\Request; @@ -22,11 +21,10 @@ final class FeaturedAuthorsController extends AbstractController public function index( Request $request, FeaturedAuthorRepository $featuredAuthorRepository, - CacheService $cacheService, + FeaturedAuthorListedRows $featuredAuthorListedRows, ParameterBagInterface $params, ): Response { $domain = trim((string) $params->get('nip05_domain')); - $keys = new Key(); $perPage = 25; $page = max(1, $request->query->getInt('page', 1)); $total = $featuredAuthorRepository->countListed(); @@ -35,21 +33,7 @@ final class FeaturedAuthorsController extends AbstractController $page = $lastPage; } $offset = ($page - 1) * $perPage; - $authors = []; - foreach ($featuredAuthorRepository->findListedOrderByLocalPartPaginated($perPage, $offset) as $fa) { - $npub = $keys->convertPublicKeyToBech32($fa->getPubkeyHex()); - $bundle = $cacheService->getMetadataBundle($npub); - $author = $bundle['content']; - $displayName = trim((string) ($author->display_name ?? $author->name ?? '')); - $picture = trim((string) ($author->picture ?? '')); - $authors[] = [ - 'npub' => $npub, - 'pubkey' => strtolower($fa->getPubkeyHex()), - 'display_name' => $displayName, - 'picture' => $picture, - 'local_part' => $fa->getLocalPart(), - ]; - } + $authors = $featuredAuthorListedRows->buildListedByLocalPartPage($perPage, $offset); return $this->render('pages/featured_authors.html.twig', [ 'authors' => $authors, diff --git a/src/Controller/SeoController.php b/src/Controller/SeoController.php index 334925a..69b885f 100644 --- a/src/Controller/SeoController.php +++ b/src/Controller/SeoController.php @@ -300,7 +300,7 @@ final class SeoController extends AbstractController $entryId = 'urn:web:'.$this->urlHostId($request) .':db-article:'.($dbId !== null && $dbId !== '' ? (string) $dbId : \spl_object_id($article)); - $pub = $article->getPublishedAt() ?? $article->getCreatedAt() ?? $tArticle; + $pub = $article->getDisplayDateTime() ?? $tArticle; $out = "\n "; $out .= "\n ".$this->xmlText($title).""; $out .= "\n xmlAttr($permalink)."\" rel=\"alternate\" type=\"text/html\"/>"; diff --git a/src/Dto/FeaturedArticleCard.php b/src/Dto/FeaturedArticleCard.php index 27ebad1..c520ad8 100644 --- a/src/Dto/FeaturedArticleCard.php +++ b/src/Dto/FeaturedArticleCard.php @@ -16,6 +16,7 @@ final readonly class FeaturedArticleCard private ?string $summary, private ?string $image, private ?\DateTimeImmutable $createdAt, + private ?\DateTimeImmutable $publishedAt, private ?string $pubkey, ) { } @@ -50,6 +51,16 @@ final readonly class FeaturedArticleCard return $this->createdAt; } + public function getPublishedAt(): ?\DateTimeImmutable + { + return $this->publishedAt; + } + + public function getDisplayAt(): ?\DateTimeImmutable + { + return $this->publishedAt ?? $this->createdAt; + } + public function getPubkey(): ?string { return $this->pubkey; diff --git a/src/Entity/Article.php b/src/Entity/Article.php index 1b522b8..bf29da1 100644 --- a/src/Entity/Article.php +++ b/src/Entity/Article.php @@ -227,6 +227,14 @@ class Article return $this; } + /** + * Prefer NIP-23 {@see publishedAt} for display/SEO; fall back to event {@see createdAt}. + */ + public function getDisplayDateTime(): ?\DateTimeImmutable + { + return $this->publishedAt ?? $this->createdAt; + } + public function getTopics() { return $this->topics; diff --git a/src/Factory/ArticleFactory.php b/src/Factory/ArticleFactory.php index 5c69126..0b41280 100644 --- a/src/Factory/ArticleFactory.php +++ b/src/Factory/ArticleFactory.php @@ -20,7 +20,11 @@ class ArticleFactory $entity = new Article(); $entity->setRaw($source); $entity->setEventId($source->id); - $entity->setCreatedAt(\DateTimeImmutable::createFromFormat('U', (string)$source->created_at)); + $created = $this->parseEventTimeValue($source->created_at ?? null); + if ($created === null) { + throw new InvalidArgumentException('Long-form event has invalid or missing created_at'); + } + $entity->setCreatedAt($created); $entity->setContent($source->content); $entity->setKind(KindsEnum::from($source->kind)); $entity->setPubkey($source->pubkey); @@ -44,7 +48,10 @@ class ArticleFactory $entity->setImage($tag[1]); break; case 'published_at': - $entity->setPublishedAt(\DateTimeImmutable::createFromFormat('U', (string)$tag[1])); + $parsed = $this->parseEventTimeValue($tag[1] ?? null); + if ($parsed !== null) { + $entity->setPublishedAt($parsed); + } break; case 't': $entity->addTopic($tag[1]); @@ -56,4 +63,35 @@ class ArticleFactory } return $entity; } + + /** + * NIP-23 times are usually Unix seconds; `published_at` may be ISO or other strings that make createFromFormat('U', …) return false. + */ + private function parseEventTimeValue(mixed $raw): ?\DateTimeImmutable + { + if (!\is_string($raw) && !\is_int($raw) && !\is_float($raw)) { + return null; + } + $s = trim((string) $raw); + if ($s === '') { + return null; + } + if (ctype_digit($s)) { + $sec = (int) $s; + if ($sec > 0) { + return (new \DateTimeImmutable('@'.$sec))->setTimezone(new \DateTimeZone('UTC')); + } + + return null; + } + $fromU = \DateTimeImmutable::createFromFormat('U', $s); + if ($fromU instanceof \DateTimeImmutable) { + return $fromU; + } + try { + return new \DateTimeImmutable($s); + } catch (\Exception) { + return null; + } + } } diff --git a/src/Repository/ArticleRepository.php b/src/Repository/ArticleRepository.php index dba0d01..3c23277 100644 --- a/src/Repository/ArticleRepository.php +++ b/src/Repository/ArticleRepository.php @@ -104,7 +104,7 @@ class ArticleRepository extends ServiceEntityRepository $conn = $this->getEntityManager()->getConnection(); $qb = $conn->createQueryBuilder(); $qb - ->select('a.id', 'a.slug', 'a.title', 'a.summary', 'a.image', 'a.created_at', 'a.pubkey') + ->select('a.id', 'a.slug', 'a.title', 'a.summary', 'a.image', 'a.created_at', 'a.published_at', 'a.pubkey') ->from('article', 'a') ->where($qb->expr()->in('a.slug', ':slugs')) ->setParameter('slugs', $slugs, ArrayParameterType::STRING) @@ -115,6 +115,7 @@ class ArticleRepository extends ServiceEntityRepository $out = []; foreach ($rows as $row) { $ca = $row['created_at'] ?? null; + $pa = $row['published_at'] ?? null; $out[] = new FeaturedArticleCard( isset($row['id']) ? (int) $row['id'] : null, isset($row['slug']) ? (string) $row['slug'] : null, @@ -122,6 +123,7 @@ class ArticleRepository extends ServiceEntityRepository isset($row['summary']) ? (string) $row['summary'] : null, isset($row['image']) ? (string) $row['image'] : null, $ca !== null && $ca !== '' ? new \DateTimeImmutable((string) $ca) : null, + $pa !== null && $pa !== '' ? new \DateTimeImmutable((string) $pa) : null, isset($row['pubkey']) ? (string) $row['pubkey'] : null, ); } diff --git a/src/Repository/FeaturedAuthorRepository.php b/src/Repository/FeaturedAuthorRepository.php index 99e362a..e135a9d 100644 --- a/src/Repository/FeaturedAuthorRepository.php +++ b/src/Repository/FeaturedAuthorRepository.php @@ -51,6 +51,25 @@ class FeaturedAuthorRepository extends ServiceEntityRepository ->getResult(); } + /** + * Listed authors who first appeared in a category index, most recently added first. + * {@see FeaturedAuthor::createdAt} is set when the row is created (sync discovered the pubkey in an `a` tag). + * + * @return list + */ + public function findListedMostRecentlyAdded(int $limit, int $offset = 0): array + { + return $this->createQueryBuilder('f') + ->where('f.isListed = :t') + ->setParameter('t', true) + ->orderBy('f.createdAt', 'DESC') + ->addOrderBy('f.id', 'DESC') + ->setFirstResult($offset) + ->setMaxResults($limit) + ->getQuery() + ->getResult(); + } + /** * @return list */ diff --git a/src/Service/FeaturedAuthorListedRows.php b/src/Service/FeaturedAuthorListedRows.php new file mode 100644 index 0000000..e0dade6 --- /dev/null +++ b/src/Service/FeaturedAuthorListedRows.php @@ -0,0 +1,45 @@ + + */ + public function buildListedByLocalPartPage(int $limit, int $offset = 0): array + { + $keys = new Key(); + $authors = []; + foreach ($this->featuredAuthorRepository->findListedOrderByLocalPartPaginated($limit, $offset) as $fa) { + $npub = $keys->convertPublicKeyToBech32($fa->getPubkeyHex()); + $bundle = $this->cacheService->getMetadataBundle($npub); + $author = $bundle['content']; + $displayName = trim((string) ($author->display_name ?? $author->name ?? '')); + $picture = trim((string) ($author->picture ?? '')); + $authors[] = [ + 'npub' => $npub, + 'pubkey' => strtolower($fa->getPubkeyHex()), + 'display_name' => $displayName, + 'picture' => $picture, + 'local_part' => $fa->getLocalPart(), + ]; + } + + return $authors; + } +} diff --git a/src/Twig/Components/Organisms/FeaturedList.php b/src/Twig/Components/Organisms/FeaturedList.php index cec04b9..558d694 100644 --- a/src/Twig/Components/Organisms/FeaturedList.php +++ b/src/Twig/Components/Organisms/FeaturedList.php @@ -94,8 +94,8 @@ final class FeaturedList private static function isNewer(FeaturedArticleCard $a, FeaturedArticleCard $b): bool { - $ca = $a->getCreatedAt(); - $cb = $b->getCreatedAt(); + $ca = $a->getDisplayAt(); + $cb = $b->getDisplayAt(); if ($ca === null) { return false; } diff --git a/src/Twig/SidebarFeaturedAuthorsExtension.php b/src/Twig/SidebarFeaturedAuthorsExtension.php new file mode 100644 index 0000000..296b81e --- /dev/null +++ b/src/Twig/SidebarFeaturedAuthorsExtension.php @@ -0,0 +1,27 @@ +featuredAuthorListedRows->buildListedByLocalPartPage($limit, 0); + }), + ]; + } +} diff --git a/templates/base.html.twig b/templates/base.html.twig index 7699e3b..24dd4c5 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -37,6 +37,10 @@
diff --git a/templates/components/Molecules/Card.html.twig b/templates/components/Molecules/Card.html.twig index 04a3d33..264d667 100644 --- a/templates/components/Molecules/Card.html.twig +++ b/templates/components/Molecules/Card.html.twig @@ -8,7 +8,7 @@ {% if not is_author_profile %}

by

{% endif %} - {{ article.createdAt|date('F j Y') }} + {{ article.displayDateTime|date('F j Y') }} {% endif %}
diff --git a/templates/components/Organisms/FeaturedList.html.twig b/templates/components/Organisms/FeaturedList.html.twig index 60e1f95..2bac6ab 100644 --- a/templates/components/Organisms/FeaturedList.html.twig +++ b/templates/components/Organisms/FeaturedList.html.twig @@ -13,9 +13,9 @@

{{ feature.title }}

- {% if feature.createdAt %} + {% if feature.displayAt %}

- +

{% endif %}

@@ -32,9 +32,9 @@

{{ item.title }}

- {% if item.createdAt %} + {% if item.displayAt %}

- +

{% endif %}

diff --git a/templates/components/Organisms/SidebarFeaturedAuthors.html.twig b/templates/components/Organisms/SidebarFeaturedAuthors.html.twig new file mode 100644 index 0000000..04672bd --- /dev/null +++ b/templates/components/Organisms/SidebarFeaturedAuthors.html.twig @@ -0,0 +1,32 @@ +{% if rows is defined and rows is not empty %} +

+

{{ 'sidebar.featured_authors'|trans }}

+ +
+{% endif %} diff --git a/templates/pages/article.html.twig b/templates/pages/article.html.twig index 2f36cf9..2952279 100644 --- a/templates/pages/article.html.twig +++ b/templates/pages/article.html.twig @@ -51,7 +51,7 @@ 'description': _desc, 'image': _og_image, 'url': _canonical, - 'datePublished': (article.publishedAt ?? article.createdAt)|date('c'), + 'datePublished': article.displayDateTime|date('c'), 'mainEntityOfPage': {'@type': 'WebPage', '@id': _canonical}, 'publisher': {'@type': 'Organization', 'name': website_name}, 'author': {'@type': 'Person', 'name': _author_name != '' ? _author_name : (npub|default('Author'))} @@ -80,12 +80,8 @@ - {% if article.publishedAt is not null %} - {{ article.publishedAt|date('F j, Y') }} - {% else %} - -{# #} - {{ article.createdAt|date('F j, Y') }}
+ {% if article.displayDateTime %} + {{ article.displayDateTime|date('F j, Y') }} {% endif %}
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml index fd1034b..ba77918 100644 --- a/translations/messages.en.yaml +++ b/translations/messages.en.yaml @@ -1,3 +1,5 @@ +sidebar: + featured_authors: 'Featured authors' text: byline: 'By' search: 'Search...'