Skip to content

fix(recording): fix recipient share path for normal shares when conversation subfolders is used #18047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
May 21, 2026
Merged

fix(recording): fix recipient share path for normal shares when conversation subfolders is used #18047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83288de
test(integration): Add a check for filesystem level paths as recordin…
nickvergessen May 20, 2026
f713d46
fix(sharing): Only include folder name when sharing via conversation/…
miaulalala May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/Share/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,25 @@ protected function overwriteShareTarget(BeforeShareCreatedEvent $event): void {
// point under their own attachment folder.
$ownerUid = $share->getShareOwner();
$relativePath = $share->getNode()->getName();
if ($this->config->isConversationSubfoldersEnabled() && $ownerUid !== null) {
if ($share->getShareType() === IShare::TYPE_ROOM && $this->config->isConversationSubfoldersEnabled() && $ownerUid !== null) {
$attachmentFolder = ltrim($this->config->getAttachmentFolder($ownerUid), '/');
$internalPath = $share->getNode()->getPath();
$prefix = '/' . $ownerUid . '/files/' . $attachmentFolder . '/';
if (str_starts_with($internalPath, $prefix)) {
$relativePath = substr($internalPath, strlen($prefix));
$candidate = substr($internalPath, strlen($prefix));
// Only keep the full relative path when the file sits inside a
// user subfolder (first segment is "<name>-<userid>") inside the
// conversation subfolder (first segment is "<name>-<token>").
// Other subdirectories (e.g. Recording/<token>/) are not part of
// the conversation subfolder hierarchy and must fall back to the
// flat filename so that recipients see the file at Talk/<filename>.
$segments = explode('/', $candidate, 3);
$potentialConversationFolder = $segments[0];
$potentialUserFolder = $segments[1] ?? '';
if (str_ends_with($potentialConversationFolder, '-' . $share->getSharedWith())
&& str_ends_with($potentialUserFolder, '-' . $share->getShareOwner())) {
$relativePath = $candidate;
}
}
}

Expand Down
15 changes: 15 additions & 0 deletions tests/integration/features/callapi/recording.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,21 @@ Feature: callapi/recording
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
| room1 | users | participant1 | participant1-displayname | record-audio | {file} | "IGNORE" |
Given user "participant2" exists
And user "participant1" adds user "participant2" to room "room1" with 200 (v4)

# Check paths on the actual file system
When user "participant2" gets the DAV properties for "/"
Then the list of returned files for "participant2" is
| / |
| /Talk/ |
| /welcome.txt |
When user "participant2" gets the DAV properties for "/Talk"
Then the list of returned files for "participant2" is
| /Talk/ |
| /Talk/join_call%20-%20summary.md |
| /Talk/join_call.md |
| /Talk/join_call.ogg |

Scenario: Store recording with success but fail to transcript
Given Fake summary task provider is enabled
Expand Down
Loading