Merge pull request #1524 from nextcloud/backport/1378/1378-stable26

[stable26] circles' activity
nextcloud · Mar 7, 2024 · 2c44a56 · 2c44a56
2 parents 6310e2e + 2bfafac
commit 2c44a56
Show file tree

Hide file tree

Showing 19 changed files with 1,017 additions and 1,016 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -69,19 +69,19 @@ Those groups of people (or "circles") can then be used by any other app for shar
 		<!--		<command>OCA\Circles\Command\SyncContact</command>-->
 	</commands>
 
-	<!--	<activity>-->
-	<!--		<settings>-->
-	<!--			<setting>OCA\Circles\Activity\SettingAsNonMember</setting>-->
-	<!--			<setting>OCA\Circles\Activity\SettingAsMember</setting>-->
-	<!--			<setting>OCA\Circles\Activity\SettingAsModerator</setting>-->
-	<!--		</settings>-->
-	<!--		<filters>-->
-	<!--			<filter>OCA\Circles\Activity\Filter</filter>-->
-	<!--		</filters>-->
-	<!--		<providers>-->
-	<!--			<provider>OCA\Circles\Activity\Provider</provider>-->
-	<!--		</providers>-->
-	<!--	</activity>-->
+		<activity>
+			<settings>
+				<setting>OCA\Circles\Activity\SettingAsNonMember</setting>
+				<setting>OCA\Circles\Activity\SettingAsMember</setting>
+				<setting>OCA\Circles\Activity\SettingAsModerator</setting>
+			</settings>
+			<filters>
+				<filter>OCA\Circles\Activity\Filter</filter>
+			</filters>
+			<providers>
+				<provider>OCA\Circles\Activity\Provider</provider>
+			</providers>
+		</activity>
 
 	<collaboration>
 		<plugins>

diff --git a/lib/Activity/Filter.php b/lib/Activity/Filter.php
@@ -1,5 +1,31 @@
 <?php
 
+declare(strict_types=1);
+
+/**
+ * Circles - Bring cloud-users closer together.
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2023
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace OCA\Circles\Activity;
 
@@ -9,15 +35,10 @@
 use OCP\IURLGenerator;
 
 class Filter implements IFilter {
-	/** @var IL10N */
-	protected $l10n;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	public function __construct(IL10N $l10n, IURLGenerator $url) {
-		$this->l10n = $l10n;
-		$this->url = $url;
+	public function __construct(
+		protected IL10N $l10n,
+		protected IURLGenerator $url
+	) {
 	}
 
 	/**