remove usersettingscontroller in favor of pagecontroller, simplify settings requests

1 files changed, 33 insertions, 0 deletions

diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 0526d79e8..4acc5f9e6 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -26,15 +26,18 @@
 namespace OCA\News\Controller;
 
 use \OCP\IRequest;
+use \OCP\AppFramework\Http\JSONResponse;
 use \OCP\AppFramework\Controller;
 
 use \OCA\News\Core\API;
 
 class PageController extends Controller {
 
+	private $api;
 
 	public function __construct(API $api, IRequest $request){
 		parent::__construct($api->getAppName(), $request);
+		$this->api = $api;
 	}
 
 
@@ -47,4 +50,34 @@ class PageController extends Controller {
 	}
 
 
+	/**
+	 * @NoAdminRequired
+	 */
+	public function settings() {
+		$showAll = $this->api->getUserValue('showAll');
+		$compact = $this->api->getUserValue('compact');
+		$language = $this->api->getTrans()->findLanguage();
+
+		$settings = array(
+			'showAll' => $showAll === '1',
+			'compact' => $compact === '1',
+			'language' => $language
+		);
+
+		return new JSONResponse($settings);
+	}
+
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function updateSettings() {
+		$isShowAll = $this->params('showAll');
+		$isCompact = $this->params('compact');
+		$this->api->setUserValue('showAll', $isShowAll);
+		$this->api->setUserValue('compact', $isCompact);
+
+		return new JSONResponse();
+	}
+
 }
\ No newline at end of file