diff options
Diffstat (limited to 'external/itemapi.php')
-rw-r--r-- | external/itemapi.php | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/external/itemapi.php b/external/itemapi.php index fae0b3593..611a51fd2 100644 --- a/external/itemapi.php +++ b/external/itemapi.php @@ -28,6 +28,8 @@ namespace OCA\News\External; use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Controller\Controller; use \OCA\AppFramework\Http\Request; +use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\News\BusinessLayer\ItemBusinessLayer; use \OCA\News\BusinessLayer\BusinessLayerException; @@ -81,7 +83,7 @@ class ItemAPI extends Controller { array_push($result['items'], $item->toAPI()); } - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -112,7 +114,7 @@ class ItemAPI extends Controller { array_push($result['items'], $item->toAPI()); } - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -121,10 +123,10 @@ class ItemAPI extends Controller { $itemId = (int) $this->params('itemId'); try { $this->itemBusinessLayer->read($itemId, $isRead, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex){ - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -135,10 +137,10 @@ class ItemAPI extends Controller { $guidHash = $this->params('guidHash'); try { $this->itemBusinessLayer->star($feedId, $guidHash, $isStarred, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex){ - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -193,7 +195,7 @@ class ItemAPI extends Controller { $newestItemId = (int) $this->params('newestItemId'); $this->itemBusinessLayer->readAll($newestItemId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } @@ -209,7 +211,7 @@ class ItemAPI extends Controller { } } - return new NewsAPIResult(); + return new JSONResponse(); } @@ -246,7 +248,7 @@ class ItemAPI extends Controller { } } - return new NewsAPIResult(); + return new JSONResponse(); } |