Skip to content

[stable32] fix(sharing): Adapt share suggestions to match trusted servers configs - #55642

Merged
nfebe merged 4 commits into
stable32from
backport/55080/stable32
Dec 16, 2025
Merged

[stable32] fix(sharing): Adapt share suggestions to match trusted servers configs#55642
nfebe merged 4 commits into
stable32from
backport/55080/stable32

Conversation

@backportbot

@backportbotbackportbotBot commented Oct 9, 2025

Copy link
Copy Markdown

Backport of #55080

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nfebenfebe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requires adaption. Backport incomplete.

Comment threadlib/private/Collaboration/Collaborators/RemotePlugin.php
@nfebe

Copy link
Copy Markdown
Contributor

Requires : #55893

When `show_federated_shares_to_trusted_servers_as_internal` is enabled
but `show_federated_shares_as_internal` is not, filter federated share
suggestions to only include trusted servers. Previously, searching for
an email address would suggest non-trusted federated servers.
Resolved: #54511
Signed-off-by: nfebe <fenn25.fn@gmail.com>
Signed-off-by: nfebe <fenn25.fn@gmail.com>
[skip ci]
@nfebe
nfebeforce-pushed the backport/55080/stable32 branch from 43bbcb5 to da82f6fCompareDecember 15, 2025 23:32
The federation app is not always installed, causing QueryException when
`OCA\Federation\TrustedServers` is injected as a hard dependency.
Signed-off-by: nfebe <fenn25.fn@gmail.com>
@nfebe

Copy link
Copy Markdown
Contributor

/compile

@nfebe
nfebe marked this pull request as ready for review December 15, 2025 23:36
@nfebe
nfebe requested review from a team as code ownersDecember 15, 2025 23:36
@nfebe
nfebe requested review from skjnldsv and szaimen and removed request for a teamDecember 15, 2025 23:36
@nfebe
nfebe requested review from Altahrim, salmart-dev and sorbaugh and removed request for a teamDecember 15, 2025 23:36
@nfebe
nfebe enabled auto-merge December 15, 2025 23:40
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nfebe
nfebe merged commit 73d85c1 into stable32Dec 16, 2025
226 of 230 checks passed
@nfebe
nfebe deleted the backport/55080/stable32 branch December 16, 2025 00:09
@nextcloud-botnextcloud-bot mentioned this pull request Jan 7, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@nfebe@nickvergessen@artonge@blizzz@Altahrim@nextcloud-command