Merge pull request #14195 from owncloud/activity-manager-performance-improvements

Activity manager performance improvements

3 files changed, 106 insertions, 64 deletions

diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index 30a54fa009c..c4759120a39 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -40,6 +40,19 @@ class ActivityManager implements IManager {
 	 */
 	private $extensions = array();
 
+	/** @var array list of filters "name" => "is valid" */
+	protected $validFilters = array(
+		'all'	=> true,
+		'by'	=> true,
+		'self'	=> true,
+	);
+
+	/** @var array list of type icons "type" => "css class" */
+	protected $typeIcons = array();
+
+	/** @var array list of special parameters "app" => ["text" => ["parameter" => "type"]] */
+	protected $specialParameters = array();
+
 	/**
 	 * @param $app
 	 * @param $subject
@@ -124,39 +137,45 @@ class ActivityManager implements IManager {
 	}
 
 	/**
-	 * @param array $types
-	 * @param string $filter
+	 * @param string $method
 	 * @return array
 	 */
-	function filterNotificationTypes($types, $filter) {
+	function getDefaultTypes($method) {
+		$defaultTypes = array();
 		foreach($this->extensions as $extension) {
 			$c = $extension();
 			if ($c instanceof IExtension) {
-				$result = $c->filterNotificationTypes($types, $filter);
-				if (is_array($result)) {
-					$types = $result;
+				$types = $c->getDefaultTypes($method);
+				if (is_array($types)) {
+					$defaultTypes = array_merge($types, $defaultTypes);
 				}
 			}
 		}
-		return $types;
+		return $defaultTypes;
 	}
 
 	/**
-	 * @param string $method
-	 * @return array
+	 * @param string $type
+	 * @return string
 	 */
-	function getDefaultTypes($method) {
-		$defaultTypes = array();
+	function getTypeIcon($type) {
+		if (isset($this->typeIcons[$type])) {
+			return $this->typeIcons[$type];
+		}
+
 		foreach($this->extensions as $extension) {
 			$c = $extension();
 			if ($c instanceof IExtension) {
-				$types = $c->getDefaultTypes($method);
-				if (is_array($types)) {
-					$defaultTypes = array_merge($types, $defaultTypes);
+				$icon = $c->getTypeIcon($type);
+				if (is_string($icon)) {
+					$this->typeIcons[$type] = $icon;
+					return $icon;
 				}
 			}
 		}
-		return $defaultTypes;
+
+		$this->typeIcons[$type] = '';
+		return '';
 	}
 
 	/**
@@ -188,38 +207,30 @@ class ActivityManager implements IManager {
 	 * @return array|false
 	 */
 	function getSpecialParameterList($app, $text) {
+		if (isset($this->specialParameters[$app][$text])) {
+			return $this->specialParameters[$app][$text];
+		}
+
+		if (!isset($this->specialParameters[$app])) {
+			$this->specialParameters[$app] = array();
+		}
+
 		foreach($this->extensions as $extension) {
 			$c = $extension();
 			if ($c instanceof IExtension) {
 				$specialParameter = $c->getSpecialParameterList($app, $text);
 				if (is_array($specialParameter)) {
+					$this->specialParameters[$app][$text] = $specialParameter;
 					return $specialParameter;
 				}
 			}
 		}
 
+		$this->specialParameters[$app][$text] = false;
 		return false;
 	}
 
 	/**
-	 * @param string $type
-	 * @return string
-	 */
-	function getTypeIcon($type) {
-		foreach($this->extensions as $extension) {
-			$c = $extension();
-			if ($c instanceof IExtension) {
-				$icon = $c->getTypeIcon($type);
-				if (is_string($icon)) {
-					return $icon;
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
 	 * @param array $activity
 	 * @return integer|false
 	 */
@@ -264,23 +275,54 @@ class ActivityManager implements IManager {
 	 * @return boolean
 	 */
 	function isFilterValid($filterValue) {
+		if (isset($this->validFilters[$filterValue])) {
+			return $this->validFilters[$filterValue];
+		}
+
 		foreach($this->extensions as $extension) {
 			$c = $extension();
 			if ($c instanceof IExtension) {
 				if ($c->isFilterValid($filterValue) === true) {
+					$this->validFilters[$filterValue] = true;
 					return true;
 				}
 			}
 		}
 
+		$this->validFilters[$filterValue] = false;
 		return false;
 	}
 
 	/**
+	 * @param array $types
+	 * @param string $filter
+	 * @return array
+	 */
+	function filterNotificationTypes($types, $filter) {
+		if (!$this->isFilterValid($filter)) {
+			return $types;
+		}
+
+		foreach($this->extensions as $extension) {
+			$c = $extension();
+			if ($c instanceof IExtension) {
+				$result = $c->filterNotificationTypes($types, $filter);
+				if (is_array($result)) {
+					$types = $result;
+				}
+			}
+		}
+		return $types;
+	}
+
+	/**
 	 * @param string $filter
 	 * @return array
 	 */
 	function getQueryForFilter($filter) {
+		if (!$this->isFilterValid($filter)) {
+			return [null, null];
+		}
 
 		$conditions = array();
 		$parameters = array();
diff --git a/lib/public/activity/iextension.php b/lib/public/activity/iextension.php
index b85532ded1f..643ea11cffa 100644
--- a/lib/public/activity/iextension.php
+++ b/lib/public/activity/iextension.php
@@ -42,16 +42,6 @@ interface IExtension {
 	public function getNotificationTypes($languageCode);
 
 	/**
-	 * The extension can filter the types based on the filter if required.
-	 * In case no filter is to be applied false is to be returned unchanged.
-	 *
-	 * @param array $types
-	 * @param string $filter
-	 * @return array|false
-	 */
-	public function filterNotificationTypes($types, $filter);
-
-	/**
 	 * For a given method additional types to be displayed in the settings can be returned.
 	 * In case no additional types are to be added false is to be returned.
 	 *
@@ -61,6 +51,15 @@ interface IExtension {
 	public function getDefaultTypes($method);
 
 	/**
+	 * A string naming the css class for the icon to be used can be returned.
+	 * If no icon is known for the given type false is to be returned.
+	 *
+	 * @param string $type
+	 * @return string|false
+	 */
+	public function getTypeIcon($type);
+
+	/**
 	 * The extension can translate a given message to the requested languages.
 	 * If no translation is available false is to be returned.
 	 *
@@ -88,15 +87,6 @@ interface IExtension {
 	public function getSpecialParameterList($app, $text);
 
 	/**
-	 * A string naming the css class for the icon to be used can be returned.
-	 * If no icon is known for the given type false is to be returned.
-	 *
-	 * @param string $type
-	 * @return string|false
-	 */
-	public function getTypeIcon($type);
-
-	/**
 	 * The extension can define the parameter grouping by returning the index as integer.
 	 * In case no grouping is required false is to be returned.
 	 *
@@ -123,6 +113,16 @@ interface IExtension {
 	public function isFilterValid($filterValue);
 
 	/**
+	 * The extension can filter the types based on the filter if required.
+	 * In case no filter is to be applied false is to be returned unchanged.
+	 *
+	 * @param array $types
+	 * @param string $filter
+	 * @return array|false
+	 */
+	public function filterNotificationTypes($types, $filter);
+
+	/**
 	 * For a given filter the extension can specify the sql query conditions including parameters for that query.
 	 * In case the extension does not know the filter false is to be returned.
 	 * The query condition and the parameters are to be returned as array with two elements.
diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php
index ded17336ed8..bc320a0f8b4 100644
--- a/lib/public/activity/imanager.php
+++ b/lib/public/activity/imanager.php
@@ -72,17 +72,16 @@ interface IManager {
 	function getNotificationTypes($languageCode);
 
 	/**
-	 * @param array $types
-	 * @param string $filter
+	 * @param string $method
 	 * @return array
 	 */
-	function filterNotificationTypes($types, $filter);
+	function getDefaultTypes($method);
 
 	/**
-	 * @param string $method
-	 * @return array
+	 * @param string $type
+	 * @return string
 	 */
-	function getDefaultTypes($method);
+	function getTypeIcon($type);
 
 	/**
 	 * @param string $app
@@ -103,12 +102,6 @@ interface IManager {
 	function getSpecialParameterList($app, $text);
 
 	/**
-	 * @param string $type
-	 * @return string
-	 */
-	function getTypeIcon($type);
-
-	/**
 	 * @param array $activity
 	 * @return integer|false
 	 */
@@ -126,6 +119,13 @@ interface IManager {
 	function isFilterValid($filterValue);
 
 	/**
+	 * @param array $types
+	 * @param string $filter
+	 * @return array
+	 */
+	function filterNotificationTypes($types, $filter);
+
+	/**
 	 * @param string $filter
 	 * @return array
 	 */