Merge pull request #2092 from nextcloud/activity-filter-api

Better API for activity filters, settings and providers + Rich Object support

apps/dav/lib/CalDAV/Activity/Backend.php

@@ -112,7 +112,7 @@ protected function triggerCalendarActivity($action, array $calendarData, array $
 
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
-			->setObject(Extension::CALENDAR, $calendarData['id'])
+			->setObject(Extension::CALENDAR, (int) $calendarData['id'])
 			->setType(Extension::CALENDAR)
 			->setAuthor($currentUser);
 
@@ -162,7 +162,7 @@ public function onCalendarUpdateShares(array $calendarData, array $shares, array
 
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
-			->setObject(Extension::CALENDAR, $calendarData['id'])
+			->setObject(Extension::CALENDAR, (int) $calendarData['id'])
 			->setType(Extension::CALENDAR)
 			->setAuthor($currentUser);
 
@@ -387,7 +387,7 @@ public function onTouchCalendarObject($action, array $calendarData, array $share
 
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
-			->setObject(Extension::CALENDAR, $calendarData['id'])
+			->setObject(Extension::CALENDAR, (int) $calendarData['id'])
 			->setType($object['type'] === 'event' ? Extension::CALENDAR_EVENT : Extension::CALENDAR_TODO)
 			->setAuthor($currentUser);
 

apps/files/appinfo/app.php

@@ -67,16 +67,3 @@
 		'name' => $l->t('Recent'),
 	];
 });
-
-\OC::$server->getActivityManager()->registerExtension(function() {
-	return new \OCA\Files\Activity(
-		\OC::$server->query('L10NFactory'),
-		\OC::$server->getURLGenerator(),
-		\OC::$server->getActivityManager(),
-		new \OCA\Files\ActivityHelper(
-			\OC::$server->getTagManager()
-		),
-		\OC::$server->getDatabaseConnection(),
-		\OC::$server->getConfig()
-	);
-});

apps/files/appinfo/info.xml

@@ -17,6 +17,25 @@
 		<user>user-files</user>
 	</documentation>
 
+	<activity>
+		<settings>
+			<setting>OCA\Files\Activity\Settings\FileChanged</setting>
+			<setting>OCA\Files\Activity\Settings\FileCreated</setting>
+			<setting>OCA\Files\Activity\Settings\FileDeleted</setting>
+			<setting>OCA\Files\Activity\Settings\FileFavorite</setting>
+			<setting>OCA\Files\Activity\Settings\FileRestored</setting>
+		</settings>
+
+		<filters>
+			<filter>OCA\Files\Activity\Filter\FileChanges</filter>
+			<filter>OCA\Files\Activity\Filter\Favorites</filter>
+		</filters>
+
+		<providers>
+			<provider>OCA\Files\Activity\Provider</provider>
+		</providers>
+	</activity>
+
 	<background-jobs>
 		<job>OCA\Files\BackgroundJob\ScanFiles</job>
 		<job>OCA\Files\BackgroundJob\DeleteOrphanedItems</job>