Browse Source

Metadata fixes

imwald
Nuša Pukšič 3 months ago
parent
commit
0f62c23bc6
  1. 6
      assets/styles/03-components/article.css
  2. 2
      src/Controller/ArticleController.php
  3. 8
      src/Controller/AuthorController.php
  4. 8
      src/Controller/EventController.php

6
assets/styles/03-components/article.css

@ -161,3 +161,9 @@ blockquote p {
article .card { article .card {
margin: 0; margin: 0;
} }
.comments {
display: flex;
flex-direction: column;
gap: var(--spacing-1);
}

2
src/Controller/ArticleController.php

@ -104,7 +104,7 @@ class ArticleController extends AbstractController
$key = new Key(); $key = new Key();
$npub = $key->convertPublicKeyToBech32($article->getPubkey()); $npub = $key->convertPublicKeyToBech32($article->getPubkey());
$author = $redisCacheService->getMetadata($npub); $author = $redisCacheService->getMetadata($article->getPubkey());
// determine whether the logged-in user is the author // determine whether the logged-in user is the author
$canEdit = false; $canEdit = false;

8
src/Controller/AuthorController.php

@ -6,6 +6,7 @@ namespace App\Controller;
use App\Service\NostrClient; use App\Service\NostrClient;
use App\Service\RedisCacheService; use App\Service\RedisCacheService;
use App\Util\NostrKeyUtil;
use Elastica\Query\Terms; use Elastica\Query\Terms;
use Exception; use Exception;
use FOS\ElasticaBundle\Finder\FinderInterface; use FOS\ElasticaBundle\Finder\FinderInterface;
@ -22,9 +23,10 @@ class AuthorController extends AbstractController
* @throws Exception * @throws Exception
*/ */
#[Route('/p/{npub}/media', name: 'author-media', requirements: ['npub' => '^npub1.*'])] #[Route('/p/{npub}/media', name: 'author-media', requirements: ['npub' => '^npub1.*'])]
public function media($npub, NostrClient $nostrClient, RedisCacheService $redisCacheService): Response public function media($npub, NostrClient $nostrClient, RedisCacheService $redisCacheService, NostrKeyUtil $keyUtil): Response
{ {
$author = $redisCacheService->getMetadata($npub);
$author = $redisCacheService->getMetadata($keyUtil->npubToHex($npub));
// Use paginated cached media events - fetches 200 from relays, serves first 24 // Use paginated cached media events - fetches 200 from relays, serves first 24
$paginatedData = $redisCacheService->getMediaEventsPaginated($npub, 1, 24); $paginatedData = $redisCacheService->getMediaEventsPaginated($npub, 1, 24);
@ -113,7 +115,7 @@ class AuthorController extends AbstractController
$keys = new Key(); $keys = new Key();
$pubkey = $keys->convertToHex($npub); $pubkey = $keys->convertToHex($npub);
$author = $redisCacheService->getMetadata($npub); $author = $redisCacheService->getMetadata($pubkey);
// Retrieve long-form content for the author // Retrieve long-form content for the author
try { try {
$list = $nostrClient->getLongFormContentForPubkey($npub); $list = $nostrClient->getLongFormContentForPubkey($npub);

8
src/Controller/EventController.php

@ -92,13 +92,7 @@ class EventController extends AbstractController
$logger->info('Parsed Nostr links from content', ['count' => count($nostrLinks)]); $logger->info('Parsed Nostr links from content', ['count' => count($nostrLinks)]);
} }
// If author is included in the event, get metadata $authorMetadata = $redisCacheService->getMetadata($event->pubkey);
$authorMetadata = null;
if (isset($event->pubkey)) {
$key = new Key();
$npub = $key->convertPublicKeyToBech32($event->pubkey);
$authorMetadata = $redisCacheService->getMetadata($npub);
}
// Render template with the event data and extracted Nostr links // Render template with the event data and extracted Nostr links
$response = $this->render('event/index.html.twig', [ $response = $this->render('event/index.html.twig', [

Loading…
Cancel
Save