fix: also remove custom group when no member left

Pasquale Tripodi · Pasquale Tripodi · commit e8d57e4dcedf · 2024-04-10T22:47:49.000+02:00
diff --git a/lib/Hooks.php b/lib/Hooks.php
@@ -35,6 +35,11 @@ public static function register(): void {
 	public static function userDelete($params) {
 		$customGroupsDbHandler = \OC::$server->query(CustomGroupsDatabaseHandler::class);
 		foreach ($customGroupsDbHandler->getUserMemberships($params['uid'], null) as $customGroup) {
+			$members = $customGroupsDbHandler->getGroupMembers($customgroup['group_id']);
+			if (\count($members) === 1 && $members[0]['user_id'] === $params['uid']) {
+				// removing custom group as deleted user is the only member/admin left
+				$customGroupsDbHandler->deleteGroup($customgroup['group_id']);
+			}
 			$customGroupsDbHandler->removeFromGroup($params['uid'], $customGroup['group_id']);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public static function register(): void {`
`35`	`35`	`public static function userDelete($params) {`
`36`	`36`	`$customGroupsDbHandler = \OC::$server->query(CustomGroupsDatabaseHandler::class);`
`37`	`37`	`foreach ($customGroupsDbHandler->getUserMemberships($params['uid'], null) as $customGroup) {`
	`38`	`+ $members = $customGroupsDbHandler->getGroupMembers($customgroup['group_id']);`
	`39`	`+ if (\count($members) === 1 && $members[0]['user_id'] === $params['uid']) {`
	`40`	`+ // removing custom group as deleted user is the only member/admin left`
	`41`	`+ $customGroupsDbHandler->deleteGroup($customgroup['group_id']);`
	`42`	`+ }`
`38`	`43`	`$customGroupsDbHandler->removeFromGroup($params['uid'], $customGroup['group_id']);`
`39`	`44`	`}`
`40`	`45`	`}`