Skip to content

fix: trim duplicate search results for external share#60587

Open
Antreesy wants to merge 1 commit into
masterfrom
fix/99281/lookup-duplicates
Open

fix: trim duplicate search results for external share#60587
Antreesy wants to merge 1 commit into
masterfrom
fix/99281/lookup-duplicates

Conversation

@Antreesy
Copy link
Copy Markdown
Contributor

Resolves

  • When deduplicating collaborator results, email shares were not being removed when the same person appeared as a lookup server result.
  • Additionally, exact email matches (in the exact bucket) were being ignored entirely due to strict guard condition.

Summary

  • Merge exact and non-exact email results before deduplication
  • Extend the removal logic to also cover lookup server results
  • now email share entry is dropped whenever a federated or lookup match exists for the same person.

TODO

  • Test coverage?
  • Manual test

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@Antreesy Antreesy added this to the Nextcloud 35 milestone May 19, 2026
@Antreesy Antreesy self-assigned this May 19, 2026
@Antreesy Antreesy requested a review from a team as a code owner May 19, 2026 16:10
@Antreesy Antreesy added bug 3. to review Waiting for reviews labels May 19, 2026
@Antreesy Antreesy requested review from leftybournes and removed request for a team May 19, 2026 16:10
Comment thread lib/private/Collaboration/Collaborators/Search.php Outdated
@Antreesy Antreesy force-pushed the fix/99281/lookup-duplicates branch from 984d4c7 to 90f2c37 Compare May 20, 2026 08:02
@n-iv
Copy link
Copy Markdown

n-iv commented May 20, 2026

Fixes the problem on a very large cluster, thank you

@Antreesy
Copy link
Copy Markdown
Contributor Author

/backport to stable34

@Antreesy
Copy link
Copy Markdown
Contributor Author

/backport to stable33

@Antreesy
Copy link
Copy Markdown
Contributor Author

/backport to stable32

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
@Antreesy Antreesy force-pushed the fix/99281/lookup-duplicates branch from 90f2c37 to 2ee8b9c Compare May 20, 2026 15:30
@CarlSchwan CarlSchwan enabled auto-merge May 21, 2026 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants