'
+ ];
+ }
+ } catch (\Exception $e) {
+ // Whatever?
}
+
return $this->render('Pages/article.html.twig', [
'article' => $article,
- 'author' => $author,
+ 'author' => $author ?? null,
'content' => $cacheItem->get(),
//'suggestions' => $suggestions
]);
@@ -140,10 +151,13 @@ class ArticleController extends AbstractController
/**
* Create new article
+ * @throws InvalidArgumentException
+ * @throws \Exception
*/
#[Route('/article-editor/create', name: 'editor-create')]
#[Route('/article-editor/edit/{id}', name: 'editor-edit')]
- public function newArticle(Request $request, EntityManagerInterface $entityManager, WorkflowInterface $articlePublishingWorkflow, Article $article = null): Response
+ public function newArticle(Request $request, EntityManagerInterface $entityManager, CacheItemPoolInterface $articlesCache,
+ WorkflowInterface $articlePublishingWorkflow, Article $article = null): Response
{
if (!$article) {
$article = new Article();
@@ -160,24 +174,33 @@ class ArticleController extends AbstractController
// Step 3: Check if the form is submitted and valid
if ($form->isSubmitted() && $form->isValid()) {
$user = $this->getUser();
- $currentPubkey = $user->getUserIdentifier();
+ $key = new Key();
+ $currentPubkey = $key->convertToHex($user->getUserIdentifier());
+
if ($article->getPubkey() === null) {
$article->setPubkey($currentPubkey);
}
// Check which button was clicked
- if ($form->get('actions')->get('submit')->isClicked()) {
+ if ($form->getClickedButton() === $form->get('actions')->get('submit')) {
// Save button was clicked, handle the "Publish" action
$this->addFlash('success', 'Product published!');
- } elseif ($form->get('actions')->get('draft')->isClicked()) {
+ } elseif ($form->getClickedButton() === $form->get('actions')->get('draft')) {
// Save and Publish button was clicked, handle the "Draft" action
$this->addFlash('success', 'Product saved as draft!');
- } elseif ($form->get('actions')->get('preview')->isClicked()) {
+ } elseif ($form->getClickedButton() === $form->get('actions')->get('preview')) {
// Preview button was clicked, handle the "Preview" action
+ // construct slug from title and save to tags
+ $slugger = new AsciiSlugger();
+ $slug = $slugger->slug($article->getTitle())->lower();
$article->setSig(''); // clear the sig
- $entityManager->persist($article);
- $entityManager->flush();
- return $this->redirectToRoute('article-preview', ['id' => $article->getId()]);
+ $article->setSlug($slug);
+ $cacheKey = 'article_' . $currentPubkey . '_' . $article->getSlug();
+ $cacheItem = $articlesCache->getItem($cacheKey);
+ $cacheItem->set($article);
+ $articlesCache->save($cacheItem);
+
+ return $this->redirectToRoute('article-preview', ['d' => $article->getSlug()]);
}
}
@@ -190,16 +213,28 @@ class ArticleController extends AbstractController
/**
* Preview article
+ * @throws InvalidArgumentException
+ * @throws CommonMarkException
+ * @throws \Exception
*/
- #[Route('/article-preview/{id}', name: 'article-preview')]
- public function preview($id, EntityManagerInterface $entityManager): Response
+ #[Route('/article-preview/{d}', name: 'article-preview')]
+ public function preview($d, Converter $converter,
+ CacheItemPoolInterface $articlesCache): Response
{
- $repository = $entityManager->getRepository(Article::class);
- $article = $repository->findOneBy(['id' => $id]);
+ $user = $this->getUser();
+ $key = new Key();
+ $currentPubkey = $key->convertToHex($user->getUserIdentifier());
+
+ $cacheKey = 'article_' . $currentPubkey . '_' . $d;
+ $cacheItem = $articlesCache->getItem($cacheKey);
+ $article = $cacheItem->get();
+
+ $content = $converter->convertToHtml($article->getContent());
return $this->render('pages/article.html.twig', [
'article' => $article,
- 'author' => $this->getUser(),
+ 'content' => $content,
+ 'author' => $user->getMetadata(),
]);
}
diff --git a/src/Controller/AuthorController.php b/src/Controller/AuthorController.php
index 2bd1dd0..01ffff7 100644
--- a/src/Controller/AuthorController.php
+++ b/src/Controller/AuthorController.php
@@ -25,15 +25,13 @@ class AuthorController extends AbstractController
public function index($npub, EntityManagerInterface $entityManager, NostrClient $client): Response
{
$keys = new Key();
+ $pubkey = $keys->convertToHex($npub);
- $meta = $client->getNpubMetadata($npub);
- $author = (array) json_decode($meta->content ?? '{}');
-
- // $client->getNpubLongForm($npub);
+ $meta = $client->getNpubMetadata($pubkey);
- $pubkey = $keys->convertToHex($npub);
+ $author = json_decode($meta->content ?? '{}');
- $list = $entityManager->getRepository(Article::class)->findBy(['pubkey' => $pubkey, 'kind' => KindsEnum::LONGFORM], ['createdAt' => 'DESC']);
+ $list = $client->getLongFormContentForPubkey($pubkey);
// deduplicate by slugs
$articles = [];
@@ -43,7 +41,7 @@ class AuthorController extends AbstractController
}
}
- $indices = $entityManager->getRepository(Event::class)->findBy(['pubkey' => $pubkey, 'kind' => KindsEnum::PUBLICATION_INDEX]);
+ // $indices = $entityManager->getRepository(Event::class)->findBy(['pubkey' => $pubkey, 'kind' => KindsEnum::PUBLICATION_INDEX]);
// $nzines = $entityManager->getRepository(Nzine::class)->findBy(['editor' => $pubkey]);
@@ -55,7 +53,7 @@ class AuthorController extends AbstractController
'articles' => $articles,
'nzine' => null,
'nzines' => null,
- 'idx' => $indices
+ 'idx' => null
]);
}
diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index effd91d..7ad63ee 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -4,14 +4,13 @@ declare(strict_types=1);
namespace App\Controller;
-use App\Entity\Article;
-use App\Enum\IndexStatusEnum;
-use Doctrine\ORM\EntityManagerInterface;
+use Elastica\Query\MatchQuery;
use FOS\ElasticaBundle\Finder\FinderInterface;
use Psr\Cache\InvalidArgumentException;
+use swentel\nostr\Event\Event;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
@@ -19,30 +18,59 @@ class DefaultController extends AbstractController
{
public function __construct(
private readonly FinderInterface $esFinder,
- private readonly EntityManagerInterface $entityManager)
+ private readonly CacheInterface $redisCache)
{
}
/**
* @throws \Exception
+ * @throws InvalidArgumentException
*/
- #[Route('/', name: 'default')]
- public function index(): Response
+ #[Route('/', name: 'home')]
+ public function index(FinderInterface $finder): Response
{
- $list = $this->entityManager->getRepository(Article::class)->findBy(['indexStatus' => IndexStatusEnum::INDEXED], ['createdAt' => 'DESC'], 10);
+ // get newsroom index, loop over categories, pick top three from each and display in sections
+ $mag = $this->redisCache->get('magazine-newsroom-magazine-by-newsroom', function (){
+ return null;
+ });
+ $tags = $mag->getTags();
- // deduplicate by slugs
- $deduplicated = [];
- foreach ($list as $item) {
- if (!key_exists((string) $item->getSlug(), $deduplicated)) {
- $deduplicated[(string) $item->getSlug()] = $item;
+ $cats = array_filter($tags, function($tag) {
+ return ($tag[0] === 'a');
+ });
+
+ return $this->render('home.html.twig', [
+ 'indices' => $cats
+ ]);
+ }
+
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ #[Route('/cat/{slug}', name: 'magazine-category')]
+ public function magCategory($slug, CacheInterface $redisCache, FinderInterface $finder): Response
+ {
+ $catIndex = $redisCache->get('magazine-' . $slug, function (){
+ throw new \Exception('Not found');
+ });
+
+ $articles = [];
+ foreach ($catIndex->getTags() as $tag) {
+ if ($tag[0] === 'a') {
+ $parts = explode(':', $tag[1]);
+ if (count($parts) === 3) {
+ $fieldQuery = new MatchQuery();
+ $fieldQuery->setFieldQuery('slug', $parts[2]);
+ $res = $finder->find($fieldQuery);
+ $articles[] = $res[0];
+ }
}
}
- return $this->render('home.html.twig', [
- 'list' => array_values(array_filter($deduplicated, function($item) {
- return !empty($item->getImage());
- }))
+
+ return $this->render('pages/category.html.twig', [
+ 'list' => array_slice($articles, 0, 9)
]);
}
diff --git a/src/Credits/Entity/CreditTransaction.php b/src/Credits/Entity/CreditTransaction.php
new file mode 100644
index 0000000..d2db15d
--- /dev/null
+++ b/src/Credits/Entity/CreditTransaction.php
@@ -0,0 +1,100 @@
+npub = $npub;
+ $this->amount = $amount;
+ $this->type = $type;
+ $this->createdAt = new \DateTime();
+ $this->reason = $reason;
+ }
+
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ public function setId(int $id): void
+ {
+ $this->id = $id;
+ }
+
+ public function getNpub(): string
+ {
+ return $this->npub;
+ }
+
+ public function setNpub(string $npub): void
+ {
+ $this->npub = $npub;
+ }
+
+ public function getAmount(): int
+ {
+ return $this->amount;
+ }
+
+ public function setAmount(int $amount): void
+ {
+ $this->amount = $amount;
+ }
+
+ public function getType(): string
+ {
+ return $this->type;
+ }
+
+ public function setType(string $type): void
+ {
+ $this->type = $type;
+ }
+
+ public function getCreatedAt(): \DateTime
+ {
+ return $this->createdAt;
+ }
+
+ public function setCreatedAt(\DateTime $createdAt): void
+ {
+ $this->createdAt = $createdAt;
+ }
+
+ public function getReason(): ?string
+ {
+ return $this->reason;
+ }
+
+ public function setReason(?string $reason): void
+ {
+ $this->reason = $reason;
+ }
+
+}
+
diff --git a/src/Credits/Service/CreditsManager.php b/src/Credits/Service/CreditsManager.php
new file mode 100644
index 0000000..439be70
--- /dev/null
+++ b/src/Credits/Service/CreditsManager.php
@@ -0,0 +1,68 @@
+redisStore->getBalance($npub);
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function resetBalance(string $npub): int
+ {
+ return $this->redisStore->resetBalance($npub);
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function addCredits(string $npub, int $amount, ?string $reason = null): void
+ {
+ $this->redisStore->addCredits($npub, $amount);
+
+ $tx = new CreditTransaction($npub, $amount, 'credit', $reason);
+ $this->em->persist($tx);
+ $this->em->flush();
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function canAfford(string $npub, int $cost): bool
+ {
+ return $this->getBalance($npub) >= $cost;
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function spendCredits(string $npub, int $cost, ?string $reason = null): void
+ {
+ if (!$this->canAfford($npub, $cost)) {
+ throw new \RuntimeException("Insufficient credits for $npub");
+ }
+
+ $this->redisStore->spendCredits($npub, $cost);
+
+ $tx = new CreditTransaction($npub, $cost, 'debit', $reason);
+ $this->em->persist($tx);
+ $this->em->flush();
+ }
+}
diff --git a/src/Credits/Util/RedisCreditStore.php b/src/Credits/Util/RedisCreditStore.php
new file mode 100644
index 0000000..b9e8d83
--- /dev/null
+++ b/src/Credits/Util/RedisCreditStore.php
@@ -0,0 +1,90 @@
+creditsCache->delete($this->key($npub));
+
+ // Fetch all transactions for the given npub
+ $transactions = $this->em->getRepository(CreditTransaction::class)
+ ->findBy(['npub' => $npub]);
+
+ // Initialize the balance
+ $balance = 0;
+
+ // Calculate the final balance based on the transactions
+ foreach ($transactions as $tx) {
+ if ($tx->getType() === 'credit') {
+ $balance += $tx->getAmount();
+ } elseif ($tx->getType() === 'debit') {
+ $balance -= $tx->getAmount();
+ }
+ }
+
+ // Write the calculated balance into the Redis cache
+ $item = $this->creditsCache->getItem($this->key($npub));
+ $item->set($balance);
+ $this->creditsCache->save($item);
+
+ return $balance;
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function getBalance(string $npub): int
+ {
+ // Use cache pool to fetch the credit balance
+ return $this->creditsCache->get($this->key($npub), function () use ($npub) {
+ return $this->resetBalance($npub);
+ });
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function addCredits(string $npub, int $amount): void
+ {
+ $currentBalance = $this->getBalance($npub);
+ $item = $this->creditsCache->getItem($this->key($npub));
+ $balance = $currentBalance + $amount;
+ $item->set($balance);
+ $this->creditsCache->save($item);
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function spendCredits(string $npub, int $amount): void
+ {
+ $currentBalance = $this->getBalance($npub);
+ $item = $this->creditsCache->getItem($this->key($npub));
+ if ($currentBalance < $amount) {
+ throw new \RuntimeException('Insufficient credits');
+ }
+ $balance = $currentBalance - $amount;
+ $item->set($balance);
+ $this->creditsCache->save($item);
+ }
+}
diff --git a/src/Factory/ArticleFactory.php b/src/Factory/ArticleFactory.php
index 060d039..5c69126 100644
--- a/src/Factory/ArticleFactory.php
+++ b/src/Factory/ArticleFactory.php
@@ -21,7 +21,6 @@ class ArticleFactory
$entity->setRaw($source);
$entity->setEventId($source->id);
$entity->setCreatedAt(\DateTimeImmutable::createFromFormat('U', (string)$source->created_at));
- // TODO escape content before saving
$entity->setContent($source->content);
$entity->setKind(KindsEnum::from($source->kind));
$entity->setPubkey($source->pubkey);
@@ -46,6 +45,7 @@ class ArticleFactory
break;
case 'published_at':
$entity->setPublishedAt(\DateTimeImmutable::createFromFormat('U', (string)$tag[1]));
+ break;
case 't':
$entity->addTopic($tag[1]);
break;
diff --git a/src/Security/UserDTOProvider.php b/src/Security/UserDTOProvider.php
index 7f5d625..6b51855 100644
--- a/src/Security/UserDTOProvider.php
+++ b/src/Security/UserDTOProvider.php
@@ -3,8 +3,10 @@
namespace App\Security;
use App\Entity\User;
+use App\Enum\KindsEnum;
use App\Service\NostrClient;
use Doctrine\ORM\EntityManagerInterface;
+use swentel\nostr\Key\Key;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\UserProviderInterface;
@@ -52,22 +54,27 @@ readonly class UserDTOProvider implements UserProviderInterface
}
try {
- $data = $this->nostrClient->getLoginData($identifier);
+ $key = new Key();
+ $pubkey = $key->convertToHex($identifier);
+ $data = $this->nostrClient->getLoginData($pubkey);
foreach ($data as $d) {
$ev = $d->event;
- if ($ev->kind === 0) {
+ if ($ev->kind === KindsEnum::METADATA) {
$metadata = json_decode($ev->content);
}
- if ($ev->kind === 10002) {
+ if ($ev->kind === KindsEnum::RELAY_LIST) {
$relays = $ev->tags;
}
}
- } catch (\Exception) {
- // even if the user metadata not found, if sig is valid, login the pubkey
+ } catch (\Exception $e) {
+ // nothing to do here right now
+ }
+
+ if (is_null($metadata)) {
+ // if no metadata event, use what you have
$metadata = new \stdClass();
$metadata->name = substr($identifier, 0, 5) . ':' . substr($identifier, -5);
}
-
$user->setMetadata($metadata);
$user->setRelays($relays);
diff --git a/src/Service/NostrClient.php b/src/Service/NostrClient.php
index 5badb68..93dc6a1 100644
--- a/src/Service/NostrClient.php
+++ b/src/Service/NostrClient.php
@@ -9,7 +9,6 @@ use App\Factory\ArticleFactory;
use App\Repository\UserEntityRepository;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ManagerRegistry;
-use Psr\Cache\InvalidArgumentException;
use Psr\Log\LoggerInterface;
use swentel\nostr\Event\Event;
use swentel\nostr\Filter\Filter;
@@ -21,9 +20,11 @@ use swentel\nostr\Request\Request;
use swentel\nostr\Subscription\Subscription;
use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Serializer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
class NostrClient
{
@@ -39,8 +40,12 @@ class NostrClient
{
// TODO configure read and write relays for logged in users from their 10002 events
$this->defaultRelaySet = new RelaySet();
- $this->defaultRelaySet->addRelay(new Relay('wss://relay.damus.io')); // public relay
+ // $this->defaultRelaySet->addRelay(new Relay('wss://relay.damus.io')); // public relay
+ // $this->defaultRelaySet->addRelay(new Relay('wss://relay.primal.net')); // public relay
$this->defaultRelaySet->addRelay(new Relay('wss://nos.lol')); // public relay
+ // $this->defaultRelaySet->addRelay(new Relay('wss://relay.snort.social')); // public relay
+ $this->defaultRelaySet->addRelay(new Relay('wss://theforest.nostr1.com')); // public relay
+ // $this->defaultRelaySet->addRelay(new Relay('wss://purplepag.es')); // public relay
}
public function getLoginData($npub)
@@ -51,10 +56,7 @@ class NostrClient
$filter->setKinds([KindsEnum::METADATA, KindsEnum::RELAY_LIST]);
$filter->setAuthors([$npub]);
$requestMessage = new RequestMessage($subscriptionId, [$filter]);
- // use default aggregator relay
- $relay = new Relay('wss://purplepag.es');
-
- $request = new Request($relay, $requestMessage);
+ $request = new Request($this->defaultRelaySet, $requestMessage);
$response = $request->send();
// response is an n-dimensional array, where n is the number of relays in the set
@@ -73,46 +75,54 @@ class NostrClient
/**
* @throws \Exception
- * @throws InvalidArgumentException
*/
public function getNpubMetadata($npub)
{
- // cache metadata, only fetch new, if no cache hit
- return $this->cacheApp->get($npub.'-0', function (ItemInterface $item) use ($npub) {
- $item->expiresAfter(7000);
-
- $subscription = new Subscription();
- $subscriptionId = $subscription->setId();
- $filter = new Filter();
- $filter->setKinds([KindsEnum::METADATA]);
- $filter->setAuthors([$npub]);
- $requestMessage = new RequestMessage($subscriptionId, [$filter]);
- $relays = new RelaySet();
- $relays->addRelay(new Relay('wss://purplepag.es')); // default metadata aggregator
- $relays->addRelay(new Relay('wss://relay.damus.io')); // major public
- $relays->addRelay(new Relay('wss://relay.snort.social')); // major public
+ $filter = new Filter();
+ $filter->setKinds([KindsEnum::METADATA]);
+ $filter->setAuthors([$npub]);
+ $filters = [$filter];
+ $subscription = new Subscription();
+ $requestMessage = new RequestMessage($subscription->getId(), $filters);
+ $relays = [
+ new Relay('wss://purplepag.es'),
+ new Relay('wss://theforest.nostr1.com'),
+ ];
+ $relaySet = new RelaySet();
+ $relaySet->setRelays($relays);
- $request = new Request($relays, $requestMessage);
+ $request = new Request($relaySet, $requestMessage);
+ $response = $request->send();
- $response = $request->send();
- // response is an array of arrays
- foreach ($response as $value) {
- foreach ($value as $item) {
- switch ($item->type) {
- case 'EVENT':
- return $item->event;
- case 'AUTH':
- throw new UnauthorizedHttpException('', 'Relay requires authentication');
- case 'ERROR':
- case 'NOTICE':
- throw new \Exception('An error occurred');
- default:
- return null;
- }
+ $meta = [];
+ // response is an array of arrays
+ foreach ($response as $value) {
+ foreach ($value as $item) {
+ switch ($item->type) {
+ case 'EVENT':
+ $meta[] = $item->event;
+ break;
+ case 'AUTH':
+ throw new UnauthorizedHttpException('', 'Relay requires authentication');
+ case 'ERROR':
+ case 'NOTICE':
+ throw new \Exception('An error occurred');
+ default:
+ // skip
}
}
- return null;
- });
+ }
+
+ if (count($meta) > 0) {
+ if (count($meta) > 1) {
+ // sort by date and pick newest
+ usort($meta, function($a, $b) {
+ return $b->created_at <=> $a->created_at;
+ });
+ }
+ return $meta[0];
+ }
+ return [];
}
public function getNpubLongForm($npub): void
@@ -132,7 +142,9 @@ class NostrClient
if ($user && $user->getRelays()) {
$relays = new RelaySet();
foreach ($user->getRelays() as $relayArr) {
- $relays->addRelay(new Relay($relayArr[1]));
+ if ($relayArr[2] == 'write') {
+ $relays->addRelay(new Relay($relayArr[1]));
+ }
}
}
@@ -184,8 +196,7 @@ class NostrClient
$user = $this->tokenStorage->getToken()?->getUser();
$relays = $this->defaultRelaySet;
if ($user) {
- $relays = new RelaySet();
-
+ //$relays = new RelaySet();
}
$request = new Request($relays, $requestMessage);
@@ -217,16 +228,21 @@ class NostrClient
$requestMessage = new RequestMessage($subscriptionId, [$filter]);
- if (empty($relayList)) {
- $relays = $this->defaultRelaySet;
- } else {
- $relays = new RelaySet();
- $relays->addRelay(new Relay($relayList[0]));
+ $relays = $this->defaultRelaySet;
+ if (!empty($relayList)) {
+ // $relays->addRelay(new Relay($relayList[0]));
}
- $request = new Request($relays, $requestMessage);
- $response = $request->send();
+ try {
+ $request = new Request($this->defaultRelaySet, $requestMessage);
+ $response = $request->send();
+ } catch (\Exception $e) {
+ // likely a problem with user's relays, go to defaults only
+ $request = new Request($this->defaultRelaySet, $requestMessage);
+ $response = $request->send();
+ }
+
// response is an n-dimensional array, where n is the number of relays in the set
// check that response has events in the results
foreach ($response as $relayRes) {
@@ -282,28 +298,89 @@ class NostrClient
}
- public function getProfileEvents($npub): void
+ /**
+ * Save user metadata
+ */
+ private function saveMetadata($metadata): void
+ {
+ try {
+ $user = $this->serializer->deserialize($metadata->content, User::class, 'json');
+ $user->setNpub($metadata->pubkey);
+ } catch (\Exception $e) {
+ $this->logger->error('Deserialization of user data failed.', ['exception' => $e]);
+ return;
+ }
+
+ try {
+ $this->logger->info('Saving user', ['user' => $user]);
+ $this->userEntityRepository->findOrCreateByUniqueField($user);
+ $this->entityManager->flush();
+ } catch (\Exception $e) {
+ $this->logger->error($e->getMessage());
+ $this->managerRegistry->resetManager();
+ }
+
+ }
+
+ private function saveLongFormContent(mixed $filtered): void
+ {
+ foreach ($filtered as $wrapper) {
+ $article = $this->articleFactory->createFromLongFormContentEvent($wrapper->event);
+ // check if event with same eventId already in DB
+ $saved = $this->entityManager->getRepository(Article::class)->findOneBy(['eventId' => $article->getEventId()]);
+ if (!$saved) {
+ try {
+ $this->logger->info('Saving article', ['article' => $article]);
+ $this->entityManager->persist($article);
+ $this->entityManager->flush();
+ } catch (\Exception $e) {
+ $this->logger->error($e->getMessage());
+ $this->managerRegistry->resetManager();
+ }
+ }
+ }
+ }
+
+ /**
+ *
+ * @return array
+ */
+ public function getNpubRelays($pubkey)
{
$subscription = new Subscription();
$subscriptionId = $subscription->setId();
$filter = new Filter();
- $filter->setKinds([KindsEnum::METADATA, KindsEnum::FOLLOWS, KindsEnum::RELAY_LIST]);
- $filter->setAuthors([$npub]);
+ $filter->setKinds([KindsEnum::RELAY_LIST]);
+ $filter->setAuthors([$pubkey]);
$requestMessage = new RequestMessage($subscriptionId, [$filter]);
// TODO make relays configurable
$relays = new RelaySet();
$relays->addRelay(new Relay('wss://purplepag.es')); // default metadata aggregator
$relays->addRelay(new Relay('wss://nos.lol')); // default public
+ $relays->addRelay(new Relay('wss://theforest.nostr1.com')); // default public
$request = new Request($relays, $requestMessage);
$response = $request->send();
+
// response is an array of arrays
foreach ($response as $value) {
foreach ($value as $item) {
switch ($item->type) {
case 'EVENT':
- dump($item);
+ $event = $item->event;
+ $relays = [];
+ foreach ($event->tags as $tag) {
+ if ($tag[0] === 'r') {
+ // if not already listed
+ if (!in_array($tag[1], $relays)) {
+ $relays[] = $tag[1];
+ }
+ }
+ }
+ if (!empty($relays)) {
+ return $relays;
+ }
break;
case 'AUTH':
throw new UnauthorizedHttpException('', 'Relay requires authentication');
@@ -315,48 +392,97 @@ class NostrClient
}
}
}
+ return [];
}
/**
- * Save user metadata
+ * @throws \Exception
*/
- private function saveMetadata($metadata): void
+ public function getComments($coordinate): array
{
- try {
- $user = $this->serializer->deserialize($metadata->content, User::class, 'json');
- $user->setNpub($metadata->pubkey);
- } catch (\Exception $e) {
- $this->logger->error('Deserialization of user data failed.', ['exception' => $e]);
- return;
- }
+ $list = [];
+ $parts = explode(':', $coordinate);
- try {
- $this->logger->info('Saving user', ['user' => $user]);
- $this->userEntityRepository->findOrCreateByUniqueField($user);
- $this->entityManager->flush();
- } catch (\Exception $e) {
- $this->logger->error($e->getMessage());
- $this->managerRegistry->resetManager();
- }
+ $subscription = new Subscription();
+ $subscriptionId = $subscription->setId();
+ $filter = new Filter();
+ $filter->setKinds([KindsEnum::COMMENTS, KindsEnum::TEXT_NOTE]);
+ $filter->setTag('#a', [$coordinate]);
+ $requestMessage = new RequestMessage($subscriptionId, [$filter]);
+ $request = new Request($this->defaultRelaySet, $requestMessage);
+
+ $response = $request->send();
+ // response is an array of arrays
+ foreach ($response as $value) {
+ foreach ($value as $item) {
+ switch ($item->type) {
+ case 'EVENT':
+ dump($item);
+ $list[] = $item;
+ break;
+ case 'AUTH':
+ throw new UnauthorizedHttpException('', 'Relay requires authentication');
+ case 'ERROR':
+ case 'NOTICE':
+ throw new \Exception('An error occurred');
+ default:
+ // nothing to do here
+ }
+ }
+ }
+ return $list;
}
- private function saveLongFormContent(mixed $filtered): void
+ /**
+ * @throws \Exception
+ */
+ public function getLongFormContentForPubkey(string $pubkey)
{
- foreach ($filtered as $wrapper) {
- $article = $this->articleFactory->createFromLongFormContentEvent($wrapper->event);
- // check if event with same eventId already in DB
- $saved = $this->entityManager->getRepository(Article::class)->findOneBy(['eventId' => $article->getEventId()]);
- if (!$saved) {
- try {
- $this->logger->info('Saving article', ['article' => $article]);
- $this->entityManager->persist($article);
- $this->entityManager->flush();
- } catch (\Exception $e) {
- $this->logger->error($e->getMessage());
- $this->managerRegistry->resetManager();
+ $articles = [];
+ // get npub relays, then look for articles
+ $relayList = $this->getNpubRelays($pubkey);
+ $relaySet = $this->defaultRelaySet;
+ foreach ($relayList as $r) {
+ // if (str_starts_with($r, 'wss:')) $relaySet->addRelay(new Relay($r));
+ }
+ // look for last months long-form notes
+ $subscription = new Subscription();
+ $subscriptionId = $subscription->setId();
+ $filter = new Filter();
+ $filter->setKinds([KindsEnum::LONGFORM]);
+ $filter->setLimit(10);
+ $filter->setAuthors([$pubkey]);
+ $requestMessage = new RequestMessage($subscriptionId, [$filter]);
+ $request = new Request($relaySet, $requestMessage);
+
+ $response = $request->send();
+
+ // response is an array of arrays
+ foreach ($response as $value) {
+ foreach ($value as $item) {
+ if (is_array($item)) continue;
+ switch ($item->type) {
+ case 'EVENT':
+ $eventStr = json_encode($item->event);
+ // remap to the Event class
+ $encoders = [new JsonEncoder()];
+ $normalizers = [new ObjectNormalizer()];
+ $serializer = new Serializer($normalizers, $encoders);
+ /** @var \App\Entity\Event $event */
+ $event = $serializer->deserialize($eventStr, \App\Entity\Event::class, 'json');
+ $articles[] = $event;
+ break;
+ case 'AUTH':
+ // throw new UnauthorizedHttpException('', 'Relay requires authentication');
+ case 'ERROR':
+ case 'NOTICE':
+ // throw new \Exception('An error occurred');
+ default:
+ // nothing to do here
}
}
}
+ return $articles;
}
}
diff --git a/src/Twig/Components/GetCreditsComponent.php b/src/Twig/Components/GetCreditsComponent.php
new file mode 100644
index 0000000..ef0eb61
--- /dev/null
+++ b/src/Twig/Components/GetCreditsComponent.php
@@ -0,0 +1,42 @@
+tokenStorage->getToken()?->getUserIdentifier();
+ if ($npub) {
+ $this->creditsManager->addCredits($npub, 5, 'voucher');
+ }
+
+ // Dispatch event to notify parent
+ $this->emit('creditsAdded', [
+ 'credits' => 5,
+ ]);
+ }
+}
+
diff --git a/src/Twig/Components/Header.php b/src/Twig/Components/Header.php
index 1a7b934..934be0d 100644
--- a/src/Twig/Components/Header.php
+++ b/src/Twig/Components/Header.php
@@ -4,12 +4,28 @@ declare(strict_types=1);
namespace App\Twig\Components;
+use Psr\Cache\InvalidArgumentException;
+use Symfony\Contracts\Cache\CacheInterface;
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
#[AsTwigComponent]
class Header
{
- public function __construct()
+ public array $cats;
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function __construct(private readonly CacheInterface $redisCache)
{
+ $mag = $this->redisCache->get('magazine-newsroom-magazine-by-newsroom', function (){
+ return null;
+ });
+
+ $tags = $mag->getTags();
+
+ $this->cats = array_filter($tags, function($tag) {
+ return ($tag[0] === 'a');
+ });
}
}
diff --git a/src/Twig/Components/Molecules/Card.php b/src/Twig/Components/Molecules/Card.php
index 5134927..5673a6d 100644
--- a/src/Twig/Components/Molecules/Card.php
+++ b/src/Twig/Components/Molecules/Card.php
@@ -10,20 +10,11 @@ use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
#[AsTwigComponent]
final class Card
{
- public string $tag = 'div';
public string $category = '';
public object $article;
- public object $user;
- public function __construct(private readonly EntityManagerInterface $entityManager, private readonly NostrClient $nostrClient)
+ public function __construct()
{
}
- public function mount(?string $npub = null): void
- {
- if ($npub) {
- $this->nostrClient->getMetadata();
- $this->user = $this->entityManager->getRepository(User::class)->findOneBy(['npub' => $npub]);
- }
- }
}
diff --git a/src/Twig/Components/Molecules/CategoryLink.php b/src/Twig/Components/Molecules/CategoryLink.php
new file mode 100644
index 0000000..eecc93d
--- /dev/null
+++ b/src/Twig/Components/Molecules/CategoryLink.php
@@ -0,0 +1,40 @@
+slug = $parts[2];
+ $cat = $this->redisCache->get('magazine-' . $parts[2], function (){
+ return null;
+ });
+
+ $tags = $cat->getTags();
+
+ $title = array_filter($tags, function($tag) {
+ return ($tag[0] === 'title');
+ });
+
+ $this->title = $title[array_key_first($title)][1];
+ } else {
+ dump($coordinate);die();
+ }
+
+ }
+
+}
diff --git a/src/Twig/Components/Molecules/UserFromNpub.php b/src/Twig/Components/Molecules/UserFromNpub.php
index 7ef3cd3..8465063 100644
--- a/src/Twig/Components/Molecules/UserFromNpub.php
+++ b/src/Twig/Components/Molecules/UserFromNpub.php
@@ -5,7 +5,6 @@ namespace App\Twig\Components\Molecules;
use App\Service\NostrClient;
use Psr\Cache\InvalidArgumentException;
use swentel\nostr\Key\Key;
-use Symfony\Contracts\Cache\CacheInterface;
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
#[AsTwigComponent]
@@ -13,9 +12,9 @@ final class UserFromNpub
{
public string $pubkey;
public string $npub;
- public ?array $user = null;
+ public $user = null;
- public function __construct(private readonly NostrClient $nostrClient, private readonly CacheInterface $redisCache)
+ public function __construct(private readonly NostrClient $nostrClient)
{
}
@@ -26,16 +25,10 @@ final class UserFromNpub
$this->npub = $keys->convertPublicKeyToBech32($pubkey);
try {
- $this->user = $this->redisCache->get('user_' . $this->npub, function () {
- try {
- $meta = $this->nostrClient->getNpubMetadata($this->npub);
- return (array) json_decode($meta->content);
- } catch (InvalidArgumentException|\Exception) {
- return null;
- }
- });
- } catch (InvalidArgumentException $e) {
- $this->user = null;
+ $meta = $this->nostrClient->getNpubMetadata($this->pubkey);
+ $this->user = (array) json_decode($meta->content);
+ } catch (InvalidArgumentException|\Exception) {
+ // nothing to do
}
}
}
diff --git a/src/Twig/Components/Organisms/Comments.php b/src/Twig/Components/Organisms/Comments.php
new file mode 100644
index 0000000..61f3b4d
--- /dev/null
+++ b/src/Twig/Components/Organisms/Comments.php
@@ -0,0 +1,25 @@
+list = $this->nostrClient->getComments($current);
+ }
+}
diff --git a/src/Twig/Components/Organisms/FeaturedList.php b/src/Twig/Components/Organisms/FeaturedList.php
new file mode 100644
index 0000000..b9a2d28
--- /dev/null
+++ b/src/Twig/Components/Organisms/FeaturedList.php
@@ -0,0 +1,52 @@
+redisCache->get('magazine-' . $parts[2], function (){
+ throw new \Exception('Not found');
+ });
+
+ foreach ($catIndex->getTags() as $tag) {
+ if ($tag[0] === 'title') {
+ $this->title = $tag[1];
+ }
+ if ($tag[0] === 'a') {
+ $parts = explode(':', $tag[1]);
+ if (count($parts) === 3) {
+ $fieldQuery = new MatchQuery();
+ $fieldQuery->setFieldQuery('slug', $parts[2]);
+ $res = $this->finder->find($fieldQuery);
+ $this->list[] = $res[0];
+ }
+ }
+ if (count($this->list) > 3) {
+ break;
+ }
+ }
+ }
+}
diff --git a/src/Twig/Components/SearchComponent.php b/src/Twig/Components/SearchComponent.php
index 3900f1c..abf9610 100644
--- a/src/Twig/Components/SearchComponent.php
+++ b/src/Twig/Components/SearchComponent.php
@@ -2,8 +2,15 @@
namespace App\Twig\Components;
+use App\Credits\Service\CreditsManager;
use FOS\ElasticaBundle\Finder\FinderInterface;
+use Psr\Cache\InvalidArgumentException;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
+use Symfony\UX\LiveComponent\Attribute\LiveListener;
use Symfony\UX\LiveComponent\Attribute\LiveProp;
use Symfony\UX\LiveComponent\DefaultActionTrait;
@@ -14,30 +21,77 @@ final class SearchComponent
#[LiveProp(writable: true)]
public string $query = '';
+ public array $results = [];
public bool $interactive = true;
- private FinderInterface $finder;
+ public int $credits = 0;
+ public ?string $npub = null;
- public function __construct(FinderInterface $finder)
+ #[LiveProp]
+ public int $vol = 0;
+
+ public function __construct(
+ private readonly FinderInterface $finder,
+ private readonly CreditsManager $creditsManager,
+ private readonly TokenStorageInterface $tokenStorage,
+ private readonly LoggerInterface $logger
+ )
+ {
+ $token = $this->tokenStorage->getToken();
+ $this->npub = $token?->getUserIdentifier();
+ }
+
+ public function mount(): void
{
- $this->finder = $finder;
+ if ($this->npub) {
+ try {
+ $this->credits = $this->creditsManager->getBalance($this->npub);
+ $this->logger->info($this->credits);
+ } catch (InvalidArgumentException $e) {
+ $this->logger->error($e);
+ $this->credits = $this->creditsManager->resetBalance($this->npub);
+ }
+ }
}
- public function getResults()
+ /**
+ * @throws InvalidArgumentException
+ */
+ #[LiveAction]
+ public function search(): void
{
+ $this->logger->info("Query: {$this->query}, npub: {$this->npub}");
+
if (empty($this->query)) {
- return [];
+ $this->results = [];
+ return;
}
- $res = $this->finder->find($this->query, 12); // Limit to 10 results
- // filter out items with bad slugs
- $filtered = array_filter($res, function($r) {
- return !str_contains($r->getSlug(), '/');
- });
+ try {
+ $this->credits = $this->creditsManager->getBalance($this->npub);
+ } catch (InvalidArgumentException $e) {
+ $this->credits = $this->creditsManager->resetBalance($this->npub);
+ }
+
+ if (!$this->creditsManager->canAfford($this->npub, 1)) {
+ $this->results = [];
+ return;
+ }
+ $this->creditsManager->spendCredits($this->npub, 1, 'search');
+ $this->credits--;
- return $filtered;
+ $this->results = array_filter(
+ $this->finder->find($this->query, 12),
+ fn($r) => !str_contains($r->getSlug(), '/')
+ );
+ }
+
+ #[LiveListener('creditsAdded')]
+ public function incrementCreditsCount(array $data): void
+ {
+ $this->credits += $data['credits'];
}
}
diff --git a/src/Twig/Filters.php b/src/Twig/Filters.php
new file mode 100644
index 0000000..bfac2f3
--- /dev/null
+++ b/src/Twig/Filters.php
@@ -0,0 +1,24 @@
+addExtension(new NostrSchemeExtension($this->bech32Decoder));
$environment->addExtension(new SmartPunctExtension());
+ $environment->addExtension(new RawImageLinkExtension());
$environment->addExtension(new AutolinkExtension());
if ($headingsCount > 3) {
$environment->addExtension(new HeadingPermalinkExtension());
@@ -65,7 +67,7 @@ class Converter
// Instantiate the converter engine and start converting some Markdown!
$converter = new MarkdownConverter($environment);
$content = html_entity_decode($markdown);
-
+
return $converter->convert($content);
}
diff --git a/src/Util/CommonMark/ImagesExtension/RawImageLinkExtension.php b/src/Util/CommonMark/ImagesExtension/RawImageLinkExtension.php
new file mode 100644
index 0000000..049b247
--- /dev/null
+++ b/src/Util/CommonMark/ImagesExtension/RawImageLinkExtension.php
@@ -0,0 +1,14 @@
+addInlineParser(new RawImageLinkParser());
+ }
+}
diff --git a/src/Util/CommonMark/ImagesExtension/RawImageLinkParser.php b/src/Util/CommonMark/ImagesExtension/RawImageLinkParser.php
new file mode 100644
index 0000000..ad89224
--- /dev/null
+++ b/src/Util/CommonMark/ImagesExtension/RawImageLinkParser.php
@@ -0,0 +1,35 @@
+getCursor();
+ $match = $inlineContext->getFullMatch();
+ // Create an Credit Transactions
+
+
+
+
+ ID
+ NPub
+ Type
+ Amount
+ Reason
+ Timestamp
+
+
+
+ {% for tx in transactions %}
+
+ {{ tx.id }}
+ {{ tx.npub|shortenNpub }} {{ tx.type }}
+ {{ tx.amount }}
+ {{ tx.reason ?: '—' }}
+ {{ tx.createdAt|date('Y-m-d H:i:s') }}
+
+ {% else %}
+
+ No transactions found.
+
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/templates/components/GetCreditsComponent.html.twig b/templates/components/GetCreditsComponent.html.twig
new file mode 100644
index 0000000..3371230
--- /dev/null
+++ b/templates/components/GetCreditsComponent.html.twig
@@ -0,0 +1,6 @@
+
+
+ Get 5 Free Credits
+
+
diff --git a/templates/components/Header.html.twig b/templates/components/Header.html.twig
index 75d2d26..1d0acc5 100644
--- a/templates/components/Header.html.twig
+++ b/templates/components/Header.html.twig
@@ -2,21 +2,9 @@
diff --git a/templates/components/Molecules/Card.html.twig b/templates/components/Molecules/Card.html.twig
index 9eab0dd..a8e377e 100644
--- a/templates/components/Molecules/Card.html.twig
+++ b/templates/components/Molecules/Card.html.twig
@@ -1,28 +1,27 @@
{% if article is defined %}
-<{{ tag }} {{ attributes }}>
-
diff --git a/templates/home.html.twig b/templates/home.html.twig
index 9cb524a..ddfe0b0 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -5,9 +5,9 @@
{% block body %}
{# content #}
-
- {# replace list with featured #}
- {{ article.publishedAt|date('F j, Y') }}
{% else %}
-
+{# #}
{# {{ article.content }}#}
{# #}
+ 30032:{{ article.pubkey }}:{{ article.slug }}
+ {% endif %}
{# Suggestions #}
{#
-
Purchase Search Credits
-
-
-
Amount: {{ amount ?? 0 }} sats
-
Status: Pending
-
-
- {# You can access the width and height via the matrix #}
- {# Replace the string with the invoice #}
- {% set qrCode = qr_code_result('My QR Code') %}
-
-
-
-
Check Payment Status
-
-
-
#}
+{#
Purchase Search Credits #}
+
+{#
#}
+{#
Amount: {{ amount ?? 0 }} sats
#}
+{#
Status: Pending
#}
+{#
#}
+
+{# #}{# You can access the width and height via the matrix #}
+{# #}{# Replace the string with the invoice #}
+{# {% set qrCode = qr_code_result('My QR Code') %}#}
+{#
#}
+
+{#
#}
+{#
Check Payment Status #}
+
+{# #}
+{#
View as N-Zine
diff --git a/templates/pages/search.html.twig b/templates/pages/search.html.twig
index 32fbc33..05a3cdd 100644
--- a/templates/pages/search.html.twig
+++ b/templates/pages/search.html.twig
@@ -6,8 +6,3 @@
{% block body %}
Magazines #}
-{# About Decent Newsroom
Rebuilding Trust in Journalism
- The internet, and especially social media, made news instant and abundant—but also cheap and unreliable. The value of simply reporting what happened and where has dropped to zero, buried under waves of misinformation, clickbait, and AI-generated noise. Worse, sorting truth from falsehood now costs more than spreading lies.
+ The internet, and especially social media, made news instant and abundant, but also cheap and unreliable. The value of simply reporting what happened and where has dropped to zero,
+ buried under waves of misinformation, clickbait, and AI-generated noise. Worse, sorting truth from falsehood now costs more than spreading lies.
Decent Newsroom is our answer to this crisis. We are building a curated, decentralized magazine featuring high-quality, long-form journalism published on Nostr.
diff --git a/templates/static/roadmap.html.twig b/templates/static/roadmap.html.twig
index bfb7941..bd0c35f 100644
--- a/templates/static/roadmap.html.twig
+++ b/templates/static/roadmap.html.twig
@@ -5,13 +5,15 @@
{% block body %}
Roadmap: The Future of Decent Newsroom
- We are building a decentralized, high-value journalism platform step by step. Each phase unlocks new features, empowering writers, publishers, and readers to engage with quality, independent reporting in a whole new way.
+ We are building a decentralized, high-value journalism platform step by step. Each phase unlocks new features,
+ empowering writers, publishers, and readers to engage with quality, independent reporting in a whole new way.
v0.1.0 – Preprint Current
A first glimpse into the future of journalism
-
This early version of First Edition Newsroom is all about discovery. We’re launching a sample magazine to showcase what’s possible.
+
This early version of Decent Newsroom is all about discovery. We’re launching a sample magazine
+ to showcase what’s possible.
Hand-curated, high-quality articles in magazine format
Full-text search to find the stories that matter to you
@@ -28,11 +30,11 @@
This milestone version introduces key features that bring Decent Newsroom to life:
Zaps
- Search and indexing requests enabled – writers and publishers can request inclusion
- Payable subscriptions and indexing via Lightning invoices
- Built-in content editor – publishers can create directly on the platform
+ Content submissions
+ Subscriptions for premium access
+ Built-in content editor so publishers can create directly on the platform
- With First Edition, journalism becomes more than just content — it becomes an ecosystem.
+ With First Edition, journalism becomes more than just content, it becomes an ecosystem.
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 3960505..8e3d628 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -11,3 +11,6 @@ heading:
editNzine: 'Edit your N-Zine'
search: 'Search'
index: 'Index'
+credit:
+ balance: '{0} No credits|{1} 1 credit|]1,Inf] %count% credits'
+
- {% endif %}
+
- 
-
-