Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/336/head
Maxence Lange 2019-01-15 12:29:14 -01:00
rodzic 6ad5dcfd12
commit daf473c9a0
5 zmienionych plików z 14 dodań i 6 usunięć

Wyświetl plik

@ -94,6 +94,12 @@ class SocialPubController extends Controller {
$this->navigationController = $navigationController;
}
/**
* @param $username
*
* @return Response
* @throws UrlCloudException
*/
private function renderPage($username): Response {
if ($this->userId) {
return $this->navigationController->navigate('');

Wyświetl plik

@ -31,11 +31,10 @@ namespace OCA\Social\Db;
use daita\MySmallPhpTools\Traits\TArrayTools;
use DateTime;
use Doctrine\DBAL\Query\QueryBuilder;
use OCA\Social\Exceptions\InvalidResourceException;
use OCA\Social\Model\ActivityPub\Object\Note;
use OCA\Social\Model\ActivityPub\Actor\Person;
use OCA\Social\Model\ActivityPub\Object\Note;
use OCA\Social\Model\InstancePath;
use OCP\DB\QueryBuilder\ICompositeExpression;
use OCP\DB\QueryBuilder\IQueryBuilder;

Wyświetl plik

@ -77,8 +77,8 @@ class DeleteInterface implements IActivityPubInterface {
$interface->delete($object);
return;
} catch (UnknownItemException $e) {
} catch (ItemNotFoundException $e) {
} catch (ItemUnknownException $e) {
}
}
}

Wyświetl plik

@ -38,7 +38,6 @@ use OCA\Social\Exceptions\NoteNotFoundException;
use OCA\Social\Interfaces\IActivityPubInterface;
use OCA\Social\Model\ActivityPub\ACore;
use OCA\Social\Model\ActivityPub\Activity\Create;
use OCA\Social\Model\ActivityPub\Activity\Update;
use OCA\Social\Model\ActivityPub\Object\Note;
use OCA\Social\Service\ConfigService;
use OCA\Social\Service\CurlService;

Wyświetl plik

@ -38,6 +38,7 @@ use OCA\Social\Db\FollowsRequest;
use OCA\Social\Db\NotesRequest;
use OCA\Social\Exceptions\AccountAlreadyExistsException;
use OCA\Social\Exceptions\ActorDoesNotExistException;
use OCA\Social\Exceptions\ItemUnknownException;
use OCA\Social\Exceptions\SocialAppConfigException;
use OCA\Social\Exceptions\UrlCloudException;
use OCA\Social\Model\ActivityPub\Actor\Person;
@ -245,8 +246,11 @@ class AccountService {
return;
}
$iconId = $this->documentService->cacheLocalAvatarByUsername($actor);
$actor->setIconId($iconId);
try {
$iconId = $this->documentService->cacheLocalAvatarByUsername($actor);
$actor->setIconId($iconId);
} catch (ItemUnknownException $e) {
}
$count = [
'followers' => $this->followsRequest->countFollowers($actor->getId()),