Merge pull request #34608 from nextcloud/backport/34569/stable25

[stable25] Filter out backup user status (those beginning with _ as userId)
nextcloud · Oct 14, 2022 · b99e478 · b99e478
2 parents 684bd27 + 25efb43
commit b99e478
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/apps/user_status/lib/Db/UserStatusMapper.php b/apps/user_status/lib/Db/UserStatusMapper.php
@@ -76,10 +76,15 @@ public function findAllRecent(?int $limit = null, ?int $offset = null): array {
 			->select('*')
 			->from($this->tableName)
 			->orderBy('status_timestamp', 'DESC')
-			->where($qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)))
-			->orWhere($qb->expr()->isNotNull('message_id'))
-			->orWhere($qb->expr()->isNotNull('custom_icon'))
-			->orWhere($qb->expr()->isNotNull('custom_message'));
+			->where($qb->expr()->andX(
+				$qb->expr()->orX(
+					$qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)),
+					$qb->expr()->isNotNull('message_id'),
+					$qb->expr()->isNotNull('custom_icon'),
+					$qb->expr()->isNotNull('custom_message'),
+				),
+				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
+			));
 
 		if ($limit !== null) {
 			$qb->setMaxResults($limit);