|
|
|
@ -4,6 +4,7 @@ declare(strict_types=1); |
|
|
|
|
|
|
|
|
|
|
|
namespace App\Service; |
|
|
|
namespace App\Service; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
use App\Enum\KindsEnum; |
|
|
|
use Psr\Cache\CacheItemPoolInterface; |
|
|
|
use Psr\Cache\CacheItemPoolInterface; |
|
|
|
use Psr\Cache\InvalidArgumentException; |
|
|
|
use Psr\Cache\InvalidArgumentException; |
|
|
|
use Psr\Log\LoggerInterface; |
|
|
|
use Psr\Log\LoggerInterface; |
|
|
|
@ -12,9 +13,14 @@ use Symfony\Contracts\Cache\ItemInterface; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Loads Nostr article discussion: NIP-22 (1111) + legacy kind 1 replies, plus quotes/reposts (q / a tags). |
|
|
|
* Loads Nostr article discussion: NIP-22 (1111) + legacy kind 1 replies, plus quotes/reposts (q / a tags). |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* Reply blurbs mirror the jumble client: resolve the parent from `e` / `E` tags (NIP-10, `reply` marker, |
|
|
|
|
|
|
|
* last-of-sequence), then show a short preview of the parent’s body (see jumble `ParentNotePreview`). Inline |
|
|
|
|
|
|
|
* NIP-22 blockquotes with `nostr:` in the child still take precedence when present. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
final readonly class ArticleCommentThreadLoader |
|
|
|
final readonly class ArticleCommentThreadLoader |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
private const PARENT_REPLY_TEXT_PREVIEW_MAX = 200; |
|
|
|
/** PSR-6 pool backing {@see $cache}; used for true cache-only reads (SSR) without invoking Nostr. */ |
|
|
|
/** PSR-6 pool backing {@see $cache}; used for true cache-only reads (SSR) without invoking Nostr. */ |
|
|
|
public function __construct( |
|
|
|
public function __construct( |
|
|
|
private NostrClient $nostrClient, |
|
|
|
private NostrClient $nostrClient, |
|
|
|
@ -157,6 +163,7 @@ final readonly class ArticleCommentThreadLoader |
|
|
|
]); |
|
|
|
]); |
|
|
|
|
|
|
|
|
|
|
|
$this->enrichThreadListForDisplay($list, $articleEventHexId); |
|
|
|
$this->enrichThreadListForDisplay($list, $articleEventHexId); |
|
|
|
|
|
|
|
$this->stripRepostEventBodies($list, $quotes); |
|
|
|
|
|
|
|
|
|
|
|
$commentLinks = []; |
|
|
|
$commentLinks = []; |
|
|
|
$quoteLinks = []; |
|
|
|
$quoteLinks = []; |
|
|
|
@ -189,6 +196,39 @@ final readonly class ArticleCommentThreadLoader |
|
|
|
]; |
|
|
|
]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* NIP-18 reposts (kinds 6 and 16) carry a JSON-wrapped copy of the original; we only show who reposted, not the body. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param array<int, object> $list |
|
|
|
|
|
|
|
* @param array<int, object> $quotes |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private function stripRepostEventBodies(array $list, array $quotes): void |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
$strip = static function (object $ev): void { |
|
|
|
|
|
|
|
$k = (int) ($ev->kind ?? 0); |
|
|
|
|
|
|
|
if ($k !== KindsEnum::REPOST->value && $k !== KindsEnum::GENERIC_REPOST->value) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
$ev->content = ''; |
|
|
|
|
|
|
|
if (isset($ev->unfold_reply_blurb)) { |
|
|
|
|
|
|
|
$ev->unfold_reply_blurb = null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (isset($ev->unfold_body)) { |
|
|
|
|
|
|
|
$ev->unfold_body = ''; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
foreach ($list as $ev) { |
|
|
|
|
|
|
|
if (\is_object($ev)) { |
|
|
|
|
|
|
|
$strip($ev); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
foreach ($quotes as $ev) { |
|
|
|
|
|
|
|
if (\is_object($ev)) { |
|
|
|
|
|
|
|
$strip($ev); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @param array<string, array<int, mixed>> $linkBucket |
|
|
|
* @param array<string, array<int, mixed>> $linkBucket |
|
|
|
* @param array<string, string> $processedContent |
|
|
|
* @param array<string, string> $processedContent |
|
|
|
@ -231,31 +271,51 @@ final readonly class ArticleCommentThreadLoader |
|
|
|
{ |
|
|
|
{ |
|
|
|
$threadIdSet = []; |
|
|
|
$threadIdSet = []; |
|
|
|
foreach ($list as $ev) { |
|
|
|
foreach ($list as $ev) { |
|
|
|
$hid = isset($ev->id) ? (string) $ev->id : ''; |
|
|
|
$hid = isset($ev->id) ? strtolower((string) $ev->id) : ''; |
|
|
|
if ($hid !== '') { |
|
|
|
if (64 === \strlen($hid) && ctype_xdigit($hid)) { |
|
|
|
$threadIdSet[$hid] = true; |
|
|
|
$threadIdSet[$hid] = true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$idToEvent = []; |
|
|
|
|
|
|
|
foreach ($list as $ev) { |
|
|
|
|
|
|
|
$hid = isset($ev->id) ? strtolower((string) $ev->id) : ''; |
|
|
|
|
|
|
|
if (64 === \strlen($hid) && ctype_xdigit($hid)) { |
|
|
|
|
|
|
|
$idToEvent[$hid] = $ev; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$parentOf = []; |
|
|
|
$parentOf = []; |
|
|
|
foreach ($list as $ev) { |
|
|
|
foreach ($list as $ev) { |
|
|
|
$id = isset($ev->id) ? (string) $ev->id : ''; |
|
|
|
$id = isset($ev->id) ? strtolower((string) $ev->id) : ''; |
|
|
|
if ($id === '') { |
|
|
|
if (64 !== \strlen($id) || !ctype_xdigit($id)) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
$p = $this->resolveParentCommentId($ev, $threadIdSet, $articleEventHexId); |
|
|
|
$p = $this->resolveInThreadParentId($ev, $threadIdSet, $articleEventHexId); |
|
|
|
if ($p !== null) { |
|
|
|
if ($p !== null) { |
|
|
|
$parentOf[$id] = $p; |
|
|
|
$parentOf[$id] = $p; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
foreach ($list as $ev) { |
|
|
|
foreach ($list as $ev) { |
|
|
|
$id = isset($ev->id) ? (string) $ev->id : ''; |
|
|
|
$id = isset($ev->id) ? strtolower((string) $ev->id) : ''; |
|
|
|
$raw = isset($ev->content) ? (string) $ev->content : ''; |
|
|
|
$raw = isset($ev->content) ? (string) $ev->content : ''; |
|
|
|
$split = $this->splitNip22ReplyBlurb($raw); |
|
|
|
$split = $this->splitNip22ReplyBlurb($raw); |
|
|
|
$ev->unfold_reply_blurb = $split['blurb']; |
|
|
|
$blurb = $split['blurb']; |
|
|
|
|
|
|
|
if (($blurb === null || trim($blurb) === '') && $id !== '' && isset($parentOf[$id])) { |
|
|
|
|
|
|
|
$pid = $parentOf[$id]; |
|
|
|
|
|
|
|
if (isset($idToEvent[$pid])) { |
|
|
|
|
|
|
|
$parent = $idToEvent[$pid]; |
|
|
|
|
|
|
|
$pRaw = isset($parent->content) ? (string) $parent->content : ''; |
|
|
|
|
|
|
|
$preview = $this->parentEventTextPreviewForBlurb($pRaw); |
|
|
|
|
|
|
|
if ($preview !== '') { |
|
|
|
|
|
|
|
$blurb = '> *'.'Replying to thread'.'* — '."\n> ".$preview; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
$ev->unfold_reply_blurb = $blurb; |
|
|
|
$ev->unfold_body = $split['body']; |
|
|
|
$ev->unfold_body = $split['body']; |
|
|
|
$ev->unfold_depth = $id === '' ? 0 : $this->threadDepthCapped($id, $parentOf, 3); |
|
|
|
$ev->unfold_depth = $id === '' || !ctype_xdigit($id) ? 0 : $this->threadDepthCapped($id, $parentOf, 3); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -281,38 +341,103 @@ final readonly class ArticleCommentThreadLoader |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* NIP-22 nested replies use a lowercase `e` tag for the immediate parent comment; root comments |
|
|
|
* Truncated single-line text from a parent’s content (strips a leading NIP-22 quote block when present), |
|
|
|
* under the article usually have no such tag. Some clients also use `E` for the article root. |
|
|
|
* similar in spirit to Jumble’s {@see ParentNotePreview} + compact ContentPreview. |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private function parentEventTextPreviewForBlurb(string $raw): string |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
$split = $this->splitNip22ReplyBlurb($raw); |
|
|
|
|
|
|
|
$use = (string) $split['body']; |
|
|
|
|
|
|
|
if (trim($use) === '' && $raw !== '') { |
|
|
|
|
|
|
|
$use = $raw; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
$one = trim((string) (preg_replace('/\s+/', ' ', $use) ?? '')); |
|
|
|
|
|
|
|
if ($one === '') { |
|
|
|
|
|
|
|
return ''; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (mb_strlen($one) > self::PARENT_REPLY_TEXT_PREVIEW_MAX) { |
|
|
|
|
|
|
|
return mb_substr($one, 0, self::PARENT_REPLY_TEXT_PREVIEW_MAX).'…'; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return $one; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* In-thread parent id for a reply, mirroring jumble’s {@code getParentETag} / kind-1111 branch: prefer |
|
|
|
|
|
|
|
* {@code e}/{@code E} with marker {@code reply} when that id is another event in the loaded thread, else |
|
|
|
|
|
|
|
* the last in-thread id when several {@code e}/{@code E} apply (NIP-10), else the only in-thread id. |
|
|
|
* |
|
|
|
* |
|
|
|
* @param array<string, true> $threadIdSet |
|
|
|
* The article’s root event id is never returned (blurbs/depth are about comments in the fetched list only). |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param array<string, true> $threadIdSet lower-hex id keys |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @return string|null lower-hex parent id, or null |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private function resolveParentCommentId(object $event, array $threadIdSet, ?string $articleEventHexId): ?string |
|
|
|
private function resolveInThreadParentId(object $event, array $threadIdSet, ?string $articleEventHexId): ?string |
|
|
|
{ |
|
|
|
{ |
|
|
|
$selfId = isset($event->id) ? (string) $event->id : ''; |
|
|
|
$selfId = isset($event->id) ? strtolower((string) $event->id) : ''; |
|
|
|
$last = null; |
|
|
|
if (64 !== \strlen($selfId) || !ctype_xdigit($selfId)) { |
|
|
|
|
|
|
|
$selfId = ''; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
$article = ($articleEventHexId !== null && $articleEventHexId !== '' && 64 === \strlen($articleEventHexId) && ctype_xdigit($articleEventHexId)) |
|
|
|
|
|
|
|
? strtolower($articleEventHexId) : null; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$isThreadTag = static function (string $n): bool { |
|
|
|
|
|
|
|
return $n === 'e' || $n === 'E'; |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
$validInThread = function (string $pid) use ($selfId, $article, $threadIdSet): bool { |
|
|
|
|
|
|
|
if (64 !== \strlen($pid) || !ctype_xdigit($pid)) { |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if ($selfId !== '' && hash_equals($pid, $selfId)) { |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if ($article !== null && hash_equals($pid, $article)) { |
|
|
|
|
|
|
|
return false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return isset($threadIdSet[$pid]); |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 1) Explicit NIP-10 "reply" marker |
|
|
|
foreach ($event->tags ?? [] as $tag) { |
|
|
|
foreach ($event->tags ?? [] as $tag) { |
|
|
|
if (!\is_array($tag) || \count($tag) < 2) { |
|
|
|
if (!\is_array($tag) || \count($tag) < 2) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if ((string) ($tag[0] ?? '') !== 'e') { |
|
|
|
if (!$isThreadTag((string) ($tag[0] ?? ''))) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
$pid = (string) ($tag[1] ?? ''); |
|
|
|
if (($tag[3] ?? '') !== 'reply') { |
|
|
|
if (64 !== \strlen($pid) || !ctype_xdigit($pid)) { |
|
|
|
|
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if ($selfId !== '' && hash_equals($pid, $selfId)) { |
|
|
|
$pid = strtolower((string) ($tag[1] ?? '')); |
|
|
|
|
|
|
|
if ($validInThread($pid)) { |
|
|
|
|
|
|
|
return $pid; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 2) All in-thread references in tag order; last wins when multiple (cf. jumble getParentETagCommentOrDiscussion) |
|
|
|
|
|
|
|
$candidates = []; |
|
|
|
|
|
|
|
foreach ($event->tags ?? [] as $tag) { |
|
|
|
|
|
|
|
if (!\is_array($tag) || \count($tag) < 2) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if ($articleEventHexId !== null && $articleEventHexId !== '' && hash_equals($pid, $articleEventHexId)) { |
|
|
|
if (!$isThreadTag((string) ($tag[0] ?? ''))) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if (isset($threadIdSet[$pid])) { |
|
|
|
$pid = strtolower((string) ($tag[1] ?? '')); |
|
|
|
$last = $pid; |
|
|
|
if ($validInThread($pid)) { |
|
|
|
|
|
|
|
$candidates[] = $pid; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if ($candidates === []) { |
|
|
|
|
|
|
|
return null; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (\count($candidates) >= 2) { |
|
|
|
|
|
|
|
return $candidates[\count($candidates) - 1]; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return $last; |
|
|
|
return $candidates[0]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
|
Silberengel