From 74147931f0da365f654d323147783eed19bdad3c Mon Sep 17 00:00:00 2001 From: Silberengel Date: Thu, 28 May 2026 07:01:49 +0200 Subject: [PATCH] fix backfill --- src/Factory/ArticleFactory.php | 9 +++++---- src/Repository/ArticleRepository.php | 4 ---- src/Service/MagazineContentService.php | 2 +- src/Service/NostrClient.php | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Factory/ArticleFactory.php b/src/Factory/ArticleFactory.php index ebefc5e..195df0e 100644 --- a/src/Factory/ArticleFactory.php +++ b/src/Factory/ArticleFactory.php @@ -14,8 +14,9 @@ class ArticleFactory { public function createFromLongFormContentEvent($source): Article { - if (!\in_array($source->kind, KindsEnum::longformKindValues(), true)) { - throw new InvalidArgumentException('Source event kind must be a longform kind (30023, 30024, 30817), got '.$source->kind); + $kind = (int) ($source->kind ?? 0); + if (!\in_array($kind, KindsEnum::longformKindValues(), true)) { + throw new InvalidArgumentException('Source event kind must be a longform kind (30023, 30024, 30817), got '.$kind); } $entity = new Article(); $entity->setRaw($source); @@ -26,14 +27,14 @@ class ArticleFactory } $entity->setCreatedAt($created); $entity->setContent($source->content); - $entity->setKind(KindsEnum::from($source->kind)); + $entity->setKind(KindsEnum::from($kind)); $entity->setPubkey($source->pubkey); $entity->setSig($source->sig); $entity->setEventStatus(EventStatusEnum::PUBLISHED); $entity->setRatingNegative(0); $entity->setRatingPositive(0); // process tags - $wikiKinds = $source->kind === KindsEnum::WIKI->value ? [] : null; + $wikiKinds = $kind === KindsEnum::WIKI->value ? [] : null; foreach ($source->tags as $tag) { if (!\is_array($tag) || !isset($tag[0])) { continue; diff --git a/src/Repository/ArticleRepository.php b/src/Repository/ArticleRepository.php index 8f833b8..87165f2 100644 --- a/src/Repository/ArticleRepository.php +++ b/src/Repository/ArticleRepository.php @@ -48,8 +48,6 @@ class ArticleRepository extends ServiceEntityRepository return $qb ->where($conditions) - ->andWhere('a.content IS NOT NULL') - ->andWhere('LENGTH(a.content) > 250') // Only articles with substantial content ->orderBy('a.createdAt', 'DESC') ->setFirstResult($offset) ->setMaxResults($limit) @@ -87,8 +85,6 @@ class ArticleRepository extends ServiceEntityRepository return (int) $qb ->where($conditions) - ->andWhere('a.content IS NOT NULL') - ->andWhere('LENGTH(a.content) > 250') ->getQuery() ->getSingleScalarResult(); } diff --git a/src/Service/MagazineContentService.php b/src/Service/MagazineContentService.php index b94814f..8826663 100644 --- a/src/Service/MagazineContentService.php +++ b/src/Service/MagazineContentService.php @@ -1017,7 +1017,7 @@ final class MagazineContentService if ($identifier === '') { continue; } - if (\in_array($kind, [KindsEnum::LONGFORM->value, KindsEnum::LONGFORM_DRAFT->value], true)) { + if (\in_array($kind, KindsEnum::longformKindValues(), true)) { $slugs[] = $identifier; if (\count($slugs) >= $maxA) { return $slugs; diff --git a/src/Service/NostrClient.php b/src/Service/NostrClient.php index 691281b..c4f34dc 100644 --- a/src/Service/NostrClient.php +++ b/src/Service/NostrClient.php @@ -425,7 +425,7 @@ class NostrClient $subscription = new Subscription(); $subscriptionId = $subscription->setId(); $filter = new Filter(); - $filter->setKinds(KindsEnum::longformKinds()); + $filter->setKinds(KindsEnum::longformKindValues()); $filter->setSince($since); $filter->setUntil($until); $requestMessage = new RequestMessage($subscriptionId, [$filter]); @@ -1132,7 +1132,7 @@ class NostrClient $subscription = new Subscription(); $subscriptionId = $subscription->setId(); $filter = new Filter(); - $filter->setKinds(KindsEnum::longformKinds()); + $filter->setKinds(KindsEnum::longformKindValues()); $filter->setTag('#d', $slugs); $requestMessage = new RequestMessage($subscriptionId, [$filter]);