From d1e3c0278d1ef4d59c835ad727a42f3c0369b3c8 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 3 Aug 2023 15:30:45 +1000 Subject: [PATCH 1/2] feat(occ): Add --all option for occ user:lastseen Signed-off-by: Jordan Brown --- core/Command/User/LastSeen.php | 42 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 5c6d44a2245de..8a47ad8837a1d 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -31,6 +31,7 @@ use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class LastSeen extends Base { @@ -40,33 +41,38 @@ public function __construct( parent::__construct(); } - protected function configure() { + protected function configure(): void { $this ->setName('user:lastseen') ->setDescription('shows when the user was logged in last time') ->addArgument( 'uid', - InputArgument::REQUIRED, + InputArgument::OPTIONAL, 'the username' - ); + ) + ->addOption( + 'all', + null, + InputOption::VALUE_NONE, + 'shows a list of when all users were last logged in' + ) + ; } - protected function execute(InputInterface $input, OutputInterface $output): int { - $user = $this->userManager->get($input->getArgument('uid')); - if (is_null($user)) { - $output->writeln('User does not exist'); - return 1; - } - - $lastLogin = $user->getLastLogin(); - if ($lastLogin === 0) { - $output->writeln('Account ' . $user->getUID() . - ' has never logged in, yet.'); + protected function execute(InputInterface $input, OutputInterface $output): int { + $singleUserId = $input->getArgument('uid'); + if ($singleUserId) { + $user = $this->userManager->get($singleUserId); + if (is_null($user)) { + $output->writeln('User does not exist'); + return 1; + } + $users = [$user]; + } elseif ($input->getOption('all')) { + $users = $this->userManager->search(''); } else { - $date = new \DateTime(); - $date->setTimestamp($lastLogin); - $output->writeln($user->getUID() . - '`s last login: ' . $date->format('d.m.Y H:i')); + $output->writeln("Please specify a username, or \"--all\" to list all"); + return 1; } return 0; } From 813406322bd6b972a78ab388d5d685f60ea5009a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 13 Mar 2024 10:24:22 +0100 Subject: [PATCH 2/2] fix: Use IUserManager::callForAllUsers() to save memory Signed-off-by: Joas Schilling --- core/Command/User/LastSeen.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/core/Command/User/LastSeen.php b/core/Command/User/LastSeen.php index 8a47ad8837a1d..d78d8661ecf69 100644 --- a/core/Command/User/LastSeen.php +++ b/core/Command/User/LastSeen.php @@ -59,7 +59,7 @@ protected function configure(): void { ; } - protected function execute(InputInterface $input, OutputInterface $output): int { + protected function execute(InputInterface $input, OutputInterface $output): int { $singleUserId = $input->getArgument('uid'); if ($singleUserId) { $user = $this->userManager->get($singleUserId); @@ -67,13 +67,34 @@ protected function execute(InputInterface $input, OutputInterface $output): int $output->writeln('User does not exist'); return 1; } - $users = [$user]; - } elseif ($input->getOption('all')) { - $users = $this->userManager->search(''); - } else { + + $lastLogin = $user->getLastLogin(); + if ($lastLogin === 0) { + $output->writeln($user->getUID() . ' has never logged in.'); + } else { + $date = new \DateTime(); + $date->setTimestamp($lastLogin); + $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i')); + } + + return 0; + } + + if (!$input->getOption('all')) { $output->writeln("Please specify a username, or \"--all\" to list all"); return 1; } + + $this->userManager->callForAllUsers(static function (IUser $user) use ($output) { + $lastLogin = $user->getLastLogin(); + if ($lastLogin === 0) { + $output->writeln($user->getUID() . ' has never logged in.'); + } else { + $date = new \DateTime(); + $date->setTimestamp($lastLogin); + $output->writeln($user->getUID() . "'s last login: " . $date->format('Y-m-d H:i')); + } + }); return 0; }