1 files changed, 23 insertions, 15 deletions

diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php
index bb798759511..66b831c793b 100644
--- a/core/Command/User/ListCommand.php
+++ b/core/Command/User/ListCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -58,9 +59,9 @@ class ListCommand extends Base {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		if ($input->getOption('disabled')) {
-			$users = $this->userManager->getDisabledUsers((int) $input->getOption('limit'), (int) $input->getOption('offset'));
+			$users = $this->userManager->getDisabledUsers((int)$input->getOption('limit'), (int)$input->getOption('offset'));
 		} else {
-			$users = $this->userManager->searchDisplayName('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
+			$users = $this->userManager->searchDisplayName('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
 		}
 
 		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info')));
@@ -69,18 +70,13 @@ class ListCommand extends Base {
 
 	/**
 	 * @param IUser[] $users
-	 * @param bool [$detailed=false]
-	 * @return array
+	 * @return \Generator<string,string|array>
 	 */
-	private function formatUsers(array $users, bool $detailed = false) {
-		$keys = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
-
-		$values = array_map(function (IUser $user) use ($detailed) {
+	private function formatUsers(array $users, bool $detailed = false): \Generator {
+		foreach ($users as $user) {
 			if ($detailed) {
 				$groups = $this->groupManager->getUserGroupIds($user);
-				return [
+				$value = [
 					'user_id' => $user->getUID(),
 					'display_name' => $user->getDisplayName(),
 					'email' => (string)$user->getSystemEMailAddress(),
@@ -88,13 +84,25 @@ class ListCommand extends Base {
 					'enabled' => $user->isEnabled(),
 					'groups' => $groups,
 					'quota' => $user->getQuota(),
-					'last_seen' => date(\DateTimeInterface::ATOM, $user->getLastLogin()), // ISO-8601
+					'first_seen' => $this->formatLoginDate($user->getFirstLogin()),
+					'last_seen' => $this->formatLoginDate($user->getLastLogin()),
 					'user_directory' => $user->getHome(),
 					'backend' => $user->getBackendClassName()
 				];
+			} else {
+				$value = $user->getDisplayName();
 			}
-			return $user->getDisplayName();
-		}, $users);
-		return array_combine($keys, $values);
+			yield $user->getUID() => $value;
+		}
+	}
+
+	private function formatLoginDate(int $timestamp): string {
+		if ($timestamp < 0) {
+			return 'unknown';
+		} elseif ($timestamp === 0) {
+			return 'never';
+		} else {
+			return date(\DateTimeInterface::ATOM, $timestamp); // ISO-8601
+		}
 	}
 }