Merge branch 'main' into new/polls

Author: BentiGorlich

config/packages/framework.yaml

@@ -42,7 +42,7 @@ framework:
     http_client:
         default_options:
             headers:
-                'User-Agent': 'Mbin/1.10.0 (+https://%kbin_domain%/agent)'
+                'User-Agent': 'Mbin/1.10.1 (+https://%kbin_domain%/agent)'
 
     #esi: true
     #fragments: true

config/packages/security.yaml

@@ -24,6 +24,7 @@ security:
             security: true
             stateless: true
             oauth2: true
+            user_checker: App\Security\UserChecker
         image_resolver:
             pattern: ^/media/cache/resolve
             security: false

migrations/Version20260526175316.php

@@ -41,11 +41,13 @@ public function down(Schema $schema): void
     public function postUp(Schema $schema): void
     {
         $this->connection->transactional(function (): void {
-            $sqlTpl = 'UPDATE $e SET last_boosted_at = greatest((SELECT $e_vote.created_at FROM $e_vote WHERE $e_vote.$fk = $e.id ORDER BY $e_vote.created_at DESC LIMIT 1), created_at);';
+            $sqlTpl = 'UPDATE $e SET last_boosted_at = greatest((SELECT $e_vote.created_at FROM $e_vote WHERE $e_vote.$fk = $e.id AND choice = 1 ORDER BY $e_vote.created_at DESC LIMIT 1), created_at);';
             $this->connection->executeStatement(str_replace('$e', 'entry', str_replace('$fk', 'entry_id', $sqlTpl)));
-            $this->connection->executeStatement(str_replace('$e', 'entry_comment', str_replace('$fk', 'comment_id', $sqlTpl)));
             $this->connection->executeStatement(str_replace('$e', 'post', str_replace('$fk', 'post_id', $sqlTpl)));
             $this->connection->executeStatement(str_replace('$e', 'post_comment', str_replace('$fk', 'comment_id', $sqlTpl)));
+
+            // set last_boosted_at of entry_comment to its created_at time to speed up migrations; not may comments are boosted anyway
+            $this->connection->executeStatement('UPDATE entry_comment SET last_boosted_at = created_at;');
         });
     }
 }

src/Controller/Tag/TagOverviewController.php

@@ -23,9 +23,11 @@ public function __construct(
 
     public function __invoke(string $name, Request $request): Response
     {
+        $user = $this->getUser();
         $activity = $this->tagRepository->findOverall(
             $this->getPageNb($request),
-            $this->tagManager->transliterate(strtolower($name))
+            $this->tagManager->transliterate(strtolower($name)),
+            $user
         );
 
         $params = [

src/Form/Type/MagazineAutocompleteType.php

@@ -28,7 +28,8 @@ public function configureOptions(OptionsResolver $resolver): void
             'choice_label' => 'name',
             'placeholder' => 'select_magazine',
             'filter_query' => function (QueryBuilder $qb, string $query) {
-                if ($currentUser = $this->security->getUser()) {
+                $currentUser = $this->security->getUser();
+                if ($currentUser) {
                     $qb
                         ->andWhere(
                             \sprintf(
@@ -39,15 +40,17 @@ public function configureOptions(OptionsResolver $resolver): void
                         ->setParameter('user', $currentUser);
                 }
 
+                if (!$currentUser || (!$currentUser->isAdmin() && !$currentUser->isModerator())) {
+                    $qb->andWhere('entity.visibility = :visibility')
+                        ->setParameter('visibility', VisibilityInterface::VISIBILITY_VISIBLE);
+                }
+
                 if (!$query) {
                     return;
                 }
 
                 $qb->andWhere('entity.name LIKE :filter OR entity.title LIKE :filter')
-                    ->andWhere('entity.visibility = :visibility')
-                    ->setParameter('filter', '%'.$query.'%')
-                    ->setParameter('visibility', VisibilityInterface::VISIBILITY_VISIBLE)
-                ;
+                    ->setParameter('filter', '%'.$query.'%');
             },
         ]);
     }

src/Repository/ContentRepository.php

@@ -102,8 +102,8 @@ public function findByCriteriaCursored(Criteria $criteria, mixed $currentCursor,
     private function getQueryAndParameters(Criteria $criteria, bool $addCursor): array
     {
         $includeEntries = Criteria::CONTENT_COMBINED === $criteria->content || Criteria::CONTENT_THREADS === $criteria->content;
-        $includeEntryComments = Criteria::CONTENT_COMBINED === $criteria->content && $criteria->includeBoosts;
-        $includePostComments = (Criteria::CONTENT_COMBINED === $criteria->content || Criteria::CONTENT_MICROBLOG === $criteria->content) && $criteria->includeBoosts;
+        $includeEntryComments = $criteria->subscribed && Criteria::CONTENT_COMBINED === $criteria->content && $criteria->includeBoosts;
+        $includePostComments = $criteria->subscribed && (Criteria::CONTENT_COMBINED === $criteria->content || Criteria::CONTENT_MICROBLOG === $criteria->content) && $criteria->includeBoosts;
 
         $parameters = [
             'visible' => VisibilityInterface::VISIBILITY_VISIBLE,
@@ -523,7 +523,6 @@ private function getQueryAndParameters(Criteria $criteria, bool $addCursor): arr
             INNER JOIN \"user\" u ON c.user_id = u.id
             $outerWhere
             $orderBy";
-        $this->logger->warning('##dbg '.$sql);
 
         if (!str_contains($sql, ':loggedInUser')) {
             $parameters = array_filter($parameters, fn ($key) => 'loggedInUser' !== $key, mode: ARRAY_FILTER_USE_KEY);

src/Repository/TagRepository.php

@@ -6,6 +6,7 @@
 
 use App\Entity\Contracts\VisibilityInterface;
 use App\Entity\Hashtag;
+use App\Entity\User;
 use App\Pagination\NativeQueryAdapter;
 use App\Pagination\Transformation\ContentPopulationTransformer;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -34,7 +35,7 @@ public function __construct(
         parent::__construct($registry, Hashtag::class);
     }
 
-    public function findOverall(int $page, string $tag): PagerfantaInterface
+    public function findOverall(int $page, string $tag, ?User $user): PagerfantaInterface
     {
         $hashtag = $this->findBy(['tag' => $tag]);
         $countAll = $this->tagLinkRepository->createQueryBuilder('link')
@@ -48,26 +49,34 @@ public function findOverall(int $page, string $tag): PagerfantaInterface
         $sql = "SELECT e.id, e.created_at, 'entry' AS type FROM entry e
                 INNER JOIN hashtag_link l ON e.id = l.entry_id
                 INNER JOIN hashtag h ON l.hashtag_id = h.id AND h.tag = :tag
-            WHERE visibility = :visibility
+                INNER JOIN magazine m ON e.magazine_id = m.id
+            WHERE :visibilityBypass = TRUE OR (e.visibility = :visibility AND m.visibility = :visibility)
         UNION ALL
         SELECT ec.id, ec.created_at, 'entry_comment' AS type FROM entry_comment ec
                 INNER JOIN hashtag_link l ON ec.id = l.entry_comment_id
                 INNER JOIN hashtag h ON l.hashtag_id = h.id AND h.tag = :tag
-            WHERE visibility = :visibility
+                INNER JOIN magazine m ON ec.magazine_id = m.id
+            WHERE :visibilityBypass = TRUE OR (ec.visibility = :visibility AND m.visibility = :visibility)
         UNION ALL
         SELECT p.id, p.created_at, 'post' AS type FROM post p
                 INNER JOIN hashtag_link l ON p.id = l.post_id
                 INNER JOIN hashtag h ON l.hashtag_id = h.id AND h.tag = :tag
-            WHERE visibility = :visibility
+                INNER JOIN magazine m ON p.magazine_id = m.id
+            WHERE :visibilityBypass = TRUE OR (p.visibility = :visibility AND m.visibility = :visibility)
         UNION ALL
-        SELECT pc.id, created_at, 'post_comment' AS type FROM post_comment pc
+        SELECT pc.id, pc.created_at, 'post_comment' AS type FROM post_comment pc
                 INNER JOIN hashtag_link l ON pc.id = l.post_comment_id
-                INNER JOIN hashtag h ON l.hashtag_id = h.id AND h.tag = :tag WHERE visibility = :visibility
+                INNER JOIN hashtag h ON l.hashtag_id = h.id AND h.tag = :tag
+                INNER JOIN magazine m ON pc.magazine_id = m.id
+            WHERE :visibilityBypass = TRUE OR (pc.visibility = :visibility AND m.visibility = :visibility)
         ORDER BY created_at DESC";
 
+        $visibilityBypass = null !== $user && ($user->isAdmin() || $user->isModerator());
+
         $adapter = new NativeQueryAdapter($conn, $sql, [
             'tag' => $tag,
             'visibility' => VisibilityInterface::VISIBILITY_VISIBLE,
+            'visibilityBypass' => $visibilityBypass,
         ], $countAll, $this->populationTransformer);
 
         $pagerfanta = new Pagerfanta($adapter);

src/Service/ProjectInfoService.php

@@ -10,7 +10,7 @@
 class ProjectInfoService
 {
     // If updating version, please also update http client UA in [/config/packages/framework.yaml]
-    private const VERSION = '1.10.0'; // TODO: Retrieve the version from git tags or getenv()?
+    private const VERSION = '1.10.1'; // TODO: Retrieve the version from git tags or getenv()?
     private const NAME = 'mbin';
     private const CANONICAL_NAME = 'Mbin';
     private const REPOSITORY_URL = 'https://github.com/MbinOrg/mbin';

src/Utils/SqlHelpers.php

@@ -106,6 +106,8 @@ public static function getSqlType(mixed $value): string|int
             return Types::DATETIMETZ_MUTABLE;
         } elseif (\is_int($value)) {
             return Types::INTEGER;
+        } elseif (\is_bool($value)) {
+            return Types::BOOLEAN;
         }
 
         return Types::STRING;

tests/FactoryTrait.php

@@ -611,26 +611,43 @@ public function getKibbyFlippedImageDto(): ImageDto
         return $this->getKibbyImageVariantDto('_flipped');
     }
 
-    private function getKibbyImageVariantDto(string $suffix): ImageDto
+    public function getKibbyImageUpload(): UploadedFile
     {
-        $imageRepository = $this->imageRepository;
-        $imageFactory = $this->imageFactory;
+        return $this->getKibbyImageVariantUpload('');
+    }
 
-        if (!file_exists(\dirname($this->kibbyPath).'/copy')) {
-            if (!mkdir(\dirname($this->kibbyPath).'/copy')) {
+    public function getKibbyFlippedImageUpload(): UploadedFile
+    {
+        return $this->getKibbyImageVariantUpload('_flipped');
+    }
+
+    private function getKibbyImageVariantUpload(string $suffix): UploadedFile
+    {
+        if (!file_exists($this->imageUploadTmpDir)) {
+            if (!mkdir($this->imageUploadTmpDir)) {
                 throw new \Exception('The copy dir could not be created');
             }
         }
 
         // Uploading a file appears to delete the file at the given path, so make a copy before upload
-        $tmpPath = \dirname($this->kibbyPath).'/copy/'.bin2hex(random_bytes(32)).'.png';
+        $tmpPath = $this->imageUploadTmpDir.bin2hex(random_bytes(32)).'.png';
         $srcPath = \dirname($this->kibbyPath).'/'.basename($this->kibbyPath, '.png').$suffix.'.png';
         if (!file_exists($srcPath)) {
             throw new \Exception('For some reason the kibby image got deleted');
         }
         copy($srcPath, $tmpPath);
+
+        return new UploadedFile($tmpPath, 'kibby_emoji.png', 'image/png');
+    }
+
+    private function getKibbyImageVariantDto(string $suffix): ImageDto
+    {
+        $imageRepository = $this->imageRepository;
+        $imageFactory = $this->imageFactory;
+
+        $imgUpload = $this->getKibbyImageVariantUpload($suffix);
         /** @var Image $image */
-        $image = $imageRepository->findOrCreateFromUpload(new UploadedFile($tmpPath, 'kibby_emoji.png', 'image/png'));
+        $image = $imageRepository->findOrCreateFromUpload($imgUpload);
         self::assertNotNull($image);
         $image->altText = 'kibby';
         $this->entityManager->persist($image);