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

renaming 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/134/head
Maxence Lange 2018-12-04 22:51:27 -01:00 zatwierdzone przez Julius Härtl
rodzic 2a47f895ad
commit 1b222bf469
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4C614C6ED2CDE6DF
2 zmienionych plików z 112 dodań i 39 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

90
lib/Controller/LocalController.php
Wyświetl plik

@ -33,12 +33,11 @@ namespace OCA\Social\Controller;
use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
use daita\MySmallPhpTools\Traits\TArrayTools;
use Exception;
use OC\User\NoUserException;
use OCA\Social\AppInfo\Application;
use OCA\Social\Exceptions\AccountAlreadyExistsException;
use OCA\Social\Exceptions\ActorDoesNotExistException;
use OCA\Social\Exceptions\AccountDoesNotExistException;
use OCA\Social\Exceptions\InvalidResourceException;
use OCA\Social\Model\ActivityPub\ACore;
use OCA\Social\Model\ActivityPub\Person;
use OCA\Social\Model\Post;
use OCA\Social\Service\ActivityPub\DocumentService;
use OCA\Social\Service\ActivityPub\FollowService;
@ -51,7 +50,6 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\Response;
use OCP\IRequest;
@ -93,6 +91,10 @@ class LocalController extends Controller {
private $miscService;
/** @var Person */
private $viewer;
/**
* LocalController constructor.
*
@ -204,10 +206,36 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function streamHome($since = 0, int $limit = 5): DataResponse {
try {
$actor = $this->actorService->getActorFromUserId($this->userId);
$posts = $this->noteService->getHomeNotesForActor($actor, $since, $limit);
$this->initViewer(true);
$posts = $this->noteService->getStreamHome($this->viewer->getId(), $since, $limit);
return $this->success($posts);
} catch (Exception $e) {
return $this->fail($e);
}
}
/**
* // TODO: Delete the NoCSRF check
*
* @NoCSRFRequired
* @NoAdminRequired
* @NoSubAdminRequired
*
* @param string $username
* @param int $since
* @param int $limit
*
* @return DataResponse
*/
public function streamAccount(string $username, $since = 0, int $limit = 5): DataResponse {
try {
$this->initViewer();
$account = $this->actorService->getActor($username);
$posts = $this->noteService->getStreamAccount($account->getId(), $since, $limit);
return $this->success($posts);
} catch (Exception $e) {
@ -229,10 +257,9 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function streamDirect(int $since = 0, int $limit = 5): DataResponse {
try {
$actor = $this->actorService->getActorFromUserId($this->userId);
$posts = $this->noteService->getDirectNotesForActor($actor, $since, $limit);
$this->initViewer();
$posts = $this->noteService->getStreamDirect($this->viewer->getId(), $since, $limit);
return $this->success($posts);
} catch (Exception $e) {
@ -257,7 +284,7 @@ class LocalController extends Controller {
*/
public function streamTimeline(int $since = 0, int $limit = 5): DataResponse {
try {
$posts = $this->noteService->getLocalTimeline($since, $limit);
$posts = $this->noteService->getStreamLocalTimeline($since, $limit);
return $this->success($posts);
} catch (Exception $e) {
@ -281,7 +308,7 @@ class LocalController extends Controller {
*/
public function streamFederated(int $since = 0, int $limit = 5): DataResponse {
try {
$posts = $this->noteService->getFederatedTimeline($since, $limit);
$posts = $this->noteService->getStreamGlobalTimeline($since, $limit);
return $this->success($posts);
} catch (Exception $e) {
@ -368,9 +395,9 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function currentFollowers(): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->actorService->getActorFromUserId($this->userId);
$followers = $this->followService->getFollowers($actor);
@ -389,9 +416,9 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function currentFollowing(): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->actorService->getActorFromUserId($this->userId);
$followers = $this->followService->getFollowing($actor);
@ -415,9 +442,8 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function accountInfo(string $username): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->actorService->getActor($username);
$actor = $this->personService->getFromLocalAccount($actor->getPreferredUsername());
@ -462,9 +488,10 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function accountFollowing(string $username): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->actorService->getActor($username);
$following = $this->followService->getFollowing($actor);
@ -488,9 +515,9 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function globalAccountInfo(string $account): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->personService->getFromAccount($account);
return $this->success(['account' => $actor]);
@ -513,9 +540,8 @@ class LocalController extends Controller {
* @return DataResponse
*/
public function globalActorInfo(string $id): DataResponse {
$this->initViewer();
try {
$this->initViewer();
$actor = $this->personService->getFromId($id);
return $this->success(['actor' => $actor]);
@ -617,14 +643,22 @@ class LocalController extends Controller {
/**
* @throws Exception
*
* @param bool $exception
*
* @throws AccountDoesNotExistException
*/
private function initViewer() {
private function initViewer(bool $exception = false) {
try {
$viewer = $this->actorService->getActorFromUserId($this->userId, true);
$this->followService->setViewerId($viewer->getId());
$this->personService->setViewerId($viewer->getId());
$this->viewer = $this->actorService->getActorFromUserId($this->userId, true);
$this->followService->setViewerId($this->viewer->getId());
$this->personService->setViewerId($this->viewer->getId());
$this->noteService->setViewerId($this->viewer->getId());
} catch (Exception $e) {
if ($exception) {
throw new AccountDoesNotExistException();
}
}
}

61
lib/Service/ActivityPub/NoteService.php
Wyświetl plik

@ -82,6 +82,10 @@ class NoteService implements ICoreService {
private $miscService;
/** @var string */
private $viewerId = '';
/**
* NoteService constructor.
*
@ -108,6 +112,19 @@ class NoteService implements ICoreService {
}
/**
* @param string $viewerId
*/
public function setViewerId(string $viewerId) {
$this->viewerId = $viewerId;
$this->notesRequest->setViewerId($viewerId);
}
public function getViewerId(): string {
return $this->viewerId;
}
/**
* @param string $userId
* @param string $content
@ -333,28 +350,39 @@ class NoteService implements ICoreService {
/**
* @param Person $actor
* @param string $actorId
*
* @param int $since
* @param int $limit
*
* @return Note[]
*/
public function getHomeNotesForActor(Person $actor, int $since = 0, int $limit = 5): array {
return $this->notesRequest->getHomeNotesForActorId($actor->getId(), $since, $limit);
public function getStreamHome(string $actorId, int $since = 0, int $limit = 5): array {
return $this->notesRequest->getStreamHome($actorId, $since, $limit);
}
/**
* @param Person $actor
*
* @param string $actorId
* @param int $since
* @param int $limit
*
* @return Note[]
*/
public function getDirectNotesForActor(Person $actor, int $since = 0, int $limit = 5): array {
return $this->notesRequest->getDirectNotesForActorId($actor->getId(), $since, $limit);
public function getStreamAccount(string $actorId, int $since = 0, int $limit = 5): array {
return $this->notesRequest->getStreamHome($actorId, $since, $limit);
}
/**
* @param string $actorId
* @param int $since
* @param int $limit
*
* @return Note[]
*/
public function getStreamDirect(string $actorId, int $since = 0, int $limit = 5): array {
return $this->notesRequest->getStreamDirect($actorId, $since, $limit);
}
@ -364,8 +392,8 @@ class NoteService implements ICoreService {
*
* @return Note[]
*/
public function getLocalTimeline(int $since = 0, int $limit = 5): array {
return $this->notesRequest->getPublicNotes($since, $limit, true);
public function getStreamLocalTimeline(int $since = 0, int $limit = 5): array {
return $this->notesRequest->getStreamTimeline($since, $limit, true);
}
@ -375,8 +403,19 @@ class NoteService implements ICoreService {
*
* @return Note[]
*/
public function getFederatedTimeline(int $since = 0, int $limit = 5): array {
return $this->notesRequest->getPublicNotes($since, $limit, false);
public function getStreamInternalTimeline(int $since = 0, int $limit = 5): array {
// TODO - admin should be able to provide a list of 'friendly/internal' instance of ActivityPub
}
/**
* @param int $since
* @param int $limit
*
* @return Note[]
*/
public function getStreamGlobalTimeline(int $since = 0, int $limit = 5): array {
return $this->notesRequest->getStreamTimeline($since, $limit, false);
}
}