From 2afeee24ad2eec19b3329aac03245e4e1e296c56 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Tue, 25 Jun 2019 23:32:46 -0100 Subject: [PATCH 1/3] get readable/json timeline using ./occ command Signed-off-by: Maxence Lange --- appinfo/info.xml | 1 + lib/AP.php | 22 ++++ lib/Command/Timeline.php | 266 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+) create mode 100644 lib/Command/Timeline.php diff --git a/appinfo/info.xml b/appinfo/info.xml index 29a3ba0a..f0888724 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -51,6 +51,7 @@ OCA\Social\Command\Fediverse OCA\Social\Command\NoteCreate OCA\Social\Command\NoteBoost + OCA\Social\Command\Timeline OCA\Social\Command\Reset OCA\Social\Command\QueueStatus OCA\Social\Command\QueueProcess diff --git a/lib/AP.php b/lib/AP.php index 54c7382d..418c0578 100644 --- a/lib/AP.php +++ b/lib/AP.php @@ -219,6 +219,7 @@ class AP { } $this->getObjectFromData($data, $item, $level); + $this->getActorFromData($data, $item, $level); return $item; } @@ -250,6 +251,27 @@ class AP { } + /** + * @param array $data + * @param ACore $item + * @param int $level + * + * @throws RedundancyLimitException + * @throws SocialAppConfigException + */ + public function getActorFromData(array $data, ACore &$item, int $level) { + try { + $actorData = $this->getArray('actor_info', $data, []); + if (!empty($actorData)) { + /** @var Person $actor */ + $actor = $this->getItemFromData($actorData, $item, $level); + $item->setActor($actor); + } + } catch (ItemUnknownException $e) { + } + } + + /** * @param array $data * diff --git a/lib/Command/Timeline.php b/lib/Command/Timeline.php new file mode 100644 index 00000000..f68711e4 --- /dev/null +++ b/lib/Command/Timeline.php @@ -0,0 +1,266 @@ + + * @copyright 2018, Maxence Lange + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + + +namespace OCA\Social\Command; + + +use daita\MySmallPhpTools\Exceptions\CacheItemNotFoundException; +use Exception; +use OC\Core\Command\Base; +use OCA\Social\AP; +use OCA\Social\Db\StreamRequest; +use OCA\Social\Exceptions\ItemUnknownException; +use OCA\Social\Exceptions\RedundancyLimitException; +use OCA\Social\Exceptions\SocialAppConfigException; +use OCA\Social\Model\ActivityPub\Actor\Person; +use OCA\Social\Model\ActivityPub\Stream; +use OCA\Social\Service\CacheActorService; +use OCA\Social\Service\ConfigService; +use OCA\Social\Service\MiscService; +use OCP\IUserManager; +use Symfony\Component\Console\Helper\Table; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\ConsoleOutput; +use Symfony\Component\Console\Output\OutputInterface; + + +/** + * Class Stream + * + * @package OCA\Social\Command + */ +class Timeline extends Base { + + /** @var IUserManager */ + private $userManager; + + /** @var StreamRequest */ + private $streamRequest; + + /** @var CacheActorService */ + private $cacheActorService; + + /** @var ConfigService */ + private $configService; + + /** @var MiscService */ + private $miscService; + + + /** @var OutputInterface */ + private $output; + + /** @var bool */ + private $asJson; + + /** @var int */ + private $count; + + + /** + * Stream constructor. + * + * @param IUserManager $userManager + * @param StreamRequest $streamRequest + * @param CacheActorService $cacheActorService + * @param ConfigService $configService + * @param MiscService $miscService + */ + public function __construct( + IUserManager $userManager, StreamRequest $streamRequest, + CacheActorService $cacheActorService, ConfigService $configService, + MiscService $miscService + ) { + parent::__construct(); + + $this->userManager = $userManager; + $this->streamRequest = $streamRequest; + $this->cacheActorService = $cacheActorService; + $this->configService = $configService; + $this->miscService = $miscService; + } + + + /** + * + */ + protected function configure() { + parent::configure(); + $this->setName('social:stream') + ->addArgument('userId', InputArgument::REQUIRED, 'viewer') + ->addArgument('timeline', InputArgument::REQUIRED, 'timeline') + ->addOption('count', '', InputOption::VALUE_REQUIRED, 'number of elements', '5') + ->addOption('json', '', InputOption::VALUE_NONE, 'return JSON format') + ->setDescription('Get stream by timeline and viewer'); + } + + + /** + * @param InputInterface $input + * @param OutputInterface $output + * + * @throws Exception + */ + protected function execute(InputInterface $input, OutputInterface $output) { + $output = new ConsoleOutput(); + $this->output = $output->section(); + + $this->asJson = $input->getOption('json'); + $this->count = intval($input->getOption('count')); + + $timeline = $input->getArgument('timeline'); + + $userId = $input->getArgument('userId'); + if ($this->userManager->get($userId) === null) { + throw new Exception('Unknown user'); + } + + $actor = $this->cacheActorService->getFromLocalAccount($userId); + + $this->outputActor($actor); + $this->displayStream($actor, $timeline); + } + + + /** + * @param Person $actor + */ + private function outputActor(Person $actor) { + if ($this->asJson) { + return; + } + + $this->output->writeln('Account: ' . $actor->getAccount()); + $this->output->writeln('Id: ' . $actor->getId()); + $this->output->writeln(''); + + } + + + /** + * @param Person $actor + * @param string $timeline + * + * @throws Exception + */ + private function displayStream(Person $actor, string $timeline) { + switch ($timeline) { + case 'home': + $stream = $this->streamRequest->getTimelineHome($actor, 0, $this->count); + $this->outputStream($stream); + break; + + case 'direct': + $stream = $this->streamRequest->getTimelineDirect($actor, 0, $this->count); + $this->outputStream($stream); + break; + + case 'notifications': + $stream = $this->streamRequest->getTimelineNotifications($actor, 0, $this->count); + $this->outputStream($stream); + break; + + case 'local': + $stream = $this->streamRequest->getTimelineGlobal(0, $this->count, true); + $this->outputStream($stream); + break; + + case 'global': + $stream = $this->streamRequest->getTimelineGlobal(0, $this->count, false); + $this->outputStream($stream); + break; + + default: + throw new Exception( + 'Unknown timeline. Try home, direct, local, global, notification.' + ); + } + } + + + /** + * @param Stream[] $stream + */ + private function outputStream(array $stream) { + if ($this->asJson) { + $this->output->writeln(json_encode($stream, JSON_PRETTY_PRINT)); + } + + $table = new Table($this->output); + $table->setHeaders(['Id', 'Source', 'Type', 'Author', 'Content']); + $table->render(); + $this->output->writeln(''); + + foreach ($stream as $item) { + $objectId = $item->getObjectId(); + $cache = $item->getCache(); + $content = ''; + $author = ''; + if ($objectId !== '' && $cache->hasItem($objectId)) { + try { + $cachedObject = $cache->getItem($objectId) + ->getObject(); + + /** @var Stream $cachedItem */ + $cachedItem = AP::$activityPub->getItemFromData($cachedObject); + $content = $cachedItem->getContent(); + $author = $cachedItem->getActor() + ->getAccount(); + } catch (CacheItemNotFoundException $e) { + } catch (ItemUnknownException $e) { + } catch (RedundancyLimitException $e) { + } catch (SocialAppConfigException $e) { + } + } else { + $content = $item->getContent(); + $author = $item->getActor() + ->getAccount(); + } + + $table->appendRow( + [ + '' . $item->getId() . '', + '' . $item->getActor() + ->getAccount() . '', + $item->getType(), + '' . $author . '', + $content, + ] + ); + } + + + } + + +} + From 40b5a67f2c129b2b3bf55953dc196e89177e90d7 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Thu, 27 Jun 2019 13:01:05 -0100 Subject: [PATCH 2/3] fixing Signed-off-by: Maxence Lange --- lib/Command/Timeline.php | 13 +++++++------ lib/Service/FollowService.php | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/Command/Timeline.php b/lib/Command/Timeline.php index f68711e4..d2120ead 100644 --- a/lib/Command/Timeline.php +++ b/lib/Command/Timeline.php @@ -41,6 +41,7 @@ use OCA\Social\Exceptions\RedundancyLimitException; use OCA\Social\Exceptions\SocialAppConfigException; use OCA\Social\Model\ActivityPub\Actor\Person; use OCA\Social\Model\ActivityPub\Stream; +use OCA\Social\Service\AccountService; use OCA\Social\Service\CacheActorService; use OCA\Social\Service\ConfigService; use OCA\Social\Service\MiscService; @@ -66,8 +67,8 @@ class Timeline extends Base { /** @var StreamRequest */ private $streamRequest; - /** @var CacheActorService */ - private $cacheActorService; + /** @var AccountService */ + private $accountService; /** @var ConfigService */ private $configService; @@ -91,20 +92,20 @@ class Timeline extends Base { * * @param IUserManager $userManager * @param StreamRequest $streamRequest - * @param CacheActorService $cacheActorService + * @param AccountService $accountService * @param ConfigService $configService * @param MiscService $miscService */ public function __construct( IUserManager $userManager, StreamRequest $streamRequest, - CacheActorService $cacheActorService, ConfigService $configService, + AccountService $accountService, ConfigService $configService, MiscService $miscService ) { parent::__construct(); $this->userManager = $userManager; $this->streamRequest = $streamRequest; - $this->cacheActorService = $cacheActorService; + $this->accountService = $accountService; $this->configService = $configService; $this->miscService = $miscService; } @@ -144,7 +145,7 @@ class Timeline extends Base { throw new Exception('Unknown user'); } - $actor = $this->cacheActorService->getFromLocalAccount($userId); + $actor = $this->accountService->getActor($userId); $this->outputActor($actor); $this->displayStream($actor, $timeline); diff --git a/lib/Service/FollowService.php b/lib/Service/FollowService.php index ec4b5b67..512dbd83 100644 --- a/lib/Service/FollowService.php +++ b/lib/Service/FollowService.php @@ -48,6 +48,7 @@ use OCA\Social\Exceptions\RequestResultSizeException; use OCA\Social\Exceptions\RequestServerException; use OCA\Social\Exceptions\SocialAppConfigException; use OCA\Social\Exceptions\ItemUnknownException; +use OCA\Social\Exceptions\UnauthorizedFediverseException; use OCA\Social\Exceptions\UrlCloudException; use OCA\Social\Model\ActivityPub\Object\Follow; use OCA\Social\Model\ActivityPub\Activity\Undo; @@ -131,6 +132,7 @@ class FollowService { * @throws RequestResultSizeException * @throws RequestServerException * @throws RequestResultNotJsonException + * @throws UnauthorizedFediverseException */ public function followAccount(Person $actor, string $account) { $remoteActor = $this->cacheActorService->getFromAccount($account); From 8d0970ccf75b2a1cb36bcbacdb69de3fdb6276e4 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Thu, 27 Jun 2019 13:01:31 -0100 Subject: [PATCH 3/3] managing accounts with ./occ Signed-off-by: Maxence Lange --- appinfo/info.xml | 4 +- lib/Command/AccountCreate.php | 123 ++++++++++++++++++++++++++++++ lib/Command/AccountFollowing.php | 127 +++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 lib/Command/AccountCreate.php create mode 100644 lib/Command/AccountFollowing.php diff --git a/appinfo/info.xml b/appinfo/info.xml index f0888724..76a3148f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -46,13 +46,15 @@ + OCA\Social\Command\AccountCreate + OCA\Social\Command\AccountFollowing OCA\Social\Command\CacheRefresh OCA\Social\Command\CheckInstall OCA\Social\Command\Fediverse OCA\Social\Command\NoteCreate OCA\Social\Command\NoteBoost - OCA\Social\Command\Timeline OCA\Social\Command\Reset + OCA\Social\Command\Timeline OCA\Social\Command\QueueStatus OCA\Social\Command\QueueProcess diff --git a/lib/Command/AccountCreate.php b/lib/Command/AccountCreate.php new file mode 100644 index 00000000..c42d4757 --- /dev/null +++ b/lib/Command/AccountCreate.php @@ -0,0 +1,123 @@ + + * @copyright 2018, Maxence Lange + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + + +namespace OCA\Social\Command; + + +use Exception; +use OC\Core\Command\Base; +use OCA\Social\Service\AccountService; +use OCA\Social\Service\CacheActorService; +use OCA\Social\Service\ConfigService; +use OCA\Social\Service\MiscService; +use OCP\IUserManager; +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 AccountCreate extends Base { + + + /** @var IUserManager */ + private $userManager; + + /** @var AccountService */ + private $accountService; + + /** @var CacheActorService */ + private $cacheActorService; + + /** @var ConfigService */ + private $configService; + + /** @var MiscService */ + private $miscService; + + + /** + * CacheUpdate constructor. + * + * @param IUserManager $userManager + * @param AccountService $accountService + * @param CacheActorService $cacheActorService + * @param ConfigService $configService + * @param MiscService $miscService + */ + public function __construct( + IUserManager $userManager, AccountService $accountService, + CacheActorService $cacheActorService, ConfigService $configService, MiscService $miscService + ) { + parent::__construct(); + + $this->userManager = $userManager; + + $this->accountService = $accountService; + $this->cacheActorService = $cacheActorService; + $this->configService = $configService; + $this->miscService = $miscService; + } + + + /** + * + */ + protected function configure() { + parent::configure(); + $this->setName('social:account:create') + ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud username of the account') + ->addOption('handle', '', InputOption::VALUE_REQUIRED, 'social handle') + ->setDescription('Create a new social account'); + } + + + /** + * @param InputInterface $input + * @param OutputInterface $output + * + * @throws Exception + */ + protected function execute(InputInterface $input, OutputInterface $output) { + $userId = $input->getArgument('userId'); + + if (($handle = $input->getOption('handle')) === null) { + $handle = $userId; + } + + if ($this->userManager->get($userId) === null) { + throw new Exception('Unknown user'); + } + + $this->accountService->createActor($userId, $handle); + } + +} + diff --git a/lib/Command/AccountFollowing.php b/lib/Command/AccountFollowing.php new file mode 100644 index 00000000..5833ef11 --- /dev/null +++ b/lib/Command/AccountFollowing.php @@ -0,0 +1,127 @@ + + * @copyright 2018, Maxence Lange + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + + +namespace OCA\Social\Command; + + +use Exception; +use OC\Core\Command\Base; +use OCA\Social\Service\AccountService; +use OCA\Social\Service\CacheActorService; +use OCA\Social\Service\ConfigService; +use OCA\Social\Service\FollowService; +use OCA\Social\Service\MiscService; +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 AccountFollowing extends Base { + + + /** @var AccountService */ + private $accountService; + + /** @var CacheActorService */ + private $cacheActorService; + + /** @var FollowService */ + private $followService; + + /** @var ConfigService */ + private $configService; + + /** @var MiscService */ + private $miscService; + + + /** + * CacheUpdate constructor. + * + * @param AccountService $accountService + * @param CacheActorService $cacheActorService + * @param FollowService $followService + * @param ConfigService $configService + * @param MiscService $miscService + */ + public function __construct( + AccountService $accountService, CacheActorService $cacheActorService, + FollowService $followService, ConfigService $configService, MiscService $miscService + ) { + parent::__construct(); + + $this->accountService = $accountService; + $this->cacheActorService = $cacheActorService; + $this->followService = $followService; + $this->configService = $configService; + $this->miscService = $miscService; + } + + + /** + * + */ + protected function configure() { + parent::configure(); + $this->setName('social:account:following') + ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud userid') + ->addArgument('account', InputArgument::REQUIRED, 'Account to follow') + ->addOption('local', '', InputOption::VALUE_NONE, 'account is local') + ->addOption('unfollow', '', InputOption::VALUE_NONE, 'unfollow') + ->setDescription('Following a new account'); + } + + + /** + * @param InputInterface $input + * @param OutputInterface $output + * + * @throws Exception + */ + protected function execute(InputInterface $input, OutputInterface $output) { + $userId = $input->getArgument('userId'); + $account = $input->getArgument('account'); + + $actor = $this->accountService->getActor($userId); + if ($input->getOption('local')) { + $local = $this->cacheActorService->getFromLocalAccount($account); + $account = $local->getAccount(); + } + + if ($input->getOption('unfollow')) { + $this->followService->unfollowAccount($actor, $account); + } else { + $this->followService->followAccount($actor, $account); + } + } + +} +