Comments for articles

assets/styles/card.css

@@ -47,3 +47,20 @@ h2.card-title {
     object-fit: cover;
 }
 
+.card.comment {
+    display: flex;
+    flex-direction: column;
+    background-color: var(--color-bg-light);
+    padding: 10px;
+}
+
+.card.comment .metadata {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.card.comment .metadata p {
+    margin: 0;
+    padding: 0;
+}

assets/styles/notice.css

@@ -10,6 +10,5 @@
 
 .notice.info {
     background-color: rgba(95, 115, 85, 0.15); /* Light version of --color-primary */
-    border-left: 4px solid var(--color-primary); /* Solid border using primary color */
     color: var(--color-text); /* Use theme text color for better contrast */
 }

src/Controller/ArticleController.php

@@ -125,7 +125,7 @@ class ArticleController  extends AbstractController
         $author = $redisCacheService->getMetadata($npub);
 
 
-        return $this->render('Pages/article.html.twig', [
+        return $this->render('pages/article.html.twig', [
             'article' => $article,
             'author' => $author,
             'npub' => $npub,

src/Controller/DefaultController.php

@@ -60,10 +60,10 @@ class DefaultController extends AbstractController
         });
 
         $list = [];
-        $slugs = [];
         $coordinates = []; // Store full coordinates (kind:author:slug)
         $category = [];
 
+        // Extract category metadata and article coordinates
         foreach ($catIndex->getTags() as $tag) {
             if ($tag[0] === 'title') {
                 $category['title'] = $tag[1];
@@ -72,74 +72,77 @@ class DefaultController extends AbstractController
                 $category['summary'] = $tag[1];
             }
             if ($tag[0] === 'a') {
-                $parts = explode(':', $tag[1]);
-                if (count($parts) === 3) {
-                    $slugs[] = $parts[2];
-                    $coordinates[] = $tag[1]; // Store the full coordinate
-                }
+                $coordinates[] = $tag[1]; // Store the full coordinate
             }
         }
 
-        if (!empty($slugs)) {
+        // Limit to first 9 coordinates to avoid excessive processing
+        $coordinates = array_slice($coordinates, 0, 9);
+
+        if (!empty($coordinates)) {
+            // Extract slugs for elasticsearch query
+            $slugs = array_map(function($coordinate) {
+                $parts = explode(':', $coordinate);
+                return count($parts) === 3 ? $parts[2] : '';
+            }, $coordinates);
+            $slugs = array_filter($slugs); // Remove empty values
+
+            // Try to fetch articles from elasticsearch first
             $query = new Terms('slug', array_values($slugs));
             $articles = $finder->find($query);
 
             // Create a map of slug => item to remove duplicates
             $slugMap = [];
-
             foreach ($articles as $item) {
                 $slug = $item->getSlug();
-
-                if ($slug !== '' && !isset($slugMap[$slug])) {
+                if ($slug !== '') {
                     $slugMap[$slug] = $item;
                 }
             }
 
-            // Find missing articles based on coordinates
+            // Find missing coordinates
             $missingCoordinates = [];
-            $missingIndexes = [];
-
-            for ($i = 0; $i < count($slugs); $i++) {
-                $slug = $slugs[$i];
-                if (!isset($slugMap[$slug])) {
-                    $missingCoordinates[] = $coordinates[$i];
-                    $missingIndexes[$coordinates[$i]] = $i; // Track original position
+            foreach ($coordinates as $coordinate) {
+                $parts = explode(':', $coordinate);
+                if (count($parts) === 3 && !isset($slugMap[$parts[2]])) {
+                    $missingCoordinates[] = $coordinate;
                 }
             }
 
-            // If we have missing articles, fetch them from nostr
+            // If we have missing articles, fetch them directly using NostrClient's getArticlesByCoordinates
             if (!empty($missingCoordinates)) {
-                $logger->info('Fetching missing articles', [
+
+                $logger->info('There were missing articles', [
                     'missing' => $missingCoordinates
                 ]);
 
-                try {
-                    $nostrArticles = $nostrClient->getArticlesByCoordinates($missingCoordinates);
-
-                    foreach ($nostrArticles as $coordinate => $event) {
-                        $parts = explode(':', $coordinate);
-                        if (count($parts) === 3) {
-                            $article = $articleFactory->createFromLongFormContentEvent($event);
-
-                            // Add to the slugMap
-                            $slugMap[$article->getSlug()] = $article;
-                        }
-                    }
-                } catch (\Exception $e) {
-                    $logger->error('Error fetching missing articles', [
-                        'error' => $e->getMessage()
-                    ]);
-                }
+//                try {
+//                    $nostrArticles = $nostrClient->getArticlesByCoordinates($missingCoordinates);
+//
+//                    foreach ($nostrArticles as $coordinate => $event) {
+//                        $parts = explode(':', $coordinate);
+//                        if (count($parts) === 3) {
+//                            $article = $articleFactory->createFromLongFormContentEvent($event);
+//                            // Save article to database for future queries
+//                            $nostrClient->saveEachArticleToTheDatabase($article);
+//                            // Add to the slugMap
+//                            $slugMap[$article->getSlug()] = $article;
+//                        }
+//                    }
+//                } catch (\Exception $e) {
+//                    $logger->error('Error fetching missing articles', [
+//                        'error' => $e->getMessage()
+//                    ]);
+//                }
             }
 
-            // Reorder by the original $slugs to maintain order
-            $results = [];
-            foreach ($slugs as $slug) {
-                if (isset($slugMap[$slug])) {
-                    $results[] = $slugMap[$slug];
+            // Build ordered list based on original coordinates order
+            foreach ($coordinates as $coordinate) {
+                $parts = explode(':', $coordinate);
+                if (count($parts) === 3 && isset($slugMap[$parts[2]])) {
+                    $list[] = $slugMap[$parts[2]];
                 }
             }
-            $list = array_values($results);
         }
 
         return $this->render('pages/category.html.twig', [

src/Enum/KindsEnum.php

@@ -16,6 +16,7 @@ enum KindsEnum: int
     case LONGFORM = 30023; // NIP-23
     case LONGFORM_DRAFT = 30024; // NIP-23
     case PUBLICATION_INDEX = 30040;
+    case ZAP = 9735; // NIP-57, Zaps
     case HIGHLIGHTS = 9802;
     case RELAY_LIST = 10002; // NIP-65, Relay list metadata
     case APP_DATA = 30078; // NIP-78, Arbitrary custom app data

src/Service/NostrClient.php

@@ -336,42 +336,89 @@ class NostrClient
     }
 
     /**
+     * Get comments for a specific coordinate
+     *
+     * @param string $coordinate The event coordinate (kind:pubkey:identifier)
+     * @return array Array of comment events
      * @throws \Exception
      */
-    public function getComments($coordinate): array
+    public function getComments(string $coordinate): array
     {
-        $list = [];
-        $parts = explode(':', $coordinate);
+        $this->logger->info('Getting comments for coordinate', ['coordinate' => $coordinate]);
 
-        $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]);
+        // Get author from coordinate, then relays
+        $parts = explode(':', $coordinate);
+        if (count($parts) !== 3) {
+            throw new \InvalidArgumentException('Invalid coordinate format, expected kind:pubkey:identifier');
+        }
+        $kind = (int)$parts[0];
+        $pubkey = $parts[1];
+        $identifier = $parts[2];
+        // Get relays for the author
+        $authorRelays = $this->getTopReputableRelaysForAuthor($pubkey);
+        // Turn into a relaySet
+        $relaySet = $this->createRelaySet($authorRelays);
 
-        $request = new Request($this->defaultRelaySet, $requestMessage);
+        // Create request using the helper method
+        $request = $this->createNostrRequest(
+            kinds: [KindsEnum::COMMENTS->value, KindsEnum::TEXT_NOTE->value],
+            filters: ['tag' => ['#a', [$coordinate], '#p', [$pubkey]]],
+            relaySet: $relaySet
+        );
 
-        $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
+        // Process the response and deduplicate by eventId
+        $uniqueEvents = [];
+        $this->processResponse($request->send(), function($event) use (&$uniqueEvents, $pubkey) {
+            $this->logger->debug('Received comment event', ['event_id' => $event->id]);
+            // If event has p tag with the pubkey, it's a comment
+            // Loop tags, look for 'p' tag
+            foreach ($event->tags as $tag) {
+                if ($tag[0] === 'p' && $tag[1] === $pubkey) {
+                    $uniqueEvents[$event->id] = $event;
+                    break;
                 }
             }
+            return null; // We'll handle the collection ourselves
+        });
+
+        return array_values($uniqueEvents);
+    }
+
+    /**
+     * Get zap events for a specific event
+     *
+     * @param string $coordinate The event coordinate (kind:pubkey:identifier)
+     * @return array Array of zap events
+     * @throws \Exception
+     */
+    public function getZapsForEvent(string $coordinate): array
+    {
+        $this->logger->info('Getting zaps for coordinate', ['coordinate' => $coordinate]);
+
+        // Parse the coordinate to get pubkey
+        $parts = explode(':', $coordinate);
+        if (count($parts) !== 3) {
+            throw new \InvalidArgumentException('Invalid coordinate format, expected kind:pubkey:identifier');
         }
-        return $list;
+        $pubkey = $parts[1];
+
+        // Get author's relays for better chances of finding zaps
+        $authorRelays = $this->getTopReputableRelaysForAuthor($pubkey);
+        $relaySet = $this->createRelaySet($authorRelays);
+
+        // Create request using the helper method
+        // Zaps are kind 9735
+        $request = $this->createNostrRequest(
+            kinds: [KindsEnum::ZAP],
+            filters: ['tag' => ['#a', [$coordinate]]],
+            relaySet: $relaySet
+        );
+
+        // Process the response
+        return $this->processResponse($request->send(), function($event) {
+            $this->logger->debug('Received zap event', ['event_id' => $event->id]);
+            return $event;
+        });
     }
 
     /**

templates/components/Organisms/Comments.html.twig

@@ -1,7 +1,13 @@
 <div class="comments">
     {% for item in list %}
-        <div class="comment">
-            <span>{{ item.content }}</span>
+        <div class="card comment">
+            <div class="metadata">
+                <p><twig:Molecules:UserFromNpub ident="{{ item.pubkey }}" /></p>
+                <small>{{ item.created_at|date('F j Y') }}</small>
+            </div>
+            <div class="card-body">
+                <p>{{ item.content }}</p>
+            </div>
         </div>
     {% endfor %}
 </div>

templates/pages/article.html.twig

@@ -58,19 +58,23 @@
             {{ content|raw }}
         </div>
 
+        {% if article.topics|length > 0 %}
         <hr class="divider" />
         <div class="tags">
             {% for tag in article.topics %}
                 <span class="tag">{{ tag }}</span>
             {% endfor %}
         </div>
+        {% endif %}
 
     </div>
 
-{#    <pre>#}
+    <hr class="divider" />
+
+    {#    <pre>#}
 {#        {{ article.content }}#}
 {#    </pre>#}
-    <twig:Organisms:Comments current="30032:{{ article.pubkey }}:{{ article.slug }}"></twig:Organisms:Comments>
+    <twig:Organisms:Comments current="30023:{{ article.pubkey }}:{{ article.slug }}"></twig:Organisms:Comments>
 {% endblock %}
 
 {% block aside %}