Improve MagazinePeopleFrontController (#1957)

Author: BentiGorlich

src/Controller/Magazine/MagazinePeopleFrontController.php

@@ -31,8 +31,8 @@ public function __invoke(
                     $this->magazineRepository->findByActivity(),
                     fn ($val) => 'random' !== $val->name && $val !== $magazine
                 ),
-                'local' => $this->userRepository->findUsersForMagazine($magazine),
-                'federated' => $this->userRepository->findUsersForMagazine($magazine, true),
+                'local' => $this->userRepository->findUsersForMagazine($magazine, limit: 28, limitTime: $magazine->getContentCount() > 1000),
+                'federated' => $this->userRepository->findUsersForMagazine($magazine, true, limit: 28, limitTime: $magazine->getContentCount() > 1000),
             ]
         );
     }

src/Entity/Magazine.php

@@ -530,4 +530,9 @@ public function isActorPostingRestricted(Magazine|User $actor): bool
 
         return true;
     }
+
+    public function getContentCount(): int
+    {
+        return $this->entryCount + $this->entryCommentCount + $this->postCount + $this->postCommentCount;
+    }
 }

src/Repository/UserRepository.php

@@ -534,22 +534,23 @@ public function findUsersSuggestions(string $query): array
             ->getResult();
     }
 
-    public function findUsersForMagazine(Magazine $magazine, ?bool $federated = false, $limit = 200, bool $limitTime = false, bool $requireAvatar = false): array
+    public function findUsersForMagazine(Magazine $magazine, ?bool $federated = false, int $limit = 200, bool $limitTime = false, bool $requireAvatar = false): array
     {
         $conn = $this->_em->getConnection();
         $timeWhere = $limitTime ? "AND created_at > now() - '30 days'::interval" : '';
         $sql = "
-        (SELECT count(id), user_id FROM entry WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT 50)
-        UNION
-        (SELECT count(id), user_id FROM entry_comment WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT 50)
-        UNION
-        (SELECT count(id), user_id FROM post WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT 50)
-        UNION
-        (SELECT count(id), user_id FROM post_comment WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT 50)
-        ORDER BY count DESC";
+        (SELECT count(id), user_id FROM entry WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT :limit)
+        UNION ALL
+        (SELECT count(id), user_id FROM entry_comment WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT :limit)
+        UNION ALL
+        (SELECT count(id), user_id FROM post WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT :limit)
+        UNION ALL
+        (SELECT count(id), user_id FROM post_comment WHERE magazine_id = :magazineId $timeWhere GROUP BY user_id ORDER BY count DESC LIMIT :limit)
+        ";
 
         $stmt = $conn->prepare($sql);
         $stmt->bindValue('magazineId', $magazine->getId());
+        $stmt->bindValue('limit', $limit);
         $counter = $stmt->executeQuery()->fetchAllAssociative();
 
         $output = [];
@@ -563,6 +564,9 @@ public function findUsersForMagazine(Magazine $magazine, ?bool $federated = fals
             }
         }
 
+        // sort the array after the counts from the different table are added up
+        usort($output, fn ($a, $b) => $b['count'] - $a['count']);
+
         $user = array_map(fn ($item) => $item['user_id'], $output);
 
         $qb = $this->createQueryBuilder('u', 'u.id');
@@ -581,8 +585,7 @@ public function findUsersForMagazine(Magazine $magazine, ?bool $federated = fals
 
         if (null !== $federated) {
             if ($federated) {
-                $qb->andWhere('u.apId IS NOT NULL')
-                    ->andWhere('u.apDiscoverable = true');
+                $qb->andWhere('u.apId IS NOT NULL');
             } else {
                 $qb->andWhere('u.apId IS NULL');
             }
@@ -603,7 +606,7 @@ public function findUsersForMagazine(Magazine $magazine, ?bool $federated = fals
             if (isset($users[$item['user_id']])) {
                 $res[] = $users[$item['user_id']];
             }
-            if (\count($res) >= 35) {
+            if (\count($res) >= $limit) {
                 break;
             }
         }