Remove legacy parser

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Jan 24, 2019 · 1289ea7 · 1289ea7
1 parent 261dcdf
commit 1289ea7
Show file tree

Hide file tree

Showing 34 changed files with 293 additions and 3,171 deletions.
diff --git a/lib/Controller/APIv1.php b/lib/Controller/APIv1.php
@@ -24,7 +24,6 @@
 use OCA\Activity\CurrentUser;
 use OCA\Activity\Data;
 use OCA\Activity\GroupHelper;
-use OCA\Activity\PlainTextParser;
 use OCA\Activity\UserSettings;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
@@ -41,9 +40,6 @@ class APIv1 extends OCSController {
 	/** @var UserSettings */
 	protected $userSettings;
 
-	/** @var PlainTextParser */
-	protected $parser;
-
 	/** @var CurrentUser */
 	protected $currentUser;
 
@@ -53,22 +49,19 @@ class APIv1 extends OCSController {
 	 * @param Data $data
 	 * @param GroupHelper $groupHelper
 	 * @param UserSettings $userSettings
-	 * @param PlainTextParser $parser
 	 * @param CurrentUser $currentUser
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								Data $data,
 								GroupHelper $groupHelper,
 								UserSettings $userSettings,
-								PlainTextParser $parser,
 								CurrentUser $currentUser) {
 		parent::__construct($appName, $request);
 
 		$this->data = $data;
 		$this->userSettings = $userSettings;
 		$this->groupHelper = $groupHelper;
-		$this->parser = $parser;
 		$this->currentUser = $currentUser;
 	}
 

diff --git a/lib/Controller/Feed.php b/lib/Controller/Feed.php
@@ -24,7 +24,6 @@
 
 use OCA\Activity\Data;
 use OCA\Activity\GroupHelper;
-use OCA\Activity\PlainTextParser;
 use OCA\Activity\UserSettings;
 use OCP\Activity\IManager;
 use OCP\AppFramework\Controller;
@@ -108,9 +107,7 @@ public function show() {
 
 			// Overwrite user and language in the helper
 			$this->l = $this->l10nFactory->get('activity', $userLang);
-			$parser = new PlainTextParser($this->l);
 			$this->helper->setL10n($this->l);
-			$this->helper->setUser($user);
 
 			$description = (string) $this->l->t('Personal activity feed for %s', $user);
 			$response = $this->data->get($this->helper, $this->settings, $user, 0, self::DEFAULT_PAGE_SIZE, 'desc', 'all');

diff --git a/lib/Data.php b/lib/Data.php
@@ -158,7 +158,6 @@ public function get(GroupHelper $groupHelper, UserSettings $userSettings, $user,
 		if ($user === '') {
 			throw new \OutOfBoundsException('Invalid user', 1);
 		}
-		$groupHelper->setUser($user);
 
 		$activeFilter = null;
 		try {

diff --git a/lib/DataHelper.php b/lib/DataHelper.php
diff --git a/lib/Extension/LegacyParser.php b/lib/Extension/LegacyParser.php
diff --git a/lib/Formatter/BaseFormatter.php b/lib/Formatter/BaseFormatter.php