refactor: flatten nesting with early returns#2564
Merged
CarlSchwan merged 1 commit intomasterfrom May 7, 2026
Merged
Conversation
- Data::setOffsetFromSince(): invert guards with early returns and extract the repeated fallback fetch into getFirstKnownActivityHeader() - MailQueueHandler::getAffectedUsers(): early return in the restrictEmails branch and extract the duplicated result loop into fetchAffectedUsers() Signed-off-by: Anna Larch <anna@nextcloud.com> AI-Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
miaulalala
force-pushed
the
refactor/early-returns
branch
from
19c3dfe to
b5fd2ff
Compare
Activity
 |
||||||||||||||||||||||||||||
| Project |
Activity
|
| Branch Review |
refactor/early-returns
|
| Run status |
|
| Run duration | 02m 00s |
| Commit |
|
| Committer | Anna |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
 |
0
|
 |
0
|
 |
1
|
 |
0
|
 |
9
|
| View all changes introduced in this branch ↗︎ | |
miaulalala
force-pushed
the
refactor/early-returns
branch
from
535df72 to
b5fd2ff
Compare
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
2 participants
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.
Summary
Data::setOffsetFromSince(): inverted the two nested guard conditions into early returns, and extracted the repeated fallback DB fetch into a privategetFirstKnownActivityHeader()helper — reducing nesting from 3 levels to 1MailQueueHandler::getAffectedUsers(): added an early return in the$restrictEmails !== nullbranch and extracted the duplicated result-fetching loop into a privatefetchAffectedUsers()helper, removing ~10 lines of copy-pasted codeNo behaviour changes. All existing tests pass.
Test plan
testSetOffsetFromSince(15 tests, 106 assertions) — greenMailQueueHandlerTest(10 tests, 93 assertions) — green🤖 Generated with Claude Code