mirror
/
social
kopia lustrzana https://github.com/nextcloud/social
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

using new Services 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/20/head
Maxence Lange 2018-11-12 21:57:50 -01:00
rodzic f4a93ec743
commit 6a0ac5934e
1 zmienionych plików z 19 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
lib/Command/NoteCreate.php
Wyświetl plik

@ -33,12 +33,14 @@ namespace OCA\Social\Command;
use Exception; use Exception;
use OC\Core\Command\Base; use OC\Core\Command\Base;
use OCA\Social\Model\InstancePath; use OCA\Social\Model\InstancePath;
use OCA\Social\Model\Post;
use OCA\Social\Service\ActivityPub\NoteService; use OCA\Social\Service\ActivityPub\NoteService;
use OCA\Social\Service\ActivityPubService; use OCA\Social\Service\ActivityService;
use OCA\Social\Service\ActorService; use OCA\Social\Service\ActorService;
use OCA\Social\Service\ConfigService; use OCA\Social\Service\ConfigService;
use OCA\Social\Service\CurlService; use OCA\Social\Service\CurlService;
use OCA\Social\Service\MiscService; use OCA\Social\Service\MiscService;
use OCA\Social\Service\PostService;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
@ -50,14 +52,14 @@ class NoteCreate extends Base {
/** @var ConfigService */ /** @var ConfigService */
private $configService; private $configService;
/** @var ActivityPubService */ /** @var ActivityService */
private $activityPubService; private $activityService;
/** @var ActorService */ /** @var ActorService */
private $actorService; private $actorService;
/** @var NoteService */ /** @var NoteService */
private $noteService; private $postService;
/** @var CurlService */ /** @var CurlService */
private $curlService; private $curlService;
@ -69,23 +71,23 @@ class NoteCreate extends Base {
/** /**
* NoteCreate constructor. * NoteCreate constructor.
* *
* @param ActivityPubService $activityPubService * @param ActivityService $activityService
* @param ActorService $actorService * @param ActorService $actorService
* @param NoteService $noteService * @param PostService $postService
* @param CurlService $curlService * @param CurlService $curlService
* @param ConfigService $configService * @param ConfigService $configService
* @param MiscService $miscService * @param MiscService $miscService
*/ */
public function __construct( public function __construct(
ActivityPubService $activityPubService, ActorService $actorService, ActivityService $activityService, ActorService $actorService,
NoteService $noteService, CurlService $curlService, PostService $postService, CurlService $curlService,
ConfigService $configService, MiscService $miscService ConfigService $configService, MiscService $miscService
) { ) {
parent::__construct(); parent::__construct();
$this->activityPubService = $activityPubService; $this->activityService = $activityService;
$this->actorService = $actorService; $this->actorService = $actorService;
$this->noteService = $noteService; $this->postService = $postService;
$this->curlService = $curlService; $this->curlService = $curlService;
$this->configService = $configService; $this->configService = $configService;
$this->miscService = $miscService; $this->miscService = $miscService;
@ -123,21 +125,15 @@ class NoteCreate extends Base {
$to = $input->getOption('to'); $to = $input->getOption('to');
$replyTo = $input->getOption('replyTo'); $replyTo = $input->getOption('replyTo');
$note = $this->noteService->generateNote($userId, $content); $post = new Post($userId);
$post->setContent($content);
$post->setReplyTo(($replyTo === null) ? '' : $replyTo);
$post->addTo($to);
if ($to !== null) { $result = $this->postService->createPost($post, $activity);
$this->noteService->assignTo($note, $to, InstancePath::INBOX);
}
if ($replyTo !== null) {
$this->noteService->replyTo($note, $replyTo);
}
$result = $this->activityPubService->createActivity($userId, $note, $activity);
echo 'object: ' . json_encode($activity, JSON_PRETTY_PRINT) . "\n";
echo 'result: ' . json_encode($result, JSON_PRETTY_PRINT) . "\n";
echo 'object: ' . json_encode($activity, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
echo 'result: ' . json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n";
} }
} }