Repository navigation
Fix user, group and circles change handling in bookmark folder shares - #2570
Merged
Merged
Conversation
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Fixes: - Listeners never ran: removed the leading backslash from the three circles registrations in Application.php. - Member branch never matched: the listener now checks CircleMemberAddedEvent and CircleMemberRemovedEvent directly, instead of their supposed parent class CircleMemberGenericEvent. - Member types read as share types: a circle is now resolved straight to its local users. A new CirclesService::getUserIdsOfCircle() uses getInheritedMembers() and keeps only user members, so groups and nested circles are already flattened. Share creation in FolderService and the listener both use it. - Broken upward propagation: removed the code that built fake events. The listener now collects the affected circles itself: the circle the event is about, plus everything above it via a new CirclesService::getParentCircleIds() (from getMemberships() → getCircleId()). It then updates every circle share on those circles. - The member that was added or removed is resolved by type: - a user is that user, - a group is the group's users, - a circle is resolved by its single id, not by userId, which is its display name. - Removing a user who is still in the circle another way: on removal, a user only loses the folder if they're no longer anywhere in that circle (directly, through a group, or through a nested circle). - Minor: the CircleDestroyedEvent handler now also catches the DB Exception. Signed-off-by: Marcel Klehr <mklehr@gmx.net>
groups inside circles are now handled Signed-off-by: Marcel Klehr <mklehr@gmx.net>
… still remove their folder even if a circle share also covers them Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…ave is now removed, including ones from circle shares Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…it through a group or circle no longer gives them a second SharedFolder Signed-off-by: Marcel Klehr <mklehr@gmx.net>
… gets the combined permissions of all of them Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…ger crashes Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…from members who are still covered by another share of it Signed-off-by: Marcel Klehr <mklehr@gmx.net>
marcelklehr
changed the title
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
marcelklehr
force-pushed
the
test/sharing-complexities
branch
from
October 5, 2026 14:59
00776eb to
811f36d
Compare
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
marcelklehr
force-pushed
the
test/sharing-complexities
branch
from
October 5, 2026 16:42
1d573d9 to
05a5d40
Compare
marcelklehr
changed the title
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…WithUser Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…ed again Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…overs them Signed-off-by: Marcel Klehr <mklehr@gmx.net>
…g shares Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
marcelklehr
enabled auto-merge
October 8, 2026 17:55
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #2569
fixes #2484
🤖 AI (if applicable)