Merge branch 'main' into swimlanes

Author: Pavlinchen

l10n/fr.js

@@ -191,6 +191,7 @@ OC.L10N.register(
     "Admin settings" : "Paramètres d'administration",
     "Limit board creation to some groups" : "Limiter la création de tableaux à certains groupes",
     "Users outside of those groups will not be able to create their own boards, but will still be able to work on boards that have been shared with them." : "Les utilisateurs qui ne font pas partie de ces groupes ne pourront pas créer leurs propres tableaux, mais pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",
+    "Enable federation" : "Activer la fédération",
     "Board actions" : "Actions sur le tableau",
     "Scroll sideways" : "Défilement latéral",
     "Navigate between cards" : "Naviguer entre les cartes",

l10n/fr.json

@@ -189,6 +189,7 @@
     "Admin settings" : "Paramètres d'administration",
     "Limit board creation to some groups" : "Limiter la création de tableaux à certains groupes",
     "Users outside of those groups will not be able to create their own boards, but will still be able to work on boards that have been shared with them." : "Les utilisateurs qui ne font pas partie de ces groupes ne pourront pas créer leurs propres tableaux, mais pourront toujours travailler sur les tableaux qui ont été partagés avec eux.",
+    "Enable federation" : "Activer la fédération",
     "Board actions" : "Actions sur le tableau",
     "Scroll sideways" : "Défilement latéral",
     "Navigate between cards" : "Naviguer entre les cartes",

l10n/lt_LT.js

@@ -88,7 +88,7 @@ OC.L10N.register(
     "Cards due tomorrow" : "Rytoj baigiamos kortelės",
     "Upcoming cards" : "Artėjančios kortelės",
     "Load more" : "Įkelti daugiau",
-    "Welcome to Nextcloud Deck!" : "Sveiki atvykę į „Nextcloud Deck“!",
+    "Welcome to Nextcloud Deck!" : "Sveiki atvykę į „Nextcloud Darbai“!",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} priskyrė jums {deck-card} kortelę iš {deck-board}.",
     "The card \"%1$s\" on \"%2$s\" has reached its due date." : "Kortelės „%1$s“ galiojimo laikas baigėsi %2$s.",
@@ -324,6 +324,7 @@ OC.L10N.register(
     "Edit card title" : "Redaguoti kortelės pavadinimą",
     "Open link" : "Atverti nuorodą",
     "Card deleted" : "Kortelė ištrinta",
+    "Change card color" : "Keisti kortelės spalvą",
     "Edit title" : "Taisyti pavadinimą",
     "Assign to me" : "Priskirti sau",
     "Unassign myself" : "Atšaukti savo priskyrimą",

l10n/lt_LT.json

@@ -86,7 +86,7 @@
     "Cards due tomorrow" : "Rytoj baigiamos kortelės",
     "Upcoming cards" : "Artėjančios kortelės",
     "Load more" : "Įkelti daugiau",
-    "Welcome to Nextcloud Deck!" : "Sveiki atvykę į „Nextcloud Deck“!",
+    "Welcome to Nextcloud Deck!" : "Sveiki atvykę į „Nextcloud Darbai“!",
     "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kortelę \"%s\" ties \"%s\" priskyrė jums %s.",
     "{user} has assigned the card {deck-card} on {deck-board} to you." : "{user} priskyrė jums {deck-card} kortelę iš {deck-board}.",
     "The card \"%1$s\" on \"%2$s\" has reached its due date." : "Kortelės „%1$s“ galiojimo laikas baigėsi %2$s.",
@@ -322,6 +322,7 @@
     "Edit card title" : "Redaguoti kortelės pavadinimą",
     "Open link" : "Atverti nuorodą",
     "Card deleted" : "Kortelė ištrinta",
+    "Change card color" : "Keisti kortelės spalvą",
     "Edit title" : "Taisyti pavadinimą",
     "Assign to me" : "Priskirti sau",
     "Unassign myself" : "Atšaukti savo priskyrimą",

l10n/sv.js

@@ -324,6 +324,7 @@ OC.L10N.register(
     "Edit card title" : "Ändra korttitel",
     "Open link" : "Öppna länken",
     "Card deleted" : "Kortet har raderats",
+    "Change card color" : "Ändra kortfärg",
     "Edit title" : "Redigera titel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",

l10n/sv.json

@@ -322,6 +322,7 @@
     "Edit card title" : "Ändra korttitel",
     "Open link" : "Öppna länken",
     "Card deleted" : "Kortet har raderats",
+    "Change card color" : "Ändra kortfärg",
     "Edit title" : "Redigera titel",
     "Assign to me" : "Tilldela till mig",
     "Unassign myself" : "Ta bort från mig själv",

l10n/zh_TW.js

@@ -324,6 +324,7 @@ OC.L10N.register(
     "Edit card title" : "編輯卡片標題",
     "Open link" : "開啟連結",
     "Card deleted" : "卡片已刪除",
+    "Change card color" : "變更卡片顏色",
     "Edit title" : "編輯標題",
     "Assign to me" : "分配給我",
     "Unassign myself" : "取消分配給我",

l10n/zh_TW.json

@@ -322,6 +322,7 @@
     "Edit card title" : "編輯卡片標題",
     "Open link" : "開啟連結",
     "Card deleted" : "卡片已刪除",
+    "Change card color" : "變更卡片顏色",
     "Edit title" : "編輯標題",
     "Assign to me" : "分配給我",
     "Unassign myself" : "取消分配給我",

lib/Service/CirclesService.php

@@ -14,6 +14,7 @@
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\Probes\CircleProbe;
+use OCA\Circles\Model\Probes\DataProbe;
 use OCP\App\IAppManager;
 use OCP\Server;
 use Throwable;
@@ -45,7 +46,9 @@ public function getCircle(string $circleId): ?Circle {
 			// Enforce current user condition since we always want the full list of members
 			$circlesManager = Server::get(CirclesManager::class);
 			$circlesManager->startSuperSession();
-			return $circlesManager->getCircle($circleId);
+			$dataProbe = new DataProbe();
+			$dataProbe->add(DataProbe::OWNER);
+			return $circlesManager->probeCircle($circleId, null, $dataProbe);
 		} catch (Throwable $e) {
 		}
 		return null;
@@ -64,7 +67,9 @@ public function isUserInCircle(string $circleId, string $userId): bool {
 			$circlesManager = Server::get(CirclesManager::class);
 			$federatedUser = $circlesManager->getFederatedUser($userId, Member::TYPE_USER);
 			$circlesManager->startSession($federatedUser);
-			$circle = $circlesManager->getCircle($circleId);
+			$dataProbe = new DataProbe();
+			$dataProbe->add(DataProbe::INITIATOR);
+			$circle = $circlesManager->probeCircle($circleId, null, $dataProbe);
 			$member = $circle->getInitiator();
 			$isUserInCircle = $member->getLevel() >= Member::LEVEL_MEMBER;
 
@@ -96,7 +101,7 @@ public function getUserCircles(string $userId): array {
 			$probe->mustBeMember();
 			return array_map(function (Circle $circle) {
 				return $circle->getSingleId();
-			}, $circlesManager->getCircles($probe));
+			}, $circlesManager->probeCircles($probe));
 		} catch (Throwable $e) {
 		}
 		return [];

tests/stub.phpstub

@@ -99,17 +99,27 @@ namespace OCA\Circles\Model\Probes {
 		public function __construct() {}
 		public function mustBeMember(bool $must = true): self {}
 	}
+	class DataProbe {
+		public const OWNER = 'd';
+		public const INITIATOR = 'h';
+		public function __construct() {}
+		public function add(string $key, array $path = []): self {}
+		public function mustBeMember(bool $must = true): self {}
+	}
 }
 
 namespace OCA\Circles {
 	use OCA\Circles\Model\Circle;
 	use OCA\Circles\Model\FederatedUser;
 	use OCA\Circles\Model\Probes\CircleProbe;
+	use OCA\Circles\Model\Probes\DataProbe;
 	class CirclesManager {
 		public function startSuperSession(): void {}
 		public function startSession(?FederatedUser $federatedUser = null): void {}
 		public function getCircles(?CircleProbe $probe = null): array {}
 		public function getCircle(string $singleId, ?CircleProbe $probe = null): Circle {}
+		public function probeCircles(?CircleProbe $circleProbe = null, ?DataProbe $dataProbe = null): array {}
+		public function probeCircle(string $singleId, ?CircleProbe $probe = null, ?DataProbe $dataProbe = null): Circle {}
 		public function getFederatedUser(string $federatedId, int $type = Member::TYPE_SINGLE): FederatedUser {}
 	}
 }