diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2019-05-06 07:29:07 -0100 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2019-05-06 07:29:07 -0100 |
| commit | 9854c65e0a7976783dafa6f733d77d4a3882d6d9 (patch) | |
| tree | ece3f813742dfbee4245f9a07016859339fa352b /lib/Controller | |
| parent | 51b936e48263b0300e8a4c8d79da28ac44ce097d (diff) | |
cleaning/merging to master
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'lib/Controller')
| -rw-r--r-- | lib/Controller/LocalController.php | 1 | ||||
| -rw-r--r-- | lib/Controller/OStatusController.php | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index d77c2d8f..17606ef7 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -36,7 +36,6 @@ use Exception; use OCA\Social\AppInfo\Application; use OCA\Social\Exceptions\AccountDoesNotExistException; use OCA\Social\Exceptions\InvalidResourceException; -use OCA\Social\Model\ActivityPub\ACore; use OCA\Social\Model\ActivityPub\Actor\Person; use OCA\Social\Model\ActivityPub\Stream; use OCA\Social\Model\Post; diff --git a/lib/Controller/OStatusController.php b/lib/Controller/OStatusController.php index 3ad8718d..cc012e87 100644 --- a/lib/Controller/OStatusController.php +++ b/lib/Controller/OStatusController.php @@ -79,6 +79,7 @@ class OStatusController extends Controller { * @param AccountService $accountService * @param CurlService $curlService * @param MiscService $miscService + * @param IUserSession $userSession */ public function __construct( IRequest $request, CacheActorService $cacheActorService, AccountService $accountService, @@ -145,7 +146,7 @@ class OStatusController extends Controller { 'account' => $following->getAccount() ] ], 'guest'); - } catch (\Exception $e) { + } catch (Exception $e) { return $this->fail($e); } } |